merge: 合并OMC分支

lib/midware/mml_log.go

@@ -9,11 +9,10 @@ import (
 	"strings"
 	"time"
 
-	"nms_cxy/lib/core/datasource"
-	"nms_cxy/lib/core/utils/ctx"
-	"nms_cxy/lib/core/utils/date"
-	"nms_cxy/lib/dborm"
+	"nms_cxy/lib/core/ctx"
 	"nms_cxy/lib/log"
+	"nms_cxy/src/framework/datasource"
+	"nms_cxy/src/framework/utils/date"
 )
 
 // LogMML mml操作日志搜集
@@ -37,7 +36,7 @@ func LogMML(next http.Handler) http.Handler {
 		// 收尾存入数据库的参数
 		mmlCmd := bodyArgs["mml"].([]any)[0]
 		ipAddr := strings.Split(r.RemoteAddr, ":")[0]
-		neType := ctx.Param(r, "elementTypeValue")
+		neType := ctx.GetParam(r, "elementTypeValue")
 		neId := ctx.GetQuery(r, "ne_id")
 		timeStr := date.ParseDateToStr(time.Now(), date.YYYY_MM_DD_HH_MM_SS)
 
@@ -50,19 +49,12 @@ func LogMML(next http.Handler) http.Handler {
 		resultStr := fmt.Sprintf(`{"status":"%s","size":"%s","content-type":"%s"}`, status, size, contentType)
 
 		// 用户名
-		username := "-"
-		accessToken := r.Header.Get("AccessToken")
-		if accessToken != "" {
-			// 验证令牌 == 这里直接查数据库session
-			se, _ := dborm.XormUpdateSessionShakeTime(accessToken)
-			username = se.AccountId
-		}
-
+		username := ctx.LoginUserToUserName(r)
 		// 执行插入
 		sql := "insert into mml_log (user,ip,ne_type,ne_id,mml,result,log_time)values(?,?,?,?,?,?,?)"
 		_, sqlerr := datasource.ExecDB("", sql, []any{username, ipAddr, neType, neId, mmlCmd, resultStr, timeStr})
 		if sqlerr != nil {
-			log.Errorf("insert row : %v", err.Error())
+			log.Errorf("insert row : %v", sqlerr.Error())
 		}
 	})
 }