fix:解决@thingskit.com登陆失败

@@ -132,6 +132,11 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
 		          return validateByUsernameAndPassword(tkDetailDTO, authentication, userPrincipal);
 		        }
 		      }
+              else {
+                  try {
+                      tkDetailDTO = ytUserDetailsByUserName(ytUserName.split("@")[0], password).get();
+                  }catch (Exception e){}
+              }
             securityUser = authenticateByUsernameAndPassword(authentication, userPrincipal, username, password,tkDetailDTO);
             if (twoFactorAuthService.isTwoFaEnabled(securityUser.getTenantId(), securityUser.getId())) {
                 return new MfaAuthenticationToken(securityUser);

@@ -86,6 +86,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
   private final TenantMapper tenantMapper;
   private final TkCustomerDevice tkCustomerDevice;
 
+
   @Override
   public List<UserDetailsDTO> findUserDetailsByUsername(String username, String tenantId) {
     // 多个租户可能存在多个username相同的情况
@@ -237,6 +238,9 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
   @Override
   public UserInfoDTO me(String userId, String tenantId, Set<String> currentRoles) {
     SysUserEntity user = baseMapper.selectById(userId);
+//    if(user==null){
+//      throw new TkDataValidationException(MessageUtils.message(ErrorMessage.USER_NOT_EXISTS.getI18nCode()));
+//    }
     UserInfoDTO userInfoDTO = new UserInfoDTO();
     if (!accountProperties.getReset() || !StringUtils.isEmpty(user.getActivateToken())) {
       userInfoDTO.setNeedSetPwd(false);