Browse Source

fix 报错

jay 2 years ago
parent
commit
086caecc66

+ 1 - 1
iot-common/iot-common-web/src/main/resources/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports → iot-common/iot-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,4 +1,4 @@
 cc.iotkit.common.web.config.CaptchaConfig
 cc.iotkit.common.web.config.FilterConfig
+#cc.iotkit.common.web.config.I18nConfig
 cc.iotkit.common.web.config.ResourcesConfig
-cc.iotkit.common.web.config.UndertowConfig

+ 1 - 2
iot-starter/src/main/java/cc/iotkit/web/controller/CaptchaController.java

@@ -19,7 +19,6 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
-import org.springframework.boot.autoconfigure.mail.MailProperties;
 import org.springframework.expression.Expression;
 import org.springframework.expression.ExpressionParser;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
@@ -45,7 +44,7 @@ public class CaptchaController {
 
     private final CaptchaProperties captchaProperties;
 //    private final SmsProperties smsProperties;
-    private final MailProperties mailProperties;
+//    private final MailProperties mailProperties;
 
     /**
      * 短信验证码

+ 1 - 0
iot-starter/src/main/java/cc/iotkit/web/service/SysLoginService.java

@@ -33,6 +33,7 @@ import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

+ 36 - 0
iot-starter/src/main/resources/application.yml

@@ -118,3 +118,39 @@ sa-token:
 #认证中心地址
 oauth2:
   auth-server-url: http://127.0.0.1:8086
+
+
+# 多租户配置
+tenant:
+  # 是否开启
+  enable: true
+  # 排除表
+  excludes:
+    - sys_menu
+    - sys_tenant
+    - sys_tenant_package
+    - sys_role_dept
+    - sys_role_menu
+    - sys_user_post
+    - sys_user_role
+
+
+captcha:
+  enable: true
+  # 页面 <参数设置> 可开启关闭 验证码校验
+  # 验证码类型 math 数组计算 char 字符验证
+  type: MATH
+  # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
+  category: CIRCLE
+  # 数字验证码位数
+  numberLength: 1
+  # 字符验证码长度
+  charLength: 4
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间(默认10分钟)
+    lockTime: 10