合并develop分支，发布3.2.0正式版本

pom.xml

@@ -6,10 +6,10 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>3.1.0</version>
+  <version>3.2.0</version>
   <packaging>pom</packaging>
   <name>Weixin Java Tools - Parent</name>
-  <description>微信公众号、企业号上级POM</description>
+  <description>微信开发Java SDK</description>
   <url>https://github.com/wechat-group/weixin-java-tools</url>
 
   <licenses>

quality-checks/google_checks.xml

@@ -83,20 +83,6 @@
     <module name="EmptyLineSeparator">
       <property name="allowNoEmptyLineBetweenFields" value="true"/>
     </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapDot"/>
-      <property name="tokens" value="DOT"/>
-      <property name="option" value="nl"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapComma"/>
-      <property name="tokens" value="COMMA"/>
-      <property name="option" value="EOL"/>
-    </module>
-    <module name="SeparatorWrap">
-      <property name="id" value="SeparatorWrapMethodRef"/>
-      <property name="option" value="nl"/>
-    </module>
     <module name="PackageName">
       <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
       <message key="name.invalidPattern"
@@ -156,7 +142,7 @@
     <module name="VariableDeclarationUsageDistance"/>
     <module name="CustomImportOrder">
       <property name="customImportOrderRules"
-                value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
+                value="SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###THIRD_PARTY_PACKAGE###STATIC"/>
       <property name="specialImportsRegExp" value="^javax\."/>
       <property name="standardPackageRegExp" value="^java\."/>
       <property name="sortImportsInGroupAlphabetically" value="true"/>

weixin-java-common/pom.xml

@@ -7,12 +7,12 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
   <name>Weixin Java Tools - Common</name>
-  <description>微信公众号、企业号Java SDK Common</description>
+  <description>微信开发Java SDK公共模块</description>
 
   <dependencies>
     <dependency>

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

@@ -6,7 +6,7 @@
 /**
  * 微信开发所使用到的常量类.
  *
- * @author chanjarster & binarywang
+ * @author Daniel Qian & binarywang
  */
 public class WxConsts {
   /**
@@ -82,7 +82,7 @@ public static class KefuMsgType {
     /**
      * 小程序卡片(要求小程序与公众号已关联)
      */
-    public static final String MINIPROGRAMPAGE="miniprogrampage";
+    public static final String MINIPROGRAMPAGE = "miniprogrampage";
   }
 
   /**
@@ -151,14 +151,106 @@ public static class EventType {
     public static final String CLICK = "CLICK";
     public static final String VIEW = "VIEW";
     public static final String MASS_SEND_JOB_FINISH = "MASSSENDJOBFINISH";
+    /**
+     * 扫码推事件的事件推送
+     */
     public static final String SCANCODE_PUSH = "scancode_push";
+    /**
+     * 扫码推事件且弹出“消息接收中”提示框的事件推送.
+     */
     public static final String SCANCODE_WAITMSG = "scancode_waitmsg";
+    /**
+     * 弹出系统拍照发图的事件推送.
+     */
     public static final String PIC_SYSPHOTO = "pic_sysphoto";
+    /**
+     * 弹出拍照或者相册发图的事件推送.
+     */
     public static final String PIC_PHOTO_OR_ALBUM = "pic_photo_or_album";
+    /**
+     * 弹出微信相册发图器的事件推送.
+     */
     public static final String PIC_WEIXIN = "pic_weixin";
+    /**
+     * 弹出地理位置选择器的事件推送.
+     */
     public static final String LOCATION_SELECT = "location_select";
+
     public static final String TEMPLATE_SEND_JOB_FINISH = "TEMPLATESENDJOBFINISH";
-    public static final String ENTER_AGENT = "enter_agent";
+    /**
+     * 微信小店 订单付款通知.
+     */
+    public static final String MERCHANT_ORDER = "merchant_order";
+
+    /**
+     * 卡券事件：卡券通过审核
+     */
+    public static final String CARD_PASS_CHECK = "card_pass_check";
+
+    /**
+     * 卡券事件：卡券未通过审核
+     */
+    public static final String CARD_NOT_PASS_CHECK = "card_not_pass_check";
+
+    /**
+     * 卡券事件：用户领取卡券
+     */
+    public static final String CARD_USER_GET_CARD = "user_get_card";
+
+    /**
+     * 卡券事件：用户转赠卡券
+     */
+    public static final String CARD_USER_GIFTING_CARD = "user_gifting_card";
+
+
+    /**
+     * 卡券事件：用户核销卡券
+     */
+    public static final String CARD_USER_CONSUME_CARD = "user_consume_card";
+
+
+    /**
+     * 卡券事件：用户通过卡券的微信买单完成时推送
+     */
+    public static final String CARD_USER_PAY_FROM_PAY_CELL = "user_pay_from_pay_cell";
+
+
+    /**
+     * 卡券事件：用户提交会员卡开卡信息
+     */
+    public static final String CARD_SUBMIT_MEMBERCARD_USER_INFO = "submit_membercard_user_info";
+
+    /**
+     * 卡券事件：用户打开查看卡券
+     */
+    public static final String CARD_USER_VIEW_CARD = "user_view_card";
+
+    /**
+     * 卡券事件：用户删除卡券
+     */
+    public static final String CARD_USER_DEL_CARD = "user_del_card";
+
+    /**
+     * 卡券事件：用户在卡券里点击查看公众号进入会话时（需要用户已经关注公众号）
+     */
+    public static final String CARD_USER_ENTER_SESSION_FROM_CARD = "user_enter_session_from_card";
+
+    /**
+     * 卡券事件：当用户的会员卡积分余额发生变动时
+     */
+    public static final String CARD_UPDATE_MEMBER_CARD = "update_member_card";
+
+    /**
+     * 卡券事件：当某个card_id的初始库存数大于200且当前库存小于等于100时，用户尝试领券会触发发送事件给商户，事件每隔12h发送一次
+     */
+    public static final String CARD_SKU_REMIND = "card_sku_remind";
+
+    /**
+     * 卡券事件：当商户朋友的券券点发生变动时
+     */
+    public static final String CARD_PAY_ORDER = "card_pay_order";
+
+
   }
 
   /**
@@ -230,10 +322,16 @@ public static class OAuth2Scope {
      * 不弹出授权页面，直接跳转，只能获取用户openid.
      */
     public static final String SNSAPI_BASE = "snsapi_base";
