diff --git a/de-xpack b/de-xpack index 62920fd79c..77019bc3a4 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 62920fd79c962635398ee96c60f26bd7e902423f +Subproject commit 77019bc3a40ca1c7a31100cdce52920444a3c7d1 diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java index d4be6fb768..aee9b7736b 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dingtalk/api/DingtalkApi.java @@ -34,4 +34,8 @@ public interface DingtalkApi { @Operation(summary = "验证可用性") @PostMapping("/validate") void validate(@RequestBody DingtalkSettingCreator creator); + + @Operation(summary = "钉钉绑定", hidden = true) + @PostMapping("/bind") + void bind(@RequestBody DingtalkTokenRequest request); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java index 324c3ac921..b768c22651 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java @@ -34,4 +34,8 @@ public interface LarkApi { @Operation(summary = "验证可用性") @PostMapping("/validate") void validate(@RequestBody LarkSettingCreator creator); + + @Operation(summary = "飞书绑定", hidden = true) + @PostMapping("/bind") + void bind(@RequestBody LarkTokenRequest request); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java index 1cca1a7795..c378eeeacb 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarksuiteApi.java @@ -34,4 +34,8 @@ public interface LarksuiteApi { @Operation(summary = "验证可用性") @PostMapping("/validate") void validate(@RequestBody LarkSettingCreator creator); + + @Operation(summary = "国际飞书绑定", hidden = true) + @PostMapping("/bind") + void bind(@RequestBody LarkTokenRequest request); } diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/api/WecomApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/wecom/api/WecomApi.java index 04a2ed72dd..f91b8957f6 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/wecom/api/WecomApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/wecom/api/WecomApi.java @@ -34,4 +34,8 @@ public interface WecomApi { @Operation(summary = "验证可用性") @PostMapping("/validate") void validate(@RequestBody WecomCreator creator); + + @Operation(summary = "企微绑定用户", hidden = true) + @PostMapping("/bind") + void bind(@RequestBody WecomTokenRequest request); } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java index 41b0dde891..8312e307f0 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java @@ -160,4 +160,16 @@ public interface UserApi { @Hidden @PostMapping("/all") List allUser(@RequestBody KeywordRequest request); + + @Hidden + @PostMapping("/bind") + void bind(@RequestBody UserBindRequest request); + + @Operation(summary = "解除绑定") + @PostMapping("/unBind/{origin}") + void unBind(@PathVariable("origin") Integer origin); + + @Operation(summary = "绑定状态") + @GetMapping("/bindStatus") + List bindStatus(); } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserBindRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserBindRequest.java new file mode 100644 index 0000000000..5f3f5b3f92 --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserBindRequest.java @@ -0,0 +1,13 @@ +package io.dataease.api.permissions.user.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class UserBindRequest implements Serializable { + + private Integer origin; + + private String sub; +}