Merge branch '20220429' into 'master'

refactor: 微信小程序登录和绑定增加第三方平台用户ID

See merge request huang/thingsboard3.3.2!90

@@ -5,8 +5,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.StringUtils;
@@ -15,7 +13,6 @@ import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
 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.OrderTypeEnum;
@@ -25,6 +22,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
 import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRepository;
 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.JwtTokenPair;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.model.UserPrincipal;
@@ -65,10 +63,10 @@ public class YtThirdPlatformController extends BaseController {
 
 
     @PostMapping("bind")
     @PostMapping("bind")
     @ApiOperation("绑定")
     @ApiOperation("绑定")
-    public JwtTokenPair saveOrUpdateAlarmProfile(
+    public YtLoginResponse saveOrUpdateAlarmProfile(
             @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
             @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
         UserDTO userDto = thirdService.bindUser(dto);
         UserDTO userDto = thirdService.bindUser(dto);
-        return buildJwtToken(userDto);
+        return buildJwtToken(userDto,dto.getThirdUserId());
     }
     }
 
 
     @DeleteMapping
     @DeleteMapping
@@ -80,18 +78,18 @@ public class YtThirdPlatformController extends BaseController {
 
 
     @GetMapping("login/{loginCode}")
     @GetMapping("login/{loginCode}")
     @ApiOperation("第三方登录")
     @ApiOperation("第三方登录")
-    public JwtTokenPair login(@PathVariable("loginCode") String loginCode)
+    public YtLoginResponse login(@PathVariable("loginCode") String loginCode)
             throws ThingsboardException {
             throws ThingsboardException {
         String thirdUserId = thirdService.thirdLogin(loginCode);
         String thirdUserId = thirdService.thirdLogin(loginCode);
         UserDTO userDto = thirdService.login(thirdUserId);
         UserDTO userDto = thirdService.login(thirdUserId);
         if(userDto == null){
         if(userDto == null){
-            return new JwtTokenPair("", thirdUserId);
+            return new YtLoginResponse().setThirdUserId(thirdUserId);
         }
         }
-        return buildJwtToken(userDto);
+        return buildJwtToken(userDto,thirdUserId);
     }
     }
 
 
     @NotNull
     @NotNull
-    private JwtTokenPair buildJwtToken(UserDTO userDto) {
+    private YtLoginResponse buildJwtToken(UserDTO userDto,String thirdUserId) {
         String accessToken = "";
         String accessToken = "";
         String refreshToken = "";
         String refreshToken = "";
         if (userDto != null && StringUtils.isNotEmpty(userDto.getTbUser())) {
         if (userDto != null && StringUtils.isNotEmpty(userDto.getTbUser())) {
@@ -108,7 +106,10 @@ public class YtThirdPlatformController extends BaseController {
             refreshToken = refreshTokenRepository.requestRefreshToken(securityUser).getToken();
             refreshToken = refreshTokenRepository.requestRefreshToken(securityUser).getToken();
 
 
         }
         }
-        return new JwtTokenPair(accessToken, refreshToken);
+        YtLoginResponse result = new YtLoginResponse();
+        result.setToken(accessToken);
+        result.setRefreshToken(refreshToken);
+        return result.setThirdUserId(thirdUserId);
     }
     }