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 1/3] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=8E=A5=E5=8F=A3=202=E3=80=81=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E6=9C=80=E5=A4=A7=E9=94=99=E8=AF=AF=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E4=B8=8E=E9=94=81=E5=AE=9A=E6=97=B6=E9=97=B4=EF=BC=9A=E4=BB=8E?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=B8=BA=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=203=E3=80=81=E7=9F=AD=E4=BF=A1=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E4=B8=8E=E9=AA=8C=E8=AF=81=E7=A0=81=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?id=EF=BC=9A=E4=BB=8E=E8=AF=BB=E5=8F=96=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8F=98=E6=9B=B4=E4=B8=BA=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=95=B0=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)); From 4518d5e66146319809d2ebbcd9973004aff3d3f7 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:14:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81=E9=85=8D=E7=BD=AEsql=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/sql/ry_vue_4.X.sql | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/script/sql/ry_vue_4.X.sql b/script/sql/ry_vue_4.X.sql index 02ef42848..802a8ed3c 100644 --- a/script/sql/ry_vue_4.X.sql +++ b/script/sql/ry_vue_4.X.sql @@ -533,13 +533,16 @@ create table sys_config ( primary key (config_id) ) engine=innodb comment = '参数配置表'; -insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', sysdate(), '', null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' ); -insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', sysdate(), '', null, '初始化密码 123456' ); -insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', sysdate(), '', null, '深色主题theme-dark，浅色主题theme-light' ); -insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', sysdate(), '', null, '是否开启验证码功能（true开启，false关闭）'); -insert into sys_config values(5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', sysdate(), '', null, '是否开启注册用户功能（true开启，false关闭）'); -insert into sys_config values(11, 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 'admin', sysdate(), '', null, 'true:开启, false:关闭'); - +insert into sys_config values(1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', '2023-03-30 12:00:22', '', NULL, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow'); +insert into sys_config values(2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', '2023-03-30 12:00:22', '', NULL, '初始化密码 123456'); +insert into sys_config values(3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', '2023-03-30 12:00:22', '', NULL, '深色主题theme-dark，浅色主题theme-light'); +insert into sys_config values(4, '账号自助-验证码开关', 'sys.account.captchaEnabled', 'true', 'Y', 'admin', '2023-03-30 12:00:22', '', NULL, '是否开启验证码功能（true开启，false关闭）'); +insert into sys_config values(5, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'true', 'Y', 'admin', '2023-03-30 12:00:22', '', NULL, '是否开启注册用户功能（true开启，false关闭）'); +insert into sys_config values(6, '用户配置-密码最大错误次数', 'sys.user.maxRetryCount', '5', 'Y', 'admin', '2023-03-30 12:16:28', '', NULL, '密码最大错误次数'); +insert into sys_config values(7, '用户配置-密码锁定时间', 'sys.user.lockTime', '10', 'Y', 'admin', '2023-03-30 12:18:03', '', NULL, '密码锁定时间（分钟）'); +insert into sys_config values(8, '账号自助-短信开关', 'sys.account.smsEnabled', 'false', 'Y', 'admin', '2023-03-30 12:19:03', '', NULL, '是否开启短信功能（true开启，false关闭）'); +insert into sys_config values(9, '账号自助-验证码模板id', 'sys.account.templateId', '', 'Y', 'admin', '2023-03-30 12:31:11', '', NULL, '验证码模板id'); +insert into sys_config values(11, 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 'admin', '2023-03-30 12:00:22', '', NULL, 'true:开启, false:关闭'); -- ---------------------------- -- 14、系统访问记录 From fea5f137364939b2448e5bdb6c85a5b82da171e7 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:26:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1=E3=80=81=E7=9F=AD=E4=BF=A1=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE=E5=BA=93=202?= =?UTF-8?q?=E3=80=81demo=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/common/CaptchaController.java | 6 +++--- ruoyi-demo/pom.xml | 5 +++++ .../java/com/ruoyi/demo/controller/SmsController.java | 10 ++++++---- .../com/ruoyi/sms/config/properties/SmsProperties.java | 2 -- 4 files changed, 14 insertions(+), 9 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 b8b72ec1a..5cbd70b02 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 @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.common; 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.constant.CacheConstants; @@ -14,7 +15,6 @@ import com.ruoyi.common.utils.redis.RedisUtils; import com.ruoyi.common.utils.reflect.ReflectUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.framework.config.properties.CaptchaProperties; -import com.ruoyi.sms.config.properties.SmsProperties; import com.ruoyi.sms.core.SmsTemplate; import com.ruoyi.sms.entity.SmsResult; import com.ruoyi.system.service.ISysConfigService; @@ -45,7 +45,6 @@ import java.util.Map; public class CaptchaController { private final CaptchaProperties captchaProperties; - private final SmsProperties smsProperties; private final ISysConfigService configService; /** @@ -53,10 +52,11 @@ public class CaptchaController { * * @param phonenumber 用户手机号 */ + @SaIgnore @GetMapping("/captchaSms") public R smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) { - if (!smsProperties.getEnabled()) { + if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) { return R.fail("当前系统没有开启短信功能！"); } String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber; diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index b64625d34..ab1f96d30 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -28,6 +28,11 @@ ruoyi-sms + + com.ruoyi + ruoyi-system + + diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java index cc6012f44..436d4694e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java @@ -1,9 +1,10 @@ package com.ruoyi.demo.controller; +import cn.hutool.core.convert.Convert; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.sms.config.properties.SmsProperties; import com.ruoyi.sms.core.SmsTemplate; +import com.ruoyi.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -26,7 +27,8 @@ import java.util.Map; @RequestMapping("/demo/sms") public class SmsController { - private final SmsProperties smsProperties; + private final ISysConfigService configService; + // private final SmsTemplate smsTemplate; // 可以使用spring注入 // private final AliyunSmsTemplate smsTemplate; // 也可以注入某个厂家的模板工具 @@ -38,7 +40,7 @@ public class SmsController { */ @GetMapping("/sendAliyun") public R sendAliyun(String phones, String templateId) { - if (!smsProperties.getEnabled()) { + if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) { return R.fail("当前系统没有开启短信功能！"); } if (!SpringUtils.containsBean("aliyunSmsTemplate")) { @@ -59,7 +61,7 @@ public class SmsController { */ @GetMapping("/sendTencent") public R sendTencent(String phones, String templateId) { - if (!smsProperties.getEnabled()) { + if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) { return R.fail("当前系统没有开启短信功能！"); } if (!SpringUtils.containsBean("tencentSmsTemplate")) { diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java b/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java index 39359cdfd..c4f57f1f0 100644 --- a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java +++ b/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java @@ -15,8 +15,6 @@ import org.springframework.stereotype.Component; @ConfigurationProperties(prefix = "sms") public class SmsProperties { - private Boolean enabled; - /** * 配置节点 * 阿里云 dysmsapi.aliyuncs.com