8000 增加查询小程序可回退的版本 接口 by hywr · Pull Request #2163 · binarywang/WxJava · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f14b88c
添加对话能力(原导购)相关结果 均通过单元测试
May 14, 2021
1c049e4
Merge remote-tracking branch 'origin/develop' into develop
hywr May 14, 2021
32695c7
Merge remote-tracking branch 'origin/develop' into develop
hywr May 17, 2021
aec9387
修改公众号、小程序、企业微信的access token自动刷新逻辑,用于避免当使用secrete误调用第三方平台专属接口的情况下出现循环递…
hywr May 17, 2021
edc935a
1.修复公众号在由第三方平台管理时OAuth2Service授权相关报错问题
hywr May 21, 2021
32028de
Merge remote-tracking branch 'origin/develop' into develop
hywr May 21, 2021
41791eb
1.增加查询小程序可回退的版本 接口
hywr Jun 23, 2021
1611b41
:memo: 更新版本信息
binarywang Jun 2, 2021
5d276b7
:memo: 更新部分信息
binarywang Jun 2, 2021
9279156
:art: 修复单元测试代码
binarywang Jun 3, 2021
933e058
:arrow_up: upgrade guava version
binarywang Jun 3, 2021
1905871
:new: #2142 【企业微信】被动回复消息内容新增任务卡片格式
arthur0201 Jun 4, 2021
d47d687
:arrow_up: Bump httpclient from 4.5 to 4.5.13 (#2143)
dependabot[bot] Jun 4, 2021
953b5f9
:art: 优化部分代码
binarywang Jun 4, 2021
a736621
:art: #2144【企业微信】更新任务卡片消息状态接口参数跟文档保持一致
arthur0201 Jun 7, 2021
d1e8fe3
:new: #2135 【小程序】实现获取 URL Link接口 以及微信电子发票报销方相关接口
mr-xiaoyu Jun 11, 2021
d6d3625
:art: #2155 【企业微信】发送新客户欢迎语接口增加对视频类型的支持,同时修复结构不正确的问题
chutian0124 Jun 21, 2021
4f5be60
:new: #2150 【企业微信】补充完善部分客户联系接口,以及服务商模式外部联系人openid转换接口
chutian0124 Jun 22, 2021
b6092db
:new: #2161 【公众号】微信推送消息类增加群发接口事件相关字段
arthur0201 Jun 23, 2021
e56eb91
1.增加查询小程序可回退的版本 接口
hywr Jun 23, 2021
a6cd1e3
Merge branch 'develop' into develop2
hywr Jun 23, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
🆕 #2142 【企业微信】被动回复消息内容新增任务卡片格式
  • Loading branch information
arthur0201 authored and hywr committed Jun 23, 2021
commit 19058716762faaf452e731e4f8ddd8b1884c58bc
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@ public HierarchicalStreamWriter createWriter(Writer out) {
private static final String SUFFIX_CDATA = "]]>";
private static final String PREFIX_MEDIA_ID = "<MediaId>";
private static final String SUFFIX_MEDIA_ID = "</MediaId>";
private static final String PREFIX_REPLACE_NAME = "<ReplaceName>";
private static final String SUFFIX_REPLACE_NAME = "</ReplaceName>";

@Override
protected void writeText(QuickWriter writer, String text) {
if (text.startsWith(PREFIX_CDATA) && text.endsWith(SUFFIX_CDATA)) {
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);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package me.chanjar.weixin.common.util.xml;

public class XStreamReplaceNameConverter extends XStreamCDataConverter {
@Override
public String toString(Object obj) {
return "<ReplaceName>" + super.toString(obj) + "</ReplaceName>";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}

}
Original file line number Diff line number Diff line change
@@ -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<TaskCardBuilder, WxCpXmlOutTaskCardMessage> {

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;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -60,6 +53,7 @@ private static Map<Class, XStream> 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;
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 = "<xml>"
+ "<ToUserName><![CDATA[to]]></ToUserName>"
+ "<FromUserName><![CDATA[from]]></FromUserName>"
+ "<CreateTime>1122</CreateTime>"
+ "<MsgType><![CDATA[update_taskcard]]></MsgType>"
+ "<TaskCard><ReplaceName><![CDATA[已驳回]]></ReplaceName></TaskCard>"
+ "</xml>";
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 = "<xml>"
+ "<ToUserName><![CDATA[to]]></ToUserName>"
+ "<FromUserName><![CDATA[from]]></FromUserName>"
+ "<CreateTime>1122</CreateTime>"
+ "<MsgType><![CDATA[update_taskcard]]></MsgType>"
+ "<TaskCard><ReplaceName><![CDATA[已驳回]]></ReplaceName></TaskCard>"
+ "</xml>";
System.out.println(m.toXml());
Assert.assertEquals(
m
.toXml()
.replaceAll("\\s", "")
.replaceAll("<CreateTime>.*?</CreateTime>", ""),
expected
.replaceAll("\\s", "")
.replaceAll("<CreateTime>.*?</CreateTime>", "")
);
}

}
0