From 19b7f0747a018a29ad4efe7b5df393882e752dd5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 04 十一月 2021 19:00:49 +0800
Subject: [PATCH] update 补全通用用户服务接口注释
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 fb8273a..08098dd 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,7 +4,9 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
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;
@@ -20,7 +22,7 @@
/**
* 鐧诲綍鏍￠獙鏂规硶
*
- * @author ruoyi
+ * @author Lion Li
*/
@Slf4j
@Service
@@ -62,17 +64,15 @@
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();
}
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
- recordLoginInfo(user.getUserId());
+ recordLoginInfo(user.getUserId(), username);
// 鐢熸垚token
- StpUtil.login(user.getUserId(), "PC");
+ LoginUtils.loginByDevice(user.getUserId(), UserType.SYS_USER, DeviceType.PC);
return StpUtil.getTokenValue();
}
@@ -103,11 +103,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