gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

🐛 修复用户登录锁定解锁后在次登录失败，计数错误

pull/82/head^2
awenes 2024-04-06 18:58:05 +08:00
parent 3fe678890e
commit 6fe87c68d4
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eiam-common/src/main/java/cn/topiam/employee/common/entity/account/UserEntity.java
View File

@ -159,6 +159,12 @@ public class UserEntity extends LogicDeleteEntity<Long> {
@Column(name = "last_auth_time") @Column(name = "last_auth_time")
private LocalDateTime lastAuthTime; private LocalDateTime lastAuthTime;
/**
* 锁定时间
*/
@Column(name = "lock_expired_time")
private LocalDateTime lockExpiredTime;
/** /**
* 扩展参数 * 扩展参数
*/ */

38
eiam-portal/src/main/java/cn/topiam/employee/portal/authentication/PortalAuthenticationFailureEventListener.java
View File

@ -17,10 +17,14 @@
*/ */
package cn.topiam.employee.portal.authentication; package cn.topiam.employee.portal.authentication;
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.Objects; import java.util.Objects;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.redisson.api.RAtomicLong;
import org.redisson.api.RedissonClient;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
@ -92,24 +96,36 @@ public class PortalAuthenticationFailureEventListener implements
//@formatter:on //@formatter:on
} }
/**
* 更新登录失败计数
*
* @param user {@link UserEntity}
*/
/** /**
* 更新登录失败计数 * 更新登录失败计数
* *
* @param user {@link UserEntity} * @param user {@link UserEntity}
*/ */
private void updateLoginFailCount(UserEntity user) { private void updateLoginFailCount(UserEntity user) {
//当前时间
LocalDateTime nowTime = LocalDateTime.now();
//根据当前时间减去登录失败持续时间
LocalDateTime beforeTime = nowTime.minusMinutes(getLoginFailureDuration());
Integer count = SettingHelp.getLoginFailureCount(); Integer count = SettingHelp.getLoginFailureCount();
UserRepository userRepository = getUserRepository(); UserRepository userRepository = getUserRepository();
//统计用户登录失败次数 //统计用户登录失败次数
Integer loginFailCount = getAuditRepository().countLoginFailByUserId(beforeTime, nowTime, RAtomicLong rAtomicLong = getRedissonClient().getAtomicLong(String.valueOf(user.getId()));
user.getId()); //如果存在该key
if (loginFailCount > count) { if (rAtomicLong.isExists()) {
user.setStatus(UserStatus.LOCKED); long loginFailCount = rAtomicLong.incrementAndGet();
userRepository.save(user); if (loginFailCount > count) {
user.setStatus(UserStatus.LOCKED);
user.setLockExpiredTime(LocalDateTime.now());
userRepository.save(user);
rAtomicLong.deleteAsync();
}
}
//如果不存在该key，并且用户未被锁定
if (!rAtomicLong.isExists() && !user.getStatus().equals(UserStatus.LOCKED)) {
rAtomicLong.incrementAndGet();
Instant expireTime = Instant.now().plus(getLoginFailureDuration(), ChronoUnit.MINUTES);
rAtomicLong.expire(expireTime);
} }
} }
@ -117,8 +133,8 @@ public class PortalAuthenticationFailureEventListener implements
return ApplicationContextHelp.getBean(UserRepository.class); return ApplicationContextHelp.getBean(UserRepository.class);
} }
private AuditRepository getAuditRepository() { private RedissonClient getRedissonClient() {
return ApplicationContextHelp.getBean(AuditRepository.class); return ApplicationContextHelp.getBean(RedissonClient.class);
} }
} }