From e763381186c3a1f74ed416ea79767ac73b984745 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 十二月 2021 18:46:49 +0800
Subject: [PATCH] update [重磅更新] 登录流程升级 支持缓存
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 4300a54..ebc208d 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
@@ -3,6 +3,7 @@
import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.service.LogininforService;
import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserStatus;
@@ -14,7 +15,6 @@
import com.ruoyi.common.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
@@ -22,7 +22,7 @@
/**
* 鐧诲綍鏍￠獙鏂规硶
*
- * @author ruoyi
+ * @author Lion Li
*/
@Slf4j
@Service
@@ -36,6 +36,9 @@
@Autowired
private LogininforService asyncService;
+
+ @Autowired
+ private SysPermissionService permissionService;
/**
* 鐧诲綍楠岃瘉
@@ -64,17 +67,21 @@
log.info("鐧诲綍鐢ㄦ埛锛歿} 宸茶鍋滅敤.", username);
throw new ServiceException("瀵逛笉璧凤紝鎮ㄧ殑璐﹀彿锛�" + username + " 宸插仠鐢�");
}
- BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
- String encodePassword = passwordEncoder.encode(password);
- if (SecurityUtils.matchesPassword(user.getPassword(), encodePassword)) {
+ if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
throw new UserPasswordNotMatchException();
}
+ 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));
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
- recordLoginInfo(user.getUserId());
+ recordLoginInfo(user.getUserId(), username);
// 鐢熸垚token
- LoginUtils.loginByDevice(user.getUserId(), UserType.SYS_USER, DeviceType.PC);
+ LoginUtils.loginByDevice(loginUser, UserType.SYS_USER, DeviceType.PC);
return StpUtil.getTokenValue();
}
@@ -105,11 +112,12 @@
*
* @param userId 鐢ㄦ埛ID
*/
- public void recordLoginInfo(Long userId) {
+ public void recordLoginInfo(Long userId, String username) {
SysUser sysUser = new SysUser();
sysUser.setUserId(userId);
sysUser.setLoginIp(ServletUtils.getClientIP());
sysUser.setLoginDate(DateUtils.getNowDate());
+ sysUser.setUpdateBy(username);
userService.updateUserProfile(sysUser);
}
}
--
Gitblit v1.9.3