From 726269988a5a51878d2e3ef3035a496500362b51 Mon Sep 17 00:00:00 2001
From: zhangruhong <zhangruhong@foxmail.com>
Date: Wed, 10 Jul 2024 10:55:11 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20#3324=20=E3=80=90=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E3=80=91=E6=B6=88=E6=81=AF=E8=B7=AF=E7=94=B1=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E7=9A=84=E4=BA=8B=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=E5=8C=B9=E9=85=8D=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/api/WxMpMessageRouterRule.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java
index 79a4ff1a5..abac350a7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouterRule.java
@@ -25,6 +25,8 @@ public class WxMpMessageRouterRule {
 
   private String event;
 
+  private String eventRegex;
+
   private String eventKey;
 
   private String eventKeyRegex;
@@ -105,6 +107,18 @@ public class WxMpMessageRouterRule {
     return this;
   }
 
+
+  /**
+   * event匹配该正则表达式
+   * 比如"^weapp_audit_.*"用以匹配所有审核类类事件
+   *
+   * @param regex the regex
+   * @return the wx mp message router rule
+   */
+  public WxMpMessageRouterRule eventRegex(String regex) {
+    this.eventRegex = regex;
+    return this;
+  }
     /**
      * 如果content等于某值
      *
@@ -236,6 +250,8 @@ public class WxMpMessageRouterRule {
         &&
         (this.event == null || this.event.equalsIgnoreCase(wxMessage.getEvent()))
         &&
+        (this.eventRegex == null || Pattern.matches(this.eventRegex, StringUtils.trimToEmpty(wxMessage.getEvent())))
+        &&
         (this.eventKey == null || this.eventKey.equalsIgnoreCase(wxMessage.getEventKey()))
         &&
         (this.eventKeyRegex == null || Pattern.matches(this.eventKeyRegex, StringUtils.trimToEmpty(wxMessage.getEventKey())))