Skip to content

Commit b69aa77

Browse files
chanjarsterchanjarster
committed
被动响应消息测试
1 parent 23e4a32 commit b69aa77

26 files changed

+104
-102
lines changed

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpMessageHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.Map;
44

55
import me.chanjar.weixin.enterprise.bean.WxCpXmlMessage;
6-
import me.chanjar.weixin.enterprise.bean.WxXmlOutMessage;
6+
import me.chanjar.weixin.enterprise.bean.WxCpXmlOutMessage;
77

88
/**
99
* 处理微信推送消息的处理器接口
@@ -18,6 +18,6 @@ public interface WxCpMessageHandler {
1818
* @param context 上下文，如果handler或interceptor之间有信息要传递，可以用这个
1919
* @return xml格式的消息，如果在异步规则里处理的话，可以返回null
2020
*/
21-
public WxXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context);
21+
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context);
2222

2323
}

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpMessageRouter.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.regex.Pattern;
1010

1111
import me.chanjar.weixin.enterprise.bean.WxCpXmlMessage;
12-
import me.chanjar.weixin.enterprise.bean.WxXmlOutMessage;
12+
import me.chanjar.weixin.enterprise.bean.WxCpXmlOutMessage;
1313

1414
/**
1515
* <pre>
@@ -57,7 +57,7 @@ public Rule rule() {
5757
* 处理微信消息
5858
* @param wxMessage
5959
*/
60-
public WxXmlOutMessage route(final WxCpXmlMessage wxMessage) {
60+
public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
6161
final List<Rule> matchRules = new ArrayList<Rule>();
6262
// 收集匹配的规则
6363
for (final Rule rule : rules) {
@@ -86,7 +86,7 @@ public void run() {
8686
return null;
8787
}
8888

89-
WxXmlOutMessage res = null;
89+
WxCpXmlOutMessage res = null;
9090
for (final Rule rule : matchRules) {
9191
// 返回最后一个匹配规则的结果
9292
res = rule.service(wxMessage);
@@ -270,7 +270,7 @@ protected boolean test(WxCpXmlMessage wxMessage) {
270270
* @param wxMessage
271271
* @return true 代表继续执行别的router，false 代表停止执行别的router
272272
*/
273-
protected WxXmlOutMessage service(WxCpXmlMessage wxMessage) {
273+
protected WxCpXmlOutMessage service(WxCpXmlMessage wxMessage) {
274274
Map<String, Object> context = new HashMap<String, Object>();
275275
// 如果拦截器不通过
276276
for (WxCpMessageInterceptor interceptor : this.interceptors) {
@@ -280,7 +280,7 @@ protected WxXmlOutMessage service(WxCpXmlMessage wxMessage) {
280280
}
281281

282282
// 交给handler处理
283-
WxXmlOutMessage res = null;
283+
WxCpXmlOutMessage res = null;
284284
for (WxCpMessageHandler handler : this.handlers) {
285285
// 返回最后handler的结果
286286
res = handler.handle(wxMessage, context);

‎weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlMessage.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public class WxCpXmlMessage {
3434
// 以下都是微信推送过来的消息的xml的element所对应的属性
3535
///////////////////////
3636

37+
@XmlElement(name="AgentID")
38+
private Integer agentId;
39+
3740
@XmlElement(name = "ToUserName")
3841
@XmlJavaTypeAdapter(AdapterCDATA.class)
3942
private String toUserName;
@@ -161,6 +164,14 @@ public class WxCpXmlMessage {
161164
@XmlElement(name = "SendLocationInfo")
162165
private SendLocationInfo sendLocationInfo = new SendLocationInfo();
163166

167+
public Integer getAgentId() {
168+
return agentId;
169+
}
170+
171+
public void setAgentId(Integer agentId) {
172+
this.agentId = agentId;
173+
}
174+
164175
public String getToUserName() {
165176
return toUserName;
166177
}
@@ -380,15 +391,15 @@ public void setFromUserName(String fromUserName) {
380391
this.fromUserName = fromUserName;
381392
}
382393

383-
public static WxCpXmlMessage fromXml(String xml) {
394+
protected static WxCpXmlMessage fromXml(String xml) {
384395
try {
385396
return XmlTransformer.fromXml(WxCpXmlMessage.class, xml);
386397
} catch (JAXBException e) {
387398
throw new RuntimeException(e);
388399
}
389400
}
390401

391-
public static WxCpXmlMessage fromXml(InputStream is) {
402+
protected static WxCpXmlMessage fromXml(InputStream is) {
392403
try {
393404
return XmlTransformer.fromXml(WxCpXmlMessage.class, is);
394405
} catch (JAXBException e) {

weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxXmlOutImageMessage.java renamed to weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutImageMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
@XmlRootElement(name = "xml")
1313
@XmlAccessorType(XmlAccessType.FIELD)
14-
public class WxXmlOutImageMessage extends WxXmlOutMessage {
14+
public class WxCpXmlOutImageMessage extends WxCpXmlOutMessage {
1515

1616
@XmlElement(name="Image")
1717
@XmlJavaTypeAdapter(MediaIdMarshaller.class)
1818
private String mediaId;
1919

20-
public WxXmlOutImageMessage() {
20+
public WxCpXmlOutImageMessage() {
2121
this.msgType = WxConsts.XML_MSG_IMAGE;
2222
}
2323

weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxXmlOutMessage.java renamed to weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@XmlRootElement(name = "xml")
2222
@XmlAccessorType(XmlAccessType.FIELD)
23-
public class WxXmlOutMessage {
23+
public class WxCpXmlOutMessage {
2424

2525
@XmlElement(name="ToUserName")
2626
@XmlJavaTypeAdapter(AdapterCDATA.class)
@@ -69,7 +69,7 @@ public void setMsgType(String msgType) {
6969
this.msgType = msgType;
7070
}
7171

72-
public String toXml() {
72+
protected String toXml() {
7373
try {
7474
return XmlTransformer.toXml((Class)this.getClass(), this);
7575
} catch (JAXBException e) {

weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxXmlOutMewsMessage.java renamed to weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMewsMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
@XmlRootElement(name = "xml")
1717
@XmlAccessorType(XmlAccessType.FIELD)
18-
public class WxXmlOutMewsMessage extends WxXmlOutMessage {
18+
public class WxCpXmlOutMewsMessage extends WxCpXmlOutMessage {
1919

2020
@XmlElement(name = "ArticleCount")
2121
protected int articleCount;
@@ -24,7 +24,7 @@ public class WxXmlOutMewsMessage extends WxXmlOutMessage {
2424
@XmlElement(name = "item")
2525
protected final List<Item> articles = new ArrayList<Item>();
2626

27-
public WxXmlOutMewsMessage() {
27+
public WxCpXmlOutMewsMessage() {
2828
this.msgType = WxConsts.XML_MSG_NEWS;
2929
}
3030

weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxXmlOutMusicMessage.java renamed to weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMusicMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
@XmlRootElement(name = "xml")
1313
@XmlAccessorType(XmlAccessType.FIELD)
14-
public class WxXmlOutMusicMessage extends WxXmlOutMessage {
14+
public class WxCpXmlOutMusicMessage extends WxCpXmlOutMessage {
1515

1616
@XmlElement(name = "Music")
1717
protected final Music music = new Music();
1818

19-
public WxXmlOutMusicMessage() {
19+
public WxCpXmlOutMusicMessage() {
2020
this.msgType = WxConsts.XML_MSG_MUSIC;
2121
}
2222

weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxXmlOutTextMessage.java renamed to weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutTextMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
@XmlRootElement(name = "xml")
1313
@XmlAccessorType(XmlAccessType.FIELD)
14-
public class WxXmlOutTextMessage extends WxXmlOutMessage {
14+
public class WxCpXmlOutTextMessage extends WxCpXmlOutMessage {
1515

1616
@XmlElement(name="Content")
1717
@XmlJavaTypeAdapter(AdapterCDATA.class)
1818
private String content;
1919

20-
public WxXmlOutTextMessage() {
20+
public WxCpXmlOutTextMessage() {
2121
this.msgType = WxConsts.XML_MSG_TEXT;
2222
}
2323

weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxXmlOutVideoMessage.java renamed to weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVideoMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111

1212
@XmlRootElement(name = "xml")
1313
@XmlAccessorType(XmlAccessType.FIELD)
14-
public class WxXmlOutVideoMessage extends WxXmlOutMessage {
14+
public class WxCpXmlOutVideoMessage extends WxCpXmlOutMessage {
1515

1616
@XmlElement(name = "Video")
1717
protected final Video video = new Video();
1818

19-
public WxXmlOutVideoMessage() {
19+
public WxCpXmlOutVideoMessage() {
2020
this.msgType = WxConsts.XML_MSG_VIDEO;
2121
}
2222

weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxXmlOutVoiceMessage.java renamed to weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVoiceMessage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
@XmlRootElement(name = "xml")
1313
@XmlAccessorType(XmlAccessType.FIELD)
14-
public class WxXmlOutVoiceMessage extends WxXmlOutMessage {
14+
public class WxCpXmlOutVoiceMessage extends WxCpXmlOutMessage {
1515

1616
@XmlElement(name="Voice")
1717
@XmlJavaTypeAdapter(MediaIdMarshaller.class)
1818
private String mediaId;
1919

20-
public WxXmlOutVoiceMessage() {
20+
public WxCpXmlOutVoiceMessage() {
2121
this.msgType = WxConsts.XML_MSG_VOICE;
2222
}
2323

0 commit comments

Comments
 (0)