From 5f0e4e81f09720335d9216b6de57a3746fc92025 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 20 一月 2022 17:13:54 +0800
Subject: [PATCH] !131 fix 修改用户信息校验方法 Merge pull request !131 from KonBAI/fix_cheakUserInfo
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
index 1712249..8c5cfff 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
@@ -5,10 +5,15 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.core.service.LogininforService;
+import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
-import com.ruoyi.common.utils.*;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ruoyi.common.utils.MessageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
/**
@@ -16,23 +21,23 @@
*
* @author Lion Li
*/
+@RequiredArgsConstructor
@Service
public class SysRegisterService {
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ISysConfigService configService;
-
- @Autowired
- private LogininforService asyncService;
+ private final ISysUserService userService;
+ private final ISysConfigService configService;
+ private final LogininforService asyncService;
/**
* 娉ㄥ唽
*/
public String register(RegisterBody registerBody) {
- String msg = "", username = registerBody.getUsername(), password = registerBody.getPassword();
+ String msg = "";
+ String username = registerBody.getUsername();
+ String password = registerBody.getPassword();
+ // 鏍￠獙鐢ㄦ埛绫诲瀷鏄惁瀛樺湪
+ String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
boolean captchaOnOff = configService.selectCaptchaOnOff();
// 楠岃瘉鐮佸紑鍏�
@@ -45,10 +50,10 @@
} else if (StringUtils.isEmpty(password)) {
msg = "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖";
} else if (username.length() < UserConstants.USERNAME_MIN_LENGTH
- || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
+ || username.length() > UserConstants.USERNAME_MAX_LENGTH) {
msg = "璐︽埛闀垮害蹇呴』鍦�2鍒�20涓瓧绗︿箣闂�";
} else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH
- || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
+ || password.length() > UserConstants.PASSWORD_MAX_LENGTH) {
msg = "瀵嗙爜闀垮害蹇呴』鍦�5鍒�20涓瓧绗︿箣闂�";
} else if (UserConstants.NOT_UNIQUE.equals(userService.checkUserNameUnique(username))) {
msg = "淇濆瓨鐢ㄦ埛'" + username + "'澶辫触锛屾敞鍐岃处鍙峰凡瀛樺湪";
@@ -57,12 +62,13 @@
sysUser.setUserName(username);
sysUser.setNickName(username);
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
+ sysUser.setUserType(userType);
boolean regFlag = userService.registerUser(sysUser);
if (!regFlag) {
msg = "娉ㄥ唽澶辫触,璇疯仈绯荤郴缁熺鐞嗕汉鍛�";
} else {
asyncService.recordLogininfor(username, Constants.REGISTER,
- MessageUtils.message("user.register.success"), ServletUtils.getRequest());
+ MessageUtils.message("user.register.success"), ServletUtils.getRequest());
}
}
return msg;
--
Gitblit v1.9.3