From dc2a723c1bce9221429975fb98580ae9891a0779 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 22 Sep 2020 09:53:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=AD=E4=B9=89=E9=94=99?= =?UTF-8?q?=E8=AF=AF&=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/SysLogininforController.java | 2 +- .../shiro/service/SysPasswordService.java | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java index 688c088b2..41c2c457d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java @@ -88,7 +88,7 @@ public class SysLogininforController extends BaseController @ResponseBody public AjaxResult unlock(String loginName) { - passwordService.unlock(loginName); + passwordService.clearLoginRecordCache(loginName); return success(); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java index 50986ca53..006246b38 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysPasswordService.java @@ -73,18 +73,13 @@ public class SysPasswordService return user.getPassword().equals(encryptPassword(user.getLoginName(), newPassword, user.getSalt())); } - public void clearLoginRecordCache(String username) - { - loginRecordCache.remove(username); - } - - public String encryptPassword(String username, String password, String salt) - { - return new Md5Hash(username + password + salt).toHex(); - } - - public void unlock(String loginName) + public void clearLoginRecordCache(String loginName) { loginRecordCache.remove(loginName); } + + public String encryptPassword(String loginName, String password, String salt) + { + return new Md5Hash(loginName + password + salt).toHex(); + } }