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(); + } }