From eccbede1474dbf9a9bfa0c0e64612b3537b3e267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9C=8D=E5=85=88=E7=94=9F?= Date: Thu, 17 Jun 2021 20:20:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/linkwechat/wecom/client/WeCropTagClient.java | 12 ++++++------ .../wecom/client/WeCustomerGroupClient.java | 7 +++---- .../wecom/client/WeCustomerMessagePushClient.java | 6 +++--- .../wecom/interceptor/ContactTokenInterceptor.java | 2 -- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCropTagClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCropTagClient.java index 8f25cb90..4124927b 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCropTagClient.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCropTagClient.java @@ -14,7 +14,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor; * @author: HaoN * @create: 2020-10-17 11:00 **/ -@BaseRequest(interceptor = WeAccessTokenInterceptor.class) +@BaseRequest(interceptor = {WeAccessTokenInterceptor.class,ContactTokenInterceptor.class}) public interface WeCropTagClient { /** @@ -22,7 +22,7 @@ public interface WeCropTagClient { * @param weCropGroupTag dataType = "json" * @return */ - @Request(url="/externalcontact/add_corp_tag", type = "POST", interceptor = ContactTokenInterceptor.class) + @Request(url="/externalcontact/add_corp_tag", type = "POST") WeCropGropTagDtlDto addCorpTag(@DataObject WeCropGroupTagDto weCropGroupTag); @@ -30,7 +30,7 @@ public interface WeCropTagClient { * 获取所有标签 WeCropGroupTagDto * @return */ - @Request(url = "/externalcontact/get_corp_tag_list", type = "POST", interceptor = ContactTokenInterceptor.class) + @Request(url = "/externalcontact/get_corp_tag_list", type = "POST") WeCropGroupTagListDto getAllCorpTagList(); @@ -38,7 +38,7 @@ public interface WeCropTagClient { * 根据指定标签的id,获取标签详情 * @return */ - @Request(url = "/externalcontact/get_corp_tag_list", type = "POST", interceptor = ContactTokenInterceptor.class) + @Request(url = "/externalcontact/get_corp_tag_list", type = "POST") WeCropGroupTagListDto getCorpTagListByTagIds(@Body WeFindCropTagParam weFindCropTagParam); @@ -47,7 +47,7 @@ public interface WeCropTagClient { * @param weCropDelDto * @return */ - @Request(url = "/externalcontact/del_corp_tag", type = "POST", interceptor = ContactTokenInterceptor.class) + @Request(url = "/externalcontact/del_corp_tag", type = "POST") WeResultDto delCorpTag(@DataObject WeCropDelDto weCropDelDto); @@ -56,6 +56,6 @@ public interface WeCropTagClient { * @param weCropTagDto * @return */ - @Request(url = "/externalcontact/edit_corp_tag", type = "POST", interceptor = ContactTokenInterceptor.class) + @Request(url = "/externalcontact/edit_corp_tag", type = "POST") WeResultDto editCorpTag(@DataObject WeCropTagDto weCropTagDto); } \ No newline at end of file diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerGroupClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerGroupClient.java index 49670510..b9bab52a 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerGroupClient.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerGroupClient.java @@ -2,7 +2,6 @@ package com.linkwechat.wecom.client; import com.dtflys.forest.annotation.BaseRequest; import com.dtflys.forest.annotation.DataObject; -import com.dtflys.forest.annotation.Query; import com.dtflys.forest.annotation.Request; import com.linkwechat.wecom.domain.dto.customer.CustomerGroupDetail; import com.linkwechat.wecom.domain.dto.customer.CustomerGroupList; @@ -14,7 +13,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor; * @author: HaoN * @create: 2020-10-20 21:50 **/ -@BaseRequest(interceptor = WeAccessTokenInterceptor.class) +@BaseRequest(interceptor = {WeAccessTokenInterceptor.class,ContactTokenInterceptor.class} ) public interface WeCustomerGroupClient { @@ -23,7 +22,7 @@ public interface WeCustomerGroupClient { * @param params * @return */ - @Request(url="/externalcontact/groupchat/list", type = "POST", interceptor = ContactTokenInterceptor.class) + @Request(url="/externalcontact/groupchat/list", type = "POST") CustomerGroupList groupChatLists(@DataObject CustomerGroupList.Params params); @@ -32,6 +31,6 @@ public interface WeCustomerGroupClient { * @param params * @return */ - @Request(url="/externalcontact/groupchat/get", type = "POST", interceptor = ContactTokenInterceptor.class) + @Request(url="/externalcontact/groupchat/get", type = "POST") CustomerGroupDetail groupChatDetail(@DataObject CustomerGroupDetail.Params params); } \ No newline at end of file diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java index 249cce3c..353dad57 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/client/WeCustomerMessagePushClient.java @@ -13,7 +13,7 @@ import com.linkwechat.wecom.interceptor.WeAccessTokenInterceptor; * @author: KeWen * @create: 2020-10-25 21:34 **/ -@BaseRequest(interceptor = WeAccessTokenInterceptor.class) +@BaseRequest(interceptor = {WeAccessTokenInterceptor.class,ContactTokenInterceptor.class}) public interface WeCustomerMessagePushClient { @@ -21,7 +21,7 @@ public interface WeCustomerMessagePushClient { * 添加企业群发消息任务 * API文档地址 */ - @Request(url = "/externalcontact/add_msg_template", type = "POST",interceptor = ContactTokenInterceptor.class) + @Request(url = "/externalcontact/add_msg_template", type = "POST") SendMessageResultDto sendCustomerMessageToUser(@Body WeCustomerMessagePushDto customerMessagePushDto); /** @@ -30,7 +30,7 @@ public interface WeCustomerMessagePushClient { * * @param queryCustomerMessageStatusResultDataObjectDto{msgid} 添加企业群发消息任务返回的msgid */ - @Request(url = "/externalcontact/get_group_msg_result", type = "POST", interceptor = ContactTokenInterceptor.class) + @Request(url = "/externalcontact/get_group_msg_result", type = "POST") QueryCustomerMessageStatusResultDto queryCustomerMessageStatus(@Body QueryCustomerMessageStatusResultDataObjectDto queryCustomerMessageStatusResultDataObjectDto); diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/ContactTokenInterceptor.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/ContactTokenInterceptor.java index 1f5d4b80..fe68c0e6 100644 --- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/ContactTokenInterceptor.java +++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/interceptor/ContactTokenInterceptor.java @@ -3,7 +3,6 @@ package com.linkwechat.wecom.interceptor; import com.dtflys.forest.http.ForestRequest; import com.dtflys.forest.interceptor.Interceptor; import com.linkwechat.wecom.service.IWeAccessTokenService; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -12,7 +11,6 @@ import org.springframework.stereotype.Component; * @author huolifu * @date 2021/6/16 */ -@Slf4j @Component public class ContactTokenInterceptor implements Interceptor { -- GitLab