From cd510b43b1ef85202ddf9018271aaadf695f3c8d Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: 星期二, 25 一月 2022 17:17:06 +0800
Subject: [PATCH] fix 优化登录、注册校验方式，在接口通过@Validated进行数据基础校验，以及服务执行到异常后，抛出异常结束方法执行（减少if-else嵌套）。
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 74 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 33 deletions(-)
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 c9a8803..a19f76d 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
@@ -8,14 +8,14 @@
import com.ruoyi.common.core.service.LogininforService;
import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserStatus;
-import com.ruoyi.common.enums.UserType;
-import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
import com.ruoyi.common.exception.user.UserException;
+import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.*;
+import com.ruoyi.common.utils.redis.RedisUtils;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
@@ -26,21 +26,15 @@
*
* @author Lion Li
*/
+@RequiredArgsConstructor
@Slf4j
@Service
public class SysLoginService {
- @Autowired
- private ISysUserService userService;
-
- @Autowired
- private ISysConfigService configService;
-
- @Autowired
- private LogininforService asyncService;
-
- @Autowired
- private SysPermissionService permissionService;
+ private final ISysUserService userService;
+ private final ISysConfigService configService;
+ private final LogininforService asyncService;
+ private final SysPermissionService permissionService;
/**
* 鐧诲綍楠岃瘉
@@ -66,17 +60,8 @@
throw new UserException("user.password.retry.limit.exceed", Constants.LOGIN_ERROR_LIMIT_TIME);
}
- SysUser user = userService.selectUserByUserName(username);
- if (StringUtils.isNull(user)) {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
- throw new UserException("user.not.exists", username);
- } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍒犻櫎.", username);
- throw new UserException("user.password.delete", username);
- } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
- log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
- throw new UserException("user.blocked", username);
- }
+ SysUser user = loadUserByUsername(username);
+
if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
// 鏄惁绗竴娆�
errorNumber = ObjectUtil.isNull(errorNumber) ? 1 : errorNumber + 1;
@@ -98,15 +83,10 @@
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
recordLoginInfo(user.getUserId(), username);
- LoginUser loginUser = new LoginUser();
- loginUser.setUserId(user.getUserId());
- loginUser.setDeptId(user.getDeptId());
- loginUser.setUsername(user.getUserName());
- loginUser.setMenuPermission(permissionService.getMenuPermission(user));
- loginUser.setRolePermission(permissionService.getRolePermission(user));
+ LoginUser loginUser = buildLoginUser(user);
// 鐢熸垚token
- LoginUtils.loginByDevice(loginUser, UserType.SYS_USER, DeviceType.PC);
+ LoginHelper.loginByDevice(loginUser, DeviceType.PC);
return StpUtil.getTokenValue();
}
@@ -116,7 +96,6 @@
* @param username 鐢ㄦ埛鍚�
* @param code 楠岃瘉鐮�
* @param uuid 鍞竴鏍囪瘑
- * @return 缁撴灉
*/
public void validateCaptcha(String username, String code, String uuid, HttpServletRequest request) {
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
@@ -132,6 +111,35 @@
}
}
+ private SysUser loadUserByUsername(String username) {
+ SysUser user = userService.selectUserByUserName(username);
+ if (ObjectUtil.isNull(user)) {
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 涓嶅瓨鍦�.", username);
+ throw new UserException("user.not.exists", username);
+ } else if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) {
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍒犻櫎.", username);
+ throw new UserException("user.password.delete", username);
+ } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+ log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
+ throw new UserException("user.blocked", username);
+ }
+ return user;
+ }
+
+ /**
+ * 鏋勫缓鐧诲綍鐢ㄦ埛
+ */
+ private LoginUser buildLoginUser(SysUser user) {
+ LoginUser loginUser = new LoginUser();
+ loginUser.setUserId(user.getUserId());
+ loginUser.setDeptId(user.getDeptId());
+ loginUser.setUsername(user.getUserName());
+ loginUser.setUserType(user.getUserType());
+ loginUser.setMenuPermission(permissionService.getMenuPermission(user));
+ loginUser.setRolePermission(permissionService.getRolePermission(user));
+ return loginUser;
+ }
+
/**
* 璁板綍鐧诲綍淇℃伅
*
--
Gitblit v1.9.3