+
     /**
      * 弹出授权页面，可通过openid拿到昵称、性别、所在地。并且，即使在未关注的情况下，只要用户授权，也能获取其信息.
      */
     public static final String SNSAPI_USERINFO = "snsapi_userinfo";
+
+    /**
+     * 手动授权,可获取成员的详细信息,包含手机、邮箱。只适用于企业微信或企业号.
+     */
+    public static final String SNSAPI_PRIVATEINFO = "snsapi_privateinfo";
   }
 
   /**
@@ -252,4 +350,5 @@ public static class MaterialType {
     public static final String IMAGE = "image";
     public static final String VIDEO = "video";
   }
+
 }

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

@@ -4,6 +4,8 @@
 
 /**
  * WxErrorException处理器.
+ *
+ * @author Daniel Qian
  */
 public interface WxErrorExceptionHandler {
 

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

@@ -5,6 +5,8 @@
  * 消息重复检查器.
  * 微信服务器在五秒内收不到响应会断掉连接，并且重新发起请求，总共重试三次
  * </pre>
+ *
+ * @author Daniel Qian
  */
 public interface WxMessageDuplicateChecker {
 

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

@@ -9,6 +9,8 @@
  * 默认消息重复检查器.
  * 将每个消息id保存在内存里，每隔5秒清理已经过期的消息id，每个消息id的过期时间是15秒
  * </pre>
+ *
+ * @author Daniel Qian
  */
 public class WxMessageInMemoryDuplicateChecker implements WxMessageDuplicateChecker {
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java

@@ -1,10 +1,15 @@
 package me.chanjar.weixin.common.bean;
 
+import java.io.Serializable;
+
 import lombok.Data;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
-import java.io.Serializable;
-
+/**
+ * access token.
+ *
+ * @author Daniel Qian
+ */
 @Data
 public class WxAccessToken implements Serializable {
   private static final long serialVersionUID = 8709719312922168909L;

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java

@@ -1,10 +1,12 @@
 package me.chanjar.weixin.common.bean;
 
-import lombok.Data;
-import me.chanjar.weixin.common.util.ToStringUtils;
-
 import java.io.Serializable;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import lombok.Data;
+
 /**
  * 卡券Api签名.
  *
@@ -35,7 +37,6 @@ public class WxCardApiSignature implements Serializable {
 
   @Override
   public String toString() {
-    return ToStringUtils.toSimpleString(this);
+    return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
   }
-
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxJsapiSignature.java

@@ -1,13 +1,21 @@
 package me.chanjar.weixin.common.bean;
 
-import lombok.Data;
-
 import java.io.Serializable;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 /**
  * jspai signature.
+ *
+ * @author Daniel Qian
  */
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxJsapiSignature implements Serializable {
   private static final long serialVersionUID = -1116808193154384804L;
 

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java

@@ -1,16 +1,18 @@
 package me.chanjar.weixin.common.bean.menu;
 
-import lombok.Data;
-import me.chanjar.weixin.common.util.ToStringUtils;
-import me.chanjar.weixin.common.util.json.WxGsonBuilder;
-
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import lombok.Data;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+
 /**
  * 菜单（公众号和企业号共用的）.
  *
@@ -47,7 +49,7 @@ public String toJson() {
 
   @Override
   public String toString() {
-    return ToStringUtils.toSimpleString(this);
+    return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
   }
 
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java

@@ -1,13 +1,20 @@
 package me.chanjar.weixin.common.bean.menu;
 
-import com.google.gson.annotations.SerializedName;
-import lombok.Data;
-import me.chanjar.weixin.common.util.ToStringUtils;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+/**
+ * menu button.
+ *
+ * @author Daniel Qian
+ */
 @Data
 public class WxMenuButton implements Serializable {
   private static final long serialVersionUID = -1070939403109776555L;
@@ -76,7 +83,7 @@ public class WxMenuButton implements Serializable {
 
   @Override
   public String toString() {
-    return ToStringUtils.toSimpleString(this);
+    return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
   }
 
 }

weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java

@@ -1,11 +1,18 @@
 package me.chanjar.weixin.common.bean.menu;
 
+import java.io.Serializable;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
-import me.chanjar.weixin.common.util.ToStringUtils;
-
-import java.io.Serializable;
 
+/**
+ * menu rule.
+ *
+ * @author Daniel Qian
+ */
 @Data
 public class WxMenuRule implements Serializable {
   private static final long serialVersionUID = -4587181819499286670L;
@@ -24,6 +31,6 @@ public class WxMenuRule implements Serializable {
 
   @Override
   public String toString() {
-    return ToStringUtils.toSimpleString(this);
+    return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
   }
 }