diff --git a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java index 24c1a4fd..4a274f9a 100644 --- a/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java +++ b/opsli-base-support/opsli-core/src/main/java/org/opsli/core/utils/UserTokenUtil.java @@ -244,7 +244,7 @@ public class UserTokenUtil { /** * 验证锁定账号 - * @param username + * @param username 用户名 */ public static void verifyLockAccount(String username){ // 判断账号是否临时锁定 @@ -273,9 +273,9 @@ public class UserTokenUtil { /** * 锁定账号 - * @param username + * @param username 用户名 */ - public static ResultVo lockAccount(String username){ + public static TokenMsg lockAccount(String username){ // 如果失败次数 超过阈值 则锁定账号 Long slipNum = redisPlugin.increment(ACCOUNT_SLIP_COUNT_PREFIX + username); if (slipNum != null){ @@ -291,20 +291,12 @@ public class UserTokenUtil { } } - Map flagMap = Maps.newHashMap(); - flagMap.put("izVerify", false); - if(slipNum != null && slipNum >= ACCOUNT_SLIP_VERIFY_COUNT){ - flagMap.put("izVerify", true); - } - return ResultVo.error(TokenMsg.EXCEPTION_LOGIN_ACCOUNT_NO.getCode(), - TokenMsg.EXCEPTION_LOGIN_ACCOUNT_NO.getMessage(), - flagMap - ); + return TokenMsg.EXCEPTION_LOGIN_ACCOUNT_NO; } /** * 获得当前失败次数 - * @param username + * @param username 用户名 */ public static long getSlipCount(String username){ long count = 0L; @@ -320,7 +312,7 @@ public class UserTokenUtil { /** * 清除锁定账号 - * @param username + * @param username 用户名 */ public static void clearLockAccount(String username){ // 删除失败次数记录 diff --git a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java index 1b1281ff..88e87cdc 100644 --- a/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java +++ b/opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/login/web/LoginRestController.java @@ -103,7 +103,8 @@ public class LoginRestController { if(user == null || !user.getPassword().equals(UserUtil.handlePassword(form.getPassword(), user.getSecretkey()))) { // 判断是否需要锁定账号 这里没有直接抛异常 而是返回错误信息, 其中包含 是否开启验证码状态 - return UserTokenUtil.lockAccount(form.getUsername()); + TokenMsg lockAccountMsg = UserTokenUtil.lockAccount(form.getUsername()); + throw new TokenException(lockAccountMsg); } // 如果验证成功, 则清除锁定信息