wangshan 5 months ago
parent
commit
ce5a664eae
4 changed files with 17 additions and 17 deletions
  1. 1 1
      src/config.json
  2. 3 3
      src/config/config.go
  3. 8 8
      src/main.go
  4. 5 5
      src/service/verify.go

+ 1 - 1
src/config.json

@@ -47,7 +47,7 @@
 			"maxIdleConns": 5
 		}
 	},
-	"redis": "other=192.168.3.149:1712",
+	"redis":  "other=172.20.45.129:1712",
 	"strategy": [
 		{
 			"day": "1",

+ 3 - 3
src/config/config.go

@@ -4,7 +4,7 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
-	"log"
+	"app.yhyue.com/moapp/jylog"
 )
 
 var (
@@ -89,7 +89,7 @@ type productInfo struct {
 func init() {
 	common.ReadConfig(&Config)
 	if Config.Mysql.Base.Address != "" {
-		log.Println("初始化 mysql Base")
+		jylog.Println("初始化 mysql Base")
 		BaseMysql = &mysql.Mysql{
 			Address:      Config.Mysql.Base.Address,
 			UserName:     Config.Mysql.Base.UserName,
@@ -110,7 +110,7 @@ func init() {
 	}
 	//初始化redis
 	if Config.Redis != "" {
-		log.Println("初始化 redis")
+		jylog.Println("初始化 redis")
 		redis.InitRedisBySize(Config.Redis, 100, 30, 300)
 	}
 }

+ 8 - 8
src/main.go

@@ -4,10 +4,9 @@ import (
 	. "Sms_Service/src/config"
 	. "Sms_Service/src/service"
 	"app.yhyue.com/moapp/jybase/common"
-	logrusx "app.yhyue.com/moapp/jylogx/logx"
+	"app.yhyue.com/moapp/jylog"
 	"encoding/json"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
 	"net"
 	"net/http"
 	"net/rpc"
@@ -25,12 +24,13 @@ func init() {
 	} else if Config.Model == 2 {
 		service = Yunpian
 	} else {
-		logx.Error("无效的model配置项", Config.Model)
+		jylog.Info("无效的model配置项", Config.Model)
+		//logx.Error("无效的model配置项", Config.Model)
 	}
 }
 
 func main() {
-	logx.SetWriter(logrusx.NewLogrusWriter())
+	//logx.SetWriter(logrusx.NewLogrusWriter())
 	//logger.SetConsole(false)
 	//logger.SetRollingDaily("./logs", "sms.log")
 	frpc := new(Sms)
@@ -39,9 +39,9 @@ func main() {
 	//处理链接
 	listen, err := net.Listen("tcp", ":"+Config.Port)
 	if err != nil {
-		logx.Error(err)
+		jylog.Error(err)
 	} else {
-		logx.Info("rpc server is listening", Config.Port)
+		jylog.Info("rpc server is listening", Config.Port)
 	}
 	http.Serve(listen, nil)
 }
@@ -56,10 +56,10 @@ func (s *Sms) Execute(param *[]byte, ret *string) error {
 		defer common.Catch()
 		var reqData *ReqData
 		if err := json.Unmarshal(*param, &reqData); err != nil {
-			logx.Error(err)
+			jylog.Error(err)
 			return
 		}
-		logx.Info("req data:", fmt.Sprintf("%+v", reqData))
+		jylog.Info("req data:", fmt.Sprintf("%+v", reqData))
 		if service.Verify(reqData) {
 			service.Execute(reqData)
 		}

+ 5 - 5
src/service/verify.go

@@ -4,8 +4,8 @@ import (
 	"Sms_Service/src/config"
 	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/redis"
+	"app.yhyue.com/moapp/jylog"
 	"fmt"
-	"log"
 	"strings"
 	"sync"
 	"time"
@@ -25,7 +25,7 @@ func SmsStrategy(keys []string) (abnormalKey []string) {
 			cacheKey := fmt.Sprintf(key, s.Day)
 			num := redis.GetInt(smsCacheCode, cacheKey)
 			ttl := redis.GetTTL(smsCacheCode, cacheKey)
-			log.Println(cacheKey, "-----num----", num, "----ttl---", ttl, "--s.Num--", s.Num)
+			jylog.Info(cacheKey, "-----num----", num, "----ttl---", ttl, "--s.Num--", s.Num)
 			if num >= s.Num {
 				abnormalKey = append(abnormalKey, cacheKey)
 			}
@@ -78,7 +78,7 @@ func Verify(reqData *ReqData) bool {
 					"ip_state": ipState,
 					"date":     date.FormatDate(&now, date.Date_Full_Layout),
 				}); id <= 0 {
-					log.Println("sms_black_ip 信息保存异常:", mobile, ip)
+					jylog.Info("sms_black_ip 信息保存异常:", mobile, ip)
 				}
 			}
 			if !phoneE {
@@ -87,11 +87,11 @@ func Verify(reqData *ReqData) bool {
 					"phone_state": phoneState,
 					"date":        date.FormatDate(&now, date.Date_Full_Layout),
 				}); id <= 0 {
-					log.Println("sms_black_phone 信息保存异常:", mobile, ip)
+					jylog.Info("sms_black_phone 信息保存异常:", mobile, ip)
 				}
 			}
 		}(aks, reqData.Ip, reqData.Phones)
-		log.Println("当前用户发送短信验证次数超过最大限制:" + strings.Join(aks, ","))
+		jylog.Info(reqData.Phones, "---当前用户发送短信验证次数超过最大限制:"+strings.Join(aks, ","))
 		return false
 	}
 	return true