From 183bdb2cbee2d1b246472aee8003f60e4eaae381 Mon Sep 17 00:00:00 2001 From: arthur0201 <704538660@qq.com> Date: Fri, 4 Jun 2021 09:33:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:new:=20#2142=20=E3=80=90=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E3=80=91=E8=A2=AB=E5=8A=A8=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E6=96=B0=E5=A2=9E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8D=A1=E7=89=87=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chanjar/weixin/common/api/WxConsts.java | 1 + .../common/util/xml/XStreamInitializer.java | 4 ++ .../util/xml/XStreamReplaceNameConverter.java | 8 +++ .../cp/bean/message/WxCpXmlOutMessage.java | 12 +++-- .../message/WxCpXmlOutTaskCardMessage.java | 24 +++++++++ .../bean/outxmlbuilder/TaskCardBuilder.java | 27 ++++++++++ .../cp/util/xml/XStreamTransformer.java | 18 ++++--- .../WxCpXmlOutTaskCardMessageTest.java | 49 +++++++++++++++++++ 8 files changed, 130 insertions(+), 13 deletions(-) create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamReplaceNameConverter.java create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutTaskCardMessage.java create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/TaskCardBuilder.java create mode 100644 weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutTaskCardMessageTest.java diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java index 1e953d080b..cfc7fc0f37 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java @@ -44,6 +44,7 @@ public static class XmlMsgType { public static final String DEVICE_STATUS = "device_status"; public static final String HARDWARE = "hardware"; public static final String TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service"; + public static final String UPDATE_TASKCARD = "update_taskcard"; } /** diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java index cf0fbb5ae9..6997eb490d 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java @@ -28,6 +28,8 @@ public HierarchicalStreamWriter createWriter(Writer out) { private static final String SUFFIX_CDATA = "]]>"; private static final String PREFIX_MEDIA_ID = ""; private static final String SUFFIX_MEDIA_ID = ""; + private static final String PREFIX_REPLACE_NAME = ""; + private static final String SUFFIX_REPLACE_NAME = ""; @Override protected void writeText(QuickWriter writer, String text) { @@ -35,6 +37,8 @@ protected void writeText(QuickWriter writer, String text) { writer.write(text); } else if (text.startsWith(PREFIX_MEDIA_ID) && text.endsWith(SUFFIX_MEDIA_ID)) { writer.write(text); + } else if (text.startsWith(PREFIX_REPLACE_NAME) && text.endsWith(SUFFIX_REPLACE_NAME)){ + writer.write(text); } else { super.writeText(writer, text); } diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamReplaceNameConverter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamReplaceNameConverter.java new file mode 100644 index 0000000000..a136934383 --- /dev/null +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamReplaceNameConverter.java @@ -0,0 +1,8 @@ +package me.chanjar.weixin.common.util.xml; + +public class XStreamReplaceNameConverter extends XStreamCDataConverter { + @Override + public String toString(Object obj) { + return "" + super.toString(obj) + ""; + } +} diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutMessage.java index 96991a5403..ff036b4c0e 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutMessage.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutMessage.java @@ -6,11 +6,7 @@ import com.thoughtworks.xstream.annotations.XStreamConverter; import lombok.Data; import me.chanjar.weixin.common.util.xml.XStreamCDataConverter; -import me.chanjar.weixin.cp.bean.outxmlbuilder.ImageBuilder; -import me.chanjar.weixin.cp.bean.outxmlbuilder.NewsBuilder; -import me.chanjar.weixin.cp.bean.outxmlbuilder.TextBuilder; -import me.chanjar.weixin.cp.bean.outxmlbuilder.VideoBuilder; -import me.chanjar.weixin.cp.bean.outxmlbuilder.VoiceBuilder; +import me.chanjar.weixin.cp.bean.outxmlbuilder.*; import me.chanjar.weixin.cp.config.WxCpConfigStorage; import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil; import me.chanjar.weixin.cp.util.xml.XStreamTransformer; @@ -76,6 +72,12 @@ public static NewsBuilder NEWS() { return new NewsBuilder(); } + /** + * 获得任务卡片消息builder. + */ + public static TaskCardBuilder TASK_CARD() { + return new TaskCardBuilder(); + } protected String toXml() { return XStreamTransformer.toXml((Class) this.getClass(), this); } diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutTaskCardMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutTaskCardMessage.java new file mode 100644 index 0000000000..63816f7e4c --- /dev/null +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutTaskCardMessage.java @@ -0,0 +1,24 @@ +package me.chanjar.weixin.cp.bean.message; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import com.thoughtworks.xstream.annotations.XStreamConverter; +import lombok.Data; +import lombok.EqualsAndHashCode; +import me.chanjar.weixin.common.api.WxConsts; +import me.chanjar.weixin.common.util.xml.XStreamReplaceNameConverter; + +@XStreamAlias("xml") +@Data +@EqualsAndHashCode(callSuper = false) +public class WxCpXmlOutTaskCardMessage extends WxCpXmlOutMessage { + private static final long serialVersionUID = 7028014900972827324L; + + @XStreamAlias("TaskCard") + @XStreamConverter(value = XStreamReplaceNameConverter.class) + private String replaceName; + + public WxCpXmlOutTaskCardMessage() { + this.msgType = WxConsts.XmlMsgType.UPDATE_TASKCARD; + } + +} diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/TaskCardBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/TaskCardBuilder.java new file mode 100644 index 0000000000..e71c5bd71d --- /dev/null +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/TaskCardBuilder.java @@ -0,0 +1,27 @@ +package me.chanjar.weixin.cp.bean.outxmlbuilder; + +import me.chanjar.weixin.cp.bean.message.WxCpXmlOutTaskCardMessage; + +/** + * 任务卡片消息builder + * + * @author tao zhang + */ +public final class TaskCardBuilder extends BaseBuilder { + + private String replaceName; + + public TaskCardBuilder replaceName(String replaceName) { + this.replaceName = replaceName; + return this; + } + + @Override + public WxCpXmlOutTaskCardMessage build() { + WxCpXmlOutTaskCardMessage m = new WxCpXmlOutTaskCardMessage(); + setCommon(m); + m.setReplaceName(this.replaceName); + return m; + } + +} diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java index ea90231112..aa907b7288 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/xml/XStreamTransformer.java @@ -6,15 +6,8 @@ import com.thoughtworks.xstream.XStream; import me.chanjar.weixin.common.util.xml.XStreamInitializer; -import me.chanjar.weixin.cp.bean.message.WxCpTpXmlMessage; +import me.chanjar.weixin.cp.bean.message.*; import me.chanjar.weixin.cp.bean.WxCpTpXmlPackage; -import me.chanjar.weixin.cp.bean.message.WxCpXmlMessage; -import me.chanjar.weixin.cp.bean.message.WxCpXmlOutImageMessage; -import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage; -import me.chanjar.weixin.cp.bean.message.WxCpXmlOutNewsMessage; -import me.chanjar.weixin.cp.bean.message.WxCpXmlOutTextMessage; -import me.chanjar.weixin.cp.bean.message.WxCpXmlOutVideoMessage; -import me.chanjar.weixin.cp.bean.message.WxCpXmlOutVoiceMessage; public class XStreamTransformer { @@ -60,6 +53,7 @@ private static Map configXStreamInstance() { map.put(WxCpXmlOutImageMessage.class, configWxCpXmlOutImageMessage()); map.put(WxCpXmlOutVideoMessage.class, configWxCpXmlOutVideoMessage()); map.put(WxCpXmlOutVoiceMessage.class, configWxCpXmlOutVoiceMessage()); + map.put(WxCpXmlOutTaskCardMessage.class, configWxCpXmlOutTaskCardMessage()); map.put(WxCpTpXmlPackage.class, configWxCpTpXmlPackage()); map.put(WxCpTpXmlMessage.class, configWxCpTpXmlMessage()); return map; @@ -118,6 +112,14 @@ private static XStream configWxCpXmlOutVoiceMessage() { return xstream; } + private static XStream configWxCpXmlOutTaskCardMessage() { + XStream xstream = XStreamInitializer.getInstance(); + + xstream.processAnnotations(WxCpXmlOutMessage.class); + xstream.processAnnotations(WxCpXmlOutTaskCardMessage.class); + return xstream; + } + private static XStream configWxCpTpXmlPackage() { XStream xstream = XStreamInitializer.getInstance(); xstream.processAnnotations(WxCpTpXmlPackage.class); diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutTaskCardMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutTaskCardMessageTest.java new file mode 100644 index 0000000000..bc867b72d1 --- /dev/null +++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/message/WxCpXmlOutTaskCardMessageTest.java @@ -0,0 +1,49 @@ +package me.chanjar.weixin.cp.bean.message; + +import me.chanjar.weixin.cp.bean.message.WxCpXmlOutTaskCardMessage; +import org.testng.Assert; +import org.testng.annotations.Test; + +@Test +public class WxCpXmlOutTaskCardMessageTest { + + public void test() { + WxCpXmlOutTaskCardMessage m = new WxCpXmlOutTaskCardMessage(); + m.setReplaceName("已驳回"); + m.setCreateTime(1122L); + m.setFromUserName("from"); + m.setToUserName("to"); + + String expected = "" + + "" + + "" + + "1122" + + "" + + "" + + ""; + System.out.println(m.toXml()); + Assert.assertEquals(m.toXml().replaceAll("\\s", ""), expected.replaceAll("\\s", "")); + } + + public void testBuild() { + WxCpXmlOutTaskCardMessage m = WxCpXmlOutMessage.TASK_CARD().replaceName("已驳回").fromUser("from").toUser("to").build(); + String expected = "" + + "" + + "" + + "1122" + + "" + + "" + + ""; + System.out.println(m.toXml()); + Assert.assertEquals( + m + .toXml() + .replaceAll("\\s", "") + .replaceAll(".*?", ""), + expected + .replaceAll("\\s", "") + .replaceAll(".*?", "") + ); + } + +} From 3ab66e3447554d63236ecae130477cbb5436031d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Jun 2021 09:34:07 +0800 Subject: [PATCH 2/3] :arrow_up: Bump httpclient from 4.5 to 4.5.13 (#2143) Bumps httpclient from 4.5 to 4.5.13. --- updated-dependencies: - dependency-name: org.apache.httpcomponents:httpclient dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 611857caa0..83469f8ee5 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ 1.8 UTF-8 - 4.5 + 4.5.13 9.4.38.v20210224 From 4ef9b5d91e4714768718f5b1a38b126a61f0e570 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Fri, 4 Jun 2021 16:11:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/apache/ApacheHttpDnsClientBuilder.java | 17 +++++------------ .../apache/DefaultApacheHttpClientBuilder.java | 2 +- .../cp/config/impl/WxCpTpDefaultConfigImpl.java | 10 +++++----- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java index fe5472f3c0..af3a32ff71 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpDnsClientBuilder.java @@ -1,12 +1,7 @@ package me.chanjar.weixin.common.util.http.apache; -import java.io.IOException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpHost; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.CredentialsProvider; @@ -25,10 +20,13 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.apache.http.protocol.HttpContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.annotation.concurrent.NotThreadSafe; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + /** * httpclient 连接管理器 自带DNS解析. *

