mirror of
https://gitee.com/dromara/RuoYi-Vue-Plus.git
synced 2026-09-20 18:15:56 +08:00
update 优化 登录授权代码,将loadUser()提取为公有代码
This commit is contained in:
parent
3fd789c158
commit
6dfa1080be
@ -66,6 +66,7 @@ public class SysLoginService {
|
|||||||
public SysUserVo loadUser(LoginType loginType, String tenantId, String account) {
|
public SysUserVo loadUser(LoginType loginType, String tenantId, String account) {
|
||||||
return TenantHelper.dynamic(tenantId, () -> {
|
return TenantHelper.dynamic(tenantId, () -> {
|
||||||
SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
|
SysUser user = userMapper.selectOne(new LambdaQueryWrapper<SysUser>()
|
||||||
|
.select(SysUser::getUserId, SysUser::getStatus)
|
||||||
.eq(LoginType.SMS == loginType, SysUser::getPhonenumber, account)
|
.eq(LoginType.SMS == loginType, SysUser::getPhonenumber, account)
|
||||||
.eq(LoginType.EMAIL == loginType, SysUser::getEmail, account)
|
.eq(LoginType.EMAIL == loginType, SysUser::getEmail, account)
|
||||||
.eq(LoginType.PASSWORD == loginType, SysUser::getUserName, account)
|
.eq(LoginType.PASSWORD == loginType, SysUser::getUserName, account)
|
||||||
@ -78,7 +79,15 @@ public class SysLoginService {
|
|||||||
log.info("登录用户:{} 已被停用.", account);
|
log.info("登录用户:{} 已被停用.", account);
|
||||||
throw new UserException("user.blocked", account);
|
throw new UserException("user.blocked", account);
|
||||||
}
|
}
|
||||||
return MapstructUtils.convert(user, SysUserVo.class);
|
|
||||||
|
SysUserVo sysUserVo = null;
|
||||||
|
switch (loginType) {
|
||||||
|
case SMS: sysUserVo = userMapper.selectUserByPhonenumber(account); break;
|
||||||
|
case EMAIL: sysUserVo = userMapper.selectUserByEmail(account); break;
|
||||||
|
case PASSWORD: sysUserVo = userMapper.selectUserByUserName(account); break;
|
||||||
|
case SOCIAL: sysUserVo = userMapper.selectUserById(Long.parseLong(account)); break;
|
||||||
|
}
|
||||||
|
return sysUserVo;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user