From 189524018644600e4d6edfd814d237b27dfbc7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=BD=AC=E5=BD=AC?= <18216219659@163.com> Date: Thu, 30 Mar 2023 13:09:51 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=B3=A8=E5=86=8C=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=202=E3=80=81=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E9=94=99=E8=AF=AF=E6=AC=A1=E6=95=B0=E4=B8=8E?= =?UTF-8?q?=E9=94=81=E5=AE=9A=E6=97=B6=E9=97=B4=EF=BC=9A=E4=BB=8E=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E4=B8=BA=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=203=E3=80=81=E7=9F=AD=E4=BF=A1=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E4=B8=8E=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A8=A1=E6=9D=BFid?= =?UTF-8?q?=EF=BC=9A=E4=BB=8E=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=8F=98=E6=9B=B4=E4=B8=BA=E8=AF=BB=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/common/CaptchaController.java | 4 ++-- .../controller/system/SysRegisterController.java | 13 +++++++++++++ ruoyi-admin/src/main/resources/application.yml | 8 -------- .../com/ruoyi/system/service/SysLoginService.java | 14 ++++++-------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index 795359c5b..b8b72ec1a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -62,8 +62,8 @@ public class CaptchaController { String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber; String code = RandomUtil.randomNumbers(4); RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); - // 验证码模板id 自行处理 (查数据库或写死均可) - String templateId = ""; + // 验证码模板id + String templateId = configService.selectConfigByKey("sys.account.templateId"); Map map = new HashMap<>(1); map.put("code", code); SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index 26445820e..3364ea733 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -8,10 +8,14 @@ import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.SysRegisterService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.util.HashMap; +import java.util.Map; + /** * 注册验证 * @@ -25,6 +29,15 @@ public class SysRegisterController extends BaseController { private final SysRegisterService registerService; private final ISysConfigService configService; + @SaIgnore + @GetMapping("/registerEnabled") + public R> registerEnabled() { + Map ajax = new HashMap<>(); + String register = configService.selectConfigByKey("sys.account.registerUser"); + ajax.put("register", register); + return R.ok(ajax); + } + /** * 用户注册 */ diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 6f229d87f..a7ab24d7d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -53,14 +53,6 @@ logging: org.springframework: warn config: classpath:logback.xml -# 用户配置 -user: - password: - # 密码最大错误次数 - maxRetryCount: 5 - # 密码锁定时间（默认10分钟） - lockTime: 10 - # Spring配置 spring: application: diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java index 3c29b85cf..98f2cf925 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java @@ -4,13 +4,14 @@ 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.constant.CacheConstants; import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.event.LogininforEvent; import com.ruoyi.common.core.domain.dto.RoleDTO; import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.event.LogininforEvent; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.XcxLoginUser; import com.ruoyi.common.enums.DeviceType; @@ -29,7 +30,6 @@ import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.mapper.SysUserMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; @@ -51,12 +51,6 @@ public class SysLoginService { private final ISysConfigService configService; private final SysPermissionService permissionService; - @Value("${user.password.maxRetryCount}") - private Integer maxRetryCount; - - @Value("${user.password.lockTime}") - private Integer lockTime; - /** * 登录验证 * @@ -266,6 +260,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(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));