wkyuer 3 сар өмнө
parent
commit
3db9f454eb

+ 1 - 1
internal/cmd/cmd.go

@@ -24,7 +24,7 @@ var (
 			s.SetSessionIdName("SESSIONID")
 			s.SetSessionStorage(gsession.NewStorageRedis(g.Redis("session")))
 			s.BindMiddlewareDefault(
-				//service.Middleware().Log,                       //访问日志
+				service.Middleware().Log,                       //访问日志
 				service.Middleware().MiddlewareHandlerResponse, //统一返回值
 				service.Middleware().LoginFilter,               //登录过滤
 			)

+ 20 - 20
internal/logic/middleware/middleware.go

@@ -41,7 +41,7 @@ func SaveLogTask() {
 		logArr = make([]map[string]interface{}, 0)
 		go func() {
 			g.Log().Info(context.TODO(), "timer..save..visit..log", len(tmpArr))
-			jyutil.MG.DB("log").SaveBulk("jy_seo_logs", tmpArr...)
+			jyutil.MG.DB("log").SaveBulk("jy_order_manager", tmpArr...)
 		}()
 	}
 	logLock.Unlock()
@@ -52,24 +52,24 @@ func SaveLogTask() {
 func (s *sMiddleware) Log(r *ghttp.Request) {
 	timeNow := time.Now()
 	data := map[string]interface{}{
-		"date":      timeNow.Unix(),
-		"ip":        r.GetClientIp(),
-		"refer":     r.Referer(),
-		"year":      timeNow.Year(),
-		"month":     timeNow.Month(),
-		"day":       timeNow.Day(),
-		"hour":      timeNow.Hour(),
-		"minutes":   timeNow.Minute(),
-		"mdescribe": r.GetBodyString(),
-		"client":    r.UserAgent(),
-		"os":        util.GetOS(r.UserAgent()),
-		"browse":    util.GetBrowse(r.UserAgent()),
-		"method":    r.Method,
-		"url":       r.RequestURI,
-	}
-	if userId, err := r.Session.Get("userId"); err == nil && !userId.IsEmpty() {
-		data["userid"] = userId.String()
+		"date":        timeNow.Unix(),
+		"ip":          r.GetClientIp(),
+		"refer":       r.Referer(),
+		"year":        timeNow.Year(),
+		"month":       timeNow.Month(),
+		"day":         timeNow.Day(),
+		"hour":        timeNow.Hour(),
+		"minutes":     timeNow.Minute(),
+		"mdescribe":   r.GetBodyString(),
+		"client":      r.UserAgent(),
+		"os":          util.GetOS(r.UserAgent()),
+		"browse":      util.GetBrowse(r.UserAgent()),
+		"method":      r.Method,
+		"url":         r.RequestURI,
+		"entUserId":   r.Session.MustGet("entUserId", 0).Int64(),
+		"entUserName": r.Session.MustGet("entUserName", "").String(),
 	}
+
 	logLock.Lock()
 	logArr = append(logArr, data)
 	if len(logArr) >= logSaveCount {
@@ -77,7 +77,7 @@ func (s *sMiddleware) Log(r *ghttp.Request) {
 		logArr = make([]map[string]interface{}, 0)
 		go func() {
 			g.Log().Info(r.Context(), "save..visit..log", len(tmpArr))
-			jyutil.MG.DB("log").SaveBulk("jy_seo_logs", tmpArr...)
+			jyutil.MG.DB("log").SaveBulk("jy_order_manager", tmpArr...)
 		}()
 	}
 	logLock.Unlock()
@@ -105,7 +105,7 @@ func (s *sMiddleware) LoginFilter(r *ghttp.Request) {
 			EntRole:    r.Session.MustGet("entRole", 0).Int64(),
 			AccountId:  r.Session.MustGet("accountId", 0).Int64(),
 			//MgoUserId:   r.Session.MustGet("mgoUserId", 0).String(),
-			EntUserName: r.Session.MustGet("entUserName", 0).String(),
+			EntUserName: r.Session.MustGet("entUserName", "").String(),
 		}
 	}
 	if uMsg == nil || uMsg.EntId == 0 || uMsg.EntUserId == 0 {