Merge branch '20220428' into 'master'

refactor: 第三方登录接口

See merge request huang/thingsboard3.3.2!87

@@ -138,7 +138,7 @@ public class DeviceProfileController extends BaseController {
                     "The implementation limits the number of devices that participate in search to 100 as a trade of between accurate results and time-consuming queries. " +
                     "The implementation limits the number of devices that participate in search to 100 as a trade of between accurate results and time-consuming queries. " +
                     TENANT_AUTHORITY_PARAGRAPH,
                     TENANT_AUTHORITY_PARAGRAPH,
             produces = "application/json")
             produces = "application/json")
-    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
     @RequestMapping(value = "/deviceProfile/devices/keys/timeseries", method = RequestMethod.GET)
     @RequestMapping(value = "/deviceProfile/devices/keys/timeseries", method = RequestMethod.GET)
     @ResponseBody
     @ResponseBody
     public List<String> getTimeseriesKeys(
     public List<String> getTimeseriesKeys(

@@ -5,6 +5,8 @@ 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;
@@ -76,11 +78,15 @@ public class YtThirdPlatformController extends BaseController {
         return thirdService.unbindUser(getCurrentUser().getCurrentTenantId(), dto.getAppUserId(),dto.getThirdUserId());
         return thirdService.unbindUser(getCurrentUser().getCurrentTenantId(), dto.getAppUserId(),dto.getThirdUserId());
     }
     }
 
 
-    @GetMapping("login/{thirdId}")
+    @GetMapping("login/{loginCode}")
     @ApiOperation("第三方登录")
     @ApiOperation("第三方登录")
-    public JwtTokenPair login(@PathVariable("thirdId") String thirdId)
+    public JwtTokenPair login(@PathVariable("loginCode") String loginCode)
             throws ThingsboardException {
             throws ThingsboardException {
-        UserDTO userDto = thirdService.login(thirdId);
+        String thirdUserId = thirdService.thirdLogin(loginCode);
+        UserDTO userDto = thirdService.login(thirdUserId);
+        if(userDto == null){
+            return new JwtTokenPair("", thirdUserId);
+        }
         return buildJwtToken(userDto);
         return buildJwtToken(userDto);
     }
     }
 
 

@@ -528,7 +528,7 @@ spring:
     open-in-view: "false"
     open-in-view: "false"
     hibernate:
     hibernate:
       ddl-auto: "none"
       ddl-auto: "none"
-    show-sql: "true"
+    show-sql: "false"
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
     database-platform: "${SPRING_JPA_DATABASE_PLATFORM:org.hibernate.dialect.PostgreSQLDialect}"
   datasource:
   datasource:
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
     driverClassName: "${SPRING_DRIVER_CLASS_NAME:org.postgresql.Driver}"
@@ -1131,9 +1131,14 @@ account:
   info:
   info:
     emailSuffix: yunteng.com
     emailSuffix: yunteng.com
     defaultPassword: 123456
     defaultPassword: 123456
+third:
+  wechat:
+    url: https://api.weixin.qq.com
+    appId: wxd5d018355f38262b
+    appSecret: f6975fcc2248b1de2fdd2e40e9d21476
 logging:
 logging:
   level:
   level:
-    org.thingsboard.server.dao.yunteng.mapper: debug
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    org.thingsboard.server.dao.yunteng.mapper: info
+#mybatis-plus:
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

+package org.thingsboard.server.common.data.yunteng.config.third;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Data
+@ConfigurationProperties(prefix = "third.wechat")
+public class WechatProperties {
+    private String url;
+    private String appId;
+    private String appSecret;
+
+}

@@ -60,7 +60,8 @@ public enum ErrorMessage {
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),
   SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动正在使用该告警配置"),
   SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动正在使用该告警配置"),
-  APP_USER_BINDED(400043,"账号【%s】已绑定"),
+  APP_USER_BINDED(400043,"平台用户【%s】已被其它账号绑定"),
+  THIRD_PLATFORM_EXCEPTION(400044,"【%s】，第三方异常【%s】"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;
   private String message;
   private String message;

@@ -6,12 +6,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.yunteng.config.third.WechatProperties;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 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.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -23,6 +26,7 @@ import org.thingsboard.server.common.data.yunteng.dto.request.CodeTTL;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 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.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.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
@@ -47,6 +51,9 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
     private final CacheUtils cacheUtils;
     private final CacheUtils cacheUtils;
     private final PasswordEncoder passwordEncoder;
     private final PasswordEncoder passwordEncoder;
 
 
+    private final RestTemplate restTemplate = new RestTemplate();
+    private final WechatProperties wechatProperties;
+
     @Override
     @Override
     public YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, ThirdPlatformEnum platformName, String name) {
     public YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, ThirdPlatformEnum platformName, String name) {
         Wrapper pageFilter = new QueryWrapper<YtThirdUserEntity>()
         Wrapper pageFilter = new QueryWrapper<YtThirdUserEntity>()
@@ -171,6 +178,19 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
         return baseMapper.delete(filter) > 0;
         return baseMapper.delete(filter) > 0;
     }
     }
 
 
+    private static final String loginApi="/sns/jscode2session?appid={appid}&secret={appid}&js_code={appid}&grant_type=authorization_code";
+    @Override
+    public String thirdLogin(String loginCode) {
+        String response = restTemplate.getForObject(wechatProperties.getUrl()+loginApi,String.class, wechatProperties.getAppId(),wechatProperties.getAppSecret(),loginCode);
+        JsonNode result = JacksonUtil.toJsonNode(response);
+
+        if(result.has("errcode")){
+            throw new YtDataValidationException(String.format(ErrorMessage.THIRD_PLATFORM_EXCEPTION.getMessage(),ThirdPlatformEnum.WECHAT,result.get("errmsg").asText()));
+        }
+        String thirdUserId = result.get("openid").asText();
+        return thirdUserId;
+    }
+
     @Override
     @Override
     public UserDTO login(String thirdUserId) {
     public UserDTO login(String thirdUserId) {
         User user = baseMapper.login(thirdUserId);
         User user = baseMapper.login(thirdUserId);
@@ -186,4 +206,7 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
     public JsonNode message(String receiver, JsonNode message) {
     public JsonNode message(String receiver, JsonNode message) {
         return null;
         return null;
     }
     }
+
+
+
 }
 }

@@ -44,6 +44,14 @@ public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
     /**
     /**
      * 第三方登录
      * 第三方登录
      *
      *
+     * @param loginCode
+     * @return
+     */
+    String thirdLogin(String loginCode);
+
+    /**
+     * 第三方登录
+     *
      * @param thirdUserId
      * @param thirdUserId
      * @return
      * @return
      */
      */