Showing
2 changed files
with
2 additions
and
6 deletions
... | ... | @@ -133,9 +133,8 @@ public class RestAuthenticationProvider implements AuthenticationProvider { |
133 | 133 | } |
134 | 134 | } |
135 | 135 | else { |
136 | - try { | |
137 | - tkDetailDTO = ytUserDetailsByUserName(ytUserName.split("@")[0], password).get(); | |
138 | - }catch (Exception e){} | |
136 | + //解决tk页面输入邮箱登录的异常 | |
137 | + tkDetailDTO = ytUserDetailsByUserName(ytUserName.split("@")[0], password).get(); | |
139 | 138 | } |
140 | 139 | securityUser = authenticateByUsernameAndPassword(authentication, userPrincipal, username, password,tkDetailDTO); |
141 | 140 | if (twoFactorAuthService.isTwoFaEnabled(securityUser.getTenantId(), securityUser.getId())) { | ... | ... |
... | ... | @@ -238,9 +238,6 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE |
238 | 238 | @Override |
239 | 239 | public UserInfoDTO me(String userId, String tenantId, Set<String> currentRoles) { |
240 | 240 | SysUserEntity user = baseMapper.selectById(userId); |
241 | -// if(user==null){ | |
242 | -// throw new TkDataValidationException(MessageUtils.message(ErrorMessage.USER_NOT_EXISTS.getI18nCode())); | |
243 | -// } | |
244 | 241 | UserInfoDTO userInfoDTO = new UserInfoDTO(); |
245 | 242 | if (!accountProperties.getReset() || !StringUtils.isEmpty(user.getActivateToken())) { |
246 | 243 | userInfoDTO.setNeedSetPwd(false); | ... | ... |