Browse Source

修正语义错误&删除多余方法

RuoYi 4 years ago
parent
commit
dc2a723c1b

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

+ 4 - 9
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)
+    public void clearLoginRecordCache(String loginName)
     {
-        loginRecordCache.remove(username);
-    }
-
-    public String encryptPassword(String username, String password, String salt)
-    {
-        return new Md5Hash(username + password + salt).toHex();
+        loginRecordCache.remove(loginName);
     }
 
-    public void unlock(String loginName)
+    public String encryptPassword(String loginName, String password, String salt)
     {
-        loginRecordCache.remove(loginName);
+        return new Md5Hash(loginName + password + salt).toHex();
     }
 }