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

【8.1.9】【sys】获取用户的状态增加自动解锁功能

dev-8.1.9
stylefeng 2024-07-12 14:55:20 +08:00
parent cc09e43f9b
commit c88622cec4
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/LoginService.java
View File

@ -219,6 +219,7 @@ public class LoginService {
Integer loginErrorCount = loginErrorCountCacheApi.get(loginRequest.getAccount()); Integer loginErrorCount = loginErrorCountCacheApi.get(loginRequest.getAccount());
if (loginErrorCount != null && loginErrorCount >= LoginConfigExpander.getMaxErrorLoginCount()) { if (loginErrorCount != null && loginErrorCount >= LoginConfigExpander.getMaxErrorLoginCount()) {
// 修改用户状态为锁定 // 修改用户状态为锁定
// 【2024年7月12日新增，默认锁定1天】
sysUserServiceApi.lockUserStatus(loginRequest.getTenantCode(), loginRequest.getAccount()); sysUserServiceApi.lockUserStatus(loginRequest.getTenantCode(), loginRequest.getAccount());
throw new AuthException(AuthExceptionEnum.LOGIN_LOCKED); throw new AuthException(AuthExceptionEnum.LOGIN_LOCKED);
} }

20
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -484,21 +484,31 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public UserValidateDTO getUserLoginValidateDTO(Long tenantId, String account) { public UserValidateDTO getUserLoginValidateDTO(Long tenantId, String account) {
LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
sysUserLambdaQueryWrapper.eq(SysUser::getAccount, account); sysUserLambdaQueryWrapper.eq(SysUser::getAccount, account);
sysUserLambdaQueryWrapper.select(SysUser::getPassword, SysUser::getPasswordSalt, SysUser::getStatusFlag, SysUser::getUserId); sysUserLambdaQueryWrapper.select(SysUser::getPassword, SysUser::getPasswordSalt, SysUser::getStatusFlag, SysUser::getFreezeDeadlineTime, SysUser::getUserId);
// 单独填充租户id // 单独填充租户id
SysUser sysUserServiceOne; SysUser sysUserServiceOne;
try { try {
TenantIdHolder.set(tenantId); TenantIdHolder.set(tenantId);
sysUserServiceOne = this.getOne(sysUserLambdaQueryWrapper, false); sysUserServiceOne = this.getOne(sysUserLambdaQueryWrapper, false);
// 用户查询不到，提示账号密码错误
if (sysUserServiceOne == null) {
throw new ServiceException(SysUserExceptionEnum.ACCOUNT_NOT_EXIST);
}
// 判断用户状态是否被临时冻结，如果超过了临时冻结时间，将用户状态改为正常态
if (UserStatusEnum.TEMP_FREEZE.getCode().equals(sysUserServiceOne.getStatusFlag())) {
Date freezeDeadlineTime = sysUserServiceOne.getFreezeDeadlineTime();
if (freezeDeadlineTime != null && freezeDeadlineTime.before(new Date())) {
sysUserServiceOne.setStatusFlag(UserStatusEnum.ENABLE.getCode());
this.updateById(sysUserServiceOne);
}
}
} finally { } finally {
TenantIdHolder.remove(); TenantIdHolder.remove();
} }
if (sysUserServiceOne == null) {
throw new ServiceException(SysUserExceptionEnum.ACCOUNT_NOT_EXIST);
}
return new UserValidateDTO(sysUserServiceOne.getUserId(), sysUserServiceOne.getPassword(), sysUserServiceOne.getPasswordSalt(), sysUserServiceOne.getStatusFlag(), tenantId, account); return new UserValidateDTO(sysUserServiceOne.getUserId(), sysUserServiceOne.getPassword(), sysUserServiceOne.getPasswordSalt(), sysUserServiceOne.getStatusFlag(), tenantId, account);
} }