!324 系统配置读取方式变更

1、前端登录页面注册开关 对接后端数据库
2、密码最大错误次数与锁定时间转移到数据库
3、短信开关与验证码模板id 转移到数据库参数管理内

ruoyi-admin/src/main/java/com/ruoyi/web/controller/AuthController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.model.EmailLoginBody;
 import com.ruoyi.common.core.domain.model.LoginBody;
@@ -57,9 +58,9 @@ public class AuthController {
         LoginVo loginVo = new LoginVo();
         // 生成令牌
         String token = loginService.login(
-                body.getTenantId(),
-                body.getUsername(), body.getPassword(),
-                body.getCode(), body.getUuid());
+            body.getTenantId(),
+            body.getUsername(), body.getPassword(),
+            body.getCode(), body.getUuid());
         loginVo.setToken(token);
         return R.ok(loginVo);
     }
@@ -150,4 +151,15 @@ public class AuthController {
         return R.ok(vo);
     }
 
+    /**
+     * 注册开关
+     *
+     * @return ture：打开 false：关闭
+     */
+    @SaIgnore
+    @GetMapping("/registerEnabled")
+    public R<Boolean> registerEnabled() {
+        return R.ok(Convert.toBool(configService.selectConfigByKey("sys.account.registerUser")));
+    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.ruoyi.common.core.constant.Constants;
@@ -14,11 +15,11 @@ import com.ruoyi.common.core.utils.reflect.ReflectUtils;
 import com.ruoyi.common.mail.config.properties.MailProperties;
 import com.ruoyi.common.mail.utils.MailUtils;
 import com.ruoyi.common.redis.utils.RedisUtils;
-import com.ruoyi.common.sms.config.properties.SmsProperties;
 import com.ruoyi.common.sms.core.SmsTemplate;
 import com.ruoyi.common.sms.entity.SmsResult;
 import com.ruoyi.common.web.config.properties.CaptchaProperties;
 import com.ruoyi.common.web.enums.CaptchaType;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.web.domain.vo.CaptchaVo;
 import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
@@ -47,8 +48,9 @@ import java.util.Map;
 public class CaptchaController {
 
     private final CaptchaProperties captchaProperties;
-    private final SmsProperties smsProperties;
     private final MailProperties mailProperties;
+    private final ISysConfigService configService;
+
 
     /**
      * 短信验证码
@@ -57,14 +59,14 @@ public class CaptchaController {
      */
     @GetMapping("/sms/code")
     public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
-        if (!smsProperties.getEnabled()) {
+        if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) {
             return R.fail("当前系统没有开启短信功能！");
         }
         String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
         String code = RandomUtil.randomNumbers(4);
         RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
         // 验证码模板id 自行处理 (查数据库或写死均可)
-        String templateId = "";
+        String templateId = configService.selectConfigByKey("sys.account.templateId");
         Map<String, String> map = new HashMap<>(1);
         map.put("code", code);
         SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);

ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.constant.Constants;
@@ -30,11 +31,11 @@ import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.system.domain.vo.SysTenantVo;
 import com.ruoyi.system.domain.vo.SysUserVo;
 import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysPermissionService;
 import com.ruoyi.system.service.ISysTenantService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
@@ -57,11 +58,7 @@ public class SysLoginService {
     private final ISysPermissionService permissionService;
     private final ISysTenantService tenantService;
 
-    @Value("${user.password.maxRetryCount}")
-    private Integer maxRetryCount;
-
-    @Value("${user.password.lockTime}")
-    private Integer lockTime;
+    private final ISysConfigService configService;
 
     /**
      * 登录验证
@@ -340,6 +337,10 @@ public class SysLoginService {
 
         // 获取用户登录错误次数(可自定义限制策略 例如: key + username + ip)
         Integer errorNumber = RedisUtils.getCacheObject(errorKey);
+        //密码最大错误次数
+        Integer maxRetryCount = Convert.toInt(configService.selectConfigByKey("sys.user.maxRetryCount"));
+        //密码锁定时间
+        Integer lockTime = Convert.toInt(configService.selectConfigByKey("sys.user.lockTime"));
         // 锁定时间内登录 则踢出
         if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(maxRetryCount)) {
             recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));

ruoyi-admin/src/main/resources/application.yml

@@ -52,14 +52,6 @@ logging:
     org.springframework: warn
   config: classpath:logback.xml
 
-# 用户配置
-user:
-  password:
-    # 密码最大错误次数
-    maxRetryCount: 5
-    # 密码锁定时间（默认10分钟）
-    lockTime: 10
-
 # Spring配置
 spring:
   application: