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 6f04cab7..4fc448da 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
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.monitor;
import java.util.List;
+
+import com.ruoyi.framework.shiro.service.SysPasswordService;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@@ -31,6 +33,9 @@ public class SysLogininforController extends BaseController
@Autowired
private ISysLogininforService logininforService;
+ @Autowired
+ private SysPasswordService passwordService;
+
@RequiresPermissions("monitor:logininfor:view")
@GetMapping()
public String logininfor()
@@ -77,4 +82,14 @@ public class SysLogininforController extends BaseController
logininforService.cleanLogininfor();
return success();
}
+
+ @RequiresPermissions("monitor:logininfor:unlock")
+ @Log(title = "账户解锁", businessType = BusinessType.OTHER)
+ @PostMapping("/unlock")
+ @ResponseBody
+ public AjaxResult unlock(String loginName)
+ {
+ passwordService.unlock(loginName);
+ return success();
+ }
}
diff --git a/ruoyi-admin/src/main/resources/static/i18n/messages.properties b/ruoyi-admin/src/main/resources/static/i18n/messages.properties
index ef2a3e4b..61fda1d9 100644
--- a/ruoyi-admin/src/main/resources/static/i18n/messages.properties
+++ b/ruoyi-admin/src/main/resources/static/i18n/messages.properties
@@ -1,8 +1,8 @@
#错误消息
not.null=* 必须填写
user.jcaptcha.error=验证码错误
-user.not.exists=用户不存在/密码错误
-user.password.not.match=用户不存在/密码错误
+user.not.exists=用户不存在
+user.password.not.match=密码错误
user.password.retry.limit.count=密码输入错误{0}次
user.password.retry.limit.exceed=密码输入错误{0}次,帐户锁定10分钟
user.password.delete=对不起,您的账号已被删除
diff --git a/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html b/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
index 9f02372d..0c0a392b 100644
--- a/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
+++ b/ruoyi-admin/src/main/resources/templates/monitor/logininfor/logininfor.html
@@ -44,6 +44,9 @@
清空
+
+ 解锁
+
导出
@@ -121,6 +124,10 @@
};
$.table.init(options);
});
+
+ function unlock() {
+ $.operate.post(prefix + "/unlock?loginName=" + $.table.selectColumns("loginName"));
+ }