merge: 合并OMC分支

lib/midware/operate_log.go

@@ -11,11 +11,11 @@ import (
 	"strings"
 	"time"
 
-	"nms_cxy/lib/core/utils/parse"
-	"nms_cxy/lib/dborm"
+	"nms_cxy/lib/core/ctx"
 	"nms_cxy/src/framework/constants/common"
 	"nms_cxy/src/framework/middleware/collectlogs"
 	"nms_cxy/src/framework/utils/ip2region"
+	"nms_cxy/src/framework/utils/parse"
 	"nms_cxy/src/modules/system/model"
 	"nms_cxy/src/modules/system/service"
 )
@@ -47,13 +47,7 @@ func LogOperate(options collectlogs.Options) func(http.Handler) http.Handler {
 			funcName = funcName[lastDotIndex+1:]
 
 			// 用户名
-			username := "-"
-			accessToken := r.Header.Get("AccessToken")
-			if accessToken != "" {
-				// 验证令牌 == 这里直接查数据库session
-				se, _ := dborm.XormUpdateSessionShakeTime(accessToken)
-				username = se.AccountId
-			}
+			username := ctx.LoginUserToUserName(r)
 
 			// 解析ip地址
 			ip := strings.Split(r.RemoteAddr, ":")[0]