fix：openApibug修改

@@ -76,7 +76,7 @@ public class TkThirdPlatformController extends BaseController {
   @ApiOperation("绑定")
   @ApiOperation("绑定")
   public TkLoginResponse saveOrUpdateAlarmProfile(@Validated @RequestBody TkThirdUserDTO dto) {
   public TkLoginResponse saveOrUpdateAlarmProfile(@Validated @RequestBody TkThirdUserDTO dto) {
     UserDTO userDto = thirdService.bindUser(dto);
     UserDTO userDto = thirdService.bindUser(dto);
-    return buildJwtToken(userDto, dto.getThirdUserId());
+    return buildJwtToken(userDto, dto.getThirdUserId(),false);
   }
   }
 
 
   @DeleteMapping
   @DeleteMapping
@@ -101,17 +101,17 @@ public class TkThirdPlatformController extends BaseController {
     if (userDto == null) {
     if (userDto == null) {
       return new TkLoginResponse().setThirdUserId(thirdUserId);
       return new TkLoginResponse().setThirdUserId(thirdUserId);
     }
     }
-    return buildJwtToken(userDto, thirdUserId);
+    return buildJwtToken(userDto, thirdUserId,false);
   }
   }
 
 
   @GetMapping("login/id/{userId}")
   @GetMapping("login/id/{userId}")
   @ApiOperation("组态用户认证")
   @ApiOperation("组态用户认证")
-  public TkLoginResponse unionidLogin(@PathVariable("userId") String userId) {
+  public TkLoginResponse unionidLogin(@PathVariable("userId") String userId,@RequestParam(value = ORDER_TYPE, required = false)Boolean isOpenApi) {
     UserDTO userDto = tkUserService.findUserInfoById(userId);
     UserDTO userDto = tkUserService.findUserInfoById(userId);
     if (userDto == null) {
     if (userDto == null) {
       return new TkLoginResponse().setThirdUserId(userId);
       return new TkLoginResponse().setThirdUserId(userId);
     }
     }
-    return buildJwtToken(userDto, userId);
+    return buildJwtToken(userDto, userId,isOpenApi);
   }
   }
 
 
   private String authrizeKey = "zhiyun";
   private String authrizeKey = "zhiyun";
@@ -128,11 +128,11 @@ public class TkThirdPlatformController extends BaseController {
     if (userDto == null) {
     if (userDto == null) {
       return new TkLoginResponse().setThirdUserId(dto.getAuthrizeKey());
       return new TkLoginResponse().setThirdUserId(dto.getAuthrizeKey());
     }
     }
-    return buildJwtToken(userDto, dto.getAuthrizeKey());
+    return buildJwtToken(userDto, dto.getAuthrizeKey(),false);
   }
   }
 
 
   @NotNull
   @NotNull
-  private TkLoginResponse buildJwtToken(UserDTO userDto, String thirdUserId) {
+  private TkLoginResponse buildJwtToken(UserDTO userDto, String thirdUserId,Boolean isOpenApi) {
     checkTenantExpireTime(userDto);
     checkTenantExpireTime(userDto);
     String accessToken = "";
     String accessToken = "";
     String refreshToken = "";
     String refreshToken = "";
@@ -170,7 +170,10 @@ public class TkThirdPlatformController extends BaseController {
     TkLoginResponse result = new TkLoginResponse();
     TkLoginResponse result = new TkLoginResponse();
     result.setToken(accessToken);
     result.setToken(accessToken);
     result.setRefreshToken(refreshToken);
     result.setRefreshToken(refreshToken);
-    return result.setThirdUserId(thirdUserId);
+    if(!isOpenApi){
+      result.setThirdUserId(thirdUserId);
+    }
+    return result;
   }
   }
 
 
   private void checkTenantExpireTime(UserDTO user)
   private void checkTenantExpireTime(UserDTO user)

@@ -69,7 +69,7 @@ public class OpenApiController extends BaseController {
     }else{
     }else{
       userId =app.getUserId();
       userId =app.getUserId();
     }
     }
-   return tkThirdPlatformController.unionidLogin(userId);
+   return tkThirdPlatformController.unionidLogin(userId,true);
   }
   }
 
 
 
 
@@ -135,10 +135,14 @@ public class OpenApiController extends BaseController {
     return new ResponseEntity<>(HttpStatus.METHOD_NOT_ALLOWED);
     return new ResponseEntity<>(HttpStatus.METHOD_NOT_ALLOWED);
   }
   }
 
 
-  @PostMapping("/getApi")
+  @GetMapping("/getApi")
   @ApiOperation(value = "获取可调用api")
   @ApiOperation(value = "获取可调用api")
