From 1ed1752f678f769e43e9faa34809701850c7f727 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 30 三月 2023 19:14:38 +0800
Subject: [PATCH] update 优化 验证码有效期 迁移到数据库 参数管理内
---
ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java
index 3f23c21..819c759 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysRegisterService.java
@@ -3,7 +3,6 @@
import cn.dev33.satoken.secure.BCrypt;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.GlobalConstants;
-import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.core.enums.UserType;
import com.ruoyi.common.core.exception.user.CaptchaException;
@@ -18,7 +17,6 @@
import com.ruoyi.common.web.config.properties.CaptchaProperties;
import com.ruoyi.system.domain.bo.SysUserBo;
import com.ruoyi.system.service.ISysUserService;
-import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -38,7 +36,6 @@
* 娉ㄥ唽
*/
public void register(RegisterBody registerBody) {
- HttpServletRequest request = ServletUtils.getRequest();
String tenantId = registerBody.getTenantId();
String username = registerBody.getUsername();
String password = registerBody.getPassword();
@@ -48,7 +45,7 @@
boolean captchaEnabled = captchaProperties.getEnable();
// 楠岃瘉鐮佸紑鍏�
if (captchaEnabled) {
- validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid(), request);
+ validateCaptcha(tenantId, username, registerBody.getCode(), registerBody.getUuid());
}
SysUserBo sysUser = new SysUserBo();
sysUser.setUserName(username);
@@ -56,7 +53,7 @@
sysUser.setPassword(BCrypt.hashpw(password));
sysUser.setUserType(userType);
- if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(sysUser))) {
+ if (!userService.checkUserNameUnique(sysUser)) {
throw new UserException("user.register.save.error", username);
}
boolean regFlag = userService.registerUser(sysUser, tenantId);
@@ -72,9 +69,8 @@
* @param username 鐢ㄦ埛鍚�
* @param code 楠岃瘉鐮�
* @param uuid 鍞竴鏍囪瘑
- * @return 缁撴灉
*/
- public void validateCaptcha(String tenantId, String username, String code, String uuid, HttpServletRequest request) {
+ public void validateCaptcha(String tenantId, String username, String code, String uuid) {
String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
String captcha = RedisUtils.getCacheObject(verifyKey);
RedisUtils.deleteObject(verifyKey);
--
Gitblit v1.9.3