Merge branch 'develop'

Author: chanjarster

README.md

@@ -17,7 +17,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>1.1.8</version>
+  <version>1.2.0</version>
 </dependency>
 ```
 
@@ -27,7 +27,7 @@ weixin-java-tools
 <dependency>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>1.1.8</version>
+  <version>1.2.0</version>
 </dependency>
 ```
 

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.chanjar</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.1.8</version>
+  <version>1.2.0</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>me.chanjar</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>1.1.8</version>
+    <version>1.2.0</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java

@@ -137,4 +137,11 @@ public class WxConsts {
   /** 弹出授权页面，可通过openid拿到昵称、性别、所在地。并且，即使在未关注的情况下，只要用户授权，也能获取其信息 */
   public static final String OAUTH2_SCOPE_USER_INFO = "snsapi_userinfo";
 
+  ///////////////////////
+  // 永久素材类型
+  ///////////////////////
+  public static final String MATERIAL_NEWS = "news";
+  public static final String MATERIAL_VOICE = "voice";
+  public static final String MATERIAL_IMAGE = "image";
+  public static final String MATERIAL_VIDEO = "video";
 }

weixin-java-cp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.1.8</version>
+        <version>1.2.0</version>
     </parent>
 
     <artifactId>weixin-java-cp</artifactId>

weixin-java-mp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>me.chanjar</groupId>
         <artifactId>weixin-java-parent</artifactId>
-        <version>1.1.8</version>
+        <version>1.2.0</version>
     </parent>
     <artifactId>weixin-java-mp</artifactId>
     <name>WeiXin Java Tools - MP</name>

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

@@ -204,15 +204,21 @@ public WxMpMessageRouter next() {
     return end();
   }
 
+  /**
+   * 将微信自定义的事件修正为不区分大小写,
+   * 比如框架定义的事件常量为click，但微信传递过来的却是CLICK
+   * @param wxMessage
+   * @return
+   */
   protected boolean test(WxMpXmlMessage wxMessage) {
     return
         (this.fromUser == null || this.fromUser.equals(wxMessage.getFromUserName()))
             &&
-            (this.msgType == null || this.msgType.equals(wxMessage.getMsgType()))
+            (this.msgType == null || this.msgType.toLowerCase().equals((wxMessage.getMsgType()==null?null:wxMessage.getMsgType().toLowerCase())))
             &&
-            (this.event == null || this.event.equals(wxMessage.getEvent()))
+            (this.event == null || this.event.toLowerCase().equals((wxMessage.getEvent()==null?null:wxMessage.getEvent().toLowerCase())))
             &&
-            (this.eventKey == null || this.eventKey.equals(wxMessage.getEventKey()))
+            (this.eventKey == null || this.eventKey.toLowerCase().equals((wxMessage.getEventKey()==null?null:wxMessage.getEventKey().toLowerCase())))
             &&
             (this.content == null || this.content
                 .equals(wxMessage.getContent() == null ? null : wxMessage.getContent().trim()))