ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-09 20:57:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 账号锁定提示增加解锁时间显示

Browse Source
This commit is contained in:
Charles7c
2025-04-01 21:39:28 +08:00
parent c041496f65
commit eef9232690
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
continew-module-system/src/main/java/top/continew/admin/auth/handler/AccountLoginHandler.java
View File

@@ -16,6 +16,9 @@
package top.continew.admin.auth.handler;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.extra.servlet.JakartaServletUtil;
import jakarta.servlet.http.HttpServletRequest;
@@ -108,10 +111,9 @@ public class AccountLoginHandler extends AbstractLoginHandler<AccountLoginReq> {
// 检测是否已被锁定
String key = CacheConstants.USER_PASSWORD_ERROR_KEY_PREFIX + RedisUtils.formatKey(username, JakartaServletUtil
.getClientIP(request));
int lockMinutes = optionService.getValueByCode2Int(PasswordPolicyEnum.PASSWORD_ERROR_LOCK_MINUTES.name());
Integer currentErrorCount = ObjectUtil.defaultIfNull(RedisUtils.get(key), 0);
CheckUtils.throwIf(currentErrorCount >= maxErrorCount, PasswordPolicyEnum.PASSWORD_ERROR_LOCK_MINUTES.getMsg()
.formatted(lockMinutes));
.formatted(this.getUnlockTime(key)));
// 登录成功清除计数
if (!isError) {
RedisUtils.delete(key);
@@ -119,8 +121,24 @@ public class AccountLoginHandler extends AbstractLoginHandler<AccountLoginReq> {
}
// 登录失败递增计数
currentErrorCount++;
int lockMinutes = optionService.getValueByCode2Int(PasswordPolicyEnum.PASSWORD_ERROR_LOCK_MINUTES.name());
RedisUtils.set(key, currentErrorCount, Duration.ofMinutes(lockMinutes));
CheckUtils.throwIf(currentErrorCount >= maxErrorCount, PasswordPolicyEnum.PASSWORD_ERROR_LOCK_COUNT.getMsg()
.formatted(maxErrorCount, lockMinutes));
.formatted(maxErrorCount, lockMinutes, this.getUnlockTime(key)));
}
/**
* 获取解锁时间
*
* @param key 键
* @return 解锁时间
*/
private String getUnlockTime(String key) {
long timeToLive = RedisUtils.getTimeToLive(key);
return timeToLive > 0
? DateUtil.date()
.offset(DateField.MILLISECOND, (int)timeToLive)
.toString(DatePattern.CHINESE_DATE_TIME_FORMAT)
: "";
}
}

4
continew-module-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java
View File

@@ -47,12 +47,12 @@ public enum PasswordPolicyEnum {
/**
* 密码错误锁定阈值
*/
PASSWORD_ERROR_LOCK_COUNT("密码错误锁定阈值取值范围为 %d-%d", SysConstants.NO, 10, "密码不正确已达 %d 次，账号锁定 %d 分钟"),
PASSWORD_ERROR_LOCK_COUNT("密码错误锁定阈值取值范围为 %d-%d", SysConstants.NO, 10, "由于您连续 %s 次输入错误密码，账号已被锁定 %s 分钟，预计解锁时间为 %s，请稍后再试"),
/**
* 账号锁定时长（分钟）
*/
PASSWORD_ERROR_LOCK_MINUTES("账号锁定时长取值范围为 %d-%d 分钟", 1, 1440, "账号锁定 %d 分钟，请稍后再试"),
PASSWORD_ERROR_LOCK_MINUTES("账号锁定时长取值范围为 %d-%d 分钟", 1, 1440, "您的账号已被锁定，预计解锁时间为 %s，请稍后再试"),
/**
* 密码有效期（天）