-  public ResponseEntity<List<OpenApiContrlooerDTO>> getApi(HttpServletRequest request) throws  ThingsboardException {
+  public ResponseEntity<List<OpenApiContrlooerDTO>> getApi() throws  ThingsboardException {
     ApplicationDTO appDto = applicationService.getDtoByUserId(getCurrentUser().getCurrentUserId());
     ApplicationDTO appDto = applicationService.getDtoByUserId(getCurrentUser().getCurrentUserId());
+    if(null==appDto.getApiList()||appDto.getApiList().isEmpty()){
+      throw new DataValidationException(String.format(MessageUtils.message(ErrorMessage.
+              APP_OPENAPI_API_ISNULL.getI18nCode())));
+    }
     return ResponseEntity.ok(openApiService.getByListId(appDto.getApiList()));
     return ResponseEntity.ok(openApiService.getByListId(appDto.getApiList()));
   }
   }
 
 

@@ -208,7 +208,7 @@ rule.chain.to.tenant = Rule chain should be assigned to tenant
 non.existent.tenant = Rule chain is referencing to non-existent tenant!
 non.existent.tenant = Rule chain is referencing to non-existent tenant!
 root.rule.chain.is.present = Another root rule chain is present in scope of current tenant!
 root.rule.chain.is.present = Another root rule chain is present in scope of current tenant!
 edge.root.rule.chain.is.present = Another edge template root rule chain is present in scope of current tenant!
 edge.root.rule.chain.is.present = Another edge template root rule chain is present in scope of current tenant!
-
+app.openapi.api.isnull = The current application does not have a callable API. Please contact the administrator
 
 
 
 
 
 

@@ -208,4 +208,6 @@ rule.chain.to.tenant =规则链应分配给租户
 non.existent.tenant =规则链正在引用不存在的租户
 non.existent.tenant =规则链正在引用不存在的租户
 root.rule.chain.is.present =当前租户范围内存在另一个根规则链
 root.rule.chain.is.present =当前租户范围内存在另一个根规则链
 edge.root.rule.chain.is.present =当前租户范围内存在另一个边缘模板根规则链
 edge.root.rule.chain.is.present =当前租户范围内存在另一个边缘模板根规则链
+app.openapi.api.isnull = 当前应用不存在可调用api请联系管理员
+
 
 

@@ -202,7 +202,7 @@ public enum ErrorMessage {
   NON_EXISTENT_TENANT(400166,"规则链正在引用不存在的租户！","non.existent.tenant"),
   NON_EXISTENT_TENANT(400166,"规则链正在引用不存在的租户！","non.existent.tenant"),
   ROOT_RULE_CHAIN_IS_PRESENT (400167,"当前租户范围内存在另一个根规则链！","root.rule.chain.is.present"),
   ROOT_RULE_CHAIN_IS_PRESENT (400167,"当前租户范围内存在另一个根规则链！","root.rule.chain.is.present"),
   EDGE_ROOT_RULE_CHAIN_IS_PRESENT(400168,"当前租户范围内存在另一个边缘模板根规则链！","edge.root.rule.chain.is.present"),
   EDGE_ROOT_RULE_CHAIN_IS_PRESENT(400168,"当前租户范围内存在另一个边缘模板根规则链！","edge.root.rule.chain.is.present"),
-
+  APP_OPENAPI_API_ISNULL(400169,"当前应用不存在可调用api请联系管理员","app.openapi.api.isnull"),
 
 
 
 
   HAVE_NO_PERMISSION(500002, "没有修改权限", "have.no.permission"),
   HAVE_NO_PERMISSION(500002, "没有修改权限", "have.no.permission"),

@@ -6,17 +6,17 @@ import lombok.Data;
 import org.thingsboard.server.common.data.yunteng.enums.ApplicationApiEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ApplicationApiEnum;
 
 
 @Data
 @Data
-public class OpenApiContrlooerDTO extends BaseDTO {
+public class OpenApiContrlooerDTO  {
+
+  @ApiModelProperty(value = "ID")
+  private String id;
 
 
   @ApiModelProperty(value = "名称")
   @ApiModelProperty(value = "名称")
   private String name;
   private String name;
+
   @ApiModelProperty(value = "请求方式")
   @ApiModelProperty(value = "请求方式")
   /** 请求方式 */
   /** 请求方式 */
-  private Integer requestMethod;
-
-  @ApiModelProperty(value = "文档地址")
-  /**文档地址*/
-  private String documentUrl;
+  private String requestMethod;
 
 
   @ApiModelProperty(value = "调用参数")
   @ApiModelProperty(value = "调用参数")
   /**调用参数*/
   /**调用参数*/

@@ -17,7 +17,7 @@ public class OpenApiDTO extends BaseDTO {
 
 
   @ApiModelProperty(value = "请求方式")
   @ApiModelProperty(value = "请求方式")
   /** 请求方式 */
   /** 请求方式 */
-  private Integer requestMethod;
+  private String requestMethod;
 
 
   @ApiModelProperty(value = "请求路由")
   @ApiModelProperty(value = "请求路由")
   /**请求路由*/
   /**请求路由*/

@@ -21,7 +21,7 @@ public class TkOpenApiEntity extends TenantBaseEntity {
   private ApplicationApiEnum classify;
   private ApplicationApiEnum classify;
 
 
   /** 请求方式 */
   /** 请求方式 */
-  private Integer requestMethod;
+  private String requestMethod;
 
 
   /**请求路由*/
   /**请求路由*/
   private String uri;
   private String uri;