Merge pull request #17 from NotFound403/1.2.6

1.2.6
NotFound403 · Jan 24, 2024 · 8d0f0c7 · 8d0f0c7
2 parents 188bcdb + fdafc71
commit 8d0f0c7
Show file tree

Hide file tree

Showing 575 changed files with 3,196 additions and 845 deletions.
diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ void webHooks()throws IOException{
 <dependency>
     <groupId>cn.felord</groupId>
     <artifactId>wecom-sdk</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6</version>
 </dependency>
 ```
 
@@ -115,7 +115,7 @@ void webHooks()throws IOException{
 <dependency>
     <groupId>cn.felord</groupId>
     <artifactId>rx-wecom-sdk</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>cn.felord</groupId>
     <artifactId>wecom</artifactId>
-    <version>1.2.5</version>
+    <version>1.2.6</version>
     <packaging>pom</packaging>
 
     <name>wecom</name>

diff --git a/rx-wecom-sdk/pom.xml b/rx-wecom-sdk/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>cn.felord</groupId>
         <artifactId>wecom</artifactId>
-        <version>1.2.5</version>
+        <version>1.2.6</version>
     </parent>
     <artifactId>rx-wecom-sdk</artifactId>
     <packaging>jar</packaging>

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/AgentApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/AgentApi.java
@@ -19,7 +19,7 @@
  * 企微应用API
  *
  * @author dax
- * @since 2023 /6/9 16:33
+ * @since 2024/6/9 16:33
  */
 public class AgentApi {
     private final WorkWeChatApiClient workWeChatApiClient;

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/AgentManagerApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/AgentManagerApi.java
@@ -53,7 +53,7 @@
  * The type Agent manager api.
  *
  * @author dax
- * @since 2023 /6/27 11:33
+ * @since 2024/6/27 11:33
  */
 public class AgentManagerApi {
     private final InternalAgentManagerApi internalAgentManagerApi;

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ApprovalApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ApprovalApi.java
@@ -41,7 +41,7 @@
  * 企业微信审批
  *
  * @author dax
- * @since 2023 /5/25 14:18
+ * @since 2024/5/25 14:18
  */
 public interface ApprovalApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ChainRuleApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ChainRuleApi.java
@@ -34,7 +34,7 @@
  * 上下游系统应用调用
  *
  * @author dax
- * @since 2023 /10/13
+ * @since 2024/10/13
  */
 public interface ChainRuleApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/CheckinApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/CheckinApi.java
@@ -40,7 +40,7 @@
  * 打卡API
  *
  * @author dax
- * @since 2023 /9/25
+ * @since 2024/9/25
  */
 public interface CheckinApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/CorpGroupApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/CorpGroupApi.java
@@ -27,7 +27,7 @@
  * 企业互联与上下游
  *
  * @author dax
- * @since 2023 /10/12
+ * @since 2024/10/12
  */
 public class CorpGroupApi {
     private final WeComTokenCacheable weComTokenCacheable;

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/CustomerAcquisitionApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/CustomerAcquisitionApi.java
@@ -40,7 +40,7 @@
  * 获客助手
  *
  * @author dax
- * @since 2023 /5/30 21:28
+ * @since 2024/5/30 21:28
  */
 public interface CustomerAcquisitionApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/DialApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/DialApi.java
@@ -28,7 +28,7 @@
  * 公费电话API
  *
  * @author dax
- * @since 2023 /10/6
+ * @since 2024/10/6
  */
 public interface DialApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/DocApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/DocApi.java
@@ -27,7 +27,7 @@
  * 文档-管理文档
  *
  * @author dax
- * @since 2023 /7/19
+ * @since 2024/7/19
  */
 public interface DocApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/DownStreamApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/DownStreamApi.java
@@ -31,7 +31,7 @@
  * 上下游-下游调用
  *
  * @author dax
- * @since 2023 /10/12
+ * @since 2024/10/12
  */
 public interface DownStreamApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ExternalContactUserApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ExternalContactUserApi.java
@@ -15,6 +15,7 @@
 
 package cn.felord.reactive.api;
 
+import cn.felord.WeComException;
 import cn.felord.domain.GenericResponse;
 import cn.felord.domain.WeComResponse;
 import cn.felord.domain.common.PageRequest;
@@ -140,4 +141,20 @@ public interface ExternalContactUserApi {
      */
     @POST("externalcontact/convert_to_openid")
     Single<GenericResponse<String>> convertToOpenid(@Body ExternalUserId externalUserId);
+
+    /**
+     * 获取已服务的外部联系人
+     * <p>
+     * 企业可通过此接口获取所有已服务的外部联系人，及其添加人和加入的群聊。
+     * 外部联系人分为客户和其他外部联系人，如果是客户，接口将返回外部联系人临时ID和externaluserid；
+     * 如果是其他外部联系人，接口将只返回外部联系人临时ID。
+     * <p>
+     * 企业可通过外部联系人临时ID排除重复数据，外部联系人临时ID有效期为4小时。
+     *
+     * @param request cursor具有有效期，请勿缓存后使用
+     * @return generic response
+     * @throws WeComException the we com exception
+     */
+    @POST("externalcontact/contact_list")
+    Single<ContractListResponse> contactList(@Body PageRequest request);
 }
diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ExternalCorPayApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ExternalCorPayApi.java
@@ -28,7 +28,7 @@
  * 对外收款
  *
  * @author dax
- * @since 2023 /6/29 13:53
+ * @since 2024/6/29 13:53
  */
 public interface ExternalCorPayApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ExternalPayAccountApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/ExternalPayAccountApi.java
@@ -27,7 +27,7 @@
  * 对外收款账户API
  *
  * @author dax
- * @since 2023 /7/3 15:57
+ * @since 2024/7/3 15:57
  */
 public interface ExternalPayAccountApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/FileManagerApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/FileManagerApi.java
@@ -32,7 +32,7 @@
  * The type File manager api.
  *
  * @author dax
- * @since 2023 /6/26 17:07
+ * @since 2024/6/26 17:07
  */
 public class FileManagerApi {
     private final InternalFileManagerApi internalFileManagerApi;

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/FormApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/FormApi.java
@@ -28,7 +28,7 @@
  * 收集表
  *
  * @author dax
- * @since 2023 /3/13 16:27
+ * @since 2024/3/13 16:27
  */
 public interface FormApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/InternalAgentMessageApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/InternalAgentMessageApi.java
@@ -26,7 +26,7 @@
  * 应用消息
  *
  * @author dax
- * @since 2023 /6/29 9:06
+ * @since 2024/6/29 9:06
  */
 interface InternalAgentMessageApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/InternalCorPayApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/InternalCorPayApi.java
@@ -28,7 +28,7 @@
  * 企业红包和向员工付款
  *
  * @author dax
- * @since 2023 /6/28
+ * @since 2024/6/28
  */
 public class InternalCorPayApi {
     private final String paySecret;

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/InternalFileManagerApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/InternalFileManagerApi.java
@@ -28,7 +28,7 @@
  * The type File manager api.
  *
  * @author dax
- * @since 2023 /3/17 15:02
+ * @since 2024/3/17 15:02
  */
 interface InternalFileManagerApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/InvoiceApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/InvoiceApi.java
@@ -25,7 +25,7 @@
  * 电子发票
  *
  * @author dax
- * @since 2023 /7/27
+ * @since 2024/7/27
  */
 public interface InvoiceApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/JournalApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/JournalApi.java
@@ -32,7 +32,7 @@
  * 汇报API
  *
  * @author dax
- * @since 2023 /10/14
+ * @since 2024/10/14
  */
 public interface JournalApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/JsApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/JsApi.java
@@ -28,7 +28,7 @@
  * jsapi ticket.
  *
  * @author dax
- * @since 2023 /5/24 17:55
+ * @since 2024/5/24 17:55
  */
 interface JsApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/KfKnowledgeApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/KfKnowledgeApi.java
@@ -35,7 +35,7 @@
  * 微信客服-机器人-知识库API
  *
  * @author dax
- * @since 2023 /10/5
+ * @since 2024/10/5
  */
 public interface KfKnowledgeApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/KfStatisticApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/KfStatisticApi.java
@@ -24,7 +24,7 @@
  * 客服统计管理
  *
  * @author dax
- * @since 2023 /6/6
+ * @since 2024/6/6
  */
 public interface KfStatisticApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/KfUpgradeApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/KfUpgradeApi.java
@@ -26,7 +26,7 @@
  * 升级服务
  *
  * @author dax
- * @since 2023 /6/6
+ * @since 2024/6/6
  */
 public interface KfUpgradeApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/LivingApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/LivingApi.java
@@ -23,7 +23,7 @@
  * 直播API
  *
  * @author dax
- * @since 2023 /11/23
+ * @since 2024/11/23
  */
 public interface LivingApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MediaApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MediaApi.java
@@ -33,7 +33,7 @@
  * 素材管理
  *
  * @author dax
- * @since 2023 /6/10 17:09
+ * @since 2024/6/10 17:09
  */
 public class MediaApi {
     private final InternalMediaApi internalMediaApi;

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MeetingRoomApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MeetingRoomApi.java
@@ -40,7 +40,7 @@
  * 会议室API
  *
  * @author dax
- * @since 2023 /11/29
+ * @since 2024/11/29
  */
 public interface MeetingRoomApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MiniAppPayApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MiniAppPayApi.java
@@ -28,7 +28,7 @@
  * 本接口适用于在 由企业微信向微信发出的小程序中使用对外收款账户进行收款。
  *
  * @author dax
- * @since 2023 /7/6 16:24
+ * @since 2024/7/6 16:24
  */
 public interface MiniAppPayApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MmPayMktTransfersApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MmPayMktTransfersApi.java
@@ -25,7 +25,7 @@
  * <a href="https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=4_3">支付证书使用说明</a>
  *
  * @author dax
- * @since 2023 /6/28 17:58
+ * @since 2024/6/28 17:58
  */
 interface MmPayMktTransfersApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MsgAuditApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/MsgAuditApi.java
@@ -32,7 +32,7 @@
  * 会话存档API
  *
  * @author dax
- * @since 2023 /12/1
+ * @since 2024/12/1
  */
 public interface MsgAuditApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/PayApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/PayApi.java
@@ -26,7 +26,7 @@
  * 企业支付
  *
  * @author dax
- * @since 2023 /6/28
+ * @since 2024/6/28
  */
 public class PayApi {
     private final WeComTokenCacheable weComTokenCacheable;

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/SecurityApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/SecurityApi.java
@@ -36,7 +36,7 @@
  * 安全管理
  *
  * @author dax
- * @since 2023 /10/11
+ * @since 2024/10/11
  */
 public interface SecurityApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/StaffManagerApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/StaffManagerApi.java
@@ -28,7 +28,7 @@
  * 人事助手
  *
  * @author dax
- * @since 2023 /8/3 11:48
+ * @since 2024/8/3 11:48
  */
 public interface StaffManagerApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/UpStreamApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/UpStreamApi.java
@@ -47,7 +47,7 @@
  * 上下游-上游调用
  *
  * @author dax
- * @since 2023 /10/12
+ * @since 2024/10/12
  */
 public interface UpStreamApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/UrgentCallApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/UrgentCallApi.java
@@ -29,7 +29,7 @@
  * 【医疗行业】的企业，可通过语音电话提醒员工查看应用推送的重要消息，以便尽快处理紧急事件
  *
  * @author dax
- * @since 2023 /5/31 12:44
+ * @since 2024/5/31 12:44
  */
 public interface UrgentCallApi {
 

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/WeDriveApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/WeDriveApi.java
@@ -32,6 +32,6 @@ public class WeDriveApi {
      * @return the form api
      */
     public FileManagerApi fileManagerApi() {
-        return workWeChatApiClient.retrofit().create(FileManagerApi.class);
+        return new FileManagerApi(workWeChatApiClient.retrofit());
     }
 }
diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/WebhookApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/WebhookApi.java
@@ -32,7 +32,7 @@
  * 群机器人
  *
  * @author dax
- * @since 2023 /6/10 15:42
+ * @since 2024/6/10 15:42
  */
 public class WebhookApi {
     private final InternalWebhookApi internalWebhookApi;

diff --git a/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/WedocApi.java b/rx-wecom-sdk/src/main/java/cn/felord/reactive/api/WedocApi.java
@@ -19,7 +19,7 @@
  * The type Office api.
  *
  * @author dax
- * @since 2023 /3/13 16:22
+ * @since 2024/3/13 16:22
  */
 public class WedocApi {
     private final WorkWeChatApiClient workWeChatApiClient;