From 4a3ec021c0dcf6e9068a6291eca7a895e45ff2c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BB=A7=E6=83=B3?= <154263362@qq.com>
Date: Thu, 24 Dec 2020 15:01:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?WxCpTpMessageRouterRule=E7=B1=BB=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20msgType=E3=80=81event=20=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tp/message/WxCpTpMessageRouterRule.java   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java
index 1b7d7fbf77..87fb414311 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java
@@ -6,6 +6,7 @@
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.cp.bean.message.WxCpTpXmlMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
+import me.chanjar.weixin.cp.message.WxCpMessageRouterRule;
 import me.chanjar.weixin.cp.tp.service.WxCpTpService;
 import org.apache.commons.lang3.StringUtils;
 
@@ -74,6 +75,28 @@ public WxCpTpMessageRouterRule async(boolean async) {
     return this;
   }
 
+  /**
+   * 如果msgType等于某值
+   *
+   * @param msgType the msg type
+   * @return the wx cp tp message router rule
+   */
+  public WxCpTpMessageRouterRule msgType(String msgType) {
+    this.msgType = msgType;
+    return this;
+  }
+
+  /**
+   * 如果event等于某值
+   *
+   * @param event the event
+   * @return the wx cp tp message router rule
+   */
+  public WxCpTpMessageRouterRule event(String event) {
+    this.event = event;
+    return this;
+  }
+
   /**
    * 匹配 Message infoType
    *
@@ -192,6 +215,8 @@ protected boolean test(WxCpTpXmlMessage wxMessage) {
         &&
         (this.msgType == null || this.msgType.equalsIgnoreCase(wxMessage.getMsgType()))
         &&
+        (this.event == null || this.event.equalsIgnoreCase(wxMessage.getEvent()))
+        &&
         (this.infoType == null || this.infoType.equals(wxMessage.getInfoType()))
         &&
         (this.suiteTicket == null || this.suiteTicket.equalsIgnoreCase(wxMessage.getSuiteTicket()))

From fe5afb87e5f6c86c0d31fb3606289f5b849d68fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BB=A7=E6=83=B3?= <154263362@qq.com>
Date: Thu, 24 Dec 2020 15:06:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java
index 87fb414311..243a17d1b4 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/tp/message/WxCpTpMessageRouterRule.java
@@ -6,7 +6,6 @@
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.cp.bean.message.WxCpTpXmlMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpXmlOutMessage;
-import me.chanjar.weixin.cp.message.WxCpMessageRouterRule;
 import me.chanjar.weixin.cp.tp.service.WxCpTpService;
 import org.apache.commons.lang3.StringUtils;