From 1f1d4e2defd90f16a4229b9bf98114f42c91405d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 12 十月 2021 11:47:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into satoken

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java |    4 +---
 1 files changed, 1 insertions(+), 3 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..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
@@ -64,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();
         }

--
Gitblit v1.9.3