Merge branch 'develop' of git.ailuowan.com:zzw/lone-services into develop

pkg/utils/log.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"context"
 	"lone-services/pkg/logRedis"
+	"time"
 
 	jsoniter "github.com/json-iterator/go"
 	"github.com/zeromicro/go-zero/core/logx"
@@ -102,7 +103,7 @@ func SetActionLog(adminInfo UserInfo, info ActionAdd) {
 		BrowserName:    adminInfo.BrowserName,
 		BrowserVersion: adminInfo.BrowserVer,
 		Reason:         info.Reason,
-		CreateTime:     Now().GoString(),
+		CreateTime:     Now().Format(time.DateTime),
 	}
 
 	logJson, err := jsoniter.Marshal(log)
@@ -128,7 +129,7 @@ func SetLoginLog(adminInfo UserInfo, status bool, reason string) {
 		BrowserName:    adminInfo.BrowserName,
 		BrowserVersion: adminInfo.BrowserVer,
 		Status:         int32(st),
-		CreateTime:     Now().GoString(),
+		CreateTime:     Now().Format(time.DateTime),
 		Reason:         reason,
 	}
 

pkg/utils/loginInfo.go

@@ -51,6 +51,7 @@ func GetUserFromCtx(ctx context.Context) UserInfo {
 	}
 	if len(userAgentList) > 0 {
 		userInfo.UserAgent = userAgentList[0]
+		userInfo.UserAgent, _ = url.QueryUnescape(userInfo.UserAgent)
 		ua := user_agent.New(userInfo.UserAgent)
 		userInfo.BrowserName, userInfo.BrowserVer = ua.Browser()
 	}