refactor: 晚上第三方登录后，SecurityUser信息

@@ -14,20 +14,23 @@ import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
+import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
+import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
+import org.thingsboard.server.dao.yunteng.service.YtUserService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRepository;
 import org.thingsboard.server.service.security.auth.yunteng.YtLoginResponse;
-import org.thingsboard.server.service.security.model.JwtTokenPair;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
 
+import java.util.List;
 import java.util.UUID;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -44,6 +47,7 @@ public class YtThirdPlatformController extends BaseController {
     private final JwtTokenFactory tokenFactory;
     private final RefreshTokenRepository refreshTokenRepository;
     private final YtThirdPlatformService thirdService;
+    private final YtUserService ytUserService;
 
     @GetMapping(params = {PAGE_SIZE, PAGE})
     @ApiOperation("分页")
@@ -66,14 +70,14 @@ public class YtThirdPlatformController extends BaseController {
     public YtLoginResponse saveOrUpdateAlarmProfile(
             @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
         UserDTO userDto = thirdService.bindUser(dto);
-        return buildJwtToken(userDto,dto.getThirdUserId());
+        return buildJwtToken(userDto, dto.getThirdUserId());
     }
 
     @DeleteMapping
     @ApiOperation("解绑")
     public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody YtThirdUserDTO dto)
             throws ThingsboardException {
-        return thirdService.unbindUser(getCurrentUser().getCurrentTenantId(), dto.getAppUserId(),dto.getThirdUserId());
+        return thirdService.unbindUser(getCurrentUser().getCurrentTenantId(), dto.getAppUserId(), dto.getThirdUserId());
     }
 
     @GetMapping("login/{loginCode}")
@@ -82,19 +86,21 @@ public class YtThirdPlatformController extends BaseController {
             throws ThingsboardException {
         String thirdUserId = thirdService.thirdLogin(loginCode);
         UserDTO userDto = thirdService.login(thirdUserId);
-        if(userDto == null){
+        if (userDto == null) {
             return new YtLoginResponse().setThirdUserId(thirdUserId);
         }
-        return buildJwtToken(userDto,thirdUserId);
+        return buildJwtToken(userDto, thirdUserId);
     }
 
     @NotNull
-    private YtLoginResponse buildJwtToken(UserDTO userDto,String thirdUserId) {
+    private YtLoginResponse buildJwtToken(UserDTO userDto, String thirdUserId) {
         String accessToken = "";
         String refreshToken = "";
         if (userDto != null && StringUtils.isNotEmpty(userDto.getTbUser())) {
             UserId userId = new UserId(UUID.fromString(userDto.getTbUser()));
             User user = userService.findUserById(null, userId);
+            List<UserDetailsDTO> userDetailsDTOS =  ytUserService.findUserDetailsByUsername(userDto.getUsername(),userDto.getTenantId());
+            user.setUserDetailsDTO(userDetailsDTOS.get(0));
             UserCredentials credentials = userService.findUserCredentialsByUserId(user.getTenantId(), userId);
             String email = user.getEmail();
             int emailIndex = email.indexOf("@");