marge: 合并代码，包名变更be.ems

src/framework/middleware/collectlogs/operate_log.go

@@ -3,16 +3,17 @@ package collectlogs
 import (
 	"encoding/json"
 	"fmt"
+	"reflect"
 	"strings"
 	"time"
 
-	"ems.agt/src/framework/constants/common"
-	"ems.agt/src/framework/i18n"
-	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/utils/parse"
-	"ems.agt/src/framework/vo/result"
-	"ems.agt/src/modules/system/model"
-	"ems.agt/src/modules/system/service"
+	"be.ems/src/framework/constants/common"
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/vo/result"
+	"be.ems/src/modules/system/model"
+	"be.ems/src/modules/system/service"
 
 	"github.com/gin-gonic/gin"
 )
@@ -83,14 +84,6 @@ func OptionNew(title, businessType string) Options {
 	}
 }
 
-// 敏感属性字段进行掩码
-var maskProperties []string = []string{
-	"password",
-	"oldPassword",
-	"newPassword",
-	"confirmPassword",
-}
-
 // OperateLog 访问操作日志记录
 //
 // 请在用户身份授权认证校验后使用以便获取登录用户信息
@@ -136,15 +129,8 @@ func OperateLog(options Options) gin.HandlerFunc {
 		// 是否需要保存request，参数和值
 		if options.IsSaveRequestData {
 			params := ctx.RequestParamsMap(c)
-			for k, v := range params {
-				// 敏感属性字段进行掩码
-				for _, s := range maskProperties {
-					if s == k {
-						params[k] = parse.SafeContent(v.(string))
-						break
-					}
-				}
-			}
+			// 敏感属性字段进行掩码
+			processSensitiveFields(params)
 			jsonStr, _ := json.Marshal(params)
 			paramsStr := string(jsonStr)
 			if len(paramsStr) > 2000 {
@@ -182,3 +168,50 @@ func OperateLog(options Options) gin.HandlerFunc {
 		service.NewSysLogOperateImpl.InsertSysLogOperate(operLog)
 	}
 }
+
+// 敏感属性字段进行掩码
+var maskProperties []string = []string{
+	"password",
+	"privateKey",
+	"privatePassword",
+	"passPhrase",
+	"oldPassword",
+	"newPassword",
+	"confirmPassword",
+}
+
+// processSensitiveFields 处理敏感属性字段
+func processSensitiveFields(obj interface{}) {
+	val := reflect.ValueOf(obj)
+
+	switch val.Kind() {
+	case reflect.Map:
+		for _, key := range val.MapKeys() {
+			value := val.MapIndex(key)
+			keyStr := key.Interface().(string)
+
+			// 遍历是否敏感属性
+			hasMaskKey := false
+			for _, v := range maskProperties {
+				if v == keyStr {
+					hasMaskKey = true
+					break
+				}
+			}
+
+			if hasMaskKey {
+				valueStr := value.Interface().(string)
+				if len(valueStr) > 100 {
+					valueStr = valueStr[0:100]
+				}
+				val.SetMapIndex(key, reflect.ValueOf(parse.SafeContent(valueStr)))
+			} else {
+				processSensitiveFields(value.Interface())
+			}
+		}
+	case reflect.Slice, reflect.Array:
+		for i := 0; i < val.Len(); i++ {
+			processSensitiveFields(val.Index(i).Interface())
+		}
+	}
+}

src/framework/middleware/cors.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"ems.agt/src/framework/config"
+	"be.ems/src/framework/config"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/pre_authorize.go

@@ -3,12 +3,12 @@ package middleware
 import (
 	"strings"
 
-	AdminConstants "ems.agt/src/framework/constants/admin"
-	commonConstants "ems.agt/src/framework/constants/common"
-	"ems.agt/src/framework/i18n"
-	ctxUtils "ems.agt/src/framework/utils/ctx"
-	tokenUtils "ems.agt/src/framework/utils/token"
-	"ems.agt/src/framework/vo/result"
+	AdminConstants "be.ems/src/framework/constants/admin"
+	commonConstants "be.ems/src/framework/constants/common"
+	"be.ems/src/framework/i18n"
+	ctxUtils "be.ems/src/framework/utils/ctx"
+	tokenUtils "be.ems/src/framework/utils/token"
+	"be.ems/src/framework/vo/result"
 
 	"github.com/gin-gonic/gin"
 )
@@ -21,6 +21,7 @@ var URL_WHITE_LIST = []string{
 	"/omcNeConfig",
 	"/cdrEvent",
 	"/upload-ue",
+	"/oauth/token",
 }
 
 // PreAuthorize 用户身份授权认证校验

src/framework/middleware/rate_limit.go

@@ -5,12 +5,12 @@ import (
 	"strings"
 	"time"
 
-	"ems.agt/src/framework/constants/cachekey"
-	"ems.agt/src/framework/i18n"
-	"ems.agt/src/framework/redis"
-	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/utils/ip2region"
-	"ems.agt/src/framework/vo/result"
+	"be.ems/src/framework/constants/cachekey"
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/redis"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/ip2region"
+	"be.ems/src/framework/vo/result"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/repeat/repeat.go

@@ -5,12 +5,12 @@ import (
 	"strconv"
 	"time"
 
-	"ems.agt/src/framework/constants/cachekey"
-	"ems.agt/src/framework/logger"
-	"ems.agt/src/framework/redis"
-	"ems.agt/src/framework/utils/ctx"
-	"ems.agt/src/framework/utils/ip2region"
-	"ems.agt/src/framework/vo/result"
+	"be.ems/src/framework/constants/cachekey"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/redis"
+	"be.ems/src/framework/utils/ctx"
+	"be.ems/src/framework/utils/ip2region"
+	"be.ems/src/framework/vo/result"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/report.go

@@ -3,7 +3,7 @@ package middleware
 import (
 	"time"
 
-	"ems.agt/src/framework/logger"
+	"be.ems/src/framework/logger"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/security/csp.go

@@ -1,8 +1,8 @@
 package security
 
 import (
-	"ems.agt/src/framework/config"
-	"ems.agt/src/framework/utils/generate"
+	"be.ems/src/framework/config"
+	"be.ems/src/framework/utils/generate"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/security/hsts.go

@@ -3,7 +3,7 @@ package security
 import (
 	"fmt"
 
-	"ems.agt/src/framework/config"
+	"be.ems/src/framework/config"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/security/noopen.go

@@ -1,7 +1,7 @@
 package security
 
 import (
-	"ems.agt/src/framework/config"
+	"be.ems/src/framework/config"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/security/nosniff.go

@@ -1,7 +1,7 @@
 package security
 
 import (
-	"ems.agt/src/framework/config"
+	"be.ems/src/framework/config"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/security/referer.go

@@ -3,8 +3,8 @@ package security
 import (
 	"net/url"
 
-	"ems.agt/src/framework/config"
-	"ems.agt/src/framework/vo/result"
+	"be.ems/src/framework/config"
+	"be.ems/src/framework/vo/result"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/security/xframe.go

@@ -1,7 +1,7 @@
 package security
 
 import (
-	"ems.agt/src/framework/config"
+	"be.ems/src/framework/config"
 
 	"github.com/gin-gonic/gin"
 )

src/framework/middleware/security/xss_protection.go

@@ -1,7 +1,7 @@
 package security
 
 import (
-	"ems.agt/src/framework/config"
+	"be.ems/src/framework/config"
 
 	"github.com/gin-gonic/gin"
 )