feat: 合并代码

src/framework/config/config/config.default.yaml

@@ -1,7 +1,7 @@
 # 项目信息
 framework:
   name: "ems_agt"
-  version: "1.6.2"
+  version: "0.0.1"
 
 # 应用服务配置
 server:
@@ -12,7 +12,7 @@ server:
 
 # 日志
 logger:
-  fileDir: "/usr/local/omc/logs"
+  fileDir: "/usr/local/omc/log"
   fileName: "ems_agt.log"
   level: 2 # 日志记录的等级 0:silent<1:info<2:warn<3:error
   maxDay: 30 # 日志会保留 30 天

src/framework/config/config/config.local.yaml

@@ -4,7 +4,7 @@ server:
 
 # 日志
 logger:
-  fileDir: "C:/usr/local/omc/logs"
+  fileDir: "C:/usr/local/omc/log"
   level: 0 # 输出最低等级
 
 # 静态文件配置, 相对项目根路径或填绝对路径

src/framework/config/config/config.prod.yaml

@@ -1,6 +1,6 @@
 # 应用服务配置
 server:
-  port: 3040
+  port: 3030
   proxy: true
 
 # security 安全

src/framework/middleware/security/referer.go

@@ -15,6 +15,9 @@ func referer(c *gin.Context) {
 	if v := config.Get("security.csrf.enable"); v != nil {
 		enable = v.(bool)
 	}
+	if !enable {
+		return
+	}
 
 	// csrf 校验类型
 	okType := false
@@ -59,16 +62,15 @@ func referer(c *gin.Context) {
 		}
 	}
 
-	if enable && okType {
-		ok := false
-		for _, domain := range refererWhiteList {
-			if domain == host {
-				ok = true
-			}
-		}
-		if !ok {
-			c.AbortWithStatusJSON(200, result.ErrMsg("无效 Referer "+host))
-			return
+	// 遍历检查
+	ok := false
+	for _, domain := range refererWhiteList {
+		if domain == host {
+			ok = true
 		}
 	}
+	if !ok {
+		c.AbortWithStatusJSON(200, result.ErrMsg("无效 Referer "+host))
+		return
+	}
 }

src/modules/common/service/account.impl.go

@@ -128,11 +128,12 @@ func (s *AccountImpl) passwordRetryCount(username string) (string, int64, time.D
 		retryCount = "0"
 	}
 	// 是否超过错误值
-	if parse.Number(retryCount) >= int64(maxRetryCount) {
+	retryCountInt64 := parse.Number(retryCount)
+	if retryCountInt64 >= int64(maxRetryCount) {
 		msg := fmt.Sprintf("密码输入错误 %d 次，帐户锁定 %d 分钟", maxRetryCount, lockTime)
-		return retrykey, int64(maxRetryCount), time.Duration(lockTime) * time.Minute, errors.New(msg)
+		return retrykey, retryCountInt64, time.Duration(lockTime) * time.Minute, errors.New(msg)
 	}
-	return retrykey, int64(maxRetryCount), time.Duration(lockTime) * time.Minute, nil
+	return retrykey, retryCountInt64, time.Duration(lockTime) * time.Minute, nil
 }
 
 // RoleAndMenuPerms 角色和菜单数据权限