From bc6db547d6b75e092cadc084035ef570bad75af7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 04 十月 2021 16:41:11 +0800
Subject: [PATCH] fix 修复密码校验错误
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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..828fe49 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;
@@ -62,9 +64,7 @@
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();
}
@@ -72,7 +72,7 @@
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
recordLoginInfo(user.getUserId());
// 鐢熸垚token
- StpUtil.login(user.getUserId(), "PC");
+ LoginUtils.loginByDevice(user.getUserId(), UserType.SYS_USER, DeviceType.PC);
return StpUtil.getTokenValue();
}
--
Gitblit v1.9.3