refactor:小程序登录JWT信息完善

@@ -14,6 +14,7 @@ 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.DeleteDTO;
+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.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
@@ -64,8 +65,8 @@ public class YtThirdPlatformController extends BaseController {
     @ApiOperation("绑定")
     public JwtTokenPair saveOrUpdateAlarmProfile(
             @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
-        String tbUserId = thirdService.saveOrUpdate(dto);
-        return buildJwtToken(tbUserId);
+        UserDTO userDto = thirdService.saveOrUpdate(dto);
+        return buildJwtToken(userDto);
     }
 
     @DeleteMapping
@@ -80,22 +81,24 @@ public class YtThirdPlatformController extends BaseController {
     @ApiOperation("第三方登录")
     public JwtTokenPair login(@PathVariable("thirdId") String thirdId)
             throws ThingsboardException {
-        String tbUserId = thirdService.login(thirdId);
-        return buildJwtToken(tbUserId);
+        UserDTO userDto = thirdService.login(thirdId);
+        return buildJwtToken(userDto);
     }
 
     @NotNull
-    private JwtTokenPair buildJwtToken(String tbUserId) {
+    private JwtTokenPair buildJwtToken(UserDTO userDto) {
         String accessToken = "";
         String refreshToken = "";
-        if (StringUtils.isNotEmpty(tbUserId)) {
-            UserId userId = new UserId(UUID.fromString(tbUserId));
+        if (userDto != null && StringUtils.isNotEmpty(userDto.getTbUser())) {
+            UserId userId = new UserId(UUID.fromString(userDto.getTbUser()));
             User user = userService.findUserById(null, userId);
             UserCredentials credentials = userService.findUserCredentialsByUserId(user.getTenantId(), userId);
             String email = user.getEmail();
             int emailIndex = email.indexOf("@");
             UserPrincipal principal = new UserPrincipal(UserPrincipal.Type.USER_NAME, emailIndex > 0 ? email.substring(0, emailIndex) : email);
             SecurityUser securityUser = new SecurityUser(user, credentials.isEnabled(), principal);
+            securityUser.setCurrentUserId(userDto.getId());
+            securityUser.setPlatformUserName(userDto.getUsername());
             accessToken = tokenFactory.createAccessJwtToken(securityUser).getToken();
             refreshToken = refreshTokenRepository.requestRefreshToken(securityUser).getToken();
 

@@ -6,26 +6,18 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.InsufficientAuthenticationException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.StringUtils;
-import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.UserId;
-import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 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.UserDetailsDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtOpinionDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.CodeTTL;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
@@ -33,17 +25,14 @@ import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.User;
-import org.thingsboard.server.dao.yunteng.entities.YtOpinionEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
-import org.thingsboard.server.dao.yunteng.mapper.YtOpinionMapper;
 import org.thingsboard.server.dao.yunteng.mapper.YtThirdPlatformMapper;
-import org.thingsboard.server.dao.yunteng.service.*;
+import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
+import org.thingsboard.server.dao.yunteng.service.YtThirdPlatformService;
 
-import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.UUID;
 
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CacheConfigKey.MOBILE_LOGIN_SMS_CODE;
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.DEFAULT_DELIMITER;
@@ -71,7 +60,7 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String saveOrUpdate(YtThirdUserDTO dto) {
+    public UserDTO saveOrUpdate(YtThirdUserDTO dto) {
         User user = null;
         switch (dto.getLoginMethod()) {
             case PHONE:
@@ -99,7 +88,7 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
             dto.setId(oldVideo.getId());
             baseMapper.updateById(dto.getEntity(YtThirdUserEntity.class));
         }
-        return user.getTbUser();
+        return user.getDTO(UserDTO.class);
     }
 
     /**
@@ -177,8 +166,9 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
     }
 
     @Override
-    public String login(String thirdUserId) {
-        return baseMapper.login(thirdUserId);
+    public UserDTO login(String thirdUserId) {
+        return baseMapper.login(thirdUserId)
+                .getDTO(UserDTO.class);
     }
 
     @Override

 package org.thingsboard.server.dao.yunteng.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.thingsboard.server.common.data.yunteng.dto.YtVideoDTO;
+import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 
-import java.util.List;
-
 /**
  * @author Administrator
  */
@@ -20,5 +17,5 @@ public interface YtThirdPlatformMapper extends BaseMapper<YtThirdUserEntity> {
      * @param thirdId
      * @return
      */
-    String login(@Param("thirdId") String thirdId);
+    User login(@Param("thirdId") String thirdId);
 }

@@ -3,34 +3,36 @@ package org.thingsboard.server.dao.yunteng.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.YtOpinionDTO;
+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.enums.ThirdPlatformEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.YtOpinionEntity;
+import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 
 /**
  * 第三方平台用户管理相关接口
  * 例如：微信小程序、钉钉等。
+ *
  * @author Administrator
  */
 public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
 
     /**
-     * @param pageInfrom      分页配置信息
-     * @param name            第三方平台用户昵称
+     * @param pageInfrom 分页配置信息
+     * @param name       第三方平台用户昵称
      * @return
      */
-    YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, ThirdPlatformEnum platformName,String name);
+    YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, ThirdPlatformEnum platformName, String name);
 
 
-
-    /** 第三方平台用户与系统用户绑定
+    /**
+     * 第三方平台用户与系统用户绑定
+     *
      * @param dto
      * @return
      */
-    String saveOrUpdate(YtThirdUserDTO dto);
+    UserDTO saveOrUpdate(YtThirdUserDTO dto);
 
     /**
      * @param deleteDTO
@@ -40,16 +42,16 @@ public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
 
     /**
      * 第三方登录
+     *
      * @param thirdUserId
      * @return
      */
-    String login(String thirdUserId);
-
-
+    UserDTO login(String thirdUserId);
 
 
     /**
      * 访问令牌
+     *
      * @param appKey
      * @param appSecret
      * @return
@@ -58,10 +60,11 @@ public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
 
     /**
      * 推送第三方程序消息
+     *
      * @param receiver
      * @param message
      * @return
      */
-    JsonNode message(String receiver,JsonNode message);
+    JsonNode message(String receiver, JsonNode message);
 
 }

@@ -3,8 +3,8 @@
 
 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.YtThirdPlatformMapper">
 
-    <select id="login" resultType="string">
-        SELECT sus.tb_user
+    <select id="login" resultType="org.thingsboard.server.dao.yunteng.entities.User">
+        SELECT sus.*
         FROM iotfs_third_user base
         LEFT JOIN sys_user sus ON base.app_user_id = sus.id
         <where>