Skip to content

Commit 24891af

Browse files
committed
Merge pull request #176 from crab890715/develop
将微信自定义的事件修正为不区分大小写, 比如框架定义的事件常量为click,但微信传递过来的却是CLICK
2 parents 3853c7e + bc054d6 commit 24891af

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,21 @@ public WxMpMessageRouter next() {
204204
return end();
205205
}
206206

207+
/**
208+
* 将微信自定义的事件修正为不区分大小写,
209+
* 比如框架定义的事件常量为click,但微信传递过来的却是CLICK
210+
* @param wxMessage
211+
* @return
212+
*/
207213
protected boolean test(WxMpXmlMessage wxMessage) {
208214
return
209215
(this.fromUser == null || this.fromUser.equals(wxMessage.getFromUserName()))
210216
&&
211-
(this.msgType == null || this.msgType.equals(wxMessage.getMsgType()))
217+
(this.msgType == null || this.msgType.toLowerCase().equals((wxMessage.getMsgType()==null?null:wxMessage.getMsgType().toLowerCase())))
212218
&&
213-
(this.event == null || this.event.equals(wxMessage.getEvent()))
219+
(this.event == null || this.event.toLowerCase().equals((wxMessage.getEvent()==null?null:wxMessage.getEvent().toLowerCase())))
214220
&&
215-
(this.eventKey == null || this.eventKey.equals(wxMessage.getEventKey()))
221+
(this.eventKey == null || this.eventKey.toLowerCase().equals((wxMessage.getEventKey()==null?null:wxMessage.getEventKey().toLowerCase())))
216222
&&
217223
(this.content == null || this.content
218224
.equals(wxMessage.getContent() == null ? null : wxMessage.getContent().trim()))

0 commit comments

Comments
 (0)