|
|
@ -138,7 +138,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService { |
|
|
|
user.setRoleId(headerRole); |
|
|
|
user.setRoleId(headerRole); |
|
|
|
} |
|
|
|
} |
|
|
|
// 成功则清除登录错误次数
|
|
|
|
// 成功则清除登录错误次数
|
|
|
|
bladeRedis.del(CacheNames.tenantKey(tenantId, CacheNames.USER_FAIL_KEY, username)); |
|
|
|
delFailCount(tenantId, username); |
|
|
|
return new BladeUserDetails(user.getId(), |
|
|
|
return new BladeUserDetails(user.getId(), |
|
|
|
user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR), |
|
|
|
user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR), |
|
|
|
username, AuthConstant.ENCRYPT + user.getPassword(), userInfo.getDetail(), true, true, true, true, |
|
|
|
username, AuthConstant.ENCRYPT + user.getPassword(), userInfo.getDetail(), true, true, true, true, |
|
|
@ -170,5 +170,15 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService { |
|
|
|
bladeRedis.setEx(CacheNames.tenantKey(tenantId, CacheNames.USER_FAIL_KEY, username), count + 1, Duration.ofMinutes(30)); |
|
|
|
bladeRedis.setEx(CacheNames.tenantKey(tenantId, CacheNames.USER_FAIL_KEY, username), count + 1, Duration.ofMinutes(30)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* 清空账号错误次数 |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param tenantId 租户id |
|
|
|
|
|
|
|
* @param username 账号 |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
private void delFailCount(String tenantId, String username) { |
|
|
|
|
|
|
|
bladeRedis.del(CacheNames.tenantKey(tenantId, CacheNames.USER_FAIL_KEY, username)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|