大部分代码拷贝自：DefaultApacheHttpClientBuilder

@@ -50,12 +48,7 @@ public class ApacheHttpDnsClientBuilder implements ApacheHttpClientBuilder { private DnsResolver dnsResover; - private HttpRequestRetryHandler httpRequestRetryHandler = new HttpRequestRetryHandler() { - @Override - public boolean retryRequest(IOException exception, int executionCount, HttpContext context) { - return false; - } - }; + private HttpRequestRetryHandler httpRequestRetryHandler = (exception, executionCount, context) -> false; private SSLConnectionSocketFactory sslConnectionSocketFactory = SSLConnectionSocketFactory.getSocketFactory(); private PlainConnectionSocketFactory plainConnectionSocketFactory = PlainConnectionSocketFactory.getSocketFactory(); private String httpProxyHost; diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java index 3fb08ab2c6..3bb0d6114c 100644 --- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java +++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java @@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpHost; -import org.apache.http.annotation.NotThreadSafe; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.CredentialsProvider; @@ -26,6 +25,7 @@ import org.apache.http.protocol.HttpContext; import org.apache.http.ssl.SSLContexts; +import javax.annotation.concurrent.NotThreadSafe; import javax.net.ssl.SSLContext; import java.io.IOException; import java.security.KeyManagementException; diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpTpDefaultConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpTpDefaultConfigImpl.java index 6bab2a4e8f..c177250bac 100644 --- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpTpDefaultConfigImpl.java +++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpTpDefaultConfigImpl.java @@ -22,7 +22,7 @@ */ public class WxCpTpDefaultConfigImpl implements WxCpTpConfigStorage, Serializable { private static final long serialVersionUID = 6678780920621872824L; - // locker + private final transient Map providerAccessTokenLocker = new ConcurrentHashMap<>(); private final transient Map suiteAccessTokenLocker = new ConcurrentHashMap<>(); private final transient Map accessTokenLocker = new ConcurrentHashMap<>(); @@ -319,10 +319,10 @@ public String getAuthCorpJsApiTicket(String authCorpId) { public boolean isAuthCorpJsApiTicketExpired(String authCorpId) { Long t = this.authCorpJsApiTicketExpireTimeMap.get(authCorpId); if (t == null) { - return System.currentTimeMillis() > t; - } else { return true; } + + return System.currentTimeMillis() > t; } @Override @@ -348,10 +348,10 @@ public String getAuthSuiteJsApiTicket(String authCorpId) { public boolean isAuthSuiteJsApiTicketExpired(String authCorpId) { Long t = authSuiteJsApiTicketExpireTimeMap.get(authCorpId); if (t == null) { - return System.currentTimeMillis() > t; - } else { return true; } + + return System.currentTimeMillis() > t; } @Override