From 2b019f15cb8116e63166aef8bc42e0c88dcf5f15 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@users.noreply.github.com>
Date: Thu, 17 Aug 2017 12:27:09 +0800
Subject: [PATCH 01/85] update

---
 readme.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/readme.md b/readme.md
index 7d4413d621..efa7a2dd95 100644
--- a/readme.md
+++ b/readme.md
@@ -8,13 +8,13 @@
 ***新人提示：本项目仅是一个开发工具包（即SDK），未提供Web实现，建议使用maven或gradle引用本项目即可使用本SDK提供的各种功能，详情可参考下文中提到的Demo项目或本项目中的部分单元测试代码；另外微信开发新手请务必阅读wiki首页的常见问题部分，可以少走很多弯路，节省不少时间。***
 
 ## Demo项目列表
-* https://github.com/wechat-group/weixin-java-miniapp-demo （微信小程序Demo） 
-* https://github.com/wechat-group/weixin-java-pay-demo （微信支付Demo） 
-* https://github.com/wechat-group/weixin-java-cp-demo （企业号Demo）
-* https://github.com/wechat-group/weixin-java-mp-demo （公众号Demo，使用Spring MVC实现）
-* https://github.com/wechat-group/weixin-java-mp-demo-springboot （公众号Demo，使用Spring Boot实现）
+* https://github.com/binarywang/weixin-java-miniapp-demo （微信小程序Demo） 
+* https://github.com/binarywang/weixin-java-pay-demo （微信支付Demo） 
+* https://github.com/binarywang/weixin-java-cp-demo （企业号Demo）
+* https://github.com/binarywang/weixin-java-mp-demo （公众号Demo，使用Spring MVC实现）
+* https://github.com/binarywang/weixin-java-mp-demo-springboot （公众号Demo，使用Spring Boot实现）
+* https://github.com/binarywang/weixin-java-mp-multi-demo (支持多公众号)
 * https://github.com/wechat-group/weixin-java-tools-springmvc （公众号Demo，内含部分微信支付代码）
-* https://github.com/wechat-group/weixin-java-mp-multi-demo (支持多公众号)
 
 ---------------------------------
 ### 其他信息：

From 67051936490afacadb56d8583e2f66867e553a6c Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@users.noreply.github.com>
Date: Wed, 23 Aug 2017 10:32:02 +0800
Subject: [PATCH 02/85] Update readme.md

---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index efa7a2dd95..199399e85c 100644
--- a/readme.md
+++ b/readme.md
@@ -5,12 +5,12 @@
 
 #### 声明： ***本项目Fork自chanjarster/weixin-java-tools，但由于原项目已停止维护，故单独维护和发布，且发布到maven上的groupId也会不同，详细信息见下文。***
 
-***新人提示：本项目仅是一个开发工具包（即SDK），未提供Web实现，建议使用maven或gradle引用本项目即可使用本SDK提供的各种功能，详情可参考下文中提到的Demo项目或本项目中的部分单元测试代码；另外微信开发新手请务必阅读wiki首页的常见问题部分，可以少走很多弯路，节省不少时间。***
+***新人提示：本项目仅是一个开发工具包（即SDK），未提供Web实现，建议使用maven或gradle引用本项目即可使用本SDK提供的各种功能，详情可参考下文中提到的Demo项目或本项目中的部分单元测试代码；另外微信开发新手请务必阅读[Wiki首页](https://github.com/Wechat-Group/weixin-java-tools/wiki)的常见问题部分，可以少走很多弯路，节省不少时间。***
 
 ## Demo项目列表
 * https://github.com/binarywang/weixin-java-miniapp-demo （微信小程序Demo） 
 * https://github.com/binarywang/weixin-java-pay-demo （微信支付Demo） 
-* https://github.com/binarywang/weixin-java-cp-demo （企业号Demo）
+* https://github.com/binarywang/weixin-java-cp-demo （企业号/企业微信Demo）
 * https://github.com/binarywang/weixin-java-mp-demo （公众号Demo，使用Spring MVC实现）
 * https://github.com/binarywang/weixin-java-mp-demo-springboot （公众号Demo，使用Spring Boot实现）
 * https://github.com/binarywang/weixin-java-mp-multi-demo (支持多公众号)

From 16c7a890c881bbe4fb10be06433394cd672cf008 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 27 Jun 2017 11:04:21 +0800
Subject: [PATCH 03/85] =?UTF-8?q?jodd-http=E5=AF=B9=E4=BA=8E=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E6=9D=A5=E8=AF=B4=E6=98=AF=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E4=BE=9D=E8=B5=96=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weixin-java-pay/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 4f24b0a9c3..859d982248 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -26,6 +26,7 @@
     <dependency>
       <groupId>org.jodd</groupId>
       <artifactId>jodd-http</artifactId>
+      <scope>compile</scope>
     </dependency>
 
     <dependency>

From cba4ad56e2e187d601e6b3245366c70d0f3d38dd Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 27 Jun 2017 18:10:36 +0800
Subject: [PATCH 04/85] =?UTF-8?q?WxPayUnifiedOrderRequest=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/request/WxPayUnifiedOrderRequest.java        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
index a5560c20df..fb4b5e09c4 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -4,11 +4,8 @@
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import me.chanjar.weixin.common.annotation.Required;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.Arrays;
-
 /**
  * <pre>
  * 统一下单请求参数对象
@@ -274,6 +271,9 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
   @XStreamAlias("openid")
   private String openid;
 
+  public WxPayUnifiedOrderRequest() {
+  }
+
   private WxPayUnifiedOrderRequest(Builder builder) {
     setAppid(builder.appid);
     setDeviceInfo(builder.deviceInfo);

From bb954edf5099b42e73dcce8ef7c88cb35dfdb4e3 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 27 Jun 2017 18:22:35 +0800
Subject: [PATCH 05/85] =?UTF-8?q?#257=20=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=94=B3=E8=AF=B7=E9=80=80=E6=AC=BE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0refund=5Fdesc=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/request/WxPayRefundRequest.java      | 63 +++++++++++++------
 1 file changed, 45 insertions(+), 18 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
index 59111da5f8..7fae6fa0f5 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
@@ -142,17 +142,26 @@ public class WxPayRefundRequest extends WxPayBaseRequest {
    */
   @XStreamAlias("refund_account")
   private String refundAccount;
-
-  public WxPayRefundRequest() {
-  }
+  /**
+   * <pre>
+   * 退款原因
+   * refund_account
+   * 否
+   * String(80)
+   * 商品已售完
+   * 若商户传入，会在下发给用户的退款消息中体现退款原因
+   * </pre>
+   */
+  @XStreamAlias("refund_desc")
+  private String refundDesc;
 
   private WxPayRefundRequest(Builder builder) {
     setDeviceInfo(builder.deviceInfo);
     setAppid(builder.appid);
     setTransactionId(builder.transactionId);
     setMchId(builder.mchId);
-    setOutTradeNo(builder.outTradeNo);
     setSubAppId(builder.subAppId);
+    setOutTradeNo(builder.outTradeNo);
     setSubMchId(builder.subMchId);
     setOutRefundNo(builder.outRefundNo);
     setNonceStr(builder.nonceStr);
@@ -162,21 +171,13 @@ private WxPayRefundRequest(Builder builder) {
     setRefundFeeType(builder.refundFeeType);
     setOpUserId(builder.opUserId);
     setRefundAccount(builder.refundAccount);
+    setRefundDesc(builder.refundDesc);
   }
 
   public static Builder newBuilder() {
     return new Builder();
   }
 
-  @Override
-  public void checkAndSign(WxPayConfig config) throws WxPayException {
-    if (StringUtils.isBlank(this.getOpUserId())) {
-      this.setOpUserId(config.getMchId());
-    }
-
-    super.checkAndSign(config);
-  }
-
   public String getDeviceInfo() {
     return this.deviceInfo;
   }
@@ -249,6 +250,26 @@ public void setRefundAccount(String refundAccount) {
     this.refundAccount = refundAccount;
   }
 
+  public String getRefundDesc() {
+    return this.refundDesc;
+  }
+
+  public void setRefundDesc(String refundDesc) {
+    this.refundDesc = refundDesc;
+  }
+
+  public WxPayRefundRequest() {
+  }
+
+  @Override
+  public void checkAndSign(WxPayConfig config) throws WxPayException {
+    if (StringUtils.isBlank(this.getOpUserId())) {
+      this.setOpUserId(config.getMchId());
+    }
+
+    super.checkAndSign(config);
+  }
+
   @Override
   protected void checkConstraints() {
     if (StringUtils.isNotBlank(this.getRefundAccount())) {
@@ -268,8 +289,8 @@ public static final class Builder {
     private String appid;
     private String transactionId;
     private String mchId;
-    private String outTradeNo;
     private String subAppId;
+    private String outTradeNo;
     private String subMchId;
     private String outRefundNo;
     private String nonceStr;
@@ -279,6 +300,7 @@ public static final class Builder {
     private String refundFeeType;
     private String opUserId;
     private String refundAccount;
+    private String refundDesc;
 
     private Builder() {
     }
@@ -303,13 +325,13 @@ public Builder mchId(String mchId) {
       return this;
     }
 
-    public Builder outTradeNo(String outTradeNo) {
-      this.outTradeNo = outTradeNo;
+    public Builder subAppId(String subAppId) {
+      this.subAppId = subAppId;
       return this;
     }
 
-    public Builder subAppId(String subAppId) {
-      this.subAppId = subAppId;
+    public Builder outTradeNo(String outTradeNo) {
+      this.outTradeNo = outTradeNo;
       return this;
     }
 
@@ -358,6 +380,11 @@ public Builder refundAccount(String refundAccount) {
       return this;
     }
 
+    public Builder refundDesc(String refundDesc) {
+      this.refundDesc = refundDesc;
+      return this;
+    }
+
     public WxPayRefundRequest build() {
       return new WxPayRefundRequest(this);
     }

From 50bfc72a3685255d0188c7f6b96c7f780b122d5e Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 27 Jun 2017 18:27:37 +0800
Subject: [PATCH 06/85] =?UTF-8?q?#255=20=E6=9C=8D=E5=8A=A1=E5=95=86?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=BB=9F=E4=B8=80=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0sub=5Fopenid=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/WxPayUnifiedOrderRequest.java     | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
index fb4b5e09c4..f5b58245d9 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -271,14 +271,29 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
   @XStreamAlias("openid")
   private String openid;
 
+  /**
+   * <pre>
+   * 用户子标识
+   * sub_openid
+   * 否
+   * String(128)
+   * oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+   * trade_type=JSAPI，此参数必传，用户在子商户appid下的唯一标识。
+   * openid和sub_openid可以选传其中之一，如果选择传sub_openid,则必须传sub_appid。
+   * 下单前需要调用【网页授权获取用户信息】接口获取到用户的Openid。
+   * </pre>
+   */
+  @XStreamAlias("sub_openid")
+  private String subOpenid;
+
   public WxPayUnifiedOrderRequest() {
   }
 
   private WxPayUnifiedOrderRequest(Builder builder) {
-    setAppid(builder.appid);
     setDeviceInfo(builder.deviceInfo);
-    setMchId(builder.mchId);
+    setAppid(builder.appid);
     setBody(builder.body);
+    setMchId(builder.mchId);
     setSubAppId(builder.subAppId);
     setSubMchId(builder.subMchId);
     setNonceStr(builder.nonceStr);
@@ -297,6 +312,7 @@ private WxPayUnifiedOrderRequest(Builder builder) {
     setProductId(builder.productId);
     setLimitPay(builder.limitPay);
     setOpenid(builder.openid);
+    setSubOpenid(builder.subOpenid);
   }
 
   public static Builder newBuilder() {
@@ -441,6 +457,14 @@ public void setOpenid(String openid) {
     this.openid = openid;
   }
 
+  public String getSubOpenid() {
+    return this.subOpenid;
+  }
+
+  public void setSubOpenid(String subOpenid) {
+    this.subOpenid = subOpenid;
+  }
+
   @Override
   protected void checkConstraints() {
 //    if (!ArrayUtils.contains(TRADE_TYPES, this.getTradeType())) {
@@ -471,10 +495,10 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {
   }
 
   public static final class Builder {
-    private String appid;
     private String deviceInfo;
-    private String mchId;
+    private String appid;
     private String body;
+    private String mchId;
     private String subAppId;
     private String subMchId;
     private String nonceStr;
@@ -493,22 +517,18 @@ public static final class Builder {
     private String productId;
     private String limitPay;
     private String openid;
+    private String subOpenid;
 
     private Builder() {
     }
 
-    public Builder appid(String appid) {
-      this.appid = appid;
-      return this;
-    }
-
     public Builder deviceInfo(String deviceInfo) {
       this.deviceInfo = deviceInfo;
       return this;
     }
 
-    public Builder mchId(String mchId) {
-      this.mchId = mchId;
+    public Builder appid(String appid) {
+      this.appid = appid;
       return this;
     }
 
@@ -517,6 +537,11 @@ public Builder body(String body) {
       return this;
     }
 
+    public Builder mchId(String mchId) {
+      this.mchId = mchId;
+      return this;
+    }
+
     public Builder subAppId(String subAppId) {
       this.subAppId = subAppId;
       return this;
@@ -607,6 +632,11 @@ public Builder openid(String openid) {
       return this;
     }
 
+    public Builder subOpenid(String subOpenid) {
+      this.subOpenid = subOpenid;
+      return this;
+    }
+
     public WxPayUnifiedOrderRequest build() {
       return new WxPayUnifiedOrderRequest(this);
     }

From 4e6c309834eb1ec1bedd678f129daba7826e841d Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 27 Jun 2017 18:28:18 +0800
Subject: [PATCH 07/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.1.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 2 +-
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index a167cd8f48..fc5d27b6e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.0</version>
+  <version>2.7.1.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 66e32664ca..fa1a9feff8 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index bcc4e73bb3..fad1f7fd7b 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 71601ef3a4..99681a1099 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index bd8f147cb0..ddf830b934 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.0</version>
+    <version>2.7.1.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 859d982248..d3c5990473 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.0</version>
+    <version>2.7.1.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From cc7a83e350c507f0ecc006aae357d50a20a61725 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 29 Jun 2017 20:07:35 +0800
Subject: [PATCH 08/85] =?UTF-8?q?#260=20=E4=BF=AE=E5=A4=8D=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=8F=91=E9=80=81=E6=A8=A1=E7=89=88=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/binarywang/wx/miniapp/api/WxMaMsgService.java     | 9 ++++-----
 .../wx/miniapp/api/impl/WxMaMsgServiceImpl.java          | 8 +++-----
 .../binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java  | 6 +++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMsgService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMsgService.java
index 040e81e530..65522f4b75 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMsgService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaMsgService.java
@@ -18,7 +18,7 @@ public interface WxMaMsgService {
   /**
    * <pre>
    * 发送客服消息
-   * 详情请见: <a href="http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140547&token=&lang=zh_CN">发送客服消息</a>
+   * 详情请见: <a href="https://mp.weixin.qq.com/debug/wxadoc/dev/api/custommsg/conversation.html">发送客服消息</a>
    * 接口url格式：https://api.weixin.qq.com/cgi-bin/message/custom/send?access_token=ACCESS_TOKEN
    * </pre>
    */
@@ -27,10 +27,9 @@ public interface WxMaMsgService {
   /**
    * <pre>
    * 发送模板消息
-   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751277&token=&lang=zh_CN
+   * 详情请见: <a href="https://mp.weixin.qq.com/debug/wxadoc/dev/api/notice.html#接口说明">发送模板消息</a>
+   * 接口url格式：https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token=ACCESS_TOKEN
    * </pre>
-   *
-   * @return 消息Id
    */
-  String sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException;
+  void sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException;
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java
index 238bbe0e7f..70a4e50445 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImpl.java
@@ -27,14 +27,12 @@ public boolean sendKefuMsg(WxMaKefuMessage message) throws WxErrorException {
   }
 
   @Override
-  public String sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException {
+  public void sendTemplateMsg(WxMaTemplateMessage templateMessage) throws WxErrorException {
     String responseContent = this.wxMaService.post(TEMPLATE_MSG_SEND_URL, templateMessage.toJson());
     JsonObject jsonObject = JSON_PARSER.parse(responseContent).getAsJsonObject();
-    if (jsonObject.get("errcode").getAsInt() == 0) {
-      return jsonObject.get("msgid").getAsString();
+    if (jsonObject.get("errcode").getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(responseContent));
     }
-
-    throw new WxErrorException(WxError.fromJson(responseContent));
   }
 
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
index 167341265a..c8605d25de 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
@@ -193,7 +193,7 @@ public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, Str
 
     try {
       T result = executor.execute(uriWithAccessToken, data);
-      this.log.debug("\n[URL]:  {}\n[PARAMS]: {}\n[RESPONSE]: {}", uriWithAccessToken, data, result);
+      this.log.debug("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", uriWithAccessToken, data, result);
       return result;
     } catch (WxErrorException e) {
       WxError error = e.getError();
@@ -212,12 +212,12 @@ public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, Str
       }
 
       if (error.getErrorCode() != 0) {
-        this.log.error("\n[URL]:  {}\n[PARAMS]: {}\n[RESPONSE]: {}", uriWithAccessToken, data, error);
+        this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uriWithAccessToken, data, error);
         throw new WxErrorException(error);
       }
       return null;
     } catch (IOException e) {
-      this.log.error("\n[URL]:  {}\n[PARAMS]: {}\n[EXCEPTION]: {}", uriWithAccessToken, data, e.getMessage());
+      this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【异常信息】：{}", uriWithAccessToken, data, e.getMessage());
       throw new RuntimeException(e);
     }
   }

From f6a31b046045d9470d8d518f5e2b7dc09977bb2a Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 29 Jun 2017 20:07:50 +0800
Subject: [PATCH 09/85] =?UTF-8?q?#260=20=E4=BF=AE=E5=A4=8D=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=8F=91=E9=80=81=E6=A8=A1=E7=89=88=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wx/miniapp/bean/WxMaTemplateMessage.java  | 47 ++++++++++++++++---
 1 file changed, 40 insertions(+), 7 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaTemplateMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaTemplateMessage.java
index 7a89dfa8a5..79f955c6d2 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaTemplateMessage.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaTemplateMessage.java
@@ -13,34 +13,67 @@
  */
 public class WxMaTemplateMessage implements Serializable {
   private static final long serialVersionUID = 5063374783759519418L;
+
   /**
-   * touser	是	接收者（用户）的 openid
+   * <pre>
+   * 参数：touser
+   * 是否必填： 是
+   * 描述： 接收者（用户）的 openid
+   * </pre>
    */
   private String toUser;
+
   /**
-   * template_id	是	所需下发的模板消息的id
+   * <pre>
+   * 参数：template_id
+   * 是否必填： 是
+   * 描述： 所需下发的模板消息的id
+   * </pre>
    */
   private String templateId;
+
   /**
    * <pre>
-   * page	否	点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。
+   * 参数：page
+   * 是否必填： 否
+   * 描述： 点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。
    * </pre>
    */
   private String page;
+
   /**
-   * form_id	是	表单提交场景下，为 submit 事件带上的 formId；支付场景下，为本次支付的 prepay_id
+   * <pre>
+   * 参数：form_id
+   * 是否必填： 是
+   * 描述： 表单提交场景下，为 submit 事件带上的 formId；支付场景下，为本次支付的 prepay_id
+   * </pre>
    */
   private String formId;
+
   /**
-   * data	是	模板内容，不填则下发空模板
+   * <pre>
+   * 参数：data
+   * 是否必填： 是
+   * 描述： 模板内容，不填则下发空模板
+   * </pre>
    */
   private List<Data> data = new ArrayList<>();
+
   /**
-   * color	否	模板内容字体的颜色，不填默认黑色
+   * <pre>
+   * 参数：color
+   * 是否必填： 否
+   * 描述： 模板内容字体的颜色，不填默认黑色
+   * </pre>
    */
   private String color;
+
   /**
-   * emphasis_keyword	否	模板需要放大的关键词，不填则默认无放大
+   * <pre>
+   * 参数：emphasis_keyword
+   * 是否必填： 否
+   * 描述： 模板需要放大的关键词，不填则默认无放大
+   * </pre>
    */
   private String emphasisKeyword;
 

From 14b78046e6cf89b401728f40918823edbd2c9958 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 30 Jun 2017 10:47:42 +0800
Subject: [PATCH 10/85] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/binarywang/wxpay/service/WxPayService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index 495ecb5eb9..03640eb067 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -112,7 +112,7 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
 
   /**
    * 读取支付结果通知
-   * 详见http://com.github.binarywang.wechat.pay.bean.pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7
+   * 详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7
    */
   WxPayOrderNotifyResult getOrderNotifyResult(String xmlData) throws WxPayException;
 

From 3a2c0f3864570b82deb02b3b7a31336435a1a613 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 30 Jun 2017 16:54:13 +0800
Subject: [PATCH 11/85] fix test case

---
 .../wx/miniapp/api/impl/WxMaMsgServiceImplTest.java       | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImplTest.java
index c5d8f1e86a..9604a25691 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImplTest.java
@@ -9,9 +9,7 @@
 import com.google.inject.Inject;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.exception.WxErrorException;
-import org.testng.Assert;
-import org.testng.annotations.Guice;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -68,9 +66,7 @@ public void testSendTemplateMsg() throws WxErrorException {
       .emphasisKeyword("keyword1.DATA")
       .build();
 
-    String msgId = this.wxService.getMsgService().sendTemplateMsg(templateMessage);
-    Assert.assertNotNull(msgId);
-    System.out.println(msgId);
+    this.wxService.getMsgService().sendTemplateMsg(templateMessage);
   }
 
 }

From 23293e87815f75840f0ead20d7a3d3014f863933 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 30 Jun 2017 16:55:55 +0800
Subject: [PATCH 12/85] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E8=B7=AF=E5=BE=84=E5=88=A4=E6=96=AD=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/config/WxPayConfig.java    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
index e6c587a13b..d05259ceeb 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
@@ -158,18 +158,27 @@ public SSLContext initSSLContext() throws WxPayException {
 
     InputStream inputStream;
     final String prefix = "classpath:";
+    String fileHasProblemMsg = "证书文件【" + this.keyPath + "】有问题，请核实！";
+    String fileNotFoundMsg = "证书文件【" + this.keyPath + "】不存在，请核实！";
     if (this.keyPath.startsWith(prefix)) {
-      inputStream = WxPayConfig.class.getResourceAsStream(this.keyPath.replace(prefix, ""));
+      String path = StringUtils.removeFirst(this.keyPath, prefix);
+      if (!path.startsWith("/")) {
+        path = "/" + path;
+      }
+      inputStream = WxPayConfig.class.getResourceAsStream(path);
+      if (inputStream == null) {
+        throw new WxPayException(fileNotFoundMsg);
+      }
     } else {
       try {
         File file = new File(this.keyPath);
         if (!file.exists()) {
-          throw new WxPayException("证书文件【" + file.getPath() + "】不存在！");
+          throw new WxPayException(fileNotFoundMsg);
         }
 
         inputStream = new FileInputStream(file);
       } catch (IOException e) {
-        throw new WxPayException("证书文件有问题，请核实！", e);
+        throw new WxPayException(fileHasProblemMsg, e);
       }
     }
 
@@ -180,7 +189,7 @@ public SSLContext initSSLContext() throws WxPayException {
       this.sslContext = SSLContexts.custom().loadKeyMaterial(keystore, partnerId2charArray).build();
       return this.sslContext;
     } catch (Exception e) {
-      throw new WxPayException("证书文件有问题，请核实！", e);
+      throw new WxPayException(fileHasProblemMsg, e);
     } finally {
       IOUtils.closeQuietly(inputStream);
     }

From b64ba9a978085284d1f3ede570e72c598e769dda Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 30 Jun 2017 17:14:55 +0800
Subject: [PATCH 13/85] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AF=B7=E6=B1=82=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/request/WxPayBaseRequest.java  |  2 +-
 .../wxpay/service/impl/WxPayServiceImpl.java  | 68 ++++++++++---------
 .../service/impl/WxPayServiceImplTest.java    | 10 +--
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
index b44822483b..0d4fc08b9d 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
@@ -119,7 +119,7 @@ protected void checkFields() throws WxPayException {
     try {
       BeanUtils.checkRequiredFields(this);
     } catch (WxErrorException e) {
-      throw new WxPayException(e.getError().getErrorMsg());
+      throw new WxPayException(e.getError().getErrorMsg(), e);
     }
 
     //check other parameters
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
index 14c34d0360..bcf425d792 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
@@ -11,14 +11,13 @@
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
 import jodd.http.net.SSLSocketHttpConnectionProvider;
-import org.apache.commons.lang3.CharEncoding;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
 import java.io.File;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -76,7 +75,7 @@ public WxPayRefundQueryResult refundQuery(String transactionId, String outTradeN
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/refundquery";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     WxPayRefundQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundQueryResult.class);
     result.composeRefundRecords();
     result.checkResult(this);
@@ -96,7 +95,7 @@ public WxPayOrderNotifyResult getOrderNotifyResult(String xmlData) throws WxPayE
       throw e;
     } catch (Exception e) {
       log.error(e.getMessage(), e);
-      throw new WxPayException("发生异常，" + e.getMessage());
+      throw new WxPayException("发生异常，" + e.getMessage(), e);
     }
   }
 
@@ -139,7 +138,7 @@ public WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo)
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/orderquery";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     if (StringUtils.isBlank(responseContent)) {
       throw new WxPayException("无响应结果");
     }
@@ -161,7 +160,7 @@ public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/closeorder";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     WxPayOrderCloseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderCloseResult.class);
     result.checkResult(this);
 
@@ -173,7 +172,7 @@ public WxPayUnifiedOrderResult unifiedOrder(WxPayUnifiedOrderRequest request) th
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/unifiedorder";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     WxPayUnifiedOrderResult result = WxPayBaseResult.fromXML(responseContent, WxPayUnifiedOrderResult.class);
     result.checkResult(this);
     return result;
@@ -294,7 +293,7 @@ public void report(WxPayReportRequest request) throws WxPayException {
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/payitil/report";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
     result.checkResult(this);
   }
@@ -310,7 +309,7 @@ public WxPayBillResult downloadBill(String billDate, String billType, String tar
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/downloadbill";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     if (responseContent.startsWith("<")) {
       WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
       result.checkResult(this);
@@ -397,7 +396,7 @@ public WxPayMicropayResult micropay(WxPayMicropayRequest request) throws WxPayEx
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/micropay";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     WxPayMicropayResult result = WxPayBaseResult.fromXML(responseContent, WxPayMicropayResult.class);
     result.checkResult(this);
     return result;
@@ -419,7 +418,7 @@ public String shorturl(WxPayShorturlRequest request) throws WxPayException {
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/tools/shorturl";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     WxPayShorturlResult result = WxPayBaseResult.fromXML(responseContent, WxPayShorturlResult.class);
     result.checkResult(this);
     return result.getShortUrl();
@@ -435,7 +434,7 @@ public String authcode2Openid(WxPayAuthcode2OpenidRequest request) throws WxPayE
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/tools/authcodetoopenid";
-    String responseContent = this.post(url, request.toXML(), true);
+    String responseContent = this.post(url, request.toXML());
     WxPayAuthcode2OpenidResult result = WxPayBaseResult.fromXML(responseContent, WxPayAuthcode2OpenidResult.class);
     result.checkResult(this);
     return result.getOpenid();
@@ -452,26 +451,21 @@ public String getSandboxSignKey() throws WxPayException {
     request.checkAndSign(this.getConfig());
 
     String url = "https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey";
-    String responseContent = this.post(url, request.toXML(), false);
+    String responseContent = this.post(url, request.toXML());
     WxPaySandboxSignKeyResult result = WxPayBaseResult.fromXML(responseContent, WxPaySandboxSignKeyResult.class);
     result.checkResult(this);
     return result.getSandboxSignKey();
   }
 
   /**
-   * @param url                  请求地址
-   * @param xmlParam             请求字符串
-   * @param needTransferEncoding 是否需要对结果进行重编码
+   * 执行post请求
+   *
+   * @param url      请求地址
+   * @param xmlParam 请求字符串
    * @return 返回请求结果
    */
-  private String post(String url, String xmlParam, boolean needTransferEncoding) {
-    String requestString = xmlParam;
-    try {
-      requestString = new String(xmlParam.getBytes(CharEncoding.UTF_8), CharEncoding.ISO_8859_1);
-    } catch (UnsupportedEncodingException e) {
-      //实际上不会发生该异常
-      e.printStackTrace();
-    }
+  private String post(String url, String xmlParam) throws WxPayException {
+    String requestString = new String(xmlParam.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
 
     HttpRequest request = HttpRequest.post(url).body(requestString);
     String responseString = this.getResponseString(request.send());
@@ -481,7 +475,10 @@ private String post(String url, String xmlParam, boolean needTransferEncoding) {
   }
 
   /**
-   * ecoolper(20170418)，修改为jodd-http方式
+   * 带证书发送post请求
+   *
+   * @param url        请求地址
+   * @param requestStr 请求信息
    */
   private String postWithKey(String url, String requestStr) throws WxPayException {
     try {
@@ -501,22 +498,27 @@ private String postWithKey(String url, String requestStr) throws WxPayException
       return responseString;
     } catch (Exception e) {
       this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
-      throw new WxPayException(e.getMessage());
+      throw new WxPayException(e.getMessage(), e);
     }
   }
 
-  private String getResponseString(HttpResponse response) {
-    this.log.debug("【微信服务器响应头信息】：\n{}", response.toString(false));
+  private String getResponseString(HttpResponse response) throws WxPayException {
+    try {
+      this.log.debug("【微信服务器响应头信息】：\n{}", response.toString(false));
+    } catch (NullPointerException e) {
+      throw new WxPayException("response.toString() 居然抛出空指针异常了", e);
+    }
 
     String responseString = response.bodyText();
 
+    if (StringUtils.isBlank(responseString)) {
+      throw new WxPayException("响应信息为空");
+    }
+
     if (StringUtils.isBlank(response.charset())) {
-      try {
-        responseString = new String(response.bodyText().getBytes(CharEncoding.ISO_8859_1), CharEncoding.UTF_8);
-      } catch (UnsupportedEncodingException e) {
-        e.printStackTrace();
-      }
+      responseString = new String(responseString.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
     }
+
     return responseString;
   }
 
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImplTest.java
index 995aa8275b..1cba44c59b 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImplTest.java
@@ -83,7 +83,7 @@ public void testRefund() throws Exception {
   }
 
   /**
-   * Test method for {@link WxPayService#refundQuery(java.lang.String, java.lang.String, java.lang.String, java.lang.String)} .
+   * Test method for {@link WxPayService#refundQuery(String, String, String, String)} .
    */
   @Test
   public void testRefundQuery() throws Exception {
@@ -121,7 +121,7 @@ public void testSendRedpack() throws Exception {
   }
 
   /**
-   * Test method for {@link WxPayService#queryRedpack(java.lang.String)}.
+   * Test method for {@link WxPayService#queryRedpack(String)}.
    */
   @Test
   public void testQueryRedpack() throws Exception {
@@ -148,7 +148,7 @@ public void testUnifiedOrder() throws WxPayException {
   }
 
   /**
-   * Test method for {@link WxPayService#queryOrder(java.lang.String, java.lang.String)} .
+   * Test method for {@link WxPayService#queryOrder(String, String)} .
    */
   @Test
   public void testQueryOrder() throws WxPayException {
@@ -157,7 +157,7 @@ public void testQueryOrder() throws WxPayException {
   }
 
   /**
-   * Test method for {@link WxPayService#closeOrder(java.lang.String)} .
+   * Test method for {@link WxPayService#closeOrder(String)} .
    */
   @Test
   public void testCloseOrder() throws WxPayException {
@@ -174,7 +174,7 @@ public void testEntPay() throws WxPayException {
   }
 
   /**
-   * Test method for {@link WxPayService#queryEntPay(java.lang.String)}.
+   * Test method for {@link WxPayService#queryEntPay(String)}.
    */
   @Test
   public void testQueryEntPay() throws WxPayException {

From 0a49967894387d8b0f172a11b1f8515978880f1f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 2 Jul 2017 15:03:20 +0800
Subject: [PATCH 14/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.2.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 4 ++--
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index fc5d27b6e7..84de33cb46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.1.BETA</version>
+  <version>2.7.2.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -288,7 +288,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</version>
+            <version>1.7-SNAPSHOT</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index fa1a9feff8..71e09c8f49 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.1.BETA</version>
+    <version>2.7.2.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index fad1f7fd7b..86c5994f4a 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.1.BETA</version>
+    <version>2.7.2.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 99681a1099..b1bb6a27d9 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.1.BETA</version>
+    <version>2.7.2.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index ddf830b934..2f1a0d6ef9 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.1.BETA</version>
+    <version>2.7.2.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index d3c5990473..e930a48178 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.1.BETA</version>
+    <version>2.7.2.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 33ced3daa270beb30986642d6f2f008b73036419 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 2 Jul 2017 15:30:08 +0800
Subject: [PATCH 15/85] =?UTF-8?q?#265=20=E5=87=A0=E4=B8=AANewsBuilder?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=9B=B4=E6=8E=A5=E8=AE=BE=E7=BD=AEArticle?=
 =?UTF-8?q?=E6=88=96Item=E5=AF=B9=E8=B1=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/bean/messagebuilder/MpnewsBuilder.java  | 10 ++++++++--
 .../weixin/cp/bean/messagebuilder/NewsBuilder.java    | 10 ++++++++--
 .../weixin/cp/bean/outxmlbuilder/NewsBuilder.java     | 11 ++++++++---
 .../me/chanjar/weixin/cp/bean/WxCpMessageTest.java    | 10 ++++------
 .../chanjar/weixin/mp/builder/kefu/NewsBuilder.java   | 11 ++++++++---
 .../chanjar/weixin/mp/builder/outxml/NewsBuilder.java | 11 ++++++++---
 .../mp/bean/message/WxMpXmlOutNewsMessageTest.java    |  5 ++---
 7 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/MpnewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/MpnewsBuilder.java
index 21ab2549a7..55ed20abab 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/MpnewsBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/MpnewsBuilder.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.cp.bean.article.MpnewsArticle;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -30,8 +31,13 @@ public MpnewsBuilder mediaId(String mediaId) {
     return this;
   }
 
-  public MpnewsBuilder addArticle(MpnewsArticle article) {
-    this.articles.add(article);
+  public MpnewsBuilder addArticle(MpnewsArticle... articles) {
+    Collections.addAll(this.articles, articles);
+    return this;
+  }
+
+  public MpnewsBuilder articles(List<MpnewsArticle> articles) {
+    this.articles = articles;
     return this;
   }
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java
index e0df095e3d..dd23941244 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/NewsBuilder.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.cp.bean.article.NewArticle;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -24,8 +25,13 @@ public NewsBuilder() {
     this.msgType = WxConsts.CUSTOM_MSG_NEWS;
   }
 
-  public NewsBuilder addArticle(NewArticle article) {
-    this.articles.add(article);
+  public NewsBuilder addArticle(NewArticle... articles) {
+    Collections.addAll(this.articles, articles);
+    return this;
+  }
+
+  public NewsBuilder articles(List<NewArticle> articles) {
+    this.articles = articles;
     return this;
   }
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java
index 3e910d8dba..5a67056ab6 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/outxmlbuilder/NewsBuilder.java
@@ -4,6 +4,7 @@
 import me.chanjar.weixin.cp.bean.WxCpXmlOutNewsMessage.Item;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -12,11 +13,15 @@
  * @author Daniel Qian
  */
 public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxCpXmlOutNewsMessage> {
+  private List<Item> articles = new ArrayList<>();
 
-  protected final List<Item> articles = new ArrayList<>();
+  public NewsBuilder addArticle(Item... items) {
+    Collections.addAll(this.articles, items);
+    return this;
+  }
 
-  public NewsBuilder addArticle(Item item) {
-    this.articles.add(item);
+  public NewsBuilder articles(List<Item> articles){
+    this.articles = articles;
     return this;
   }
 
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java
index f41f3a55a7..f97c0c79b0 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java
@@ -3,9 +3,9 @@
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.cp.bean.article.MpnewsArticle;
 import me.chanjar.weixin.cp.bean.article.NewArticle;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
 
-import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.*;
 
 @Test
 public class WxCpMessageTest {
@@ -127,11 +127,9 @@ public void testMpnewsBuild_with_articles() {
       .thumbMediaId("thumb")
       .build();
 
-    WxCpMessage reply = WxCpMessage.MPNEWS().toUser("OPENID").addArticle(article1).addArticle(article2).build();
+    WxCpMessage reply = WxCpMessage.MPNEWS().toUser("OPENID").addArticle(article1, article2).build();
 
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"mpnews\"," +
-      "\"mpnews\":{\"articles\":[{\"title\":\"Happy Day\",\"thumb_media_id\":\"thumb\",\"author\":\"aaaaaa\",\"content_source_url\":\"nice url\",\"content\":\"hahaha\",\"digest\":\"digest\",\"show_cover_pic\":\"heihei\"}," +
-      "{\"title\":\"Happy Day\",\"thumb_media_id\":\"thumb\",\"author\":\"aaaaaa\",\"content_source_url\":\"nice url\",\"content\":\"hahaha\",\"digest\":\"digest\",\"show_cover_pic\":\"heihei\"}]}}");
+    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"mpnews\",\"safe\":\"0\",\"mpnews\":{\"articles\":[{\"title\":\"Happy Day\",\"thumb_media_id\":\"thumb\",\"author\":\"aaaaaa\",\"content_source_url\":\"nice url\",\"content\":\"hahaha\",\"digest\":\"digest\",\"show_cover_pic\":\"heihei\"},{\"title\":\"Happy Day\",\"thumb_media_id\":\"thumb\",\"author\":\"aaaaaa\",\"content_source_url\":\"nice url\",\"content\":\"hahaha\",\"digest\":\"digest\",\"show_cover_pic\":\"heihei\"}]}}");
   }
 
   public void testMpnewsBuild_with_media_id() {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/NewsBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/NewsBuilder.java
index 1626f77e2c..11e866e84a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/NewsBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/kefu/NewsBuilder.java
@@ -4,6 +4,7 @@
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -16,15 +17,19 @@
  * @author chanjarster
  */
 public final class NewsBuilder extends BaseBuilder<NewsBuilder> {
-
   private List<WxMpKefuMessage.WxArticle> articles = new ArrayList<>();
 
   public NewsBuilder() {
     this.msgType = WxConsts.CUSTOM_MSG_NEWS;
   }
 
-  public NewsBuilder addArticle(WxMpKefuMessage.WxArticle article) {
-    this.articles.add(article);
+  public NewsBuilder addArticle(WxMpKefuMessage.WxArticle... articles) {
+    Collections.addAll(this.articles, articles);
+    return this;
+  }
+
+  public NewsBuilder articles(List<WxMpKefuMessage.WxArticle> articles) {
+    this.articles = articles;
     return this;
   }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/NewsBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/NewsBuilder.java
index 4f9e22e67f..01af0d627f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/NewsBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/builder/outxml/NewsBuilder.java
@@ -3,6 +3,7 @@
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutNewsMessage;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -11,11 +12,15 @@
  * @author chanjarster
  */
 public final class NewsBuilder extends BaseBuilder<NewsBuilder, WxMpXmlOutNewsMessage> {
+  private List<WxMpXmlOutNewsMessage.Item> articles = new ArrayList<>();
 
-  protected final List<WxMpXmlOutNewsMessage.Item> articles = new ArrayList<>();
+  public NewsBuilder addArticle(WxMpXmlOutNewsMessage.Item... items) {
+    Collections.addAll(this.articles, items);
+    return this;
+  }
 
-  public NewsBuilder addArticle(WxMpXmlOutNewsMessage.Item item) {
-    this.articles.add(item);
+  public NewsBuilder articles(List<WxMpXmlOutNewsMessage.Item> articles){
+    this.articles = articles;
     return this;
   }
 
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessageTest.java
index c9a1f98264..f8f72c9e5e 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessageTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessageTest.java
@@ -54,15 +54,13 @@ public void testBuild() {
     WxMpXmlOutNewsMessage m = WxMpXmlOutMessage.NEWS()
       .fromUser("fromUser")
       .toUser("toUser")
-      .addArticle(item)
-      .addArticle(item)
+      .addArticle(item,item)
       .build();
     String expected = "<xml>"
       + "<ToUserName><![CDATA[toUser]]></ToUserName>"
       + "<FromUserName><![CDATA[fromUser]]></FromUserName>"
       + "<CreateTime>1122</CreateTime>"
       + "<MsgType><![CDATA[news]]></MsgType>"
-      + "    <ArticleCount>2</ArticleCount>"
       + "    <Articles>"
       + "        <item>"
       + "            <Title><![CDATA[title]]></Title>"
@@ -77,6 +75,7 @@ public void testBuild() {
       + "            <Url><![CDATA[url]]></Url>"
       + "        </item>"
       + "    </Articles>"
+      + "    <ArticleCount>2</ArticleCount>"
       + "</xml>";
     System.out.println(m.toXml());
     Assert.assertEquals(

From 69d869c776e168f78eac99462d033439075840e5 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 2 Jul 2017 17:01:51 +0800
Subject: [PATCH 16/85] =?UTF-8?q?#256=20=E4=BC=81=E4=B8=9A=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=8D=A1=E7=89=87=E6=B6=88=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/common/api/WxConsts.java   |  1 +
 .../chanjar/weixin/cp/bean/WxCpMessage.java   | 15 ++++
 .../cp/bean/messagebuilder/BaseBuilder.java   |  4 +-
 .../bean/messagebuilder/TextCardBuilder.java  | 47 ++++++++++++
 .../cp/util/json/WxCpMessageGsonAdapter.java  |  8 ++
 .../weixin/cp/api/WxCpMessageAPITest.java     |  1 -
 .../weixin/cp/bean/WxCpMessageTest.java       | 75 +++----------------
 7 files changed, 85 insertions(+), 66 deletions(-)
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextCardBuilder.java

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
index e04dc45682..e416323e02 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/api/WxConsts.java
@@ -35,6 +35,7 @@ public class WxConsts {
   public static final String CUSTOM_MSG_NEWS = "news";//图文消息（点击跳转到外链）
   public static final String CUSTOM_MSG_MPNEWS = "mpnews";//图文消息（点击跳转到图文消息页面）
   public static final String CUSTOM_MSG_FILE = "file";//发送文件（CP专用）
+  public static final String CUSTOM_MSG_TEXTCARD = "textcard";//文本卡片消息（CP专用）
   public static final String CUSTOM_MSG_WXCARD = "wxcard";//卡券消息
   public static final String CUSTOM_MSG_TRANSFER_CUSTOMER_SERVICE = "transfer_customer_service";
   public static final String CUSTOM_MSG_SAFE_NO = "0";
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
index 2d07fcf867..c59ca87e1f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpMessage.java
@@ -30,6 +30,7 @@ public class WxCpMessage implements Serializable {
   private String musicUrl;
   private String hqMusicUrl;
   private String safe;
+  private String url;
   private List<NewArticle> articles = new ArrayList<>();
   private List<MpnewsArticle> mpnewsArticles = new ArrayList<>();
 
@@ -40,6 +41,13 @@ public static TextBuilder TEXT() {
     return new TextBuilder();
   }
 
+  /**
+   * 获得文本卡片消息builder
+   */
+  public static TextCardBuilder TEXTCARD() {
+    return new TextCardBuilder();
+  }
+
   /**
    * 获得图片消息builder
    */
@@ -220,4 +228,11 @@ public String toJson() {
     return WxCpGsonBuilder.INSTANCE.create().toJson(this);
   }
 
+  public String getUrl() {
+    return this.url;
+  }
+
+  public void setUrl(String url) {
+    this.url = url;
+  }
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
index ea3e710c64..784de9a769 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/BaseBuilder.java
@@ -2,6 +2,7 @@
 
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.cp.bean.WxCpMessage;
+import org.apache.commons.lang3.StringUtils;
 
 public class BaseBuilder<T> {
   protected String msgType;
@@ -43,8 +44,7 @@ public WxCpMessage build() {
     m.setToUser(this.toUser);
     m.setToParty(this.toParty);
     m.setToTag(this.toTag);
-    m.setSafe(
-      (this.safe == null || "".equals(this.safe)) ? WxConsts.CUSTOM_MSG_SAFE_NO : this.safe);
+    m.setSafe(StringUtils.defaultIfBlank(this.safe, WxConsts.CUSTOM_MSG_SAFE_NO));
     return m;
   }
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextCardBuilder.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextCardBuilder.java
new file mode 100644
index 0000000000..a30b9d4059
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/messagebuilder/TextCardBuilder.java
@@ -0,0 +1,47 @@
+package me.chanjar.weixin.cp.bean.messagebuilder;
+
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.cp.bean.WxCpMessage;
+
+/**
+ * <pre>
+ * 文本卡片消息Builder
+ * 用法: WxCustomMessage m = WxCustomMessage.TEXTCARD().title(...)....toUser(...).build();
+ * Created by Binary Wang on 2017-7-2.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class TextCardBuilder extends BaseBuilder<TextCardBuilder> {
+  private String title;
+  private String description;
+  private String url;
+
+  public TextCardBuilder() {
+    this.msgType = WxConsts.CUSTOM_MSG_TEXTCARD;
+  }
+
+  public TextCardBuilder title(String title) {
+    this.title = title;
+    return this;
+  }
+
+  public TextCardBuilder description(String description) {
+    this.description = description;
+    return this;
+  }
+
+  public TextCardBuilder url(String url) {
+    this.url = url;
+    return this;
+  }
+
+  @Override
+  public WxCpMessage build() {
+    WxCpMessage m = super.build();
+    m.setTitle(this.title);
+    m.setDescription(this.description);
+    m.setUrl(this.url);
+    return m;
+  }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpMessageGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpMessageGsonAdapter.java
index a74c17b64c..67e43c4ccc 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpMessageGsonAdapter.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpMessageGsonAdapter.java
@@ -43,6 +43,14 @@ public JsonElement serialize(WxCpMessage message, Type typeOfSrc, JsonSerializat
       messageJson.add("text", text);
     }
 
+    if (WxConsts.CUSTOM_MSG_TEXTCARD.equals(message.getMsgType())) {
+      JsonObject text = new JsonObject();
+      text.addProperty("title", message.getTitle());
+      text.addProperty("description", message.getDescription());
+      text.addProperty("url", message.getUrl());
+      messageJson.add("textcard", text);
+    }
+
     if (WxConsts.CUSTOM_MSG_IMAGE.equals(message.getMsgType())) {
       JsonObject image = new JsonObject();
       image.addProperty("media_id", message.getMediaId());
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java
index ece6d5348b..1e0d40b05b 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java
@@ -57,6 +57,5 @@ public void testSendMessage1() throws WxErrorException {
     System.out.println(messageSendResult.getInvalidPartyList());
     System.out.println(messageSendResult.getInvalidUserList());
     System.out.println(messageSendResult.getInvalidTagList());
-
   }
 }
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java
index f97c0c79b0..e02cc6672d 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpMessageTest.java
@@ -1,6 +1,5 @@
 package me.chanjar.weixin.cp.bean;
 
-import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.cp.bean.article.MpnewsArticle;
 import me.chanjar.weixin.cp.bean.article.NewArticle;
 import org.testng.annotations.*;
@@ -10,82 +9,32 @@
 @Test
 public class WxCpMessageTest {
 
-  public void testTextReply() {
-    WxCpMessage reply = new WxCpMessage();
-    reply.setToUser("OPENID");
-    reply.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
-    reply.setContent("sfsfdsdf");
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"text\",\"text\":{\"content\":\"sfsfdsdf\"}}");
-  }
-
   public void testTextBuild() {
     WxCpMessage reply = WxCpMessage.TEXT().toUser("OPENID").content("sfsfdsdf").build();
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"text\",\"text\":{\"content\":\"sfsfdsdf\"}}");
+    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"text\",\"text\":{\"content\":\"sfsfdsdf\"},\"safe\":\"0\"}");
   }
 
-  public void testImageReply() {
-    WxCpMessage reply = new WxCpMessage();
-    reply.setToUser("OPENID");
-    reply.setMsgType(WxConsts.CUSTOM_MSG_IMAGE);
-    reply.setMediaId("MEDIA_ID");
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"image\",\"image\":{\"media_id\":\"MEDIA_ID\"}}");
+  public void testTextCardBuild() {
+    WxCpMessage reply = WxCpMessage.TEXTCARD().toUser("OPENID")
+      .title("领奖通知")
+      .description( "<div class=\"gray\">2016年9月26日</div> <div class=\"normal\">恭喜你抽中iPhone 7一台，领奖码：xxxx</div><div class=\"highlight\">请于2016年10月10日前联系行政同事领取</div>")
+      .url("http://www.qq.com").build();
+    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"textcard\",\"textcard\":{\"title\":\"领奖通知\",\"description\":\"<div class=\\\"gray\\\">2016年9月26日</div> <div class=\\\"normal\\\">恭喜你抽中iPhone 7一台，领奖码：xxxx</div><div class=\\\"highlight\\\">请于2016年10月10日前联系行政同事领取</div>\",\"url\":\"http://www.qq.com\"},\"safe\":\"0\"}");
   }
 
   public void testImageBuild() {
     WxCpMessage reply = WxCpMessage.IMAGE().toUser("OPENID").mediaId("MEDIA_ID").build();
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"image\",\"image\":{\"media_id\":\"MEDIA_ID\"}}");
-  }
-
-  public void testVoiceReply() {
-    WxCpMessage reply = new WxCpMessage();
-    reply.setToUser("OPENID");
-    reply.setMsgType(WxConsts.CUSTOM_MSG_VOICE);
-    reply.setMediaId("MEDIA_ID");
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"voice\",\"voice\":{\"media_id\":\"MEDIA_ID\"}}");
+    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"image\",\"image\":{\"media_id\":\"MEDIA_ID\"},\"safe\":\"0\"}");
   }
 
   public void testVoiceBuild() {
     WxCpMessage reply = WxCpMessage.VOICE().toUser("OPENID").mediaId("MEDIA_ID").build();
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"voice\",\"voice\":{\"media_id\":\"MEDIA_ID\"}}");
-  }
-
-  public void testVideoReply() {
-    WxCpMessage reply = new WxCpMessage();
-    reply.setToUser("OPENID");
-    reply.setMsgType(WxConsts.CUSTOM_MSG_VIDEO);
-    reply.setMediaId("MEDIA_ID");
-    reply.setThumbMediaId("MEDIA_ID");
-    reply.setTitle("TITLE");
-    reply.setDescription("DESCRIPTION");
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"video\",\"video\":{\"media_id\":\"MEDIA_ID\",\"thumb_media_id\":\"MEDIA_ID\",\"title\":\"TITLE\",\"description\":\"DESCRIPTION\"}}");
+    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"voice\",\"voice\":{\"media_id\":\"MEDIA_ID\"},\"safe\":\"0\"}");
   }
 
   public void testVideoBuild() {
     WxCpMessage reply = WxCpMessage.VIDEO().toUser("OPENID").title("TITLE").mediaId("MEDIA_ID").thumbMediaId("MEDIA_ID").description("DESCRIPTION").build();
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"video\",\"video\":{\"media_id\":\"MEDIA_ID\",\"thumb_media_id\":\"MEDIA_ID\",\"title\":\"TITLE\",\"description\":\"DESCRIPTION\"}}");
-  }
-
-  public void testNewsReply() {
-    WxCpMessage reply = new WxCpMessage();
-    reply.setToUser("OPENID");
-    reply.setMsgType(WxConsts.CUSTOM_MSG_NEWS);
-
-    NewArticle article1 = new NewArticle();
-    article1.setUrl("URL");
-    article1.setPicUrl("PIC_URL");
-    article1.setDescription("Is Really A Happy Day");
-    article1.setTitle("Happy Day");
-    reply.getArticles().add(article1);
-
-    NewArticle article2 = new NewArticle();
-    article2.setUrl("URL");
-    article2.setPicUrl("PIC_URL");
-    article2.setDescription("Is Really A Happy Day");
-    article2.setTitle("Happy Day");
-    reply.getArticles().add(article2);
-
-
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"news\":{\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}}");
+    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"video\",\"safe\":\"0\",\"video\":{\"media_id\":\"MEDIA_ID\",\"thumb_media_id\":\"MEDIA_ID\",\"title\":\"TITLE\",\"description\":\"DESCRIPTION\"}}");
   }
 
   public void testNewsBuild() {
@@ -103,7 +52,7 @@ public void testNewsBuild() {
 
     WxCpMessage reply = WxCpMessage.NEWS().toUser("OPENID").addArticle(article1).addArticle(article2).build();
 
-    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"news\":{\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}}");
+    assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"news\",\"safe\":\"0\",\"news\":{\"articles\":[{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"},{\"title\":\"Happy Day\",\"description\":\"Is Really A Happy Day\",\"url\":\"URL\",\"picurl\":\"PIC_URL\"}]}}");
   }
 
   public void testMpnewsBuild_with_articles() {
@@ -136,7 +85,7 @@ public void testMpnewsBuild_with_media_id() {
     WxCpMessage reply = WxCpMessage.MPNEWS().toUser("OPENID").mediaId("mmm").build();
 
     assertEquals(reply.toJson(),
-      "{\"touser\":\"OPENID\",\"msgtype\":\"mpnews\",\"mpnews\":{\"media_id\":\"mmm\"}}");
+      "{\"touser\":\"OPENID\",\"msgtype\":\"mpnews\",\"safe\":\"0\",\"mpnews\":{\"media_id\":\"mmm\"}}");
   }
 
 }

From 75916277a124f9c0f80ff857142ac506c661285e Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 2 Jul 2017 17:17:35 +0800
Subject: [PATCH 17/85] =?UTF-8?q?#195=20=E6=8A=BD=E5=8F=96=E7=B4=A0?=
 =?UTF-8?q?=E6=9D=90=E7=AE=A1=E7=90=86=E8=AF=B7=E6=B1=82URL=E5=88=B0?=
 =?UTF-8?q?=E5=B8=B8=E9=87=8F=E7=B1=BB=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/api/WxMpMaterialService.java    | 14 +++++-
 .../mp/api/impl/WxMpMaterialServiceImpl.java  | 45 +++++++------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java
index 8e769d3e2d..05ca87eab7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMaterialService.java
@@ -16,6 +16,16 @@
  * </pre>
  */
 public interface WxMpMaterialService {
+  String MEDIA_GET_URL = "https://api.weixin.qq.com/cgi-bin/media/get";
+  String MEDIA_UPLOAD_URL = "https://api.weixin.qq.com/cgi-bin/media/upload?type=%s";
+  String IMG_UPLOAD_URL = "https://api.weixin.qq.com/cgi-bin/media/uploadimg";
+  String MATERIAL_ADD_URL = "https://api.weixin.qq.com/cgi-bin/material/add_material?type=%s";
+  String NEWS_ADD_URL = "https://api.weixin.qq.com/cgi-bin/material/add_news";
+  String MATERIAL_GET_URL = "https://api.weixin.qq.com/cgi-bin/material/get_material";
+  String NEWS_UPDATE_URL = "https://api.weixin.qq.com/cgi-bin/material/update_news";
+  String MATERIAL_DEL_URL = "https://api.weixin.qq.com/cgi-bin/material/del_material";
+  String MATERIAL_GET_COUNT_URL = "https://api.weixin.qq.com/cgi-bin/material/get_materialcount";
+  String MATERIAL_BATCHGET_URL = "https://api.weixin.qq.com/cgi-bin/material/batchget_material";
 
   /**
    * <pre>
@@ -73,11 +83,11 @@ public interface WxMpMaterialService {
    * 接口url格式：https://api.weixin.qq.com/cgi-bin/media/get?access_token=ACCESS_TOKEN&media_id=MEDIA_ID
    * </pre>
    *
-   * @param media_id
+   * @param mediaId 媒体文件Id
    * @return 保存到本地的临时文件
    * @throws WxErrorException
    */
-  File mediaDownload(String media_id) throws WxErrorException;
+  File mediaDownload(String mediaId) throws WxErrorException;
 
   /**
    * <pre>
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java
index bb5857be83..99a63f914b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java
@@ -25,8 +25,7 @@
  * Created by Binary Wang on 2016/7/21.
  */
 public class WxMpMaterialServiceImpl implements WxMpMaterialService {
-  private static final String MEDIA_API_URL_PREFIX = "https://api.weixin.qq.com/cgi-bin/media";
-  private static final String MATERIAL_API_URL_PREFIX = "https://api.weixin.qq.com/cgi-bin/material";
+
   private WxMpService wxMpService;
 
   public WxMpMaterialServiceImpl(WxMpService wxMpService) {
@@ -45,28 +44,26 @@ public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputS
 
   @Override
   public WxMediaUploadResult mediaUpload(String mediaType, File file) throws WxErrorException {
-    String url = MEDIA_API_URL_PREFIX + "/upload?type=" + mediaType;
+    String url = String.format(MEDIA_UPLOAD_URL, mediaType);
     return this.wxMpService.execute(MediaUploadRequestExecutor.create(this.wxMpService.getRequestHttp()), url, file);
   }
 
   @Override
-  public File mediaDownload(String media_id) throws WxErrorException {
-    String url = MEDIA_API_URL_PREFIX + "/get";
+  public File mediaDownload(String mediaId) throws WxErrorException {
     return this.wxMpService.execute(
       MediaDownloadRequestExecutor.create(this.wxMpService.getRequestHttp(), this.wxMpService.getWxMpConfigStorage().getTmpDirFile()),
-      url,
-      "media_id=" + media_id);
+      MEDIA_GET_URL,
+      "media_id=" + mediaId);
   }
 
   @Override
   public WxMediaImgUploadResult mediaImgUpload(File file) throws WxErrorException {
-    String url = MEDIA_API_URL_PREFIX + "/uploadimg";
-    return this.wxMpService.execute(MediaImgUploadRequestExecutor.create(this.wxMpService.getRequestHttp()), url, file);
+    return this.wxMpService.execute(MediaImgUploadRequestExecutor.create(this.wxMpService.getRequestHttp()), IMG_UPLOAD_URL, file);
   }
 
   @Override
   public WxMpMaterialUploadResult materialFileUpload(String mediaType, WxMpMaterial material) throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/add_material?type=" + mediaType;
+    String url = String.format(MATERIAL_ADD_URL, mediaType);
     return this.wxMpService.execute(MaterialUploadRequestExecutor.create(this.wxMpService.getRequestHttp()), url, material);
   }
 
@@ -75,33 +72,29 @@ public WxMpMaterialUploadResult materialNewsUpload(WxMpMaterialNews news) throws
     if (news == null || news.isEmpty()) {
       throw new IllegalArgumentException("news is empty!");
     }
-    String url = MATERIAL_API_URL_PREFIX + "/add_news";
-    String responseContent = this.wxMpService.post(url, news.toJson());
+    String responseContent = this.wxMpService.post(NEWS_ADD_URL, news.toJson());
     return WxMpMaterialUploadResult.fromJson(responseContent);
   }
 
   @Override
   public InputStream materialImageOrVoiceDownload(String media_id) throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/get_material";
-    return this.wxMpService.execute(MaterialVoiceAndImageDownloadRequestExecutor.create(this.wxMpService.getRequestHttp(), this.wxMpService.getWxMpConfigStorage().getTmpDirFile()), url, media_id);
+    return this.wxMpService.execute(MaterialVoiceAndImageDownloadRequestExecutor
+      .create(this.wxMpService.getRequestHttp(), this.wxMpService.getWxMpConfigStorage().getTmpDirFile()), MATERIAL_GET_URL, media_id);
   }
 
   @Override
   public WxMpMaterialVideoInfoResult materialVideoInfo(String media_id) throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/get_material";
-    return this.wxMpService.execute(MaterialVideoInfoRequestExecutor.create(this.wxMpService.getRequestHttp()), url, media_id);
+    return this.wxMpService.execute(MaterialVideoInfoRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_GET_URL, media_id);
   }
 
   @Override
   public WxMpMaterialNews materialNewsInfo(String media_id) throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/get_material";
-    return this.wxMpService.execute(MaterialNewsInfoRequestExecutor.create(this.wxMpService.getRequestHttp()), url, media_id);
+    return this.wxMpService.execute(MaterialNewsInfoRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_GET_URL, media_id);
   }
 
   @Override
   public boolean materialNewsUpdate(WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate) throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/update_news";
-    String responseText = this.wxMpService.post(url, wxMpMaterialArticleUpdate.toJson());
+    String responseText = this.wxMpService.post(NEWS_UPDATE_URL, wxMpMaterialArticleUpdate.toJson());
     WxError wxError = WxError.fromJson(responseText);
     if (wxError.getErrorCode() == 0) {
       return true;
@@ -112,14 +105,12 @@ public boolean materialNewsUpdate(WxMpMaterialArticleUpdate wxMpMaterialArticleU
 
   @Override
   public boolean materialDelete(String media_id) throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/del_material";
-    return this.wxMpService.execute(MaterialDeleteRequestExecutor.create(this.wxMpService.getRequestHttp()), url, media_id);
+    return this.wxMpService.execute(MaterialDeleteRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_DEL_URL, media_id);
   }
 
   @Override
   public WxMpMaterialCountResult materialCount() throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/get_materialcount";
-    String responseText = this.wxMpService.get(url, null);
+    String responseText = this.wxMpService.get(MATERIAL_GET_COUNT_URL, null);
     WxError wxError = WxError.fromJson(responseText);
     if (wxError.getErrorCode() == 0) {
       return WxMpGsonBuilder.create().fromJson(responseText, WxMpMaterialCountResult.class);
@@ -130,12 +121,11 @@ public WxMpMaterialCountResult materialCount() throws WxErrorException {
 
   @Override
   public WxMpMaterialNewsBatchGetResult materialNewsBatchGet(int offset, int count) throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/batchget_material";
     Map<String, Object> params = new HashMap<>();
     params.put("type", WxConsts.MATERIAL_NEWS);
     params.put("offset", offset);
     params.put("count", count);
-    String responseText = this.wxMpService.post(url, WxGsonBuilder.create().toJson(params));
+    String responseText = this.wxMpService.post(MATERIAL_BATCHGET_URL, WxGsonBuilder.create().toJson(params));
     WxError wxError = WxError.fromJson(responseText);
     if (wxError.getErrorCode() == 0) {
       return WxMpGsonBuilder.create().fromJson(responseText, WxMpMaterialNewsBatchGetResult.class);
@@ -146,12 +136,11 @@ public WxMpMaterialNewsBatchGetResult materialNewsBatchGet(int offset, int count
 
   @Override
   public WxMpMaterialFileBatchGetResult materialFileBatchGet(String type, int offset, int count) throws WxErrorException {
-    String url = MATERIAL_API_URL_PREFIX + "/batchget_material";
     Map<String, Object> params = new HashMap<>();
     params.put("type", type);
     params.put("offset", offset);
     params.put("count", count);
-    String responseText = this.wxMpService.post(url, WxGsonBuilder.create().toJson(params));
+    String responseText = this.wxMpService.post(MATERIAL_BATCHGET_URL, WxGsonBuilder.create().toJson(params));
     WxError wxError = WxError.fromJson(responseText);
     if (wxError.getErrorCode() == 0) {
       return WxMpGsonBuilder.create().fromJson(responseText, WxMpMaterialFileBatchGetResult.class);

From 256284af6e4dbd3788c26a020b7c6f4ee083121f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 2 Jul 2017 18:23:21 +0800
Subject: [PATCH 18/85] =?UTF-8?q?#252=20=E5=8E=9F=E6=9C=89=E5=9B=BE?=
 =?UTF-8?q?=E6=96=87=E7=B4=A0=E6=9D=90=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=95=99=E8=A8=80=E7=AE=A1=E7=90=86=E6=89=80?=
 =?UTF-8?q?=E9=9C=80=E4=B8=A4=E4=B8=AA=E5=8F=82=E6=95=B0=EF=BC=9Aneed=5Fop?=
 =?UTF-8?q?en=5Fcomment=20=E5=92=8C=20only=5Ffans=5Fcan=5Fcomment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/api/impl/WxMpMaterialServiceImpl.java  | 16 +++---
 .../mp/bean/material/WxMpMaterialNews.java    | 52 ++++++++++++++++++-
 .../material/WxMpMaterialUploadResult.java    | 25 +++++++--
 ...lVoiceAndImageDownloadRequestExecutor.java |  2 -
 ...ApacheMaterialNewsInfoRequestExecutor.java |  5 ++
 ...lVoiceAndImageDownloadRequestExecutor.java |  5 +-
 .../JoddMaterialNewsInfoRequestExecutor.java  |  4 ++
 ...lVoiceAndImageDownloadRequestExecutor.java |  3 +-
 ...OkhttpMaterialNewsInfoRequestExecutor.java |  4 ++
 ...lVoiceAndImageDownloadRequestExecutor.java |  3 +-
 .../WxMpMaterialNewsArticleGsonAdapter.java   | 21 ++++++++
 .../json/WxMpMaterialNewsGsonAdapter.java     | 13 +++++
 .../api/impl/WxMpMaterialServiceImplTest.java |  5 +-
 13 files changed, 137 insertions(+), 21 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java
index 99a63f914b..90594fe031 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImpl.java
@@ -77,19 +77,19 @@ public WxMpMaterialUploadResult materialNewsUpload(WxMpMaterialNews news) throws
   }
 
   @Override
-  public InputStream materialImageOrVoiceDownload(String media_id) throws WxErrorException {
+  public InputStream materialImageOrVoiceDownload(String mediaId) throws WxErrorException {
     return this.wxMpService.execute(MaterialVoiceAndImageDownloadRequestExecutor
-      .create(this.wxMpService.getRequestHttp(), this.wxMpService.getWxMpConfigStorage().getTmpDirFile()), MATERIAL_GET_URL, media_id);
+      .create(this.wxMpService.getRequestHttp(), this.wxMpService.getWxMpConfigStorage().getTmpDirFile()), MATERIAL_GET_URL, mediaId);
   }
 
   @Override
-  public WxMpMaterialVideoInfoResult materialVideoInfo(String media_id) throws WxErrorException {
-    return this.wxMpService.execute(MaterialVideoInfoRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_GET_URL, media_id);
+  public WxMpMaterialVideoInfoResult materialVideoInfo(String mediaId) throws WxErrorException {
+    return this.wxMpService.execute(MaterialVideoInfoRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_GET_URL, mediaId);
   }
 
   @Override
-  public WxMpMaterialNews materialNewsInfo(String media_id) throws WxErrorException {
-    return this.wxMpService.execute(MaterialNewsInfoRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_GET_URL, media_id);
+  public WxMpMaterialNews materialNewsInfo(String mediaId) throws WxErrorException {
+    return this.wxMpService.execute(MaterialNewsInfoRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_GET_URL, mediaId);
   }
 
   @Override
@@ -104,8 +104,8 @@ public boolean materialNewsUpdate(WxMpMaterialArticleUpdate wxMpMaterialArticleU
   }
 
   @Override
-  public boolean materialDelete(String media_id) throws WxErrorException {
-    return this.wxMpService.execute(MaterialDeleteRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_DEL_URL, media_id);
+  public boolean materialDelete(String mediaId) throws WxErrorException {
+    return this.wxMpService.execute(MaterialDeleteRequestExecutor.create(this.wxMpService.getRequestHttp()), MATERIAL_DEL_URL, mediaId);
   }
 
   @Override
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNews.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNews.java
index a107facaed..51f2d0c6bd 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNews.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialNews.java
@@ -4,12 +4,16 @@
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.ArrayList;
 import java.util.List;
 
 public class WxMpMaterialNews implements Serializable {
   private static final long serialVersionUID = -3283203652013494976L;
 
+  private Date createdTime;
+  private Date updatedTime;
+
   private List<WxMpMaterialNewsArticle> articles = new ArrayList<>();
 
   public List<WxMpMaterialNewsArticle> getArticles() {
@@ -28,9 +32,25 @@ public boolean isEmpty() {
     return this.articles == null || this.articles.isEmpty();
   }
 
+  public Date getCreatedTime() {
+    return this.createdTime;
+  }
+
+  public void setCreatedTime(Date createdTime) {
+    this.createdTime = createdTime;
+  }
+
+  public Date getUpdatedTime() {
+    return this.updatedTime;
+  }
+
+  public void setUpdatedTime(Date updatedTime) {
+    this.updatedTime = updatedTime;
+  }
+
   @Override
   public String toString() {
-    return ToStringUtils.toSimpleString(this);
+    return this.toJson();
   }
 
   /**
@@ -44,6 +64,8 @@ public String toString() {
    * 6. digest          图文消息的描述
    * 7. showCoverPic  是否显示封面，true为显示，false为不显示
    * 8. url           点击图文消息跳转链接
+   * 9. need_open_comment（新增字段）	否	Uint32	是否打开评论，0不打开，1打开
+   * 10. only_fans_can_comment（新增字段）	否	Uint32	是否粉丝才可评论，0所有人可评论，1粉丝才可评论
    * </pre>
    *
    * @author chanjarster
@@ -87,6 +109,18 @@ public static class WxMpMaterialNewsArticle {
      */
     private String url;
 
+    /**
+     * need_open_comment
+     * 是否打开评论，0不打开，1打开
+     */
+    private Boolean needOpenComment;
+
+    /**
+     * only_fans_can_comment
+     * 是否粉丝才可评论，0所有人可评论，1粉丝才可评论
+     */
+    private Boolean onlyFansCanComment;
+
     public String getThumbMediaId() {
       return this.thumbMediaId;
     }
@@ -159,6 +193,22 @@ public void setThumbUrl(String thumbUrl) {
       this.thumbUrl = thumbUrl;
     }
 
+    public Boolean getNeedOpenComment() {
+      return this.needOpenComment;
+    }
+
+    public void setNeedOpenComment(Boolean needOpenComment) {
+      this.needOpenComment = needOpenComment;
+    }
+
+    public Boolean getOnlyFansCanComment() {
+      return this.onlyFansCanComment;
+    }
+
+    public void setOnlyFansCanComment(Boolean onlyFansCanComment) {
+      this.onlyFansCanComment = onlyFansCanComment;
+    }
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialUploadResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialUploadResult.java
index ec1d115496..0e5546b9aa 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialUploadResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialUploadResult.java
@@ -1,17 +1,16 @@
 package me.chanjar.weixin.mp.bean.material;
 
+import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
 
 public class WxMpMaterialUploadResult implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = -128818731449449537L;
   private String mediaId;
   private String url;
+  private Integer errCode;
+  private String errMsg;
 
   public static WxMpMaterialUploadResult fromJson(String json) {
     return WxMpGsonBuilder.create().fromJson(json, WxMpMaterialUploadResult.class);
@@ -33,9 +32,25 @@ public void setUrl(String url) {
     this.url = url;
   }
 
+  public Integer getErrCode() {
+    return this.errCode;
+  }
+
+  public void setErrCode(Integer errCode) {
+    this.errCode = errCode;
+  }
+
+  public String getErrMsg() {
+    return this.errMsg;
+  }
+
+  public void setErrMsg(String errMsg) {
+    this.errMsg = errMsg;
+  }
+
   @Override
   public String toString() {
-    return "WxMpMaterialUploadResult [media_id=" + this.mediaId + ", url=" + this.url + "]";
+    return ToStringUtils.toSimpleString(this);
   }
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java
index 8bf55d03e0..09cb70d0f5 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialVoiceAndImageDownloadRequestExecutor.java
@@ -13,13 +13,11 @@ public abstract class MaterialVoiceAndImageDownloadRequestExecutor<H, P> impleme
   protected RequestHttp<H, P> requestHttp;
   protected File tmpDirFile;
 
-
   public MaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
     this.requestHttp = requestHttp;
     this.tmpDirFile = tmpDirFile;
   }
 
-
   public static RequestExecutor<InputStream, String> create(RequestHttp requestHttp, File tmpDirFile) {
     switch (requestHttp.getRequestType()) {
       case APACHE_HTTP:
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java
index 77d22659ec..5298160f35 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialNewsInfoRequestExecutor.java
@@ -14,6 +14,8 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -23,6 +25,8 @@
  * Created by ecoolper on 2017/5/5.
  */
 public class ApacheMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<CloseableHttpClient, HttpHost> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
   public ApacheMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
@@ -40,6 +44,7 @@ public WxMpMaterialNews execute(String uri, String materialId) throws WxErrorExc
     httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params)));
     try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
       String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
+      this.logger.debug("响应原始数据：{}", responseContent);
       WxError error = WxError.fromJson(responseContent);
       if (error.getErrorCode() != 0) {
         throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java
index 87d7b545c6..b1011a5282 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialVoiceAndImageDownloadRequestExecutor.java
@@ -18,6 +18,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -41,10 +42,10 @@ public InputStream execute(String uri, String materialId) throws WxErrorExceptio
     params.put("media_id", materialId);
     httpPost.setEntity(new StringEntity(WxGsonBuilder.create().toJson(params)));
     try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost);
-         InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);) {
+         InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response)) {
       // 下载媒体文件出错
       byte[] responseContent = IOUtils.toByteArray(inputStream);
-      String responseContentString = new String(responseContent, "UTF-8");
+      String responseContentString = new String(responseContent, StandardCharsets.UTF_8);
       if (responseContentString.length() < 100) {
         try {
           WxError wxError = WxGsonBuilder.create().fromJson(responseContentString, WxError.class);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java
index a5d5ad1fd3..181a640787 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialNewsInfoRequestExecutor.java
@@ -12,6 +12,8 @@
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
 import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
@@ -19,6 +21,7 @@
  * Created by ecoolper on 2017/5/5.
  */
 public class JoddMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<HttpConnectionProvider, ProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
   public JoddMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
@@ -36,6 +39,7 @@ public WxMpMaterialNews execute(String uri, String materialId) throws WxErrorExc
     response.charset(StringPool.UTF_8);
 
     String responseContent = response.bodyText();
+    this.logger.debug("响应原始数据：{}", responseContent);
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
       throw new WxErrorException(error);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java
index a6317d5a00..ca43a1455d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/jodd/JoddMaterialVoiceAndImageDownloadRequestExecutor.java
@@ -17,6 +17,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Created by ecoolper on 2017/5/5.
@@ -40,7 +41,7 @@ public InputStream execute(String uri, String materialId) throws WxErrorExceptio
     try (InputStream inputStream = new ByteArrayInputStream(response.bodyBytes())) {
       // 下载媒体文件出错
       byte[] responseContent = IOUtils.toByteArray(inputStream);
-      String responseContentString = new String(responseContent, "UTF-8");
+      String responseContentString = new String(responseContent, StandardCharsets.UTF_8);
       if (responseContentString.length() < 100) {
         try {
           WxError wxError = WxGsonBuilder.create().fromJson(responseContentString, WxError.class);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java
index d51fbbe481..a0a1c05231 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java
@@ -8,6 +8,8 @@
 import me.chanjar.weixin.mp.util.http.MaterialNewsInfoRequestExecutor;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
@@ -15,6 +17,7 @@
  * Created by ecoolper on 2017/5/5.
  */
 public class OkhttpMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
   public OkhttpMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
@@ -44,6 +47,7 @@ public Request authenticate(Route route, Response response) throws IOException {
 
     Response response = client.newCall(request).execute();
     String responseContent = response.body().string();
+    this.logger.debug("响应原始数据：{}", responseContent);
 
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java
index 336b3a989e..1d0a5f7f65 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java
@@ -13,6 +13,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 /**
  * Created by ecoolper on 2017/5/5.
@@ -50,7 +51,7 @@ public Request authenticate(Route route, Response response) throws IOException {
 
       // 下载媒体文件出错
       byte[] responseContent = IOUtils.toByteArray(inputStream);
-      String responseContentString = new String(responseContent, "UTF-8");
+      String responseContentString = new String(responseContent, StandardCharsets.UTF_8);
       if (responseContentString.length() < 100) {
         try {
           WxError wxError = WxGsonBuilder.create().fromJson(responseContentString, WxError.class);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
index a74877f126..5a17a7bdb8 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
@@ -11,6 +11,7 @@
 import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
+import org.apache.commons.lang3.BooleanUtils;
 
 import java.lang.reflect.Type;
 
@@ -37,6 +38,16 @@ public JsonElement serialize(WxMpMaterialNews.WxMpMaterialNewsArticle article, T
     if (null != article.getUrl()) {
       articleJson.addProperty("url", article.getUrl());
     }
+
+    if (null != article.getNeedOpenComment()) {
+      articleJson.addProperty("need_open_comment",
+        BooleanUtils.toInteger(article.getNeedOpenComment(), 1, 0));
+    }
+
+    if (null != article.getOnlyFansCanComment()) {
+      articleJson.addProperty("only_fans_can_comment",
+        BooleanUtils.toInteger(article.getOnlyFansCanComment(), 1, 0));
+    }
     return articleJson;
   }
 
@@ -81,6 +92,16 @@ public WxMpMaterialNews.WxMpMaterialNewsArticle deserialize(JsonElement jsonElem
     if (url != null && !url.isJsonNull()) {
       article.setUrl(GsonHelper.getAsString(url));
     }
+
+    JsonElement needOpenComment = articleInfo.get("need_open_comment");
+    if (needOpenComment != null && !needOpenComment.isJsonNull()) {
+      article.setNeedOpenComment(GsonHelper.getAsBoolean(needOpenComment));
+    }
+
+    JsonElement onlyFansCanComment = articleInfo.get("only_fans_can_comment");
+    if (onlyFansCanComment != null && !onlyFansCanComment.isJsonNull()) {
+      article.setOnlyFansCanComment(GsonHelper.getAsBoolean(onlyFansCanComment));
+    }
     return article;
   }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
index 8da6dacdc4..a77a209814 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
@@ -9,9 +9,11 @@
 package me.chanjar.weixin.mp.util.json;
 
 import com.google.gson.*;
+import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
 
 import java.lang.reflect.Type;
+import java.util.Date;
 
 public class WxMpMaterialNewsGsonAdapter implements JsonSerializer<WxMpMaterialNews>, JsonDeserializer<WxMpMaterialNews> {
 
@@ -41,6 +43,17 @@ public WxMpMaterialNews deserialize(JsonElement jsonElement, Type type, JsonDese
         wxMpMaterialNews.addArticle(article);
       }
     }
+
+    if (json.get("create_time") != null && !json.get("create_time").isJsonNull()) {
+      Date createTime = new Date(GsonHelper.getAsLong(json.get("create_time")));
+      wxMpMaterialNews.setCreatedTime(createTime);
+    }
+
+    if (json.get("update_time") != null && !json.get("update_time").isJsonNull()) {
+      Date updateTime = new Date(GsonHelper.getAsLong(json.get("update_time")));
+      wxMpMaterialNews.setUpdatedTime(updateTime);
+    }
+
     return wxMpMaterialNews;
   }
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java
index b175114af1..309c4e0e47 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMaterialServiceImplTest.java
@@ -175,7 +175,7 @@ public void testDownloadMaterial(String mediaId) throws WxErrorException, IOExce
     }
   }
 
-  @Test(dependsOnMethods = {"testAddNews"})
+  @Test(dependsOnMethods = {"testAddNews","testUploadMaterial"})
   public void testGetNewsInfo() throws WxErrorException {
     WxMpMaterialNews wxMpMaterialNewsSingle = this.wxService
       .getMaterialService().materialNewsInfo(this.singleNewsMediaId);
@@ -183,6 +183,9 @@ public void testGetNewsInfo() throws WxErrorException {
       .getMaterialService().materialNewsInfo(this.multiNewsMediaId);
     assertNotNull(wxMpMaterialNewsSingle);
     assertNotNull(wxMpMaterialNewsMultiple);
+
+    System.out.println(wxMpMaterialNewsSingle);
+    System.out.println(wxMpMaterialNewsMultiple);
   }
 
   @Test(dependsOnMethods = {"testGetNewsInfo"})

From e906edd37eeea0a5094507e2933301c70d3e72e9 Mon Sep 17 00:00:00 2001
From: Jink2005 <jink2005@163.com>
Date: Mon, 3 Jul 2017 10:37:47 +0800
Subject: [PATCH 19/85] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83sign=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84bug=20(#266)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/result/WxPayOrderNotifyResult.java   | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java
index 723702a455..bfeb98f0b4 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java
@@ -89,6 +89,24 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializa
   @XStreamAlias("bank_type")
   private String bankType;
 
+  /**
+   * <pre>
+   *     用户是否关注子公众账号
+   *     String(1)
+   *     Y-关注，N-未关注，仅在公众账号类型支付有效
+   * </pre>
+   */
+  @XStreamAlias("sub_is_subscribe")
+  private String subIsSubscribe;
+
+  /**
+   * <pre>
+   *     用户在子商户appid下的唯一标识
+   *     String(128)
+   * </pre>
+   */
+  @XStreamAlias("sub_openid")
+  private String subOpenId;
 
   /**
    * <pre>
@@ -293,6 +311,22 @@ public void setBankType(String bankType) {
     this.bankType = bankType;
   }
 
+  public String getSubIsSubscribe() {
+    return subIsSubscribe;
+  }
+
+  public void setSubIsSubscribe(String subIsSubscribe) {
+    this.subIsSubscribe = subIsSubscribe;
+  }
+
+  public String getSubOpenId() {
+    return subOpenId;
+  }
+
+  public void setSubOpenId(String subOpenId) {
+    this.subOpenId = subOpenId;
+  }
+
   public Integer getTotalFee() {
     return totalFee;
   }

From 92afa77dce6fdb3473da0c5cc8402ce059ac1d8d Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 3 Jul 2017 15:48:17 +0800
Subject: [PATCH 20/85] =?UTF-8?q?=E4=BC=98=E5=8C=96javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/result/WxPayOrderNotifyResult.java   | 260 +++++++++---------
 1 file changed, 134 insertions(+), 126 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java
index bfeb98f0b4..a411cd2c70 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java
@@ -25,12 +25,12 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializa
 
   /**
    * <pre>
-   * 设备号
-   * device_info
-   * 否
-   * String(32)
-   * 013467007045764
-   * 微信支付分配的终端设备号，
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 类型：String(32)
+   * 示例值：013467007045764
+   * 描述：微信支付分配的终端设备号，
    * </pre>
    */
   @XStreamAlias("device_info")
@@ -38,12 +38,12 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializa
 
   /**
    * <pre>
-   * 用户标识
-   * openid
-   * 是
-   * String(128)
-   * wxd930ea5d5a258f4f
-   * 用户在商户appid下的唯一标识
+   * 字段名：用户标识
+   * 变量名：openid
+   * 是否必填：是
+   * 类型：String(128)
+   * 示例值：wxd930ea5d5a258f4f
+   * 描述：用户在商户appid下的唯一标识
    * </pre>
    */
   @XStreamAlias("openid")
@@ -51,131 +51,139 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializa
 
   /**
    * <pre>
-   * 是否关注公众账号
-   * is_subscribe
-   * 否
-   * String(1)
-   * Y
-   * 用户是否关注公众账号，Y-关注，N-未关注，仅在公众账号类型支付有效
+   * 字段名：是否关注公众账号
+   * 变量名：is_subscribe
+   * 是否必填：否
+   * 类型：String(1)
+   * 示例值：Y
+   * 描述：用户是否关注公众账号，Y-关注，N-未关注，仅在公众账号类型支付有效
    * </pre>
    */
   @XStreamAlias("is_subscribe")
   private String isSubscribe;
 
-
   /**
    * <pre>
-   * 交易类型
-   * trade_type
-   * 是
-   * String(16)
-   * JSAPI	JSAPI、NATIVE、APP
+   * 字段名：用户子标识
+   * 变量名：sub_openid
+   * 是否必填：是
+   * 类型：String(128)
+   * 示例值：wxd930ea5d5a258f4f
+   * 描述：用户在子商户appid下的唯一标识
    * </pre>
    */
-  @XStreamAlias("trade_type")
-  private String tradeType;
-
+  @XStreamAlias("sub_openid")
+  private String subOpenid;
 
   /**
    * <pre>
-   * 付款银行
-   * bank_type
-   * 是
-   * String(16)
-   * CMC
-   * 银行类型，采用字符串类型的银行标识，银行类型见银行列表
+   * 字段名：是否关注子公众账号
+   * 变量名：sub_is_subscribe
+   * 是否必填：否
+   * 类型：String(1)
+   * 示例值：Y
+   * 描述：用户是否关注子公众账号，Y-关注，N-未关注，仅在公众账号类型支付有效
    * </pre>
    */
-  @XStreamAlias("bank_type")
-  private String bankType;
+  @XStreamAlias("sub_is_subscribe")
+  private String subIsSubscribe;
+
 
   /**
    * <pre>
-   *     用户是否关注子公众账号
-   *     String(1)
-   *     Y-关注，N-未关注，仅在公众账号类型支付有效
+   * 字段名：交易类型
+   * 变量名：trade_type
+   * 是否必填：是
+   * 类型：String(16)
+   * 示例值：JSAPI
+   * JSA描述：PI、NATIVE、APP
    * </pre>
    */
-  @XStreamAlias("sub_is_subscribe")
-  private String subIsSubscribe;
+  @XStreamAlias("trade_type")
+  private String tradeType;
+
 
   /**
    * <pre>
-   *     用户在子商户appid下的唯一标识
-   *     String(128)
+   * 字段名：付款银行
+   * 变量名：bank_type
+   * 是否必填：是
+   * 类型：String(16)
+   * 示例值：CMC
+   * 描述：银行类型，采用字符串类型的银行标识，银行类型见银行列表
    * </pre>
    */
-  @XStreamAlias("sub_openid")
-  private String subOpenId;
+  @XStreamAlias("bank_type")
+  private String bankType;
 
   /**
    * <pre>
-   * 订单金额
-   * total_fee
-   * 是
-   * Int
-   * 100
-   * 订单总金额，单位为分
+   * 字段名：订单金额
+   * 变量名：total_fee
+   * 是否必填：是
+   * 类型：Int
+   * 示例值：100
+   * 描述：订单总金额，单位为分
    * </pre>
    */
   @XStreamAlias("total_fee")
   private Integer totalFee;
   /**
    * <pre>
-   * 应结订单金额
-   * settlement_total_fee
-   * 否
-   * Int
-   * 100
-   * 应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
+   * 字段名：应结订单金额
+   * 变量名：settlement_total_fee
+   * 是否必填：否
+   * 类型：Int
+   * 示例值：100
+   * 描述：应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
    * </pre>
    */
   @XStreamAlias("settlement_total_fee")
   private Integer settlementTotalFee;
   /**
    * <pre>
-   * 货币种类
-   * fee_type
-   * 否
-   * String(8)
-   * CNY
-   * 货币类型，符合ISO4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
+   * 字段名：货币种类
+   * 变量名：fee_type
+   * 是否必填：否
+   * 类型：String(8)
+   * 示例值：CNY
+   * 描述：货币类型，符合ISO4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
    * </pre>
    */
   @XStreamAlias("fee_type")
   private String feeType;
   /**
    * <pre>
-   * 现金支付金额
-   * cash_fee
-   * 是
-   * Int
-   * 100
-   * 现金支付金额订单现金支付金额，详见支付金额
+   * 字段名：现金支付金额
+   * 变量名：cash_fee
+   * 是否必填：是
+   * 类型：Int
+   * 示例值：100
+   * 描述：现金支付金额订单现金支付金额，详见支付金额
    * </pre>
    */
   @XStreamAlias("cash_fee")
   private Integer cashFee;
   /**
    * <pre>
-   * 现金支付货币类型
-   * cash_fee_type
-   * 否
-   * String(16)
-   * CNY
-   * 货币类型，符合ISO4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
+   * 字段名：现金支付货币类型
+   * 变量名：cash_fee_type
+   * 是否必填：否
+   * 类型：String(16)
+   * 示例值：CNY
+   * 描述：货币类型，符合ISO4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
    * </pre>
    */
   @XStreamAlias("cash_fee_type")
   private String cashFeeType;
   /**
    * <pre>
-   * 总代金券金额
-   * coupon_fee
-   * 否
-   * Int
-   * 10
-   * 代金券金额<=订单金额，订单金额-代金券金额=现金支付金额，详见支付金额
+   * 字段名：总代金券金额
+   * 变量名：coupon_fee
+   * 是否必填：否
+   * 类型：Int
+   * 示例值：10
+   * 描述：代金券金额<=订单金额，订单金额-代金券金额=现金支付金额，详见支付金额
    * </pre>
    */
   @XStreamAlias("coupon_fee")
@@ -183,12 +191,12 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializa
 
   /**
    * <pre>
-   * 代金券使用数量
-   * coupon_count
-   * 否
-   * Int
-   * 1
-   * 代金券使用数量
+   * 字段名：代金券使用数量
+   * 变量名：coupon_count
+   * 是否必填：否
+   * 类型：Int
+   * 示例值：1
+   * 描述：代金券使用数量
    * </pre>
    */
   @XStreamAlias("coupon_count")
@@ -198,12 +206,12 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializa
 
   /**
    * <pre>
-   * 微信支付订单号
-   * transaction_id
-   * 是
-   * String(32)
-   * 1217752501201407033233368018
-   * 微信支付订单号
+   * 字段名：微信支付订单号
+   * 变量名：transaction_id
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：1217752501201407033233368018
+   * 描述：微信支付订单号
    * </pre>
    */
   @XStreamAlias("transaction_id")
@@ -211,36 +219,36 @@ public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializa
 
   /**
    * <pre>
-   * 商户订单号
-   * out_trade_no
-   * 是
-   * String(32)
-   * 1212321211201407033568112322
-   * 商户系统的订单号，与请求一致。
+   * 字段名：商户订单号
+   * 变量名：out_trade_no
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：1212321211201407033568112322
+   * 描述：商户系统的订单号，与请求一致。
    * </pre>
    */
   @XStreamAlias("out_trade_no")
   private String outTradeNo;
   /**
    * <pre>
-   * 商家数据包
-   * attach
-   * 否
-   * String(128)
-   * 123456
-   * 商家数据包，原样返回
+   * 字段名：商家数据包
+   * 变量名：attach
+   * 是否必填：否
+   * 类型：String(128)
+   * 示例值：123456
+   * 描述：商家数据包，原样返回
    * </pre>
    */
   @XStreamAlias("attach")
   private String attach;
   /**
    * <pre>
-   * 支付完成时间
-   * time_end
-   * 是
-   * String(14)
-   * 20141030133525
-   * 支付完成时间，格式为yyyyMMddHHmmss，如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
+   * 字段名：支付完成时间
+   * 变量名：time_end
+   * 是否必填：是
+   * 类型：String(14)
+   * 示例值：20141030133525
+   * 描述：支付完成时间，格式为yyyyMMddHHmmss，如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
    * </pre>
    */
   @XStreamAlias("time_end")
@@ -311,22 +319,6 @@ public void setBankType(String bankType) {
     this.bankType = bankType;
   }
 
-  public String getSubIsSubscribe() {
-    return subIsSubscribe;
-  }
-
-  public void setSubIsSubscribe(String subIsSubscribe) {
-    this.subIsSubscribe = subIsSubscribe;
-  }
-
-  public String getSubOpenId() {
-    return subOpenId;
-  }
-
-  public void setSubOpenId(String subOpenId) {
-    this.subOpenId = subOpenId;
-  }
-
   public Integer getTotalFee() {
     return totalFee;
   }
@@ -407,6 +399,22 @@ public void setTimeEnd(String timeEnd) {
     this.timeEnd = timeEnd;
   }
 
+  public String getSubOpenid() {
+    return this.subOpenid;
+  }
+
+  public void setSubOpenid(String subOpenid) {
+    this.subOpenid = subOpenid;
+  }
+
+  public String getSubIsSubscribe() {
+    return this.subIsSubscribe;
+  }
+
+  public void setSubIsSubscribe(String subIsSubscribe) {
+    this.subIsSubscribe = subIsSubscribe;
+  }
+
   @Override
   public Map<String, String> toMap() {
     Map<String, String> resultMap = BeanUtils.xmlBean2Map(this);

From acf179d0f06472af2359b6bb8096752b6ea8a71f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 3 Jul 2017 15:49:18 +0800
Subject: [PATCH 21/85] fix time

---
 .../mp/util/json/WxMpMaterialNewsGsonAdapter.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
index a77a209814..084e355cbc 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsGsonAdapter.java
@@ -13,6 +13,7 @@
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
 
 import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 public class WxMpMaterialNewsGsonAdapter implements JsonSerializer<WxMpMaterialNews>, JsonDeserializer<WxMpMaterialNews> {
@@ -28,6 +29,16 @@ public JsonElement serialize(WxMpMaterialNews wxMpMaterialNews, Type typeOfSrc,
     }
     newsJson.add("articles", articleJsonArray);
 
+    if (wxMpMaterialNews.getCreatedTime() != null) {
+      newsJson.addProperty("create_time",
+        SimpleDateFormat.getDateTimeInstance().format(wxMpMaterialNews.getCreatedTime()));
+    }
+
+    if (wxMpMaterialNews.getUpdatedTime() != null) {
+      newsJson.addProperty("update_time",
+        SimpleDateFormat.getDateTimeInstance().format(wxMpMaterialNews.getUpdatedTime()));
+    }
+
     return newsJson;
   }
 
@@ -45,12 +56,12 @@ public WxMpMaterialNews deserialize(JsonElement jsonElement, Type type, JsonDese
     }
 
     if (json.get("create_time") != null && !json.get("create_time").isJsonNull()) {
-      Date createTime = new Date(GsonHelper.getAsLong(json.get("create_time")));
+      Date createTime = new Date(GsonHelper.getAsLong(json.get("create_time"))* 1000);
       wxMpMaterialNews.setCreatedTime(createTime);
     }
 
     if (json.get("update_time") != null && !json.get("update_time").isJsonNull()) {
-      Date updateTime = new Date(GsonHelper.getAsLong(json.get("update_time")));
+      Date updateTime = new Date(GsonHelper.getAsLong(json.get("update_time"))* 1000);
       wxMpMaterialNews.setUpdatedTime(updateTime);
     }
 

From 00b553d51e8b396b9bbcc0807295a5ddbd3e277b Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 3 Jul 2017 17:36:10 +0800
Subject: [PATCH 22/85] =?UTF-8?q?=E4=BC=98=E5=8C=96javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/WxPayUnifiedOrderRequest.java     | 214 +++++++++---------
 1 file changed, 104 insertions(+), 110 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
index f5b58245d9..342a3eb2d2 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -10,13 +10,6 @@
  * <pre>
  * 统一下单请求参数对象
  * 参考文档：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
- * 注释中各行每个字段描述对应如下：
- * <li>字段名
- * <li>变量名
- * <li>是否必填
- * <li>类型
- * <li>示例值
- * <li>描述
  * </pre>
  * Created by Binary Wang on 2016/9/25.
  *
@@ -24,16 +17,16 @@
  */
 @XStreamAlias("xml")
 public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
-  private static final String[] TRADE_TYPES = new String[]{"JSAPI", "NATIVE", "APP","MWEB"};
+  private static final String[] TRADE_TYPES = new String[]{"JSAPI", "NATIVE", "APP", "MWEB"};
 
   /**
    * <pre>
-   * 设备号
-   * device_info
-   * 否
-   * String(32)
-   * 013467007045764
-   * 终端设备号(门店号或收银设备Id)，注意：PC网页或公众号内支付请传"WEB"
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 类型：String(32)
+   * 示例值：013467007045764
+   * 描述：终端设备号(门店号或收银设备Id)，注意：PC网页或公众号内支付请传"WEB"
    * </pre>
    */
   @XStreamAlias("device_info")
@@ -41,12 +34,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 商品描述
-   * body
-   * 是
-   * String(128)
-   * 腾讯充值中心-QQ会员充值
-   * 商品简单描述，该字段须严格按照规范传递，具体请见参数规定
+   * 字段名：商品描述
+   * 变量名：body
+   * 是否必填：是
+   * 类型：String(128)
+   * 示例值： 腾讯充值中心-QQ会员充值
+   * 描述：商品简单描述，该字段须严格按照规范传递，具体请见参数规定
    * </pre>
    */
   @Required
@@ -55,12 +48,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 商品详情
-   * detail
-   * 否
-   * String(6000)
-   *  {  "goods_detail":[
-   * {
+   * 字段名：商品详情
+   * 变量名：detail
+   * 是否必填：否
+   * 类型：String(6000)
+   * 示例值： {  "goods_detail":[
+   *  {
    * "goods_id":"iphone6s_16G",
    * "wxpay_goods_id":"1001",
    * "goods_name":"iPhone6s 16G",
@@ -80,7 +73,7 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
    * }
    * ]
    * }
-   * 商品详细列表，使用Json格式，传输签名前请务必使用CDATA标签将JSON文本串保护起来。
+   * 描述：商品详细列表，使用Json格式，传输签名前请务必使用CDATA标签将JSON文本串保护起来。
    * goods_detail []：
    * └ goods_id String 必填 32 商品的编号
    * └ wxpay_goods_id String 可选 32 微信支付定义的统一商品编号
@@ -96,12 +89,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 附加数据
-   * attach
-   * 否
-   * String(127)
-   * 深圳分店
-   *  附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据
+   * 字段名：附加数据
+   * 变量名：attach
+   * 是否必填：否
+   * 类型：String(127)
+   * 示例值： 深圳分店
+   * 描述：  附加数据，在查询API和支付通知中原样返回，该字段主要用于商户携带订单的自定义数据
    * </pre>
    */
   @XStreamAlias("attach")
@@ -109,12 +102,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 商户订单号
-   * out_trade_no
-   * 是
-   * String(32)
-   * 20150806125346
-   * 商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
+   * 字段名：商户订单号
+   * 变量名：out_trade_no
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：20150806125346
+   * 描述：商户系统内部的订单号,32个字符内、可包含字母, 其他说明见商户订单号
    * </pre>
    */
   @Required
@@ -123,12 +116,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 货币类型
-   * fee_type
-   * 否
-   * String(16)
-   * CNY
-   * 符合ISO 4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
+   * 字段名：货币类型
+   * 变量名：fee_type
+   * 是否必填：否
+   * 类型：String(16)
+   * 示例值：CNY
+   * 描述： 符合ISO 4217标准的三位字母代码，默认人民币：CNY，其他值列表详见货币类型
    * </pre>
    */
   @XStreamAlias("fee_type")
@@ -136,12 +129,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 总金额
-   * total_fee
-   * 是
-   * Int
-   * 888
-   * 订单总金额，单位为分，详见支付金额
+   * 字段名：总金额
+   * 变量名：total_fee
+   * 是否必填：是
+   * 类型：Int
+   * 示例值： 888
+   * 描述：订单总金额，单位为分，详见支付金额
    * </pre>
    */
   @Required
@@ -150,12 +143,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 终端IP
-   * spbill_create_ip
-   * 是
-   * String(16)
-   * 123.12.12.123
-   * APP和网页支付提交用户端ip，Native支付填调用微信支付API的机器IP。
+   * 字段名：终端IP
+   * 变量名：spbill_create_ip
+   * 是否必填：是
+   * 类型：String(16)
+   * 示例值：123.12.12.123
+   * 描述：APP和网页支付提交用户端ip，Native支付填调用微信支付API的机器IP。
    * </pre>
    */
   @Required
@@ -164,12 +157,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 交易起始时间
-   * time_start
-   * 否
-   * String(14)
-   * 20091225091010
-   * 订单生成时间，格式为yyyyMMddHHmmss，如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
+   * 字段名：交易起始时间
+   * 变量名：time_start
+   * 是否必填：否
+   * 类型：String(14)
+   * 示例值：20091225091010
+   * 描述：订单生成时间，格式为yyyyMMddHHmmss，如2009年12月25日9点10分10秒表示为20091225091010。其他详见时间规则
    * </pre>
    */
   @XStreamAlias("time_start")
@@ -177,12 +170,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 交易结束时间
-   * time_expire
-   * 否
-   * String(14)
-   * 20091227091010
-   * 订单失效时间，格式为yyyyMMddHHmmss，如2009年12月27日9点10分10秒表示为20091227091010。其他详见时间规则
+   * 字段名：交易结束时间
+   * 变量名：time_expire
+   * 是否必填：否
+   * 类型：String(14)
+   * 示例值：20091227091010
+   * 描述：订单失效时间，格式为yyyyMMddHHmmss，如2009年12月27日9点10分10秒表示为20091227091010。其他详见时间规则
    *   注意：最短失效时间间隔必须大于5分钟
    * </pre>
    */
@@ -191,12 +184,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 商品标记
-   * goods_tag
-   * 否
-   * String(32)
-   * WXG
-   * 商品标记，代金券或立减优惠功能的参数，说明详见代金券或立减优惠
+   * 字段名：商品标记
+   * 变量名：goods_tag
+   * 是否必填：否
+   * 类型：String(32)
+   * 示例值：WXG
+   * 描述：商品标记，代金券或立减优惠功能的参数，说明详见代金券或立减优惠
    * </pre>
    */
   @XStreamAlias("goods_tag")
@@ -204,12 +197,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 通知地址
-   * notify_url
-   * 是
-   * String(256)
-   * http://www.weixin.qq.com/wxpay/pay.php
-   * 接收微信支付异步通知回调地址，通知url必须为直接可访问的url，不能携带参数。
+   * 字段名：通知地址
+   * 变量名：notify_url
+   * 是否必填：是
+   * 类型：String(256)
+   * 示例值：http://www.weixin.qq.com/wxpay/pay.php
+   * 描述：接收微信支付异步通知回调地址，通知url必须为直接可访问的url，不能携带参数。
    * </pre>
    */
   @Required
@@ -218,12 +211,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 交易类型
-   * trade_type
-   * 是
-   * String(16)
-   * JSAPI
-   * 取值如下：JSAPI，NATIVE，APP，详细说明见参数规定:
+   * 字段名：交易类型
+   * 变量名：trade_type
+   * 是否必填：是
+   * 类型：String(16)
+   * 示例值： JSAPI
+   * 描述： 取值如下：JSAPI，NATIVE，APP，详细说明见参数规定:
    * JSAPI--公众号支付、NATIVE--原生扫码支付、APP--app支付，统一下单接口trade_type的传参可参考这里
    * </pre>
    */
@@ -233,12 +226,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 商品Id
-   * product_id
-   * 否
-   * String(32)
-   * 12235413214070356458058
-   * trade_type=NATIVE，此参数必传。此id为二维码中包含的商品Id，商户自行定义。
+   * 字段名：商品Id
+   * 变量名：product_id
+   * 是否必填：否
+   * 类型：String(32)
+   * 示例值：12235413214070356458058
+   * 描述：trade_type=NATIVE，此参数必传。此id为二维码中包含的商品Id，商户自行定义。
    * </pre>
    */
   @XStreamAlias("product_id")
@@ -246,11 +239,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 指定支付方式
-   * limit_pay
-   * 否
-   * String(32)
-   * no_credit no_credit--指定不能使用信用卡支付
+   * 字段名：指定支付方式
+   * 变量名：limit_pay
+   * 是否必填：否
+   * 类型：String(32)
+   * 示例值：no_credit
+   * 描述：no_credit--指定不能使用信用卡支付
    * </pre>
    */
   @XStreamAlias("limit_pay")
@@ -258,12 +252,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 用户标识
-   * openid
-   * 否
-   * String(128)
-   * oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
-   * trade_type=JSAPI，此参数必传，用户在商户appid下的唯一标识。
+   * 字段名：用户标识
+   * 变量名：openid
+   * 是否必填：否
+   * 类型：String(128)
+   * 示例值：oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+   * 描述：trade_type=JSAPI，此参数必传，用户在商户appid下的唯一标识。
    * openid如何获取，可参考【获取openid】。
    * 企业号请使用【企业号OAuth2.0接口】获取企业号内成员userid，再调用【企业号userid转openid接口】进行转换
    * </pre>
@@ -273,12 +267,12 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 用户子标识
-   * sub_openid
-   * 否
-   * String(128)
-   * oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
-   * trade_type=JSAPI，此参数必传，用户在子商户appid下的唯一标识。
+   * 字段名：用户子标识
+   * 变量名：sub_openid
+   * 是否必填：否
+   * 类型：String(128)
+   * 示例值：oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+   * 描述：trade_type=JSAPI，此参数必传，用户在子商户appid下的唯一标识。
    * openid和sub_openid可以选传其中之一，如果选择传sub_openid,则必须传sub_appid。
    * 下单前需要调用【网页授权获取用户信息】接口获取到用户的Openid。
    * </pre>

From b7542bb3b8d1a7297e69e5114a8a111e7d4689ac Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 3 Jul 2017 17:38:37 +0800
Subject: [PATCH 23/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.3.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 2 +-
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 84de33cb46..a718c699bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.2.BETA</version>
+  <version>2.7.3.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 71e09c8f49..61e4cb7842 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.2.BETA</version>
+    <version>2.7.3.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 86c5994f4a..0fa4104a2e 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.2.BETA</version>
+    <version>2.7.3.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index b1bb6a27d9..fc4c3f43c0 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.2.BETA</version>
+    <version>2.7.3.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 2f1a0d6ef9..5030f42b1e 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.2.BETA</version>
+    <version>2.7.3.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index e930a48178..0f9e4c8d8b 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.2.BETA</version>
+    <version>2.7.3.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 35c1be235bb86552bec223ff7b1828201e55aa56 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 3 Jul 2017 17:57:44 +0800
Subject: [PATCH 24/85] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E6=97=B6=E5=8F=91=E7=8E=B0=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E7=9A=84javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/common/util/crypto/WxCryptUtil.java       | 12 +++++-------
 .../common/util/http/okhttp/OkHttpProxyInfo.java     |  3 +--
 .../wx/miniapp/message/WxMaMessageRouterRule.java    |  2 --
 .../java/me/chanjar/weixin/mp/api/WxMpService.java   |  2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
index e80419d716..e362e64b2f 100755
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
@@ -13,21 +13,23 @@
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.StringReader;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Random;
 
 /**
+ * <pre>
  * 对公众平台发送给公众账号的消息加解密示例代码.
- *
- * @copyright Copyright (c) 1998-2014 Tencent Inc.
+ * Copyright (c) 1998-2014 Tencent Inc.
  * 针对org.apache.commons.codec.binary.Base64，
  * 需要导入架包commons-codec-1.9（或commons-codec-1.8等其他版本）
  * 官方下载地址：http://commons.apache.org/proper/commons-codec/download_codec.cgi
+ * </pre>
  */
 public class WxCryptUtil {
 
   private static final Base64 base64 = new Base64();
-  private static final Charset CHARSET = Charset.forName("utf-8");
+  private static final Charset CHARSET = StandardCharsets.UTF_8;
 
   private static final ThreadLocal<DocumentBuilder> builderLocal = new ThreadLocal<DocumentBuilder>() {
     @Override
@@ -76,8 +78,6 @@ static String extractEncryptPart(String xml) {
 
   /**
    * 将一个数字转换成生成4个字节的网络字节序bytes数组
-   *
-   * @param number
    */
   private static byte[] number2BytesInNetworkOrder(int number) {
     byte[] orderBytes = new byte[4];
@@ -90,8 +90,6 @@ private static byte[] number2BytesInNetworkOrder(int number) {
 
   /**
    * 4个字节的网络字节序bytes数组还原成一个数字
-   *
-   * @param bytesInNetworkOrder
    */
   private static int bytesNetworkOrder2Number(byte[] bytesInNetworkOrder) {
     int sourceNumber = 0;
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java
index 5515b0f713..eb9f7ac908 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpProxyInfo.java
@@ -13,6 +13,7 @@ public class OkHttpProxyInfo {
   private final String proxyUsername;
   private final String proxyPassword;
   private final ProxyType proxyType;
+
   public OkHttpProxyInfo(ProxyType proxyType, String proxyHost, int proxyPort, String proxyUser, String proxyPassword) {
     this.proxyType = proxyType;
     this.proxyAddress = proxyHost;
@@ -91,8 +92,6 @@ public String getProxyPassword() {
 
   /**
    * 返回 java.net.Proxy
-   *
-   * @return
    */
   public Proxy getProxy() {
     Proxy proxy = null;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java
index 9fce8b1a04..835eb2894a 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouterRule.java
@@ -189,8 +189,6 @@ protected boolean test(WxMaMessage wxMessage) {
 
   /**
    * 处理微信推送过来的消息
-   *
-   * @return true 代表继续执行别的router，false 代表停止执行别的router
    */
   protected void service(WxMaMessage wxMessage,
                          Map<String, Object> context,
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index 71a5413523..7199d4e05c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -422,7 +422,7 @@ public interface WxMpService {
   void initHttp();
 
   /**
-   * @return
+   * @return RequestHttp对象
    */
   RequestHttp getRequestHttp();
 

From 99b44279b698110b528ef819f652cd01ffeaebf9 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 5 Jul 2017 12:03:44 +0800
Subject: [PATCH 25/85] =?UTF-8?q?#268=20=E4=BF=AE=E5=A4=8DWxCpUserServiceI?=
 =?UTF-8?q?mpl=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/cp/api/impl/WxCpUserServiceImpl.java  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImpl.java
index c49c1ffd69..13009427c6 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpUserServiceImpl.java
@@ -42,15 +42,12 @@ public void update(WxCpUser user) throws WxErrorException {
     this.mainService.post(url, user.toJson());
   }
 
-  public void deleteOne(String userId) throws WxErrorException {
-    String url = "https://qyapi.weixin.qq.com/cgi-bin/user/delete?userid=" + userId;
-    this.mainService.get(url, null);
-  }
-
   @Override
   public void delete(String... userIds) throws WxErrorException {
     if (userIds.length == 1) {
-      this.deleteOne(userIds[0]);
+      String url = "https://qyapi.weixin.qq.com/cgi-bin/user/delete?userid=" + userIds[0];
+      this.mainService.get(url, null);
+      return;
     }
 
     String url = "https://qyapi.weixin.qq.com/cgi-bin/user/batchdelete";

From 83623d4eb84c1dd3ab58c59077bcd2724c88f4ea Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 6 Jul 2017 15:21:42 +0800
Subject: [PATCH 26/85] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/cp/api/impl/AbstractWxCpServiceImpl.java   | 2 +-
 .../cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java    | 2 +-
 .../chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/AbstractWxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/AbstractWxCpServiceImpl.java
index 6cff26485e..be1b311857 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/AbstractWxCpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/AbstractWxCpServiceImpl.java
@@ -405,7 +405,7 @@ protected synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor,
 
       if (error.getErrorCode() != 0) {
         this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uriWithAccessToken, data, error);
-        throw new WxErrorException(error);
+        throw new WxErrorException(error, e);
       }
       return null;
     } catch (IOException e) {
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
index c8605d25de..023306634b 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
@@ -213,7 +213,7 @@ public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, Str
 
       if (error.getErrorCode() != 0) {
         this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uriWithAccessToken, data, error);
-        throw new WxErrorException(error);
+        throw new WxErrorException(error, e);
       }
       return null;
     } catch (IOException e) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
index 9dc1d755dd..d3075aa11d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
@@ -306,7 +306,7 @@ public synchronized <T, E> T executeInternal(RequestExecutor<T, E> executor, Str
 
       if (error.getErrorCode() != 0) {
         this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uriWithAccessToken, data, error);
-        throw new WxErrorException(error);
+        throw new WxErrorException(error, e);
       }
       return null;
     } catch (IOException e) {
@@ -397,7 +397,7 @@ public WxMpDeviceService getDeviceService() {
   }
 
   @Override
-  public WxMpShakeService getShakeService(){
+  public WxMpShakeService getShakeService() {
     return this.shakeService;
   }
 

From 763e48f92f84127b2bd72cf90d6561911f55a494 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 6 Jul 2017 15:44:58 +0800
Subject: [PATCH 27/85] fix javadoc

---
 .../java/me/chanjar/weixin/common/annotation/Required.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java
index 9370561fb7..e18be69e96 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/annotation/Required.java
@@ -6,9 +6,10 @@
 import java.lang.annotation.Target;
 
 /**
+ * <pre>
  * 标识某个字段是否是必填的
- * <p>
  * Created by Binary Wang on 2016/9/25.
+ * </pre>
  *
  * @author binarywang (https://github.com/binarywang)
  */

From 4c7ce17bcbb235b8531050631fe7932b8c39aec1 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 6 Jul 2017 15:47:06 +0800
Subject: [PATCH 28/85] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weixin-java-common/src/test/resources/logback-test.xml  | 3 +--
 weixin-java-cp/src/test/resources/logback-test.xml      | 3 +--
 weixin-java-miniapp/src/test/resources/logback-test.xml | 3 +--
 weixin-java-mp/src/test/resources/logback-test.xml      | 3 +--
 weixin-java-pay/src/test/resources/logback-test.xml     | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/weixin-java-common/src/test/resources/logback-test.xml b/weixin-java-common/src/test/resources/logback-test.xml
index e206e178ec..9a6fe3eea1 100644
--- a/weixin-java-common/src/test/resources/logback-test.xml
+++ b/weixin-java-common/src/test/resources/logback-test.xml
@@ -5,9 +5,8 @@
     </encoder>
   </appender>
 
-  <root level="info">
+  <root level="debug">
     <appender-ref ref="STDOUT"/>
   </root>
 
-  <logger name="me.chanjar.weixin.common" level="debug"/>
 </configuration>
diff --git a/weixin-java-cp/src/test/resources/logback-test.xml b/weixin-java-cp/src/test/resources/logback-test.xml
index ec3deca97f..e4a33acd88 100644
--- a/weixin-java-cp/src/test/resources/logback-test.xml
+++ b/weixin-java-cp/src/test/resources/logback-test.xml
@@ -6,9 +6,8 @@
     </encoder>
   </appender>
 
-  <root level="info">
+  <root level="debug">
     <appender-ref ref="STDOUT"/>
   </root>
 
-  <logger name="me.chanjar.weixin.cp" level="debug"/>
 </configuration>
diff --git a/weixin-java-miniapp/src/test/resources/logback-test.xml b/weixin-java-miniapp/src/test/resources/logback-test.xml
index 14d6a9a79b..e4a33acd88 100644
--- a/weixin-java-miniapp/src/test/resources/logback-test.xml
+++ b/weixin-java-miniapp/src/test/resources/logback-test.xml
@@ -6,9 +6,8 @@
     </encoder>
   </appender>
 
-  <root level="info">
+  <root level="debug">
     <appender-ref ref="STDOUT"/>
   </root>
 
-  <logger name="cn.binarywang.wx.miniapp" level="debug"/>
 </configuration>
diff --git a/weixin-java-mp/src/test/resources/logback-test.xml b/weixin-java-mp/src/test/resources/logback-test.xml
index 8e87c71af2..e4a33acd88 100644
--- a/weixin-java-mp/src/test/resources/logback-test.xml
+++ b/weixin-java-mp/src/test/resources/logback-test.xml
@@ -6,9 +6,8 @@
     </encoder>
   </appender>
 
-  <root level="info">
+  <root level="debug">
     <appender-ref ref="STDOUT"/>
   </root>
 
-  <logger name="me.chanjar.weixin.mp" level="debug"/>
 </configuration>
diff --git a/weixin-java-pay/src/test/resources/logback-test.xml b/weixin-java-pay/src/test/resources/logback-test.xml
index 75de28c04c..35deb2ed28 100644
--- a/weixin-java-pay/src/test/resources/logback-test.xml
+++ b/weixin-java-pay/src/test/resources/logback-test.xml
@@ -12,5 +12,4 @@
     <appender-ref ref="STDOUT"/>
   </root>
 
-  <logger name="com.github.binarywang.wxpay" level="debug"/>
 </configuration>

From afeabff363bacf0d2daf3e92991a106f234468d4 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 6 Jul 2017 15:59:13 +0800
Subject: [PATCH 29/85] =?UTF-8?q?#269=20=E4=BF=AE=E5=A4=8Dokhttp=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=B4=A0=E6=9D=90=E4=B8=8A=E4=BC=A0=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OkHttpMediaUploadRequestExecutor.java     |  8 +++--
 .../OkhttpMaterialUploadRequestExecutor.java  | 35 ++++++++++---------
 .../OkhttpMediaImgUploadRequestExecutor.java  | 16 +++++----
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java
index c01b373808..91b36d7da6 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java
@@ -39,8 +39,12 @@ public Request authenticate(Route route, Response response) throws IOException {
     //得到httpClient
     OkHttpClient client = clientBuilder.build();
 
-    RequestBody fileBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-    RequestBody body = new MultipartBody.Builder().addFormDataPart("media", null, fileBody).build();
+    RequestBody body = new MultipartBody.Builder()
+      .setType(MediaType.parse("multipart/form-data"))
+      .addFormDataPart("media",
+        file.getName(),
+        RequestBody.create(MediaType.parse("application/octet-stream"), file))
+      .build();
     Request request = new Request.Builder().url(uri).post(body).build();
 
     Response response = client.newCall(request).execute();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java
index 27a9b5bfc7..3770aa1b67 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java
@@ -25,6 +25,14 @@ public OkhttpMaterialUploadRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public WxMpMaterialUploadResult execute(String uri, WxMpMaterial material) throws WxErrorException, IOException {
+    if (material == null) {
+      throw new WxErrorException(WxError.newBuilder().setErrorMsg("非法请求，material参数为空").build());
+    }
+    File file = material.getFile();
+    if (file == null || !file.exists()) {
+      throw new FileNotFoundException();
+    }
+
     OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
     //设置代理
     if (requestHttp.getRequestHttpProxy() != null) {
@@ -40,27 +48,19 @@ public Request authenticate(Route route, Response response) throws IOException {
           .build();
       }
     });
-    //得到httpClient
-    OkHttpClient client = clientBuilder.build();
 
-
-    if (material == null) {
-      throw new WxErrorException(WxError.newBuilder().setErrorMsg("非法请求，material参数为空").build());
-    }
-
-    File file = material.getFile();
-    if (file == null || !file.exists()) {
-      throw new FileNotFoundException();
-    }
-    RequestBody fileBody = RequestBody.create(MediaType.parse("multipart/form-data"), file);
-    MultipartBody.Builder bodyBuilder = new MultipartBody.Builder().addFormDataPart("media", null, fileBody);
+    MultipartBody.Builder bodyBuilder = new MultipartBody.Builder()
+      .setType(MediaType.parse("multipart/form-data"))
+      .addFormDataPart("media",
+        file.getName(),
+        RequestBody.create(MediaType.parse("application/octet-stream"), file));
     Map<String, String> form = material.getForm();
-    if (material.getForm() != null) {
+    if (form != null) {
       bodyBuilder.addFormDataPart("description", WxGsonBuilder.create().toJson(form));
     }
-    RequestBody body = bodyBuilder.build();
-    Request request = new Request.Builder().url(uri).post(body).build();
-    Response response = client.newCall(request).execute();
+
+    Request request = new Request.Builder().url(uri).post(bodyBuilder.build()).build();
+    Response response = clientBuilder.build().newCall(request).execute();
     String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
@@ -69,4 +69,5 @@ public Request authenticate(Route route, Response response) throws IOException {
       return WxMpMaterialUploadResult.fromJson(responseContent);
     }
   }
+
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java
index 3d8abd394a..3b10f63bcf 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java
@@ -21,7 +21,7 @@ public OkhttpMediaImgUploadRequestExecutor(RequestHttp requestHttp) {
   }
 
   @Override
-  public WxMediaImgUploadResult execute(String uri, File data) throws WxErrorException, IOException {
+  public WxMediaImgUploadResult execute(String uri, File file) throws WxErrorException, IOException {
     OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
     //设置代理
     if (requestHttp.getRequestHttpProxy() != null) {
@@ -37,14 +37,16 @@ public Request authenticate(Route route, Response response) throws IOException {
           .build();
       }
     });
-    //得到httpClient
-    OkHttpClient client = clientBuilder.build();
 
-    RequestBody fileBody = RequestBody.create(MediaType.parse("multipart/form-data"), data);
-    RequestBody body = new MultipartBody.Builder().addFormDataPart("media", null, fileBody).build();
-    Request request = new Request.Builder().url(uri).post(body).build();
+    RequestBody body = new MultipartBody.Builder()
+      .setType(MediaType.parse("multipart/form-data"))
+      .addFormDataPart("media",
+        file.getName(),
+        RequestBody.create(MediaType.parse("application/octet-stream"), file))
+      .build();
 
-    Response response = client.newCall(request).execute();
+    Request request = new Request.Builder().url(uri).post(body).build();
+    Response response = clientBuilder.build().newCall(request).execute();
     String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {

From 5612dd58ebfdcc88bdd1c6accf7b66996160dd16 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 6 Jul 2017 16:02:07 +0800
Subject: [PATCH 30/85] =?UTF-8?q?=E8=AE=A9httpclient=E6=94=AF=E6=8C=81slf4?=
 =?UTF-8?q?j=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weixin-java-common/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 61e4cb7842..f198bd70d9 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -37,11 +37,23 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpmime</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <version>1.7.24</version>
+    </dependency>
+
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>

From 8599562c36c7d90103bb31ed5cb6cc11ecfb25ea Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 6 Jul 2017 16:29:46 +0800
Subject: [PATCH 31/85] add maven-checkstyle-plugin

---
 pom.xml                          |  20 +++
 quality-checks/google_checks.xml | 217 +++++++++++++++++++++++++++++++
 2 files changed, 237 insertions(+)
 create mode 100644 quality-checks/google_checks.xml

diff --git a/pom.xml b/pom.xml
index a718c699bb..3383cb0fb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,6 +349,26 @@
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>2.17</version>
+        <configuration>
+          <configLocation>quality-checks/google_checks.xml</configLocation>
+          <includeTestSourceDirectory>true</includeTestSourceDirectory>
+          <consoleOutput>true</consoleOutput>
+          <failsOnError>true</failsOnError>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/quality-checks/google_checks.xml b/quality-checks/google_checks.xml
new file mode 100644
index 0000000000..925172dab6
--- /dev/null
+++ b/quality-checks/google_checks.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+  "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+  "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
+
+<!--
+    Checkstyle configuration that checks the Google coding conventions from Google Java Style
+    that can be found at https://google.github.io/styleguide/javaguide.html.
+
+    Checkstyle is very configurable. Be sure to read the documentation at
+    http://checkstyle.sf.net (or in your downloaded distribution).
+
+    To completely disable a check, just comment it out or delete it from the file.
+
+    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+ -->
+
+<module name = "Checker">
+  <property name="charset" value="UTF-8"/>
+
+  <property name="severity" value="warning"/>
+
+  <property name="fileExtensions" value="java, properties, xml"/>
+  <!-- Checks for whitespace                               -->
+  <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+  </module>
+
+  <module name="TreeWalker">
+    <module name="OuterTypeFilename"/>
+    <module name="IllegalTokenText">
+      <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+      <property name="format" value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+      <property name="message" value="Consider using special escape sequence instead of octal value or Unicode escaped value."/>
+    </module>
+    <module name="AvoidEscapedUnicodeCharacters">
+      <property name="allowEscapesForControlCharacters" value="true"/>
+      <property name="allowByTailComment" value="true"/>
+      <property name="allowNonPrintableEscapes" value="true"/>
+    </module>
+    <module name="LineLength">
+      <property name="max" value="100"/>
+      <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+    </module>
+    <module name="AvoidStarImport"/>
+    <module name="OneTopLevelClass"/>
+    <module name="NoLineWrap"/>
+    <module name="EmptyBlock">
+      <property name="option" value="TEXT"/>
+      <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+    </module>
+    <module name="NeedBraces"/>
+    <module name="LeftCurly">
+      <property name="maxLineLength" value="100"/>
+    </module>
+    <module name="RightCurly">
+      <property name="id" value="RightCurlySame"/>
+      <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
+    </module>
+    <module name="RightCurly">
+      <property name="id" value="RightCurlyAlone"/>
+      <property name="option" value="alone"/>
+      <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
+    </module>
+    <module name="WhitespaceAround">
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+      <property name="allowEmptyTypes" value="true"/>
+      <property name="allowEmptyLoops" value="true"/>
+      <message key="ws.notFollowed"
+               value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+      <message key="ws.notPreceded"
+               value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+    </module>
+    <module name="OneStatementPerLine"/>
+    <module name="MultipleVariableDeclarations"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="MissingSwitchDefault"/>
+    <module name="FallThrough"/>
+    <module name="UpperEll"/>
+    <module name="ModifierOrder"/>
+    <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"
+               value="Package name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="TypeName">
+      <message key="name.invalidPattern"
+               value="Type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="MemberName">
+      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+      <message key="name.invalidPattern"
+               value="Member name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="ParameterName">
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern"
+               value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="LocalVariableName">
+      <property name="tokens" value="VARIABLE_DEF"/>
+      <property name="format" value="^[a-z]([a-z0-9][a-zA-Z0-9]*)?$"/>
+      <message key="name.invalidPattern"
+               value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="ClassTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+      <message key="name.invalidPattern"
+               value="Class type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="MethodTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+      <message key="name.invalidPattern"
+               value="Method type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="InterfaceTypeParameterName">
+      <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+      <message key="name.invalidPattern"
+               value="Interface type name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="NoFinalizer"/>
+    <module name="GenericWhitespace">
+      <message key="ws.followed"
+               value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+      <message key="ws.preceded"
+               value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+      <message key="ws.illegalFollow"
+               value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+      <message key="ws.notPreceded"
+               value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+    </module>
+    <module name="Indentation">
+      <property name="basicOffset" value="2"/>
+      <property name="braceAdjustment" value="0"/>
+      <property name="caseIndent" value="2"/>
+      <property name="throwsIndent" value="4"/>
+      <property name="lineWrappingIndentation" value="4"/>
+      <property name="arrayInitIndent" value="2"/>
+    </module>
+    <module name="AbbreviationAsWordInName">
+      <property name="ignoreFinal" value="false"/>
+      <property name="allowedAbbreviationLength" value="1"/>
+    </module>
+    <module name="OverloadMethodsDeclarationOrder"/>
+    <module name="VariableDeclarationUsageDistance"/>
+    <module name="CustomImportOrder">
+      <property name="sortImportsInGroupAlphabetically" value="true"/>
+      <property name="separateLineBetweenGroups" value="true"/>
+      <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+    </module>
+    <module name="MethodParamPad"/>
+    <module name="ParenPad"/>
+    <module name="OperatorWrap">
+      <property name="option" value="NL"/>
+      <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
+    </module>
+    <module name="AnnotationLocation">
+      <property name="id" value="AnnotationLocationMostCases"/>
+      <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
+    </module>
+    <module name="AnnotationLocation">
+      <property name="id" value="AnnotationLocationVariables"/>
+      <property name="tokens" value="VARIABLE_DEF"/>
+      <property name="allowSamelineMultipleAnnotations" value="true"/>
+    </module>
+    <module name="NonEmptyAtclauseDescription"/>
+    <module name="JavadocTagContinuationIndentation"/>
+    <module name="SummaryJavadoc">
+      <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+    </module>
+    <module name="JavadocParagraph"/>
+    <module name="AtclauseOrder">
+      <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+      <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+    </module>
+    <module name="JavadocMethod">
+      <property name="scope" value="public"/>
+      <property name="allowMissingParamTags" value="true"/>
+      <property name="allowMissingThrowsTags" value="true"/>
+      <property name="allowMissingReturnTag" value="true"/>
+      <property name="minLineCount" value="2"/>
+      <property name="allowedAnnotations" value="Override, Test"/>
+      <property name="allowThrowsTagsForSubclasses" value="true"/>
+    </module>
+    <module name="MethodName">
+      <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+      <message key="name.invalidPattern"
+               value="Method name ''{0}'' must match pattern ''{1}''."/>
+    </module>
+    <module name="SingleLineJavadoc">
+      <property name="ignoreInlineTags" value="false"/>
+    </module>
+    <module name="EmptyCatchBlock">
+      <property name="exceptionVariableName" value="expected"/>
+    </module>
+    <module name="CommentsIndentation"/>
+  </module>
+</module>

From 69f024dc6b5e236bea92801a6fdfe89810cca1e2 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 8 Jul 2017 15:55:48 +0800
Subject: [PATCH 32/85] =?UTF-8?q?#270=20NewArticle=E5=92=8CMpnewsArticle?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BA=8F=E5=88=97=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/cp/bean/article/MpnewsArticle.java    | 6 +++++-
 .../java/me/chanjar/weixin/cp/bean/article/NewArticle.java  | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java
index 82c4e2aaa6..b3f4acf402 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java
@@ -1,5 +1,7 @@
 package me.chanjar.weixin.cp.bean.article;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  *  Created by BinaryWang on 2017/3/27.
@@ -7,7 +9,9 @@
  *
  * @author Binary Wang
  */
-public class MpnewsArticle {
+public class MpnewsArticle implements Serializable {
+  private static final long serialVersionUID = 6985871812170756481L;
+
   private String title;
   private String thumbMediaId;
   private String author;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/NewArticle.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/NewArticle.java
index d4c056d5ad..02b0b1086f 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/NewArticle.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/article/NewArticle.java
@@ -1,5 +1,7 @@
 package me.chanjar.weixin.cp.bean.article;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  *  Created by BinaryWang on 2017/3/27.
@@ -7,7 +9,8 @@
  *
  * @author Binary Wang
  */
-public class NewArticle {
+public class NewArticle implements Serializable {
+  private static final long serialVersionUID = 4087852055781140659L;
 
   private String title;
   private String description;

From 55cd862b556b8fc66663b40f555604febc3e2725 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 8 Jul 2017 16:01:46 +0800
Subject: [PATCH 33/85] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E5=A2=9E=E5=8A=A0=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E6=97=B6=E9=97=B4=E7=9A=84=E8=AE=BE=E7=BD=AE=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/config/WxPayConfig.java  | 33 +++++++++++++++++++
 .../wxpay/service/impl/WxPayServiceImpl.java  | 10 ++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
index d05259ceeb..aeab939a06 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
@@ -18,6 +18,17 @@
  * @author Binary Wang (https://github.com/binarywang)
  */
 public class WxPayConfig {
+
+  /**
+   * http请求连接超时时间
+   */
+  private int httpConnectionTimeout = 5000;
+
+  /**
+   * http请求数据读取等待时间
+   */
+  private int httpTimeout = 10000;
+
   private String appId;
   private String subAppId;
   private String mchId;
@@ -194,4 +205,26 @@ public SSLContext initSSLContext() throws WxPayException {
       IOUtils.closeQuietly(inputStream);
     }
   }
+
+  /**
+   * http请求连接超时时间
+   */
+  public int getHttpConnectionTimeout() {
+    return this.httpConnectionTimeout;
+  }
+
+  public void setHttpConnectionTimeout(int httpConnectionTimeout) {
+    this.httpConnectionTimeout = httpConnectionTimeout;
+  }
+
+  /**
+   * http请求数据读取等待时间
+   */
+  public int getHttpTimeout() {
+    return this.httpTimeout;
+  }
+
+  public void setHttpTimeout(int httpTimeout) {
+    this.httpTimeout = httpTimeout;
+  }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
index bcf425d792..a2b036e8e8 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
@@ -465,9 +465,11 @@ public String getSandboxSignKey() throws WxPayException {
    * @return 返回请求结果
    */
   private String post(String url, String xmlParam) throws WxPayException {
-    String requestString = new String(xmlParam.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
-
-    HttpRequest request = HttpRequest.post(url).body(requestString);
+    HttpRequest request = HttpRequest
+      .post(url)
+      .timeout(this.config.getHttpTimeout())
+      .connectionTimeout(this.config.getHttpConnectionTimeout())
+      .body(new String(xmlParam.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
     String responseString = this.getResponseString(request.send());
 
     this.log.info("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", url, xmlParam, responseString);
@@ -489,6 +491,8 @@ private String postWithKey(String url, String requestStr) throws WxPayException
 
       HttpRequest request = HttpRequest
         .post(url)
+        .timeout(this.config.getHttpTimeout())
+        .connectionTimeout(this.config.getHttpConnectionTimeout())
         .withConnectionProvider(new SSLSocketHttpConnectionProvider(sslContext))
         .bodyText(requestStr);
 

From 96dead8f84666688ef33d2a958d162e89c18594e Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 8 Jul 2017 16:14:03 +0800
Subject: [PATCH 34/85] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E8=AF=B7=E6=B1=82=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/service/impl/WxPayServiceImpl.java  | 75 ++++++++-----------
 1 file changed, 30 insertions(+), 45 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
index a2b036e8e8..f799a2c974 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
@@ -57,7 +57,7 @@ public WxPayRefundResult refund(WxPayRefundRequest request) throws WxPayExceptio
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/secapi/pay/refund";
-    String responseContent = this.postWithKey(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), true);
     WxPayRefundResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundResult.class);
     result.checkResult(this);
     return result;
@@ -75,7 +75,7 @@ public WxPayRefundQueryResult refundQuery(String transactionId, String outTradeN
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/refundquery";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     WxPayRefundQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundQueryResult.class);
     result.composeRefundRecords();
     result.checkResult(this);
@@ -109,7 +109,7 @@ public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request) throw
       url = this.getPayBaseUrl() + "/mmpaymkttransfers/sendgroupredpack";
     }
 
-    String responseContent = this.postWithKey(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), true);
     WxPaySendRedpackResult result = WxPayBaseResult.fromXML(responseContent, WxPaySendRedpackResult.class);
     //毋须校验，因为没有返回签名信息
     // this.checkResult(result);
@@ -124,7 +124,7 @@ public WxPayRedpackQueryResult queryRedpack(String mchBillNo) throws WxPayExcept
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gethbinfo";
-    String responseContent = this.postWithKey(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), true);
     WxPayRedpackQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRedpackQueryResult.class);
     result.checkResult(this);
     return result;
@@ -138,7 +138,7 @@ public WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo)
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/orderquery";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     if (StringUtils.isBlank(responseContent)) {
       throw new WxPayException("无响应结果");
     }
@@ -160,7 +160,7 @@ public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/closeorder";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     WxPayOrderCloseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderCloseResult.class);
     result.checkResult(this);
 
@@ -172,7 +172,7 @@ public WxPayUnifiedOrderResult unifiedOrder(WxPayUnifiedOrderRequest request) th
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/unifiedorder";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     WxPayUnifiedOrderResult result = WxPayBaseResult.fromXML(responseContent, WxPayUnifiedOrderResult.class);
     result.checkResult(this);
     return result;
@@ -227,7 +227,7 @@ public WxEntPayResult entPay(WxEntPayRequest request) throws WxPayException {
     request.checkAndSign(this.getConfig());
     String url = this.getPayBaseUrl() + "/mmpaymkttransfers/promotion/transfers";
 
-    String responseContent = this.postWithKey(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), true);
     WxEntPayResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayResult.class);
     result.checkResult(this);
     return result;
@@ -240,7 +240,7 @@ public WxEntPayQueryResult queryEntPay(String partnerTradeNo) throws WxPayExcept
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gettransferinfo";
-    String responseContent = this.postWithKey(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), true);
     WxEntPayQueryResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayQueryResult.class);
     result.checkResult(this);
     return result;
@@ -293,7 +293,7 @@ public void report(WxPayReportRequest request) throws WxPayException {
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/payitil/report";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
     result.checkResult(this);
   }
@@ -309,7 +309,7 @@ public WxPayBillResult downloadBill(String billDate, String billType, String tar
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/downloadbill";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     if (responseContent.startsWith("<")) {
       WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
       result.checkResult(this);
@@ -396,7 +396,7 @@ public WxPayMicropayResult micropay(WxPayMicropayRequest request) throws WxPayEx
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/pay/micropay";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     WxPayMicropayResult result = WxPayBaseResult.fromXML(responseContent, WxPayMicropayResult.class);
     result.checkResult(this);
     return result;
@@ -407,7 +407,7 @@ public WxPayOrderReverseResult reverseOrder(WxPayOrderReverseRequest request) th
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/secapi/pay/reverse";
-    String responseContent = this.postWithKey(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), true);
     WxPayOrderReverseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderReverseResult.class);
     result.checkResult(this);
     return result;
@@ -418,7 +418,7 @@ public String shorturl(WxPayShorturlRequest request) throws WxPayException {
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/tools/shorturl";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     WxPayShorturlResult result = WxPayBaseResult.fromXML(responseContent, WxPayShorturlResult.class);
     result.checkResult(this);
     return result.getShortUrl();
@@ -434,7 +434,7 @@ public String authcode2Openid(WxPayAuthcode2OpenidRequest request) throws WxPayE
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/tools/authcodetoopenid";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     WxPayAuthcode2OpenidResult result = WxPayBaseResult.fromXML(responseContent, WxPayAuthcode2OpenidResult.class);
     result.checkResult(this);
     return result.getOpenid();
@@ -451,57 +451,42 @@ public String getSandboxSignKey() throws WxPayException {
     request.checkAndSign(this.getConfig());
 
     String url = "https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey";
-    String responseContent = this.post(url, request.toXML());
+    String responseContent = this.post(url, request.toXML(), false);
     WxPaySandboxSignKeyResult result = WxPayBaseResult.fromXML(responseContent, WxPaySandboxSignKeyResult.class);
     result.checkResult(this);
     return result.getSandboxSignKey();
   }
 
   /**
-   * 执行post请求
-   *
-   * @param url      请求地址
-   * @param xmlParam 请求字符串
-   * @return 返回请求结果
-   */
-  private String post(String url, String xmlParam) throws WxPayException {
-    HttpRequest request = HttpRequest
-      .post(url)
-      .timeout(this.config.getHttpTimeout())
-      .connectionTimeout(this.config.getHttpConnectionTimeout())
-      .body(new String(xmlParam.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
-    String responseString = this.getResponseString(request.send());
-
-    this.log.info("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", url, xmlParam, responseString);
-    return responseString;
-  }
-
-  /**
-   * 带证书发送post请求
+   * 发送post请求
    *
    * @param url        请求地址
    * @param requestStr 请求信息
+   * @param useKey     是否使用证书
+   * @return 返回请求结果字符串
    */
-  private String postWithKey(String url, String requestStr) throws WxPayException {
+  private String post(String url, String requestStr, boolean useKey) throws WxPayException {
     try {
-      SSLContext sslContext = this.getConfig().getSslContext();
-      if (null == sslContext) {
-        sslContext = this.getConfig().initSSLContext();
-      }
-
       HttpRequest request = HttpRequest
         .post(url)
         .timeout(this.config.getHttpTimeout())
         .connectionTimeout(this.config.getHttpConnectionTimeout())
-        .withConnectionProvider(new SSLSocketHttpConnectionProvider(sslContext))
         .bodyText(requestStr);
 
+      if (useKey) {
+        SSLContext sslContext = this.getConfig().getSslContext();
+        if (null == sslContext) {
+          sslContext = this.getConfig().initSSLContext();
+        }
+        request.withConnectionProvider(new SSLSocketHttpConnectionProvider(sslContext));
+      }
+
       String responseString = this.getResponseString(request.send());
 
-      this.log.info("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", url, requestStr, responseString);
+      this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, responseString);
       return responseString;
     } catch (Exception e) {
-      this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
+      this.log.error("\n【请求地址】：{}\n【请求数据】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
       throw new WxPayException(e.getMessage(), e);
     }
   }

From a2880d882178e9926af2bde98e8b04c69e53fa92 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 8 Jul 2017 16:16:15 +0800
Subject: [PATCH 35/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.4.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 2 +-
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3383cb0fb7..5f1d901d4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.3.BETA</version>
+  <version>2.7.4.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index f198bd70d9..3800522ceb 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.3.BETA</version>
+    <version>2.7.4.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 0fa4104a2e..1790105d8f 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.3.BETA</version>
+    <version>2.7.4.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index fc4c3f43c0..60d1194a78 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.3.BETA</version>
+    <version>2.7.4.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 5030f42b1e..d65bceef9f 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.3.BETA</version>
+    <version>2.7.4.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 0f9e4c8d8b..7e9780f881 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.3.BETA</version>
+    <version>2.7.4.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 62c1d61bcf2eba5e1667b541d20e031acdb6f906 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 8 Jul 2017 17:37:33 +0800
Subject: [PATCH 36/85] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=B0=83=E6=95=B4=EF=BC=8C=E8=B7=9F=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=A8=A1=E5=9D=97=E4=BF=9D=E6=8C=81=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?,=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8apache=20httpclient?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weixin-java-pay/pom.xml                       |   3 +-
 .../wxpay/bean/result/WxPayBaseResult.java    |   4 +-
 .../impl/WxPayServiceAbstractImpl.java        | 466 ++++++++++++++++
 .../impl/WxPayServiceApacheHttpImpl.java      |  66 +++
 .../wxpay/service/impl/WxPayServiceImpl.java  | 515 +-----------------
 .../impl/WxPayServiceJoddHttpImpl.java        |  68 +++
 6 files changed, 610 insertions(+), 512 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java

diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 7e9780f881..7bb79b229d 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -23,10 +23,11 @@
       <groupId>com.github.binarywang</groupId>
       <artifactId>qrcode-utils</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.jodd</groupId>
       <artifactId>jodd-http</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java
index 3f07a58199..802e22b312 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java
@@ -1,7 +1,7 @@
 package com.github.binarywang.wxpay.bean.result;
 
 import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
+import com.github.binarywang.wxpay.service.impl.WxPayServiceAbstractImpl;
 import com.github.binarywang.wxpay.util.SignUtils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Maps;
@@ -307,7 +307,7 @@ protected Integer getXmlValueAsInt(String... path) {
   /**
    * 校验返回结果签名
    */
-  public void checkResult(WxPayServiceImpl wxPayService) throws WxPayException {
+  public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayException {
     //校验返回结果签名
     Map<String, String> map = toMap();
     if (getSign() != null && !SignUtils.checkSign(map, wxPayService.getConfig().getMchKey())) {
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
new file mode 100644
index 0000000000..aa9291760c
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -0,0 +1,466 @@
+package com.github.binarywang.wxpay.service.impl;
+
+import com.github.binarywang.utils.qrcode.QrcodeUtils;
+import com.github.binarywang.wxpay.bean.request.*;
+import com.github.binarywang.wxpay.bean.result.*;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.util.SignUtils;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <pre>
+ *  微信支付接口请求抽象实现类
+ * Created by Binary Wang on 2017-7-8.
+ * </pre>
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public abstract class WxPayServiceAbstractImpl implements WxPayService {
+  private static final String PAY_BASE_URL = "https://api.mch.weixin.qq.com";
+  protected final Logger log = LoggerFactory.getLogger(this.getClass());
+
+  protected WxPayConfig config;
+
+  @Override
+  public WxPayConfig getConfig() {
+    return this.config;
+  }
+
+  @Override
+  public void setConfig(WxPayConfig config) {
+    this.config = config;
+  }
+
+  private String getPayBaseUrl() {
+    if (this.getConfig().useSandbox()) {
+      return PAY_BASE_URL + "/sandboxnew";
+    }
+
+    return PAY_BASE_URL;
+  }
+
+  /**
+   * 发送post请求
+   *
+   * @param url        请求地址
+   * @param requestStr 请求信息
+   * @param useKey     是否使用证书
+   * @return 返回请求结果字符串
+   */
+  protected abstract String post(String url, String requestStr, boolean useKey) throws WxPayException;
+
+  @Override
+  public WxPayRefundResult refund(WxPayRefundRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/secapi/pay/refund";
+    String responseContent = this.post(url, request.toXML(), true);
+    WxPayRefundResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundResult.class);
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, String outRefundNo, String refundId)
+    throws WxPayException {
+    WxPayRefundQueryRequest request = new WxPayRefundQueryRequest();
+    request.setOutTradeNo(StringUtils.trimToNull(outTradeNo));
+    request.setTransactionId(StringUtils.trimToNull(transactionId));
+    request.setOutRefundNo(StringUtils.trimToNull(outRefundNo));
+    request.setRefundId(StringUtils.trimToNull(refundId));
+
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/pay/refundquery";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayRefundQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundQueryResult.class);
+    result.composeRefundRecords();
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public WxPayOrderNotifyResult getOrderNotifyResult(String xmlData) throws WxPayException {
+    try {
+      log.debug("微信支付回调参数详细：{}", xmlData);
+      WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
+      log.debug("微信支付回调结果对象：{}", result);
+      result.checkResult(this);
+      return result;
+    } catch (WxPayException e) {
+      log.error(e.getMessage(), e);
+      throw e;
+    } catch (Exception e) {
+      log.error(e.getMessage(), e);
+      throw new WxPayException("发生异常，" + e.getMessage(), e);
+    }
+  }
+
+  @Override
+  public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/sendredpack";
+    if (request.getAmtType() != null) {
+      //裂变红包
+      url = this.getPayBaseUrl() + "/mmpaymkttransfers/sendgroupredpack";
+    }
+
+    String responseContent = this.post(url, request.toXML(), true);
+    WxPaySendRedpackResult result = WxPayBaseResult.fromXML(responseContent, WxPaySendRedpackResult.class);
+    //毋须校验，因为没有返回签名信息
+    // this.checkResult(result);
+    return result;
+  }
+
+  @Override
+  public WxPayRedpackQueryResult queryRedpack(String mchBillNo) throws WxPayException {
+    WxPayRedpackQueryRequest request = new WxPayRedpackQueryRequest();
+    request.setMchBillNo(mchBillNo);
+    request.setBillType("MCHT");
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gethbinfo";
+    String responseContent = this.post(url, request.toXML(), true);
+    WxPayRedpackQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRedpackQueryResult.class);
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo) throws WxPayException {
+    WxPayOrderQueryRequest request = new WxPayOrderQueryRequest();
+    request.setOutTradeNo(StringUtils.trimToNull(outTradeNo));
+    request.setTransactionId(StringUtils.trimToNull(transactionId));
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/pay/orderquery";
+    String responseContent = this.post(url, request.toXML(), false);
+    if (StringUtils.isBlank(responseContent)) {
+      throw new WxPayException("无响应结果");
+    }
+
+    WxPayOrderQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderQueryResult.class);
+    result.composeCoupons();
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException {
+    if (StringUtils.isBlank(outTradeNo)) {
+      throw new IllegalArgumentException("out_trade_no不能为空");
+    }
+
+    WxPayOrderCloseRequest request = new WxPayOrderCloseRequest();
+    request.setOutTradeNo(StringUtils.trimToNull(outTradeNo));
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/pay/closeorder";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayOrderCloseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderCloseResult.class);
+    result.checkResult(this);
+
+    return result;
+  }
+
+  @Override
+  public WxPayUnifiedOrderResult unifiedOrder(WxPayUnifiedOrderRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/pay/unifiedorder";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayUnifiedOrderResult result = WxPayBaseResult.fromXML(responseContent, WxPayUnifiedOrderResult.class);
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws WxPayException {
+    WxPayUnifiedOrderResult unifiedOrderResult = this.unifiedOrder(request);
+    String prepayId = unifiedOrderResult.getPrepayId();
+    if (StringUtils.isBlank(prepayId)) {
+      throw new RuntimeException(String.format("无法获取prepay id，错误代码： '%s'，信息：%s。",
+        unifiedOrderResult.getErrCode(), unifiedOrderResult.getErrCodeDes()));
+    }
+
+    Map<String, String> payInfo = new HashMap<>();
+    if ("NATIVE".equals(request.getTradeType())) {
+      payInfo.put("codeUrl", unifiedOrderResult.getCodeURL());
+    } else if ("APP".equals(request.getTradeType())) {
+      // APP支付绑定的是微信开放平台上的账号，APPID为开放平台上绑定APP后发放的参数
+      String appId = getConfig().getAppId();
+      Map<String, String> configMap = new HashMap<>();
+      // 此map用于参与调起sdk支付的二次签名,格式全小写，timestamp只能是10位,格式固定，切勿修改
+      String partnerid = getConfig().getMchId();
+      configMap.put("prepayid", prepayId);
+      configMap.put("partnerid", partnerid);
+      configMap.put("package", "Sign=WXPay");
+      configMap.put("timestamp", String.valueOf(System.currentTimeMillis() / 1000));
+      configMap.put("noncestr", String.valueOf(System.currentTimeMillis()));
+      configMap.put("appid", appId);
+      // 此map用于客户端与微信服务器交互
+      payInfo.put("sign", SignUtils.createSign(configMap, this.getConfig().getMchKey()));
+      payInfo.put("prepayId", prepayId);
+      payInfo.put("partnerId", partnerid);
+      payInfo.put("appId", appId);
+      payInfo.put("packageValue", "Sign=WXPay");
+      payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
+      payInfo.put("nonceStr", String.valueOf(System.currentTimeMillis()));
+    } else if ("JSAPI".equals(request.getTradeType())) {
+      payInfo.put("appId", unifiedOrderResult.getAppid());
+      // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+      payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
+      payInfo.put("nonceStr", String.valueOf(System.currentTimeMillis()));
+      payInfo.put("package", "prepay_id=" + prepayId);
+      payInfo.put("signType", "MD5");
+      payInfo.put("paySign", SignUtils.createSign(payInfo, this.getConfig().getMchKey()));
+    }
+    return payInfo;
+  }
+
+  @Override
+  public WxEntPayResult entPay(WxEntPayRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/promotion/transfers";
+
+    String responseContent = this.post(url, request.toXML(), true);
+    WxEntPayResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayResult.class);
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public WxEntPayQueryResult queryEntPay(String partnerTradeNo) throws WxPayException {
+    WxEntPayQueryRequest request = new WxEntPayQueryRequest();
+    request.setPartnerTradeNo(partnerTradeNo);
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gettransferinfo";
+    String responseContent = this.post(url, request.toXML(), true);
+    WxEntPayQueryResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayQueryResult.class);
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) {
+    String content = this.createScanPayQrcodeMode1(productId);
+    return this.createQrcode(content, logoFile, sideLength);
+  }
+
+  @Override
+  public String createScanPayQrcodeMode1(String productId) {
+    //weixin://wxpay/bizpayurl?sign=XXXXX&appid=XXXXX&mch_id=XXXXX&product_id=XXXXXX&time_stamp=XXXXXX&nonce_str=XXXXX
+    StringBuilder codeUrl = new StringBuilder("weixin://wxpay/bizpayurl?");
+    Map<String, String> params = Maps.newHashMap();
+    params.put("appid", this.getConfig().getAppId());
+    params.put("mch_id", this.getConfig().getMchId());
+    params.put("product_id", productId);
+    params.put("time_stamp", String.valueOf(System.currentTimeMillis() / 1000));//这里需要秒，10位数字
+    params.put("nonce_str", String.valueOf(System.currentTimeMillis()));
+
+    String sign = SignUtils.createSign(params, this.getConfig().getMchKey());
+    params.put("sign", sign);
+
+
+    for (String key : params.keySet()) {
+      codeUrl.append(key + "=" + params.get(key) + "&");
+    }
+
+    String content = codeUrl.toString().substring(0, codeUrl.length() - 1);
+    log.debug("扫码支付模式一生成二维码的URL:{}", content);
+    return content;
+  }
+
+  @Override
+  public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) {
+    return this.createQrcode(codeUrl, logoFile, sideLength);
+  }
+
+  private byte[] createQrcode(String content, File logoFile, Integer sideLength) {
+    if (sideLength == null || sideLength < 1) {
+      return QrcodeUtils.createQrcode(content, logoFile);
+    }
+
+    return QrcodeUtils.createQrcode(content, sideLength, logoFile);
+  }
+
+  public void report(WxPayReportRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/payitil/report";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
+    result.checkResult(this);
+  }
+
+  @Override
+  public WxPayBillResult downloadBill(String billDate, String billType, String tarType, String deviceInfo) throws WxPayException {
+    WxPayDownloadBillRequest request = new WxPayDownloadBillRequest();
+    request.setBillType(billType);
+    request.setBillDate(billDate);
+    request.setTarType(tarType);
+    request.setDeviceInfo(deviceInfo);
+
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/pay/downloadbill";
+    String responseContent = this.post(url, request.toXML(), false);
+    if (responseContent.startsWith("<")) {
+      WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
+      result.checkResult(this);
+      return null;
+    } else {
+      WxPayBillResult wxPayBillResult = billInformationDeal(responseContent);
+      return wxPayBillResult;
+    }
+  }
+
+  private WxPayBillResult billInformationDeal(String responseContent) {
+    WxPayBillResult wxPayBillResult = new WxPayBillResult();
+
+    String listStr = "";
+    String objStr = "";
+    if (responseContent.contains("总交易单数")) {
+      listStr = responseContent.substring(0, responseContent.indexOf("总交易单数"));
+      objStr = responseContent.substring(responseContent.indexOf("总交易单数"));
+    }
+
+    /*
+     * 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
+     * 交易状态:REFUND 付款银行:CFT 货币种类:CNY 总金额:0.00 企业红包金额:0.00 微信退款单号: 商户退款单号:20170406010000933 退款金额:0.01 企业红包退款金额:0.00
+     * 退款类型:ORIGINAL 退款状态:SUCCESS 商品名称: 商户数据包: 手续费:0.00000 费率 :0.60%
+     */
+
+    // 参考以上格式进行取值
+
+    List<WxPayBillBaseResult> wxPayBillBaseResultLst = new LinkedList<>();
+    String newStr = listStr.replaceAll(",", " "); // 去空格
+    String[] tempStr = newStr.split("`"); // 数据分组
+    String[] t = tempStr[0].split(" ");// 分组标题
+    int j = tempStr.length / t.length; // 计算循环次数
+    int k = 1; // 纪录数组下标
+    for (int i = 0; i < j; i++) {
+      WxPayBillBaseResult wxPayBillBaseResult = new WxPayBillBaseResult();
+
+      wxPayBillBaseResult.setTradeTime(tempStr[k]);
+      wxPayBillBaseResult.setAppId(tempStr[k + 1]);
+      wxPayBillBaseResult.setMchId(tempStr[k + 2]);
+      wxPayBillBaseResult.setSubMchId(tempStr[k + 3]);
+      wxPayBillBaseResult.setDeviceInfo(tempStr[k + 4]);
+      wxPayBillBaseResult.setTransationId(tempStr[k + 5]);
+      wxPayBillBaseResult.setOutTradeNo(tempStr[k + 6]);
+      wxPayBillBaseResult.setOpenId(tempStr[k + 7]);
+      wxPayBillBaseResult.setTradeType(tempStr[k + 8]);
+      wxPayBillBaseResult.setTradeState(tempStr[k + 9]);
+      wxPayBillBaseResult.setBankType(tempStr[k + 10]);
+      wxPayBillBaseResult.setFeeType(tempStr[k + 11]);
+      wxPayBillBaseResult.setTotalFee(tempStr[k + 12]);
+      wxPayBillBaseResult.setCouponFee(tempStr[k + 13]);
+      wxPayBillBaseResult.setRefundId(tempStr[k + 14]);
+      wxPayBillBaseResult.setOutRefundNo(tempStr[k + 15]);
+      wxPayBillBaseResult.setSettlementRefundFee(tempStr[k + 16]);
+      wxPayBillBaseResult.setCouponRefundFee(tempStr[k + 17]);
+      wxPayBillBaseResult.setRefundChannel(tempStr[k + 18]);
+      wxPayBillBaseResult.setRefundState(tempStr[k + 19]);
+      wxPayBillBaseResult.setBody(tempStr[k + 20]);
+      wxPayBillBaseResult.setAttach(tempStr[k + 21]);
+      wxPayBillBaseResult.setPoundage(tempStr[k + 22]);
+      wxPayBillBaseResult.setPoundageRate(tempStr[k + 23]);
+      wxPayBillBaseResultLst.add(wxPayBillBaseResult);
+      k += t.length;
+    }
+    /*
+     * 总交易单数,总交易额,总退款金额,总代金券或立减优惠退款金额,手续费总金额 `2,`0.02,`0.0,`0.0,`0
+     */
+
+    // 参考以上格式进行取值
+
+    String totalStr = objStr.replaceAll(",", " ");
+    String[] totalTempStr = totalStr.split("`");
+    wxPayBillResult.setTotalRecord(totalTempStr[1]);
+    wxPayBillResult.setTotalFee(totalTempStr[2]);
+    wxPayBillResult.setTotalRefundFee(totalTempStr[3]);
+    wxPayBillResult.setTotalCouponFee(totalTempStr[4]);
+    wxPayBillResult.setTotalPoundageFee(totalTempStr[5]);
+
+    return wxPayBillResult;
+  }
+
+  @Override
+  public WxPayMicropayResult micropay(WxPayMicropayRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/pay/micropay";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayMicropayResult result = WxPayBaseResult.fromXML(responseContent, WxPayMicropayResult.class);
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public WxPayOrderReverseResult reverseOrder(WxPayOrderReverseRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/secapi/pay/reverse";
+    String responseContent = this.post(url, request.toXML(), true);
+    WxPayOrderReverseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderReverseResult.class);
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public String shorturl(WxPayShorturlRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/tools/shorturl";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayShorturlResult result = WxPayBaseResult.fromXML(responseContent, WxPayShorturlResult.class);
+    result.checkResult(this);
+    return result.getShortUrl();
+  }
+
+  @Override
+  public String shorturl(String longUrl) throws WxPayException {
+    return this.shorturl(new WxPayShorturlRequest(longUrl));
+  }
+
+  @Override
+  public String authcode2Openid(WxPayAuthcode2OpenidRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/tools/authcodetoopenid";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayAuthcode2OpenidResult result = WxPayBaseResult.fromXML(responseContent, WxPayAuthcode2OpenidResult.class);
+    result.checkResult(this);
+    return result.getOpenid();
+  }
+
+  @Override
+  public String authcode2Openid(String authCode) throws WxPayException {
+    return this.authcode2Openid(new WxPayAuthcode2OpenidRequest(authCode));
+  }
+
+  @Override
+  public String getSandboxSignKey() throws WxPayException {
+    WxPayDefaultRequest request = new WxPayDefaultRequest();
+    request.checkAndSign(this.getConfig());
+
+    String url = "https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPaySandboxSignKeyResult result = WxPayBaseResult.fromXML(responseContent, WxPaySandboxSignKeyResult.class);
+    result.checkResult(this);
+    return result.getSandboxSignKey();
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
new file mode 100644
index 0000000000..c5da982c13
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
@@ -0,0 +1,66 @@
+package com.github.binarywang.wxpay.service.impl;
+
+import com.github.binarywang.wxpay.exception.WxPayException;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ssl.DefaultHostnameVerifier;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import javax.net.ssl.SSLContext;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * <pre>
+ * 微信支付请求实现类，apache httpclient实现
+ * Created by Binary Wang on 2016/7/28.
+ * </pre>
+ *
+ * @author binarywang (https://github.com/binarywang)
+ */
+public class WxPayServiceApacheHttpImpl extends WxPayServiceAbstractImpl {
+
+  @Override
+  protected String post(String url, String requestStr, boolean useKey) throws WxPayException {
+    try {
+      HttpClientBuilder httpClientBuilder = HttpClients.custom();
+      if (useKey) {
+        SSLContext sslContext = this.getConfig().getSslContext();
+        if (null == sslContext) {
+          sslContext = this.getConfig().initSSLContext();
+        }
+
+        SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext,
+          new String[]{"TLSv1"}, null, new DefaultHostnameVerifier());
+        httpClientBuilder.setSSLSocketFactory(sslsf);
+      }
+
+      HttpPost httpPost = new HttpPost(url);
+      httpPost.setConfig(RequestConfig.custom()
+        .setConnectionRequestTimeout(this.getConfig().getHttpConnectionTimeout())
+        .setConnectTimeout(this.getConfig().getHttpConnectionTimeout())
+        .setSocketTimeout(this.getConfig().getHttpTimeout())
+        .build());
+
+      try (CloseableHttpClient httpclient = httpClientBuilder.build()) {
+        httpPost.setEntity(new StringEntity(new String(requestStr.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1)));
+        try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
+          String result = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+          this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, result);
+          return result;
+        }
+      } finally {
+        httpPost.releaseConnection();
+      }
+    } catch (Exception e) {
+      this.log.error("\n【请求地址】：{}\n【请求数据】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
+      throw new WxPayException(e.getMessage(), e);
+    }
+  }
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
index f799a2c974..8e795966f4 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImpl.java
@@ -1,515 +1,12 @@
 package com.github.binarywang.wxpay.service.impl;
 
-import com.github.binarywang.utils.qrcode.QrcodeUtils;
-import com.github.binarywang.wxpay.bean.request.*;
-import com.github.binarywang.wxpay.bean.result.*;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.util.SignUtils;
-import com.google.common.collect.Maps;
-import jodd.http.HttpRequest;
-import jodd.http.HttpResponse;
-import jodd.http.net.SSLSocketHttpConnectionProvider;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.net.ssl.SSLContext;
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
 /**
- * Created by Binary Wang on 2016/7/28.
+ * <pre>
+ * 微信支付接口请求实现类，默认使用Apache HttpClient实现
+ * Created by Binary Wang on 2017-7-8.
+ * </pre>
  *
- * @author binarywang (https://github.com/binarywang)
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
-public class WxPayServiceImpl implements WxPayService {
-  private static final String PAY_BASE_URL = "https://api.mch.weixin.qq.com";
-  private final Logger log = LoggerFactory.getLogger(this.getClass());
-
-  private WxPayConfig config;
-
-  @Override
-  public WxPayConfig getConfig() {
-    return this.config;
-  }
-
-  @Override
-  public void setConfig(WxPayConfig config) {
-    this.config = config;
-  }
-
-  private String getPayBaseUrl() {
-    if (this.getConfig().useSandbox()) {
-      return PAY_BASE_URL + "/sandboxnew";
-    }
-
-    return PAY_BASE_URL;
-  }
-
-  @Override
-  public WxPayRefundResult refund(WxPayRefundRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/secapi/pay/refund";
-    String responseContent = this.post(url, request.toXML(), true);
-    WxPayRefundResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundResult.class);
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, String outRefundNo, String refundId)
-    throws WxPayException {
-    WxPayRefundQueryRequest request = new WxPayRefundQueryRequest();
-    request.setOutTradeNo(StringUtils.trimToNull(outTradeNo));
-    request.setTransactionId(StringUtils.trimToNull(transactionId));
-    request.setOutRefundNo(StringUtils.trimToNull(outRefundNo));
-    request.setRefundId(StringUtils.trimToNull(refundId));
-
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/pay/refundquery";
-    String responseContent = this.post(url, request.toXML(), false);
-    WxPayRefundQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRefundQueryResult.class);
-    result.composeRefundRecords();
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public WxPayOrderNotifyResult getOrderNotifyResult(String xmlData) throws WxPayException {
-    try {
-      log.debug("微信支付回调参数详细：{}", xmlData);
-      WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
-      log.debug("微信支付回调结果对象：{}", result);
-      result.checkResult(this);
-      return result;
-    } catch (WxPayException e) {
-      log.error(e.getMessage(), e);
-      throw e;
-    } catch (Exception e) {
-      log.error(e.getMessage(), e);
-      throw new WxPayException("发生异常，" + e.getMessage(), e);
-    }
-  }
-
-  @Override
-  public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/sendredpack";
-    if (request.getAmtType() != null) {
-      //裂变红包
-      url = this.getPayBaseUrl() + "/mmpaymkttransfers/sendgroupredpack";
-    }
-
-    String responseContent = this.post(url, request.toXML(), true);
-    WxPaySendRedpackResult result = WxPayBaseResult.fromXML(responseContent, WxPaySendRedpackResult.class);
-    //毋须校验，因为没有返回签名信息
-    // this.checkResult(result);
-    return result;
-  }
-
-  @Override
-  public WxPayRedpackQueryResult queryRedpack(String mchBillNo) throws WxPayException {
-    WxPayRedpackQueryRequest request = new WxPayRedpackQueryRequest();
-    request.setMchBillNo(mchBillNo);
-    request.setBillType("MCHT");
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gethbinfo";
-    String responseContent = this.post(url, request.toXML(), true);
-    WxPayRedpackQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayRedpackQueryResult.class);
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo) throws WxPayException {
-    WxPayOrderQueryRequest request = new WxPayOrderQueryRequest();
-    request.setOutTradeNo(StringUtils.trimToNull(outTradeNo));
-    request.setTransactionId(StringUtils.trimToNull(transactionId));
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/pay/orderquery";
-    String responseContent = this.post(url, request.toXML(), false);
-    if (StringUtils.isBlank(responseContent)) {
-      throw new WxPayException("无响应结果");
-    }
-
-    WxPayOrderQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderQueryResult.class);
-    result.composeCoupons();
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException {
-    if (StringUtils.isBlank(outTradeNo)) {
-      throw new IllegalArgumentException("out_trade_no不能为空");
-    }
-
-    WxPayOrderCloseRequest request = new WxPayOrderCloseRequest();
-    request.setOutTradeNo(StringUtils.trimToNull(outTradeNo));
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/pay/closeorder";
-    String responseContent = this.post(url, request.toXML(), false);
-    WxPayOrderCloseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderCloseResult.class);
-    result.checkResult(this);
-
-    return result;
-  }
-
-  @Override
-  public WxPayUnifiedOrderResult unifiedOrder(WxPayUnifiedOrderRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/pay/unifiedorder";
-    String responseContent = this.post(url, request.toXML(), false);
-    WxPayUnifiedOrderResult result = WxPayBaseResult.fromXML(responseContent, WxPayUnifiedOrderResult.class);
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws WxPayException {
-    WxPayUnifiedOrderResult unifiedOrderResult = this.unifiedOrder(request);
-    String prepayId = unifiedOrderResult.getPrepayId();
-    if (StringUtils.isBlank(prepayId)) {
-      throw new RuntimeException(String.format("无法获取prepay id，错误代码： '%s'，信息：%s。",
-        unifiedOrderResult.getErrCode(), unifiedOrderResult.getErrCodeDes()));
-    }
-
-    Map<String, String> payInfo = new HashMap<>();
-    if ("NATIVE".equals(request.getTradeType())) {
-      payInfo.put("codeUrl", unifiedOrderResult.getCodeURL());
-    } else if ("APP".equals(request.getTradeType())) {
-      // APP支付绑定的是微信开放平台上的账号，APPID为开放平台上绑定APP后发放的参数
-      String appId = getConfig().getAppId();
-      Map<String, String> configMap = new HashMap<>();
-      // 此map用于参与调起sdk支付的二次签名,格式全小写，timestamp只能是10位,格式固定，切勿修改
-      String partnerid = getConfig().getMchId();
-      configMap.put("prepayid", prepayId);
-      configMap.put("partnerid", partnerid);
-      configMap.put("package", "Sign=WXPay");
-      configMap.put("timestamp", String.valueOf(System.currentTimeMillis() / 1000));
-      configMap.put("noncestr", String.valueOf(System.currentTimeMillis()));
-      configMap.put("appid", appId);
-      // 此map用于客户端与微信服务器交互
-      payInfo.put("sign", SignUtils.createSign(configMap, this.getConfig().getMchKey()));
-      payInfo.put("prepayId", prepayId);
-      payInfo.put("partnerId", partnerid);
-      payInfo.put("appId", appId);
-      payInfo.put("packageValue", "Sign=WXPay");
-      payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
-      payInfo.put("nonceStr", String.valueOf(System.currentTimeMillis()));
-    } else if ("JSAPI".equals(request.getTradeType())) {
-      payInfo.put("appId", unifiedOrderResult.getAppid());
-      // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
-      payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
-      payInfo.put("nonceStr", String.valueOf(System.currentTimeMillis()));
-      payInfo.put("package", "prepay_id=" + prepayId);
-      payInfo.put("signType", "MD5");
-      payInfo.put("paySign", SignUtils.createSign(payInfo, this.getConfig().getMchKey()));
-    }
-    return payInfo;
-  }
-
-  @Override
-  public WxEntPayResult entPay(WxEntPayRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/promotion/transfers";
-
-    String responseContent = this.post(url, request.toXML(), true);
-    WxEntPayResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayResult.class);
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public WxEntPayQueryResult queryEntPay(String partnerTradeNo) throws WxPayException {
-    WxEntPayQueryRequest request = new WxEntPayQueryRequest();
-    request.setPartnerTradeNo(partnerTradeNo);
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gettransferinfo";
-    String responseContent = this.post(url, request.toXML(), true);
-    WxEntPayQueryResult result = WxPayBaseResult.fromXML(responseContent, WxEntPayQueryResult.class);
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) {
-    String content = this.createScanPayQrcodeMode1(productId);
-    return this.createQrcode(content, logoFile, sideLength);
-  }
-
-  @Override
-  public String createScanPayQrcodeMode1(String productId) {
-    //weixin://wxpay/bizpayurl?sign=XXXXX&appid=XXXXX&mch_id=XXXXX&product_id=XXXXXX&time_stamp=XXXXXX&nonce_str=XXXXX
-    StringBuilder codeUrl = new StringBuilder("weixin://wxpay/bizpayurl?");
-    Map<String, String> params = Maps.newHashMap();
-    params.put("appid", this.getConfig().getAppId());
-    params.put("mch_id", this.getConfig().getMchId());
-    params.put("product_id", productId);
-    params.put("time_stamp", String.valueOf(System.currentTimeMillis() / 1000));//这里需要秒，10位数字
-    params.put("nonce_str", String.valueOf(System.currentTimeMillis()));
-
-    String sign = SignUtils.createSign(params, this.getConfig().getMchKey());
-    params.put("sign", sign);
-
-
-    for (String key : params.keySet()) {
-      codeUrl.append(key + "=" + params.get(key) + "&");
-    }
-
-    String content = codeUrl.toString().substring(0, codeUrl.length() - 1);
-    log.debug("扫码支付模式一生成二维码的URL:{}", content);
-    return content;
-  }
-
-  @Override
-  public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) {
-    return this.createQrcode(codeUrl, logoFile, sideLength);
-  }
-
-  private byte[] createQrcode(String content, File logoFile, Integer sideLength) {
-    if (sideLength == null || sideLength < 1) {
-      return QrcodeUtils.createQrcode(content, logoFile);
-    }
-
-    return QrcodeUtils.createQrcode(content, sideLength, logoFile);
-  }
-
-  public void report(WxPayReportRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/payitil/report";
-    String responseContent = this.post(url, request.toXML(), false);
-    WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
-    result.checkResult(this);
-  }
-
-  @Override
-  public WxPayBillResult downloadBill(String billDate, String billType, String tarType, String deviceInfo) throws WxPayException {
-    WxPayDownloadBillRequest request = new WxPayDownloadBillRequest();
-    request.setBillType(billType);
-    request.setBillDate(billDate);
-    request.setTarType(tarType);
-    request.setDeviceInfo(deviceInfo);
-
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/pay/downloadbill";
-    String responseContent = this.post(url, request.toXML(), false);
-    if (responseContent.startsWith("<")) {
-      WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
-      result.checkResult(this);
-      return null;
-    } else {
-      WxPayBillResult wxPayBillResult = billInformationDeal(responseContent);
-      return wxPayBillResult;
-    }
-  }
-
-  private WxPayBillResult billInformationDeal(String responseContent) {
-    WxPayBillResult wxPayBillResult = new WxPayBillResult();
-
-    String listStr = "";
-    String objStr = "";
-    if (responseContent.contains("总交易单数")) {
-      listStr = responseContent.substring(0, responseContent.indexOf("总交易单数"));
-      objStr = responseContent.substring(responseContent.indexOf("总交易单数"));
-    }
-
-    /*
-     * 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
-     * 交易状态:REFUND 付款银行:CFT 货币种类:CNY 总金额:0.00 企业红包金额:0.00 微信退款单号: 商户退款单号:20170406010000933 退款金额:0.01 企业红包退款金额:0.00
-     * 退款类型:ORIGINAL 退款状态:SUCCESS 商品名称: 商户数据包: 手续费:0.00000 费率 :0.60%
-     */
-
-    // 参考以上格式进行取值
-
-    List<WxPayBillBaseResult> wxPayBillBaseResultLst = new LinkedList<>();
-    String newStr = listStr.replaceAll(",", " "); // 去空格
-    String[] tempStr = newStr.split("`"); // 数据分组
-    String[] t = tempStr[0].split(" ");// 分组标题
-    int j = tempStr.length / t.length; // 计算循环次数
-    int k = 1; // 纪录数组下标
-    for (int i = 0; i < j; i++) {
-      WxPayBillBaseResult wxPayBillBaseResult = new WxPayBillBaseResult();
-
-      wxPayBillBaseResult.setTradeTime(tempStr[k]);
-      wxPayBillBaseResult.setAppId(tempStr[k + 1]);
-      wxPayBillBaseResult.setMchId(tempStr[k + 2]);
-      wxPayBillBaseResult.setSubMchId(tempStr[k + 3]);
-      wxPayBillBaseResult.setDeviceInfo(tempStr[k + 4]);
-      wxPayBillBaseResult.setTransationId(tempStr[k + 5]);
-      wxPayBillBaseResult.setOutTradeNo(tempStr[k + 6]);
-      wxPayBillBaseResult.setOpenId(tempStr[k + 7]);
-      wxPayBillBaseResult.setTradeType(tempStr[k + 8]);
-      wxPayBillBaseResult.setTradeState(tempStr[k + 9]);
-      wxPayBillBaseResult.setBankType(tempStr[k + 10]);
-      wxPayBillBaseResult.setFeeType(tempStr[k + 11]);
-      wxPayBillBaseResult.setTotalFee(tempStr[k + 12]);
-      wxPayBillBaseResult.setCouponFee(tempStr[k + 13]);
-      wxPayBillBaseResult.setRefundId(tempStr[k + 14]);
-      wxPayBillBaseResult.setOutRefundNo(tempStr[k + 15]);
-      wxPayBillBaseResult.setSettlementRefundFee(tempStr[k + 16]);
-      wxPayBillBaseResult.setCouponRefundFee(tempStr[k + 17]);
-      wxPayBillBaseResult.setRefundChannel(tempStr[k + 18]);
-      wxPayBillBaseResult.setRefundState(tempStr[k + 19]);
-      wxPayBillBaseResult.setBody(tempStr[k + 20]);
-      wxPayBillBaseResult.setAttach(tempStr[k + 21]);
-      wxPayBillBaseResult.setPoundage(tempStr[k + 22]);
-      wxPayBillBaseResult.setPoundageRate(tempStr[k + 23]);
-      wxPayBillBaseResultLst.add(wxPayBillBaseResult);
-      k += t.length;
-    }
-    /*
-     * 总交易单数,总交易额,总退款金额,总代金券或立减优惠退款金额,手续费总金额 `2,`0.02,`0.0,`0.0,`0
-     */
-
-    // 参考以上格式进行取值
-
-    String totalStr = objStr.replaceAll(",", " ");
-    String[] totalTempStr = totalStr.split("`");
-    wxPayBillResult.setTotalRecord(totalTempStr[1]);
-    wxPayBillResult.setTotalFee(totalTempStr[2]);
-    wxPayBillResult.setTotalRefundFee(totalTempStr[3]);
-    wxPayBillResult.setTotalCouponFee(totalTempStr[4]);
-    wxPayBillResult.setTotalPoundageFee(totalTempStr[5]);
-
-    return wxPayBillResult;
-  }
-
-  @Override
-  public WxPayMicropayResult micropay(WxPayMicropayRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/pay/micropay";
-    String responseContent = this.post(url, request.toXML(), false);
-    WxPayMicropayResult result = WxPayBaseResult.fromXML(responseContent, WxPayMicropayResult.class);
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public WxPayOrderReverseResult reverseOrder(WxPayOrderReverseRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/secapi/pay/reverse";
-    String responseContent = this.post(url, request.toXML(), true);
-    WxPayOrderReverseResult result = WxPayBaseResult.fromXML(responseContent, WxPayOrderReverseResult.class);
-    result.checkResult(this);
-    return result;
-  }
-
-  @Override
-  public String shorturl(WxPayShorturlRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/tools/shorturl";
-    String responseContent = this.post(url, request.toXML(), false);
-    WxPayShorturlResult result = WxPayBaseResult.fromXML(responseContent, WxPayShorturlResult.class);
-    result.checkResult(this);
-    return result.getShortUrl();
-  }
-
-  @Override
-  public String shorturl(String longUrl) throws WxPayException {
-    return this.shorturl(new WxPayShorturlRequest(longUrl));
-  }
-
-  @Override
-  public String authcode2Openid(WxPayAuthcode2OpenidRequest request) throws WxPayException {
-    request.checkAndSign(this.getConfig());
-
-    String url = this.getPayBaseUrl() + "/tools/authcodetoopenid";
-    String responseContent = this.post(url, request.toXML(), false);
-    WxPayAuthcode2OpenidResult result = WxPayBaseResult.fromXML(responseContent, WxPayAuthcode2OpenidResult.class);
-    result.checkResult(this);
-    return result.getOpenid();
-  }
-
-  @Override
-  public String authcode2Openid(String authCode) throws WxPayException {
-    return this.authcode2Openid(new WxPayAuthcode2OpenidRequest(authCode));
-  }
-
-  @Override
-  public String getSandboxSignKey() throws WxPayException {
-    WxPayDefaultRequest request = new WxPayDefaultRequest();
-    request.checkAndSign(this.getConfig());
-
-    String url = "https://api.mch.weixin.qq.com/sandboxnew/pay/getsignkey";
-    String responseContent = this.post(url, request.toXML(), false);
-    WxPaySandboxSignKeyResult result = WxPayBaseResult.fromXML(responseContent, WxPaySandboxSignKeyResult.class);
-    result.checkResult(this);
-    return result.getSandboxSignKey();
-  }
-
-  /**
-   * 发送post请求
-   *
-   * @param url        请求地址
-   * @param requestStr 请求信息
-   * @param useKey     是否使用证书
-   * @return 返回请求结果字符串
-   */
-  private String post(String url, String requestStr, boolean useKey) throws WxPayException {
-    try {
-      HttpRequest request = HttpRequest
-        .post(url)
-        .timeout(this.config.getHttpTimeout())
-        .connectionTimeout(this.config.getHttpConnectionTimeout())
-        .bodyText(requestStr);
-
-      if (useKey) {
-        SSLContext sslContext = this.getConfig().getSslContext();
-        if (null == sslContext) {
-          sslContext = this.getConfig().initSSLContext();
-        }
-        request.withConnectionProvider(new SSLSocketHttpConnectionProvider(sslContext));
-      }
-
-      String responseString = this.getResponseString(request.send());
-
-      this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, responseString);
-      return responseString;
-    } catch (Exception e) {
-      this.log.error("\n【请求地址】：{}\n【请求数据】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
-      throw new WxPayException(e.getMessage(), e);
-    }
-  }
-
-  private String getResponseString(HttpResponse response) throws WxPayException {
-    try {
-      this.log.debug("【微信服务器响应头信息】：\n{}", response.toString(false));
-    } catch (NullPointerException e) {
-      throw new WxPayException("response.toString() 居然抛出空指针异常了", e);
-    }
-
-    String responseString = response.bodyText();
-
-    if (StringUtils.isBlank(responseString)) {
-      throw new WxPayException("响应信息为空");
-    }
-
-    if (StringUtils.isBlank(response.charset())) {
-      responseString = new String(responseString.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
-    }
-
-    return responseString;
-  }
-
-
+public class WxPayServiceImpl extends WxPayServiceApacheHttpImpl {
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
new file mode 100644
index 0000000000..29008e26bd
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
@@ -0,0 +1,68 @@
+package com.github.binarywang.wxpay.service.impl;
+
+import com.github.binarywang.wxpay.exception.WxPayException;
+import jodd.http.HttpRequest;
+import jodd.http.HttpResponse;
+import jodd.http.net.SSLSocketHttpConnectionProvider;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.net.ssl.SSLContext;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 微信支付请求实现类，jodd-http实现
+ * Created by Binary Wang on 2016/7/28.
+ *
+ * @author binarywang (https://github.com/binarywang)
+ */
+public class WxPayServiceJoddHttpImpl extends WxPayServiceAbstractImpl {
+
+  @Override
+  protected String post(String url, String requestStr, boolean useKey) throws WxPayException {
+    try {
+      HttpRequest request = HttpRequest
+        .post(url)
+        .timeout(this.config.getHttpTimeout())
+        .connectionTimeout(this.config.getHttpConnectionTimeout())
+        .bodyText(requestStr);
+
+      if (useKey) {
+        SSLContext sslContext = this.getConfig().getSslContext();
+        if (null == sslContext) {
+          sslContext = this.getConfig().initSSLContext();
+        }
+        request.withConnectionProvider(new SSLSocketHttpConnectionProvider(sslContext));
+      }
+
+      String responseString = this.getResponseString(request.send());
+
+      this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, responseString);
+      return responseString;
+    } catch (Exception e) {
+      this.log.error("\n【请求地址】：{}\n【请求数据】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
+      throw new WxPayException(e.getMessage(), e);
+    }
+  }
+
+  private String getResponseString(HttpResponse response) throws WxPayException {
+    try {
+      this.log.debug("【微信服务器响应头信息】：\n{}", response.toString(false));
+    } catch (NullPointerException e) {
+      throw new WxPayException("response.toString() 居然抛出空指针异常了", e);
+    }
+
+    String responseString = response.bodyText();
+
+    if (StringUtils.isBlank(responseString)) {
+      throw new WxPayException("响应信息为空");
+    }
+
+    if (StringUtils.isBlank(response.charset())) {
+      responseString = new String(responseString.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);
+    }
+
+    return responseString;
+  }
+
+
+}

From 94724670daa6aa3c5f92b84e5d184aef5894a65c Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 8 Jul 2017 19:22:26 +0800
Subject: [PATCH 37/85] =?UTF-8?q?#68=20=E5=AE=9E=E7=8E=B0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=85=AC=E4=BC=97=E5=8F=B7=E7=9A=84=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E8=A7=84=E5=88=99=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/json/WxBooleanTypeAdapter.java       |  47 +++
 .../common/util/json/WxDateTypeAdapter.java   |  43 +++
 .../me/chanjar/weixin/mp/api/WxMpService.java |  30 +-
 .../mp/api/impl/AbstractWxMpServiceImpl.java  |   5 +
 .../bean/result/WxMpCurrentAutoReplyInfo.java | 359 ++++++++++++++++++
 .../mp/api/impl/WxMpServiceImplTest.java      |  12 +
 .../result/WxMpCurrentAutoReplyInfoTest.java  | 157 ++++++++
 7 files changed, 647 insertions(+), 6 deletions(-)
 create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxBooleanTypeAdapter.java
 create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxDateTypeAdapter.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java
 create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfoTest.java

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxBooleanTypeAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxBooleanTypeAdapter.java
new file mode 100644
index 0000000000..3fbbef4a43
--- /dev/null
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxBooleanTypeAdapter.java
@@ -0,0 +1,47 @@
+package me.chanjar.weixin.common.util.json;
+
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import org.apache.commons.lang3.BooleanUtils;
+
+import java.io.IOException;
+
+/**
+ * <pre>
+ * Gson 布尔类型类型转换器
+ * Created by Binary Wang on 2017-7-8.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxBooleanTypeAdapter extends TypeAdapter<Boolean> {
+  @Override
+  public void write(JsonWriter out, Boolean value) throws IOException {
+    if (value == null) {
+      out.nullValue();
+    } else {
+      out.value(value);
+    }
+  }
+
+  @Override
+  public Boolean read(JsonReader in) throws IOException {
+    JsonToken peek = in.peek();
+    switch (peek) {
+      case BOOLEAN:
+        return in.nextBoolean();
+      case NULL:
+        in.nextNull();
+        return null;
+      case NUMBER:
+        return BooleanUtils.toBoolean(in.nextInt());
+      case STRING:
+        return BooleanUtils.toBoolean(in.nextString());
+      default:
+        throw new JsonParseException("Expected BOOLEAN or NUMBER but was " + peek);
+    }
+  }
+}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxDateTypeAdapter.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxDateTypeAdapter.java
new file mode 100644
index 0000000000..fd54cf3f43
--- /dev/null
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/json/WxDateTypeAdapter.java
@@ -0,0 +1,43 @@
+package me.chanjar.weixin.common.util.json;
+
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * <pre>
+ * Gson 日期类型转换器
+ * Created by Binary Wang on 2017-7-8.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxDateTypeAdapter extends TypeAdapter<Date> {
+  @Override
+  public void write(JsonWriter out, Date value) throws IOException {
+    if (value == null) {
+      out.nullValue();
+    } else {
+      out.value(value.getTime() / 1000);
+    }
+  }
+
+  @Override
+  public Date read(JsonReader in) throws IOException {
+    JsonToken peek = in.peek();
+    switch (peek) {
+      case NULL:
+        in.nextNull();
+        return null;
+      case NUMBER:
+        return new Date(in.nextInt() * 1000);
+      default:
+        throw new JsonParseException("Expected NUMBER but was " + peek);
+    }
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index 7199d4e05c..0cff2c1cfd 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -77,6 +77,11 @@ public interface WxMpService {
    */
   String CONNECT_OAUTH2_AUTHORIZE_URL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=%s#wechat_redirect";
 
+  /**
+   * 获取公众号的自动回复规则
+   */
+  String GET_CURRENT_AUTOREPLY_INFO_URL = "https://api.weixin.qq.com/cgi-bin/get_current_autoreply_info";
+
   /**
    * <pre>
    * 验证消息的确来自微信服务器
@@ -273,6 +278,24 @@ public interface WxMpService {
    */
   String[] getCallbackIP() throws WxErrorException;
 
+  /**
+   * <pre>
+   * 获取公众号的自动回复规则
+   * http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751299&token=&lang=zh_CN
+   * 开发者可以通过该接口，获取公众号当前使用的自动回复规则，包括关注后自动回复、消息自动回复（60分钟内触发一次）、关键词自动回复。
+   * 请注意：
+   * 1、第三方平台开发者可以通过本接口，在旗下公众号将业务授权给你后，立即通过本接口检测公众号的自动回复配置，并通过接口再次给公众号设置好自动回复规则，以提升公众号运营者的业务体验。
+   * 2、本接口仅能获取公众号在公众平台官网的自动回复功能中设置的自动回复规则，若公众号自行开发实现自动回复，或通过第三方平台开发者来实现，则无法获取。
+   * 3、认证/未认证的服务号/订阅号，以及接口测试号，均拥有该接口权限。
+   * 4、从第三方平台的公众号登录授权机制上来说，该接口从属于消息与菜单权限集。
+   * 5、本接口中返回的图片/语音/视频为临时素材（临时素材每次获取都不同，3天内有效，通过素材管理-获取临时素材接口来获取这些素材），本接口返回的图文消息为永久素材素材（通过素材管理-获取永久素材接口来获取这些素材）。
+   * 接口调用请求说明
+   * http请求方式: GET（请使用https协议）
+   * https://api.weixin.qq.com/cgi-bin/get_current_autoreply_info?access_token=ACCESS_TOKEN
+   * </pre>
+   */
+  WxMpCurrentAutoReplyInfo getCurrentAutoReplyInfo() throws WxErrorException;
+
   /**
    * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求
    */
@@ -292,15 +315,10 @@ public interface WxMpService {
    */
   <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException;
 
-  /**
-   * 获取代理对象
-   */
-  //HttpHost getRequestHttpProxy();
-
   /**
    * <pre>
    * 设置当微信系统响应系统繁忙时，要等待多少 retrySleepMillis(ms) * 2^(重试次数 - 1) 再发起重试
-   * 默认：1000ms
+   * @param retrySleepMillis 默认：1000ms
    * </pre>
    */
   void setRetrySleepMillis(int retrySleepMillis);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
index d3075aa11d..ed93d4936f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
@@ -231,6 +231,11 @@ public String[] getCallbackIP() throws WxErrorException {
     return ipArray;
   }
 
+  @Override
+  public WxMpCurrentAutoReplyInfo getCurrentAutoReplyInfo() throws WxErrorException {
+    return WxMpCurrentAutoReplyInfo.fromJson(this.get(GET_CURRENT_AUTOREPLY_INFO_URL, null));
+  }
+
   @Override
   public String get(String url, String queryParam) throws WxErrorException {
     return execute(SimpleGetRequestExecutor.create(this), url, queryParam);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java
new file mode 100644
index 0000000000..6738b8bc4a
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java
@@ -0,0 +1,359 @@
+package me.chanjar.weixin.mp.bean.result;
+
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import me.chanjar.weixin.common.util.ToStringUtils;
+import me.chanjar.weixin.common.util.json.WxBooleanTypeAdapter;
+import me.chanjar.weixin.common.util.json.WxDateTypeAdapter;
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <pre>
+ * 公众号的自动回复规则
+ * Created by Binary Wang on 2017-7-8.
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * </pre>
+ */
+public class WxMpCurrentAutoReplyInfo {
+  @Override
+  public String toString() {
+    return ToStringUtils.toSimpleString(this);
+  }
+
+  public static WxMpCurrentAutoReplyInfo fromJson(String json) {
+    return WxMpGsonBuilder.create().fromJson(json, WxMpCurrentAutoReplyInfo.class);
+  }
+
+  @SerializedName("is_add_friend_reply_open")
+  @JsonAdapter(WxBooleanTypeAdapter.class)
+  private Boolean isAddFriendReplyOpen;
+
+  @SerializedName("is_autoreply_open")
+  @JsonAdapter(WxBooleanTypeAdapter.class)
+  private Boolean isAutoReplyOpen;
+
+  @SerializedName("add_friend_autoreply_info")
+  private AutoReplyInfo addFriendAutoReplyInfo;
+
+  @SerializedName("message_default_autoreply_info")
+  private AutoReplyInfo messageDefaultAutoReplyInfo;
+
+  @SerializedName("keyword_autoreply_info")
+  private KeywordAutoReplyInfo keywordAutoReplyInfo;
+
+  public Boolean getAddFriendReplyOpen() {
+    return this.isAddFriendReplyOpen;
+  }
+
+  public void setAddFriendReplyOpen(Boolean addFriendReplyOpen) {
+    isAddFriendReplyOpen = addFriendReplyOpen;
+  }
+
+  public Boolean getAutoReplyOpen() {
+    return this.isAutoReplyOpen;
+  }
+
+  public void setAutoReplyOpen(Boolean autoReplyOpen) {
+    isAutoReplyOpen = autoReplyOpen;
+  }
+
+  public AutoReplyInfo getAddFriendAutoReplyInfo() {
+    return this.addFriendAutoReplyInfo;
+  }
+
+  public void setAddFriendAutoReplyInfo(AutoReplyInfo addFriendAutoReplyInfo) {
+    this.addFriendAutoReplyInfo = addFriendAutoReplyInfo;
+  }
+
+  public AutoReplyInfo getMessageDefaultAutoReplyInfo() {
+    return this.messageDefaultAutoReplyInfo;
+  }
+
+  public void setMessageDefaultAutoReplyInfo(AutoReplyInfo messageDefaultAutoReplyInfo) {
+    this.messageDefaultAutoReplyInfo = messageDefaultAutoReplyInfo;
+  }
+
+  public KeywordAutoReplyInfo getKeywordAutoReplyInfo() {
+    return this.keywordAutoReplyInfo;
+  }
+
+  public void setKeywordAutoReplyInfo(KeywordAutoReplyInfo keywordAutoReplyInfo) {
+    this.keywordAutoReplyInfo = keywordAutoReplyInfo;
+  }
+
+  public static class AutoReplyRule {
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    @SerializedName("rule_name")
+    private String ruleName;
+
+    @SerializedName("create_time")
+    @JsonAdapter(WxDateTypeAdapter.class)
+    private Date createTime;
+
+    @SerializedName("reply_mode")
+    private String replyMode;
+
+    @SerializedName("keyword_list_info")
+    private List<KeywordInfo> keywordListInfo;
+
+    @SerializedName("reply_list_info")
+    private List<ReplyInfo> replyListInfo;
+
+    public String getRuleName() {
+      return this.ruleName;
+    }
+
+    public void setRuleName(String ruleName) {
+      this.ruleName = ruleName;
+    }
+
+    public Date getCreateTime() {
+      return this.createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+      this.createTime = createTime;
+    }
+
+    public String getReplyMode() {
+      return this.replyMode;
+    }
+
+    public void setReplyMode(String replyMode) {
+      this.replyMode = replyMode;
+    }
+
+    public List<KeywordInfo> getKeywordListInfo() {
+      return this.keywordListInfo;
+    }
+
+    public void setKeywordListInfo(List<KeywordInfo> keywordListInfo) {
+      this.keywordListInfo = keywordListInfo;
+    }
+
+    public List<ReplyInfo> getReplyListInfo() {
+      return this.replyListInfo;
+    }
+
+    public void setReplyListInfo(List<ReplyInfo> replyListInfo) {
+      this.replyListInfo = replyListInfo;
+    }
+  }
+
+  public static class ReplyInfo {
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    private String type;
+    private String content;
+
+    @SerializedName("news_info")
+    private NewsInfo newsInfo;
+
+    public String getType() {
+      return this.type;
+    }
+
+    public void setType(String type) {
+      this.type = type;
+    }
+
+    public String getContent() {
+      return this.content;
+    }
+
+    public void setContent(String content) {
+      this.content = content;
+    }
+
+    public NewsInfo getNewsInfo() {
+      return this.newsInfo;
+    }
+
+    public void setNewsInfo(NewsInfo newsInfo) {
+      this.newsInfo = newsInfo;
+    }
+  }
+
+  public static class NewsInfo {
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    private List<NewsItem> list;
+
+    public List<NewsItem> getList() {
+      return this.list;
+    }
+
+    public void setList(List<NewsItem> list) {
+      this.list = list;
+    }
+  }
+
+  public static class NewsItem {
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    @SerializedName("cover_url")
+    private String coverUrl;
+    private String author;
+    @SerializedName("content_url")
+    private String contentUrl;
+    private String digest;
+    @SerializedName("show_cover")
+    @JsonAdapter(WxBooleanTypeAdapter.class)
+    private Boolean showCover;
+    @SerializedName("source_url")
+    private String sourceUrl;
+    private String title;
+
+    public String getCoverUrl() {
+      return this.coverUrl;
+    }
+
+    public void setCoverUrl(String coverUrl) {
+      this.coverUrl = coverUrl;
+    }
+
+    public String getAuthor() {
+      return this.author;
+    }
+
+    public void setAuthor(String author) {
+      this.author = author;
+    }
+
+    public String getContentUrl() {
+      return this.contentUrl;
+    }
+
+    public void setContentUrl(String contentUrl) {
+      this.contentUrl = contentUrl;
+    }
+
+    public String getDigest() {
+      return this.digest;
+    }
+
+    public void setDigest(String digest) {
+      this.digest = digest;
+    }
+
+    public Boolean getShowCover() {
+      return this.showCover;
+    }
+
+    public void setShowCover(Boolean showCover) {
+      this.showCover = showCover;
+    }
+
+    public String getSourceUrl() {
+      return this.sourceUrl;
+    }
+
+    public void setSourceUrl(String sourceUrl) {
+      this.sourceUrl = sourceUrl;
+    }
+
+    public String getTitle() {
+      return this.title;
+    }
+
+    public void setTitle(String title) {
+      this.title = title;
+    }
+  }
+
+  public static class KeywordInfo {
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    private String type;
+    @SerializedName("match_mode")
+    private String matchMode;
+    private String content;
+
+    public String getType() {
+      return this.type;
+    }
+
+    public void setType(String type) {
+      this.type = type;
+    }
+
+    public String getMatchMode() {
+      return this.matchMode;
+    }
+
+    public void setMatchMode(String matchMode) {
+      this.matchMode = matchMode;
+    }
+
+    public String getContent() {
+      return this.content;
+    }
+
+    public void setContent(String content) {
+      this.content = content;
+    }
+  }
+
+  public static class KeywordAutoReplyInfo {
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    private List<AutoReplyRule> list;
+
+    public List<AutoReplyRule> getList() {
+      return this.list;
+    }
+
+    public void setList(List<AutoReplyRule> list) {
+      this.list = list;
+    }
+  }
+
+  public static class AutoReplyInfo {
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    private String type;
+    private String content;
+
+    public String getType() {
+      return this.type;
+    }
+
+    public void setType(String type) {
+      this.type = type;
+    }
+
+    public String getContent() {
+      return this.content;
+    }
+
+    public void setContent(String content) {
+      this.content = content;
+    }
+  }
+
+}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
index d5bf621287..c3f9f69d7b 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java
@@ -2,12 +2,16 @@
 
 import com.google.inject.Inject;
 import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.test.ApiTestModule;
 import me.chanjar.weixin.mp.api.test.TestConfigStorage;
+import me.chanjar.weixin.mp.bean.result.WxMpCurrentAutoReplyInfo;
 import org.testng.*;
 import org.testng.annotations.*;
 
+import static org.testng.Assert.*;
+
 @Test
 @Guice(modules = ApiTestModule.class)
 public class WxMpServiceImplTest {
@@ -15,6 +19,14 @@ public class WxMpServiceImplTest {
   @Inject
   private WxMpService wxService;
 
+  @Test
+  public void testGetCurrentAutoReplyInfo() throws WxErrorException {
+    WxMpCurrentAutoReplyInfo autoReplyInfo = this.wxService.getCurrentAutoReplyInfo();
+
+    assertNotNull(autoReplyInfo);
+    System.out.println(autoReplyInfo);
+  }
+
   @Test
   public void testCheckSignature() {
     Assert.fail("Not yet implemented");
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfoTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfoTest.java
new file mode 100644
index 0000000000..da2cddff40
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfoTest.java
@@ -0,0 +1,157 @@
+package me.chanjar.weixin.mp.bean.result;
+
+import org.testng.annotations.*;
+
+import static org.testng.Assert.*;
+
+/**
+ * <pre>
+ * Created by Binary Wang on 2017-7-8.
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * </pre>
+ */
+public class WxMpCurrentAutoReplyInfoTest {
+  @Test
+  public void testFromJson() throws Exception {
+    String json = "{ \n" +
+      "  \"is_add_friend_reply_open\": 1, \n" +
+      "  \"is_autoreply_open\": 1, \n" +
+      "  \"add_friend_autoreply_info\": { \n" +
+      "      \"type\": \"text\", \n" +
+      "      \"content\": \"Thanks for your attention!\"\n" +
+      "  }, \n" +
+      "  \"message_default_autoreply_info\": { \n" +
+      "      \"type\": \"text\", \n" +
+      "      \"content\": \"Hello, this is autoreply!\"\n" +
+      "  }, \n" +
+      "  \"keyword_autoreply_info\": { \n" +
+      "      \"list\": [ \n" +
+      "          { \n" +
+      "              \"rule_name\": \"autoreply-news\", \n" +
+      "              \"create_time\": 1423028166, \n" +
+      "              \"reply_mode\": \"reply_all\", \n" +
+      "              \"keyword_list_info\": [ \n" +
+      "                  { \n" +
+      "                      \"type\": \"text\", \n" +
+      "                      \"match_mode\": \"contain\", \n" +
+      "                      \"content\": \"news测试\"//此处content即为关键词内容\n" +
+      "                  }\n" +
+      "              ], \n" +
+      "              \"reply_list_info\": [ \n" +
+      "                  { \n" +
+      "                      \"type\": \"news\", \n" +
+      "                      \"news_info\": { \n" +
+      "                          \"list\": [ \n" +
+      "                              { \n" +
+      "                                  \"title\": \"it's news\", \n" +
+      "                                  \"author\": \"jim\", \n" +
+      "                                  \"digest\": \"it's digest\", \n" +
+      "                                  \"show_cover\": 1,  \"cover_url\": \"http://mmbiz.qpic.cn/mmbiz/GE7et87vE9vicuCibqXsX9GPPLuEtBfXfKbE8sWdt2DDcL0dMfQWJWTVn1N8DxI0gcRmrtqBOuwQH\n" +
+      "  euPKmFLK0ZQ/0\", \n" +
+      "                                  \"content_url\": \"http://mp.weixin.qq.com/s?__biz=MjM5ODUwNTM3Ng==&mid=203929886&idx=1&sn=628f964cf0c6d84c026881b6959aea8b#rd\", \n" +
+      "                                  \"source_url\": \"http://www.url.com\"\n" +
+      "                              }\n" +
+      "                          ]\n" +
+      "                      }\n" +
+      "                  }, \n" +
+      "                  { \n" +
+      "                      \"type\": \"news\",\n" +
+      "                      \"content\":\"KQb_w_Tiz-nSdVLoTV35Psmty8hGBulGhEdbb9SKs-o\", \n" +
+      "                      \"news_info\": { \n" +
+      "                          \"list\": [ \n" +
+      "                              { \n" +
+      "                                  \"title\": \"MULTI_NEWS\", \n" +
+      "                                  \"author\": \"JIMZHENG\", \n" +
+      "                                  \"digest\": \"text\", \n" +
+      "                                  \"show_cover\": 0, \n" +
+      "                                  \"cover_url\": \"http://mmbiz.qpic.cn/mmbiz/GE7et87vE9vicuCibqXsX9GPPLuEtBfXfK0HKuBIa1A1cypS0uY1wickv70iaY1gf3I1DTszuJoS3lAVLv\n" +
+      "hTcm9sDA/0\", \n" +
+      "                                  \"content_url\": \"http://mp.weixin.qq.com/s?__biz=MjM5ODUwNTM3Ng==&mid=204013432&idx=1&sn=80ce6d9abcb832237bf86c87e50fda15#rd\", \n" +
+      "                                  \"source_url\": \"\"\n" +
+      "                              },\n" +
+      "                              { \n" +
+      "                                  \"title\": \"MULTI_NEWS4\", \n" +
+      "                                  \"author\": \"JIMZHENG\", \n" +
+      "                                  \"digest\": \"MULTI_NEWSMULTI_NEWSMULTI_NEWSMULTI_NEWSMULTI_NEWSMULT\", \n" +
+      "                                  \"show_cover\": 1, \n" +
+      "\"cover_url\": \"http://mmbiz.qpic.cn/mmbiz/GE7et87vE9vicuCibqXsX9GPPLuEtBfXfKbE8sWdt2DDcL0dMfQWJWTVn1N8DxI0gcRmrtqBOuwQ\n" +
+      "HeuPKmFLK0ZQ/0\", \n" +
+      "                                  \"content_url\": \"http://mp.weixin.qq.com/s?__biz=MjM5ODUwNTM3Ng==&mid=204013432&idx=5&sn=b4ef73a915e7c2265e437096582774af#rd\", \n" +
+      "                                  \"source_url\": \"\"\n" +
+      "                              }\n" +
+      "                          ]\n" +
+      "                      }\n" +
+      "                  }\n" +
+      "              ]\n" +
+      "          }, \n" +
+      "          { \n" +
+      "              \"rule_name\": \"autoreply-voice\", \n" +
+      "              \"create_time\": 1423027971, \n" +
+      "              \"reply_mode\": \"random_one\", \n" +
+      "              \"keyword_list_info\": [ \n" +
+      "                  { \n" +
+      "                      \"type\": \"text\", \n" +
+      "                      \"match_mode\": \"contain\", \n" +
+      "                      \"content\": \"voice测试\"\n" +
+      "                  }\n" +
+      "              ], \n" +
+      "              \"reply_list_info\": [ \n" +
+      "                  { \n" +
+      "                      \"type\": \"voice\", \n" +
+      "                      \"content\": \"NESsxgHEvAcg3egJTtYj4uG1PTL6iPhratdWKDLAXYErhN6oEEfMdVyblWtBY5vp\"\n" +
+      "                  }\n" +
+      "              ]\n" +
+      "          }, \n" +
+      "          { \n" +
+      "              \"rule_name\": \"autoreply-text\", \n" +
+      "              \"create_time\": 1423027926, \n" +
+      "              \"reply_mode\": \"random_one\", \n" +
+      "              \"keyword_list_info\": [ \n" +
+      "                  { \n" +
+      "                      \"type\": \"text\", \n" +
+      "                      \"match_mode\": \"contain\", \n" +
+      "                      \"content\": \"text测试\"\n" +
+      "                  }\n" +
+      "              ], \n" +
+      "              \"reply_list_info\": [ \n" +
+      "                  { \n" +
+      "                      \"type\": \"text\", \n" +
+      "                      \"content\": \"hello!text!\"\n" +
+      "                  }\n" +
+      "              ]\n" +
+      "          }, \n" +
+      "          { \n" +
+      "              \"rule_name\": \"autoreply-video\", \n" +
+      "              \"create_time\": 1423027801, \n" +
+      "              \"reply_mode\": \"random_one\", \n" +
+      "              \"keyword_list_info\": [ \n" +
+      "                  { \n" +
+      "                      \"type\": \"text\", \n" +
+      "                      \"match_mode\": \"equal\", \n" +
+      "                      \"content\": \"video测试\"\n" +
+      "                  }\n" +
+      "              ], \n" +
+      "              \"reply_list_info\": [ \n" +
+      "                  { \n" +
+      "                 \"type\": \"video\", \n" +
+      "\"content\": \"http://61.182.133.153/vweixinp.tc.qq.com/1007_114bcede9a2244eeb5ab7f76d951df5f.f10.mp4?vkey=7183E5C952B16C3AB1991BA8138673DE1037CB82A29801A504B64A77F691BF9DF7AD054A9B7FE683&sha=0&save=1\"\n" +
+      "                  }\n" +
+      "              ]\n" +
+      "          }\n" +
+      "      ]\n" +
+      "  }\n" +
+      "}";
+
+    WxMpCurrentAutoReplyInfo autoReplyInfo = WxMpCurrentAutoReplyInfo.fromJson(json);
+
+    assertNotNull(autoReplyInfo);
+    assertTrue(autoReplyInfo.getAddFriendReplyOpen());
+    assertTrue(autoReplyInfo.getAutoReplyOpen());
+    assertNotNull(autoReplyInfo.getAddFriendAutoReplyInfo());
+    assertNotNull(autoReplyInfo.getMessageDefaultAutoReplyInfo());
+    assertTrue(autoReplyInfo.getKeywordAutoReplyInfo().getList().size() > 0);
+
+    System.out.println(autoReplyInfo);
+  }
+
+}

From 027c962d00e958aeb741eee928318981d2b418ff Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 11 Jul 2017 17:48:13 +0800
Subject: [PATCH 38/85] =?UTF-8?q?#272=20=E7=BB=9F=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0H5=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=BF=85=E9=A1=BB=E7=9A=84=E5=8F=82=E6=95=B0scene=5Fi?=
 =?UTF-8?q?nfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/WxPayUnifiedOrderRequest.java     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
index 342a3eb2d2..fdfcea3e22 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -280,6 +280,26 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
   @XStreamAlias("sub_openid")
   private String subOpenid;
 
+  /**
+   * <pre>
+   * 字段名：场景信息
+   * 变量名：scene_info
+   * 是否必填：否，对H5支付来说是必填
+   * 类型：String(256)
+   * 示例值：{
+   * "store_id": "SZT10000",
+   * "store_name":"腾讯大厦腾大餐厅"
+   * }
+   * 描述：该字段用于统一下单时上报场景信息，目前支持上报实际门店信息。
+   * {
+   * "store_id": "", //门店唯一标识，选填，String(32)
+   * "store_name":"”//门店名称，选填，String(64)
+   * }
+   * </pre>
+   */
+  @XStreamAlias("scene_info")
+  private String sceneInfo;
+
   public WxPayUnifiedOrderRequest() {
   }
 
@@ -307,6 +327,7 @@ private WxPayUnifiedOrderRequest(Builder builder) {
     setLimitPay(builder.limitPay);
     setOpenid(builder.openid);
     setSubOpenid(builder.subOpenid);
+    setSceneInfo(builder.sceneInfo);
   }
 
   public static Builder newBuilder() {
@@ -459,6 +480,14 @@ public void setSubOpenid(String subOpenid) {
     this.subOpenid = subOpenid;
   }
 
+  public String getSceneInfo() {
+    return this.sceneInfo;
+  }
+
+  public void setSceneInfo(String sceneInfo) {
+    this.sceneInfo = sceneInfo;
+  }
+
   @Override
   protected void checkConstraints() {
 //    if (!ArrayUtils.contains(TRADE_TYPES, this.getTradeType())) {
@@ -512,6 +541,7 @@ public static final class Builder {
     private String limitPay;
     private String openid;
     private String subOpenid;
+    private String sceneInfo;
 
     private Builder() {
     }
@@ -631,6 +661,11 @@ public Builder subOpenid(String subOpenid) {
       return this;
     }
 
+    public Builder sceneInfo(String sceneInfo) {
+      this.sceneInfo = sceneInfo;
+      return this;
+    }
+
     public WxPayUnifiedOrderRequest build() {
       return new WxPayUnifiedOrderRequest(this);
     }

From 39e3383248f7346ce7f8da45de923cd0929a6567 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 11 Jul 2017 17:59:27 +0800
Subject: [PATCH 39/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.5.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 2 +-
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f1d901d4b..3b6ab1509b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.4.BETA</version>
+  <version>2.7.5.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 3800522ceb..a2f1195b9a 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.4.BETA</version>
+    <version>2.7.5.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 1790105d8f..b63055ebc2 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.4.BETA</version>
+    <version>2.7.5.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 60d1194a78..b3e0e88e15 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.4.BETA</version>
+    <version>2.7.5.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index d65bceef9f..bd95d24728 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.4.BETA</version>
+    <version>2.7.5.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 7bb79b229d..7c695abc3e 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.4.BETA</version>
+    <version>2.7.5.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 039430c984c4162787d99e5f439a991cd84f04e0 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 15 Jul 2017 13:55:05 +0800
Subject: [PATCH 40/85] =?UTF-8?q?#279=20=E7=BB=9F=E4=B8=80=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?WxPayUnifiedOrderRequest=E5=A2=9E=E5=8A=A0fingerprint=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/WxPayUnifiedOrderRequest.java     | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
index fdfcea3e22..7c927425de 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -299,6 +299,16 @@ public class WxPayUnifiedOrderRequest extends WxPayBaseRequest {
    */
   @XStreamAlias("scene_info")
   private String sceneInfo;
+  /**
+   * <pre>
+   * 字段名：浏览器指纹
+   * 变量名：fingerprint
+   * 是否必填：否
+   * 详细参考 https://pay.weixin.qq.com/wiki/doc/api/H5.php?chapter=15_7&index=6
+   * </pre>
+   */
+  @XStreamAlias("fingerprint")
+  private String fingerprint;
 
   public WxPayUnifiedOrderRequest() {
   }
@@ -328,6 +338,7 @@ private WxPayUnifiedOrderRequest(Builder builder) {
     setOpenid(builder.openid);
     setSubOpenid(builder.subOpenid);
     setSceneInfo(builder.sceneInfo);
+    fingerprint = builder.fingerprint;
   }
 
   public static Builder newBuilder() {
@@ -518,14 +529,14 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {
   }
 
   public static final class Builder {
-    private String deviceInfo;
     private String appid;
-    private String body;
     private String mchId;
     private String subAppId;
     private String subMchId;
     private String nonceStr;
     private String sign;
+    private String deviceInfo;
+    private String body;
     private String detail;
     private String attach;
     private String outTradeNo;
@@ -542,25 +553,16 @@ public static final class Builder {
     private String openid;
     private String subOpenid;
     private String sceneInfo;
+    private String fingerprint;
 
     private Builder() {
     }
 
-    public Builder deviceInfo(String deviceInfo) {
-      this.deviceInfo = deviceInfo;
-      return this;
-    }
-
     public Builder appid(String appid) {
       this.appid = appid;
       return this;
     }
 
-    public Builder body(String body) {
-      this.body = body;
-      return this;
-    }
-
     public Builder mchId(String mchId) {
       this.mchId = mchId;
       return this;
@@ -586,6 +588,16 @@ public Builder sign(String sign) {
       return this;
     }
 
+    public Builder deviceInfo(String deviceInfo) {
+      this.deviceInfo = deviceInfo;
+      return this;
+    }
+
+    public Builder body(String body) {
+      this.body = body;
+      return this;
+    }
+
     public Builder detail(String detail) {
       this.detail = detail;
       return this;
@@ -666,6 +678,11 @@ public Builder sceneInfo(String sceneInfo) {
       return this;
     }
 
+    public Builder fingerprint(String fingerprint) {
+      this.fingerprint = fingerprint;
+      return this;
+    }
+
     public WxPayUnifiedOrderRequest build() {
       return new WxPayUnifiedOrderRequest(this);
     }

From 2726325fadc92f63ba11cc7b9a1d29998618587b Mon Sep 17 00:00:00 2001
From: mgcnrx11 <mgcnrx11@hotmail.com>
Date: Sat, 15 Jul 2017 16:22:36 +0800
Subject: [PATCH 41/85] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=8D=A1=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=20(#280)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 新增会员卡相关接口
1. 激活会员卡接口
2. 拉取会员信息接口
---
 .../weixin/mp/api/WxMpMemberCardService.java  |  38 +++++
 .../me/chanjar/weixin/mp/api/WxMpService.java |   7 +
 .../mp/api/impl/AbstractWxMpServiceImpl.java  |   6 +
 .../api/impl/WxMpMemberCardServiceImpl.java   |  78 ++++++++++
 .../bean/membercard/MemberCardUserInfo.java   |  27 ++++
 .../weixin/mp/bean/membercard/NameValues.java |  36 +++++
 .../WxMpMemberCardActivatedMessage.java       | 144 ++++++++++++++++++
 .../WxMpMemberCardUserInfoResult.java         | 137 +++++++++++++++++
 .../weixin/mp/util/json/WxMpGsonBuilder.java  |   2 +
 ...MpMemberCardUserInfoResultGsonAdapter.java |  72 +++++++++
 10 files changed, 547 insertions(+)
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java
new file mode 100644
index 0000000000..89b9fd74ea
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java
@@ -0,0 +1,38 @@
+package me.chanjar.weixin.mp.api;
+
+import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardActivatedMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult;
+
+/**
+ * 会员卡相关接口
+ *
+ * @author YuJian(mgcnrx11@gmail.com)
+ * @version 2017/7/8
+ */
+public interface WxMpMemberCardService {
+
+  /**
+   * 得到WxMpService
+   */
+  WxMpService getWxMpService();
+
+  /**
+   * 会员卡激活接口
+   *
+   * @param activatedMessage 激活所需参数
+   * @return 调用返回的JSON字符串。
+   * @throws WxErrorException 接口调用失败抛出的异常
+   */
+  String activateMemberCard(WxMpMemberCardActivatedMessage activatedMessage) throws WxErrorException;
+
+  /**
+   * 拉取会员信息接口
+   *
+   * @param cardId 会员卡的CardId，微信分配
+   * @param code 领取会员的会员卡Code
+   * @return 会员信息的结果对象
+   * @throws WxErrorException 接口调用失败抛出的异常
+   */
+  WxMpMemberCardUserInfoResult getUserInfo(String cardId, String code) throws WxErrorException;
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index 0cff2c1cfd..e4da721c8e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -434,6 +434,13 @@ public interface WxMpService {
    */
   WxMpShakeService getShakeService();
 
+  /**
+   * 返回会员卡相关接口方法的实现类对象，以方便调用其各个接口
+   *
+   * @return WxMpMemberCardService
+   */
+  WxMpMemberCardService getMemberCardService();
+
   /**
    * 初始化http请求对象
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
index ed93d4936f..cc965026c4 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
@@ -42,6 +42,7 @@ public abstract class AbstractWxMpServiceImpl<H, P> implements WxMpService, Requ
   private WxMpTemplateMsgService templateMsgService = new WxMpTemplateMsgServiceImpl(this);
   private WxMpDeviceService deviceService = new WxMpDeviceServiceImpl(this);
   private WxMpShakeService shakeService = new WxMpShakeServiceImpl(this);
+  private WxMpMemberCardService memberCardService = new WxMpMemberCardServiceImpl(this);
 
   private int retrySleepMillis = 1000;
   private int maxRetryTimes = 5;
@@ -406,6 +407,11 @@ public WxMpShakeService getShakeService() {
     return this.shakeService;
   }
 
+  @Override
+  public WxMpMemberCardService getMemberCardService() {
+    return this.memberCardService;
+  }
+
   @Override
   public RequestHttp getRequestHttp() {
     return this;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java
new file mode 100644
index 0000000000..24c70ebe9f
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java
@@ -0,0 +1,78 @@
+package me.chanjar.weixin.mp.api.impl;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.reflect.TypeToken;
+import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpMemberCardService;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardActivatedMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult;
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 会员卡相关接口的实现类
+ *
+ * @author YuJian(mgcnrx11@gmail.com)
+ * @version 2017/7/8
+ */
+public class WxMpMemberCardServiceImpl implements WxMpMemberCardService {
+
+  private final Logger log = LoggerFactory.getLogger(WxMpMemberCardServiceImpl.class);
+
+  private static final String MEMBER_CARD_ACTIVATE = "https://api.weixin.qq.com/card/membercard/activate";
+  private static final String MEMBER_CARD_USER_INFO_GET = "https://api.weixin.qq.com/card/membercard/userinfo/get";
+
+  private WxMpService wxMpService;
+
+  private static final Gson GSON = new Gson();
+
+  WxMpMemberCardServiceImpl(WxMpService wxMpService) {
+    this.wxMpService = wxMpService;
+  }
+
+  /**
+   * 得到WxMpService
+   */
+  @Override
+  public WxMpService getWxMpService() {
+    return this.wxMpService;
+  }
+
+  /**
+   * 会员卡激活接口
+   *
+   * @param activatedMessage 激活所需参数
+   * @return 调用返回的JSON字符串。
+   * @throws WxErrorException 接口调用失败抛出的异常
+   */
+  @Override
+  public String activateMemberCard(WxMpMemberCardActivatedMessage activatedMessage) throws WxErrorException {
+    return this.wxMpService.post(MEMBER_CARD_ACTIVATE, GSON.toJson(activatedMessage));
+  }
+
+  /**
+   * 拉取会员信息接口
+   *
+   * @param cardId 会员卡的CardId，微信分配
+   * @param code   领取会员的会员卡Code
+   * @return 会员信息的结果对象
+   * @throws WxErrorException 接口调用失败抛出的异常
+   */
+  @Override
+  public WxMpMemberCardUserInfoResult getUserInfo(String cardId, String code) throws WxErrorException {
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("card_id", cardId);
+    jsonObject.addProperty("code",code);
+
+    String responseContent = this.getWxMpService().post(MEMBER_CARD_USER_INFO_GET, jsonObject.toString());
+    JsonElement tmpJsonElement = new JsonParser().parse(responseContent);
+    return WxMpGsonBuilder.INSTANCE.create().fromJson(tmpJsonElement,
+      new TypeToken<WxMpMemberCardUserInfoResult>() {
+      }.getType());
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java
new file mode 100644
index 0000000000..336008b085
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java
@@ -0,0 +1,27 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+/**
+ * Created by YuJian on 2017/7/11.
+ */
+public class MemberCardUserInfo {
+
+  private NameValues[] commonFieldList;
+
+  private NameValues[] customFieldList;
+
+  public NameValues[] getCommonFieldList() {
+    return commonFieldList;
+  }
+
+  public void setCommonFieldList(NameValues[] commonFieldList) {
+    this.commonFieldList = commonFieldList;
+  }
+
+  public NameValues[] getCustomFieldList() {
+    return customFieldList;
+  }
+
+  public void setCustomFieldList(NameValues[] customFieldList) {
+    this.customFieldList = customFieldList;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java
new file mode 100644
index 0000000000..ae30d7a9a4
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java
@@ -0,0 +1,36 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+/**
+ * Created by YuJian on 2017/7/11.
+ */
+public class NameValues {
+  private String name;
+
+  private String value;
+
+  private String[] valueList;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+  public String[] getValueList() {
+    return valueList;
+  }
+
+  public void setValueList(String[] valueList) {
+    this.valueList = valueList;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java
new file mode 100644
index 0000000000..8040224a09
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java
@@ -0,0 +1,144 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 会员卡激活接口的参数
+ *
+ * @author YuJian(mgcnrx11@hotmail.com)
+ * @version 2017/7/8
+ */
+public class WxMpMemberCardActivatedMessage {
+
+  // 会员卡编号，由开发者填入，作为序列号显示在用户的卡包里。可与Code码保持等值。
+  @SerializedName("membership_number")
+  private String membershipNumber;
+  // 领取会员卡用户获得的code
+  private String code;
+  // 卡券ID,自定义code卡券必填
+  @SerializedName("card_id")
+  private String cardId;
+  // 商家自定义会员卡背景图，须先调用上传图片接口将背景图上传至CDN，否则报错。卡面设计请遵循微信会员卡自定义背景设计规范
+  @SerializedName("background_pic_url")
+  private String backgroundPicUrl;
+  // 激活后的有效起始时间。若不填写默认以创建时的 data_info 为准。Unix时间戳格式。
+  @SerializedName("activate_begin_time")
+  private Integer activateBeginTime;
+  // 激活后的有效截至时间。若不填写默认以创建时的 data_info 为准。Unix时间戳格式。
+  @SerializedName("activate_end_time")
+  private Integer activateEndTime;
+  // 初始积分，不填为0。
+  @SerializedName("init_bonus")
+  private Integer initBonus;
+  // 积分同步说明。
+  @SerializedName("init_bonus_record")
+  private String initBonusRecord;
+  // 初始余额，不填为0。
+  @SerializedName("init_balance")
+  private Integer initBalance;
+  // 创建时字段custom_field1定义类型的初始值，限制为4个汉字，12字节。
+  @SerializedName("init_custom_field_value1")
+  private String initCustomFieldValue1;
+  // 创建时字段custom_field2定义类型的初始值，限制为4个汉字，12字节。
+  @SerializedName("init_custom_field_value2")
+  private String initCustomFieldValue2;
+  // 创建时字段custom_field3定义类型的初始值，限制为4个汉字，12字节。
+  @SerializedName("init_custom_field_value3")
+  private String initCustomFieldValue3;
+
+  public String getMembershipNumber() {
+    return membershipNumber;
+  }
+
+  public void setMembershipNumber(String membershipNumber) {
+    this.membershipNumber = membershipNumber;
+  }
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public String getCardId() {
+    return cardId;
+  }
+
+  public void setCardId(String cardId) {
+    this.cardId = cardId;
+  }
+
+  public String getBackgroundPicUrl() {
+    return backgroundPicUrl;
+  }
+
+  public void setBackgroundPicUrl(String backgroundPicUrl) {
+    this.backgroundPicUrl = backgroundPicUrl;
+  }
+
+  public Integer getActivateBeginTime() {
+    return activateBeginTime;
+  }
+
+  public void setActivateBeginTime(Integer activateBeginTime) {
+    this.activateBeginTime = activateBeginTime;
+  }
+
+  public Integer getActivateEndTime() {
+    return activateEndTime;
+  }
+
+  public void setActivateEndTime(Integer activateEndTime) {
+    this.activateEndTime = activateEndTime;
+  }
+
+  public Integer getInitBonus() {
+    return initBonus;
+  }
+
+  public void setInitBonus(Integer initBonus) {
+    this.initBonus = initBonus;
+  }
+
+  public String getInitBonusRecord() {
+    return initBonusRecord;
+  }
+
+  public void setInitBonusRecord(String initBonusRecord) {
+    this.initBonusRecord = initBonusRecord;
+  }
+
+  public Integer getInitBalance() {
+    return initBalance;
+  }
+
+  public void setInitBalance(Integer initBalance) {
+    this.initBalance = initBalance;
+  }
+
+  public String getInitCustomFieldValue1() {
+    return initCustomFieldValue1;
+  }
+
+  public void setInitCustomFieldValue1(String initCustomFieldValue1) {
+    this.initCustomFieldValue1 = initCustomFieldValue1;
+  }
+
+  public String getInitCustomFieldValue2() {
+    return initCustomFieldValue2;
+  }
+
+  public void setInitCustomFieldValue2(String initCustomFieldValue2) {
+    this.initCustomFieldValue2 = initCustomFieldValue2;
+  }
+
+  public String getInitCustomFieldValue3() {
+    return initCustomFieldValue3;
+  }
+
+  public void setInitCustomFieldValue3(String initCustomFieldValue3) {
+    this.initCustomFieldValue3 = initCustomFieldValue3;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
new file mode 100644
index 0000000000..b3691da6dd
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
@@ -0,0 +1,137 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+import java.io.Serializable;
+
+/**
+ * 拉取会员信息返回的结果
+ *
+ * 字段格式参考https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1451025283  6.2.1小节的步骤5
+ *
+ * @author YuJian
+ * @version 2017/7/9
+ */
+public class WxMpMemberCardUserInfoResult implements Serializable {
+
+  private static final long serialVersionUID = 9084777967442098311L;
+
+  private String errorCode;
+
+  private String errorMsg;
+
+  private String openId;
+
+  private String nickname;
+
+  private String membershipNumber;
+
+  private Integer bonus;
+
+  private String sex;
+
+  private MemberCardUserInfo userInfo;
+
+  private String userCardStatus;
+
+  private Boolean hasActive;
+
+  public static long getSerialVersionUID() {
+    return serialVersionUID;
+  }
+
+  public String getErrorCode() {
+    return errorCode;
+  }
+
+  public void setErrorCode(String errorCode) {
+    this.errorCode = errorCode;
+  }
+
+  public String getErrorMsg() {
+    return errorMsg;
+  }
+
+  public void setErrorMsg(String errorMsg) {
+    this.errorMsg = errorMsg;
+  }
+
+  public String getOpenId() {
+    return openId;
+  }
+
+  public void setOpenId(String openId) {
+    this.openId = openId;
+  }
+
+  public String getNickname() {
+    return nickname;
+  }
+
+  public void setNickname(String nickname) {
+    this.nickname = nickname;
+  }
+
+  public String getMembershipNumber() {
+    return membershipNumber;
+  }
+
+  public void setMembershipNumber(String membershipNumber) {
+    this.membershipNumber = membershipNumber;
+  }
+
+  public Integer getBonus() {
+    return bonus;
+  }
+
+  public void setBonus(Integer bonus) {
+    this.bonus = bonus;
+  }
+
+  public String getSex() {
+    return sex;
+  }
+
+  public void setSex(String sex) {
+    this.sex = sex;
+  }
+
+  public MemberCardUserInfo getUserInfo() {
+    return userInfo;
+  }
+
+  public void setUserInfo(MemberCardUserInfo userInfo) {
+    this.userInfo = userInfo;
+  }
+
+  public String getUserCardStatus() {
+    return userCardStatus;
+  }
+
+  public void setUserCardStatus(String userCardStatus) {
+    this.userCardStatus = userCardStatus;
+  }
+
+  public Boolean getHasActive() {
+    return hasActive;
+  }
+
+  public void setHasActive(Boolean hasActive) {
+    this.hasActive = hasActive;
+  }
+
+  @Override
+  public String toString() {
+    return "WxMpMemberCardUserInfoResult{" +
+      "errorCode='" + errorCode + '\'' +
+      ", errorMsg='" + errorMsg + '\'' +
+      ", openId='" + openId + '\'' +
+      ", nickname='" + nickname + '\'' +
+      ", membershipNumber='" + membershipNumber + '\'' +
+      ", bonus=" + bonus +
+      ", sex='" + sex + '\'' +
+      ", userInfo=" + userInfo +
+      ", userCardStatus='" + userCardStatus + '\'' +
+      ", hasActive=" + hasActive +
+      '}';
+  }
+}
+
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
index 286778ad4b..8fca5a6a88 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
@@ -6,6 +6,7 @@
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult;
 import me.chanjar.weixin.mp.bean.material.*;
 import me.chanjar.weixin.mp.bean.result.*;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateIndustry;
@@ -49,6 +50,7 @@ public class WxMpGsonBuilder {
     INSTANCE.registerTypeAdapter(WxMediaImgUploadResult.class, new WxMediaImgUploadResultGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpTemplateIndustry.class, new WxMpIndustryGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpUserBlacklistGetResult.class, new WxUserBlacklistGetResultGsonAdapter());
+    INSTANCE.registerTypeAdapter(WxMpMemberCardUserInfoResult.class, new WxMpMemberCardUserInfoResultGsonAdapter());
   }
 
   public static Gson create() {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java
new file mode 100644
index 0000000000..021ea60226
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java
@@ -0,0 +1,72 @@
+package me.chanjar.weixin.mp.util.json;
+
+import com.google.gson.*;
+import me.chanjar.weixin.common.util.json.GsonHelper;
+import me.chanjar.weixin.mp.bean.membercard.MemberCardUserInfo;
+import me.chanjar.weixin.mp.bean.membercard.NameValues;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult;
+
+import java.lang.reflect.Type;
+
+/**
+ * Created by YuJian on 2017/7/11.
+ *
+ * @author YuJian
+ * @version 2017/7/11
+ */
+public class WxMpMemberCardUserInfoResultGsonAdapter implements JsonDeserializer<WxMpMemberCardUserInfoResult> {
+
+  @Override
+  public WxMpMemberCardUserInfoResult deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+    WxMpMemberCardUserInfoResult result = new WxMpMemberCardUserInfoResult();
+
+    JsonObject jsonObject = jsonElement.getAsJsonObject();
+
+    result.setOpenId(GsonHelper.getString(jsonObject, "openid"));
+    result.setErrorCode(GsonHelper.getString(jsonObject, "errcode"));
+    result.setErrorMsg(GsonHelper.getString(jsonObject, "errmsg"));
+    result.setNickname(GsonHelper.getString(jsonObject, "nickname"));
+    result.setMembershipNumber(GsonHelper.getString(jsonObject, "membership_number"));
+    result.setBonus(GsonHelper.getInteger(jsonObject, "bonus"));
+    result.setSex(GsonHelper.getString(jsonObject, "sex"));
+    result.setUserCardStatus(GsonHelper.getString(jsonObject, "user_card_status"));
+    result.setHasActive(GsonHelper.getBoolean(jsonObject, "has_active"));
+
+    JsonObject userInfoJsonObject = jsonObject.getAsJsonObject("user_info");
+    MemberCardUserInfo cardUserInfo = new MemberCardUserInfo();
+
+    JsonArray commonFieldListObj = userInfoJsonObject.getAsJsonArray("common_field_list");
+    NameValues[] commonFieldListValues = new NameValues[commonFieldListObj.size()];
+    for (int i = 0; i < commonFieldListObj.size(); i++) {
+      JsonObject commonField = commonFieldListObj.get(i).getAsJsonObject();
+      NameValues commonNameValues = new NameValues();
+      commonNameValues.setName(GsonHelper.getString(commonField, "name"));
+      commonNameValues.setValue(GsonHelper.getString(commonField, "value"));
+      commonFieldListValues[i] = commonNameValues;
+    }
+    cardUserInfo.setCommonFieldList(commonFieldListValues);
+
+    JsonArray customFieldListObj = userInfoJsonObject.getAsJsonArray("custom_field_list");
+    NameValues[] customFieldListValues = new NameValues[customFieldListObj.size()];
+    for (int i = 0; i < customFieldListObj.size(); i++) {
+      JsonObject customField = customFieldListObj.get(i).getAsJsonObject();
+      NameValues customNameValues = new NameValues();
+      customNameValues.setName(GsonHelper.getString(customField, "name"));
+      customNameValues.setValue(GsonHelper.getString(customField, "value"));
+
+      JsonArray valueListArray = customField.getAsJsonArray("value_list");
+      String[] valueList = new String[valueListArray.size()];
+      for (int j = 0; j < valueListArray.size(); j++) {
+        JsonObject valueListObj = valueListArray.getAsJsonObject();
+        valueList[i] = valueListObj.getAsString();
+      }
+      customNameValues.setValueList(valueList);
+      customFieldListValues[i] = customNameValues;
+    }
+    cardUserInfo.setCustomFieldList(customFieldListValues);
+
+    result.setUserInfo(cardUserInfo);
+
+    return result;
+  }
+}

From 33d5f872297e40112e7942f3bb8046232e3fa9a4 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 15 Jul 2017 17:13:00 +0800
Subject: [PATCH 42/85] =?UTF-8?q?#178=20=E5=AE=9E=E7=8E=B0=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E4=BB=A3=E9=87=91=E5=88=B8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/coupon/WxPayCouponSendRequest.java   | 311 ++++++++++++++++++
 .../bean/coupon/WxPayCouponSendResult.java    | 204 ++++++++++++
 .../wxpay/bean/request/WxPayBaseRequest.java  |  79 ++---
 .../wxpay/service/WxPayService.java           |  12 +
 .../impl/WxPayServiceAbstractImpl.java        |  13 +
 ...java => WxPayServiceAbstractImplTest.java} |  14 +-
 6 files changed, 589 insertions(+), 44 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendRequest.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java
 rename weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/{WxPayServiceImplTest.java => WxPayServiceAbstractImplTest.java} (94%)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendRequest.java
new file mode 100644
index 0000000000..9a98fd64a2
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendRequest.java
@@ -0,0 +1,311 @@
+package com.github.binarywang.wxpay.bean.coupon;
+
+import com.github.binarywang.wxpay.bean.request.WxPayBaseRequest;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import me.chanjar.weixin.common.annotation.Required;
+
+/**
+ * <pre>
+ * 发送代金券请求对象类
+ * Created by Binary Wang on 2017-7-15.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@XStreamAlias("xml")
+public class WxPayCouponSendRequest extends WxPayBaseRequest {
+  /**
+   * <pre>
+   * 字段名：代金券批次id
+   * 变量名：coupon_stock_id
+   * 是否必填：是
+   * 示例值：1757
+   * 类型：String
+   * 说明：代金券批次id
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("coupon_stock_id")
+  private String couponStockId;
+
+  /**
+   * <pre>
+   * 字段名：openid记录数
+   * 变量名：openid_count
+   * 是否必填：是
+   * 示例值：1
+   * 类型：int
+   * 说明：openid记录数（目前支持num=1）
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("openid_count")
+  private Integer openidCount;
+
+  /**
+   * <pre>
+   * 字段名：商户单据号
+   * 变量名：partner_trade_no
+   * 是否必填：是
+   * 示例值：1000009820141203515766
+   * 类型：String
+   * 说明：商户此次发放凭据号（格式：商户id+日期+流水号），商户侧需保持唯一性
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("partner_trade_no")
+  private String partnerTradeNo;
+
+  /**
+   * <pre>
+   * 字段名：用户openid
+   * 变量名：openid
+   * 是否必填：是
+   * 示例值：onqOjjrXT-776SpHnfexGm1_P7iE
+   * 类型：String
+   * 说明：Openid信息，用户在appid下的openid。
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("openid")
+  private String openid;
+
+  /**
+   * <pre>
+   * 字段名：操作员
+   * 变量名：op_user_id
+   * 是否必填：否
+   * 示例值：10000098
+   * 类型：String(32)
+   * 说明：操作员帐号, 默认为商户号,可在商户平台配置操作员对应的api权限
+   * </pre>
+   */
+  @XStreamAlias("op_user_id")
+  private String opUserId;
+
+  /**
+   * <pre>
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 示例值：
+   * 类型：String(32)
+   * 说明：微信支付分配的终端设备号
+   * </pre>
+   */
+  @XStreamAlias("device_info")
+  private String deviceInfo;
+
+  /**
+   * <pre>
+   * 字段名：协议版本
+   * 变量名：version
+   * 是否必填：否
+   * 示例值：1.0
+   * 类型：String(32)
+   * 说明：默认1.0
+   * </pre>
+   */
+  @XStreamAlias("version")
+  private String version;
+
+  /**
+   * <pre>
+   * 字段名：协议类型
+   * 变量名：type
+   * 是否必填：否
+   * 示例值：XML
+   * 类型：String(32)
+   * 说明：XML【目前仅支持默认XML】
+   * </pre>
+   */
+  @XStreamAlias("type")
+  private String type;
+
+  public WxPayCouponSendRequest() {
+  }
+
+  private WxPayCouponSendRequest(Builder builder) {
+    setAppid(builder.appid);
+    setMchId(builder.mchId);
+    setSubAppId(builder.subAppId);
+    setSubMchId(builder.subMchId);
+    setNonceStr(builder.nonceStr);
+    setSign(builder.sign);
+    setCouponStockId(builder.couponStockId);
+    setOpenidCount(builder.openidCount);
+    setPartnerTradeNo(builder.partnerTradeNo);
+    setOpenid(builder.openid);
+    setOpUserId(builder.opUserId);
+    setDeviceInfo(builder.deviceInfo);
+    setVersion(builder.version);
+    setType(builder.type);
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public String getCouponStockId() {
+    return this.couponStockId;
+  }
+
+  public void setCouponStockId(String couponStockId) {
+    this.couponStockId = couponStockId;
+  }
+
+  public Integer getOpenidCount() {
+    return this.openidCount;
+  }
+
+  public void setOpenidCount(Integer openidCount) {
+    this.openidCount = openidCount;
+  }
+
+  public String getPartnerTradeNo() {
+    return this.partnerTradeNo;
+  }
+
+  public void setPartnerTradeNo(String partnerTradeNo) {
+    this.partnerTradeNo = partnerTradeNo;
+  }
+
+  public String getOpenid() {
+    return this.openid;
+  }
+
+  public void setOpenid(String openid) {
+    this.openid = openid;
+  }
+
+  public String getOpUserId() {
+    return this.opUserId;
+  }
+
+  public void setOpUserId(String opUserId) {
+    this.opUserId = opUserId;
+  }
+
+  public String getDeviceInfo() {
+    return this.deviceInfo;
+  }
+
+  public void setDeviceInfo(String deviceInfo) {
+    this.deviceInfo = deviceInfo;
+  }
+
+  public String getVersion() {
+    return this.version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  public String getType() {
+    return this.type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  @Override
+  protected void checkConstraints() {
+    //do nothing
+  }
+
+  public static final class Builder {
+    private String appid;
+    private String mchId;
+    private String subAppId;
+    private String subMchId;
+    private String nonceStr;
+    private String sign;
+    private String couponStockId;
+    private Integer openidCount;
+    private String partnerTradeNo;
+    private String openid;
+    private String opUserId;
+    private String deviceInfo;
+    private String version;
+    private String type;
+
+    private Builder() {
+    }
+
+    public Builder appid(String appid) {
+      this.appid = appid;
+      return this;
+    }
+
+    public Builder mchId(String mchId) {
+      this.mchId = mchId;
+      return this;
+    }
+
+    public Builder subAppId(String subAppId) {
+      this.subAppId = subAppId;
+      return this;
+    }
+
+    public Builder subMchId(String subMchId) {
+      this.subMchId = subMchId;
+      return this;
+    }
+
+    public Builder nonceStr(String nonceStr) {
+      this.nonceStr = nonceStr;
+      return this;
+    }
+
+    public Builder sign(String sign) {
+      this.sign = sign;
+      return this;
+    }
+
+    public Builder couponStockId(String couponStockId) {
+      this.couponStockId = couponStockId;
+      return this;
+    }
+
+    public Builder openidCount(Integer openidCount) {
+      this.openidCount = openidCount;
+      return this;
+    }
+
+    public Builder partnerTradeNo(String partnerTradeNo) {
+      this.partnerTradeNo = partnerTradeNo;
+      return this;
+    }
+
+    public Builder openid(String openid) {
+      this.openid = openid;
+      return this;
+    }
+
+    public Builder opUserId(String opUserId) {
+      this.opUserId = opUserId;
+      return this;
+    }
+
+    public Builder deviceInfo(String deviceInfo) {
+      this.deviceInfo = deviceInfo;
+      return this;
+    }
+
+    public Builder version(String version) {
+      this.version = version;
+      return this;
+    }
+
+    public Builder type(String type) {
+      this.type = type;
+      return this;
+    }
+
+    public WxPayCouponSendRequest build() {
+      return new WxPayCouponSendRequest(this);
+    }
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java
new file mode 100644
index 0000000000..1c562adae2
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponSendResult.java
@@ -0,0 +1,204 @@
+package com.github.binarywang.wxpay.bean.coupon;
+
+import com.github.binarywang.wxpay.bean.result.WxPayBaseResult;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+/**
+ * <pre>
+ * 发送代金券响应结果类
+ * Created by Binary Wang on 2017-7-15.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@XStreamAlias("xml")
+public class WxPayCouponSendResult extends WxPayBaseResult {
+  /**
+   * <pre>
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 示例值：123456sb
+   * 类型：String(32)
+   * 描述：微信支付分配的终端设备号，
+   * </pre>
+   */
+  @XStreamAlias("device_info")
+  private String deviceInfo;
+
+  /**
+   * <pre>
+   * 字段名：代金券批次id
+   * 变量名：coupon_stock_id
+   * 是否必填：是
+   * 示例值：1757
+   * 类型：String
+   * 描述：用户在商户appid下的唯一标识
+   * </pre>
+   */
+  @XStreamAlias("coupon_stock_id")
+  private String couponStockId;
+
+  /**
+   * <pre>
+   * 字段名：返回记录数
+   * 变量名：resp_count
+   * 是否必填：是
+   * 示例值：1
+   * 类型：Int
+   * 描述：返回记录数
+   * </pre>
+   */
+  @XStreamAlias("resp_count")
+  private Integer respCount;
+
+  /**
+   * <pre>
+   * 字段名：成功记录数
+   * 变量名：success_count
+   * 是否必填：是
+   * 示例值：1或者0
+   * 类型：Int
+   * 描述：成功记录数
+   * </pre>
+   */
+  @XStreamAlias("success_count")
+  private Integer successCount;
+
+  /**
+   * <pre>
+   * 字段名：失败记录数
+   * 变量名：failed_count
+   * 是否必填：是
+   * 示例值：1或者0
+   * 类型：Int
+   * 描述：失败记录数
+   * </pre>
+   */
+  @XStreamAlias("failed_count")
+  private Integer failedCount;
+
+  /**
+   * <pre>
+   * 字段名：用户标识
+   * 变量名：openid
+   * 是否必填：是
+   * 示例值：onqOjjrXT-776SpHnfexGm1_P7iE
+   * 类型：String
+   * 描述：用户在商户appid下的唯一标识
+   * </pre>
+   */
+  @XStreamAlias("openid")
+  private String openid;
+
+  /**
+   * <pre>
+   * 字段名：返回码
+   * 变量名：ret_code
+   * 是否必填：是
+   * 示例值：SUCCESS或者FAILED
+   * 类型：String
+   * 描述：返回码，SUCCESS/FAILED
+   * </pre>
+   */
+  @XStreamAlias("ret_code")
+  private String retCode;
+
+  /**
+   * <pre>
+   * 字段名：代金券id
+   * 变量名：coupon_id
+   * 是否必填：是
+   * 示例值：1870
+   * 类型：String
+   * 描述：对一个用户成功发放代金券则返回代金券id，即ret_code为SUCCESS的时候；如果ret_code为FAILED则填写空串""
+   * </pre>
+   */
+  @XStreamAlias("coupon_id")
+  private String couponId;
+
+  /**
+   * <pre>
+   * 字段名：返回信息
+   * 变量名：ret_msg
+   * 是否必填：是
+   * 示例值：失败描述信息，例如：“用户已达领用上限”
+   * 类型：String
+   * 描述：返回信息，当返回码是FAILED的时候填写，否则填空串“”
+   * </pre>
+   */
+  @XStreamAlias("ret_msg")
+  private String retMsg;
+
+  public String getDeviceInfo() {
+    return this.deviceInfo;
+  }
+
+  public void setDeviceInfo(String deviceInfo) {
+    this.deviceInfo = deviceInfo;
+  }
+
+  public String getCouponStockId() {
+    return this.couponStockId;
+  }
+
+  public void setCouponStockId(String couponStockId) {
+    this.couponStockId = couponStockId;
+  }
+
+  public Integer getRespCount() {
+    return this.respCount;
+  }
+
+  public void setRespCount(Integer respCount) {
+    this.respCount = respCount;
+  }
+
+  public Integer getSuccessCount() {
+    return this.successCount;
+  }
+
+  public void setSuccessCount(Integer successCount) {
+    this.successCount = successCount;
+  }
+
+  public Integer getFailedCount() {
+    return this.failedCount;
+  }
+
+  public void setFailedCount(Integer failedCount) {
+    this.failedCount = failedCount;
+  }
+
+  public String getOpenid() {
+    return this.openid;
+  }
+
+  public void setOpenid(String openid) {
+    this.openid = openid;
+  }
+
+  public String getRetCode() {
+    return this.retCode;
+  }
+
+  public void setRetCode(String retCode) {
+    this.retCode = retCode;
+  }
+
+  public String getCouponId() {
+    return this.couponId;
+  }
+
+  public void setCouponId(String couponId) {
+    this.couponId = couponId;
+  }
+
+  public String getRetMsg() {
+    return this.retMsg;
+  }
+
+  public void setRetMsg(String retMsg) {
+    this.retMsg = retMsg;
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
index 0d4fc08b9d..b0c2e85d5c 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
@@ -17,13 +17,6 @@
  * <pre>
  * Created by Binary Wang on 2016-10-24.
  *  微信支付请求对象共用的参数存放类
- * 注释中各行每个字段描述对应如下：
- * <li>字段名
- * <li>变量名
- * <li>是否必填
- * <li>类型
- * <li>示例值
- * <li>描述
  * </pre>
  *
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
@@ -31,72 +24,72 @@
 public abstract class WxPayBaseRequest {
   /**
    * <pre>
-   * 公众账号ID
-   * appid
-   * 是
-   * String(32)
-   * wxd678efh567hg6787
-   * 微信分配的公众账号ID（企业号corpid即为此appId）
+   * 字段名：公众账号ID
+   * 变量名：appid
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：wxd678efh567hg6787
+   * 描述：微信分配的公众账号ID（企业号corpid即为此appId）
    * </pre>
    */
   @XStreamAlias("appid")
   protected String appid;
   /**
    * <pre>
-   * 商户号
-   * mch_id
-   * 是
-   * String(32)
-   * 1230000109
-   * 微信支付分配的商户号
+   * 字段名：商户号
+   * 变量名：mch_id
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：1230000109
+   * 描述：微信支付分配的商户号
    * </pre>
    */
   @XStreamAlias("mch_id")
   protected String mchId;
   /**
    * <pre>
-   * 服务商模式下的子商户公众账号ID
-   * sub_appid
-   * 是
-   * String(32)
-   * wxd678efh567hg6787
-   * 微信分配的子商户公众账号ID
+   * 字段名：服务商模式下的子商户公众账号ID
+   * 变量名：sub_appid
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：wxd678efh567hg6787
+   * 描述：微信分配的子商户公众账号ID
    * </pre>
    */
   @XStreamAlias("sub_appid")
   protected String subAppId;
   /**
    * <pre>
-   * 服务商模式下的子商户号
-   * sub_mch_id
-   * 是
-   * String(32)
-   * 1230000109
-   * 微信支付分配的子商户号，开发者模式下必填
+   * 字段名：服务商模式下的子商户号
+   * 变量名：sub_mch_id
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：1230000109
+   * 描述：微信支付分配的子商户号，开发者模式下必填
    * </pre>
    */
   @XStreamAlias("sub_mch_id")
   protected String subMchId;
   /**
    * <pre>
-   * 随机字符串
-   * nonce_str
-   * 是
-   * String(32)
-   * 5K8264ILTKCH16CQ2502SI8ZNMTM67VS
-   * 随机字符串，不长于32位。推荐随机数生成算法
+   * 字段名：随机字符串
+   * 变量名：nonce_str
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：5K8264ILTKCH16CQ2502SI8ZNMTM67VS
+   * 描述：随机字符串，不长于32位。推荐随机数生成算法
    * </pre>
    */
   @XStreamAlias("nonce_str")
   protected String nonceStr;
   /**
    * <pre>
-   * 签名
-   * sign
-   * 是
-   * String(32)
-   * C380BEC2BFD727A4B6845133519F3AD6
-   * 签名，详见签名生成算法
+   * 字段名：签名
+   * 变量名：sign
+   * 是否必填：是
+   * 类型：String(32)
+   * 示例值：C380BEC2BFD727A4B6845133519F3AD6
+   * 描述：签名，详见签名生成算法
    * </pre>
    */
   @XStreamAlias("sign")
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index 03640eb067..f2106c7260 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -1,5 +1,7 @@
 package com.github.binarywang.wxpay.service;
 
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -339,4 +341,14 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
    * </pre>
    */
   String getSandboxSignKey() throws WxPayException;
+
+  /**
+   * <pre>
+   * 发放代金券
+   * 接口请求链接：https://api.mch.weixin.qq.com/mmpaymkttransfers/send_coupon
+   * 是否需要证书：请求需要双向证书。
+   * 文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_3
+   * </pre>
+   */
+  WxPayCouponSendResult sendCoupon(WxPayCouponSendRequest request) throws WxPayException;
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index aa9291760c..b1c31b8676 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -1,6 +1,8 @@
 package com.github.binarywang.wxpay.service.impl;
 
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -463,4 +465,15 @@ public String getSandboxSignKey() throws WxPayException {
     result.checkResult(this);
     return result.getSandboxSignKey();
   }
+
+  @Override
+  public WxPayCouponSendResult sendCoupon(WxPayCouponSendRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/send_coupon";
+    String responseContent = this.post(url, request.toXML(), true);
+    WxPayCouponSendResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponSendResult.class);
+    result.checkResult(this);
+    return result;
+  }
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
similarity index 94%
rename from weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImplTest.java
rename to weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
index 1cba44c59b..cc6ab5a0b5 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -1,6 +1,8 @@
 package com.github.binarywang.wxpay.service.impl;
 
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
+import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.exception.WxPayException;
@@ -26,7 +28,7 @@
  */
 @Test
 @Guice(modules = ApiTestModule.class)
-public class WxPayServiceImplTest {
+public class WxPayServiceAbstractImplTest {
   private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
   @Inject
@@ -271,4 +273,14 @@ public void testGetSandboxSignKey() throws Exception {
     this.logger.info(signKey);
   }
 
+  @Test
+  public void testSendCoupon() throws Exception {
+    WxPayCouponSendResult result = this.payService.sendCoupon(WxPayCouponSendRequest.newBuilder()
+      .couponStockId("123")
+      .openid("122")
+      .partnerTradeNo("1212")
+      .openidCount(1)
+      .build());
+    this.logger.info(result.toString());
+  }
 }

From e36d16f2a23e095211d2c1d57d6a53ea4ed261e2 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 15 Jul 2017 18:05:00 +0800
Subject: [PATCH 43/85] =?UTF-8?q?#281=20=E6=B6=88=E6=81=AF=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=99=A8=E5=A2=9E=E5=8A=A0=E5=AF=B9EventKey=E6=AD=A3?=
 =?UTF-8?q?=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=8C=B9=E9=85=8D=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cp/message/WxCpMessageRouterRule.java     | 25 +++++++++++++------
 .../weixin/mp/api/WxMpMessageRouterRule.java  | 25 +++++++++++++------
 .../weixin/mp/api/WxMpMessageRouterTest.java  |  1 +
 3 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/message/WxCpMessageRouterRule.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/message/WxCpMessageRouterRule.java
index 5f41f61783..b5912404ce 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/message/WxCpMessageRouterRule.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/message/WxCpMessageRouterRule.java
@@ -6,6 +6,7 @@
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
 import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -27,6 +28,8 @@ public class WxCpMessageRouterRule {
 
   private String eventKey;
 
+  private String eventKeyRegex;
+
   private String content;
 
   private String rContent;
@@ -95,6 +98,14 @@ public WxCpMessageRouterRule eventKey(String eventKey) {
     return this;
   }
 
+  /**
+   * 如果eventKey匹配该正则表达式
+   */
+  public WxCpMessageRouterRule eventKeyRegex(String regex) {
+    this.eventKeyRegex = regex;
+    return this;
+  }
+
   /**
    * 如果content等于某值
    *
@@ -207,17 +218,17 @@ protected boolean test(WxCpXmlMessage wxMessage) {
         &&
         (this.agentId == null || this.agentId.equals(wxMessage.getAgentId()))
         &&
-        (this.msgType == null || this.msgType.equals(wxMessage.getMsgType()))
+        (this.msgType == null || this.msgType.equalsIgnoreCase(wxMessage.getMsgType()))
+        &&
+        (this.event == null || this.event.equalsIgnoreCase(wxMessage.getEvent()))
         &&
-        (this.event == null || this.event.equals(wxMessage.getEvent()))
+        (this.eventKey == null || this.eventKey.equalsIgnoreCase(wxMessage.getEventKey()))
         &&
-        (this.eventKey == null || this.eventKey.equals(wxMessage.getEventKey()))
+        (this.eventKeyRegex == null || Pattern.matches(this.eventKeyRegex, StringUtils.trimToEmpty(wxMessage.getEventKey())))
         &&
-        (this.content == null || this.content
-          .equals(wxMessage.getContent() == null ? null : wxMessage.getContent().trim()))
+        (this.content == null || this.content.equals(StringUtils.trimToNull(wxMessage.getContent())))
         &&
-        (this.rContent == null || Pattern
-          .matches(this.rContent, wxMessage.getContent() == null ? "" : wxMessage.getContent().trim()))
+        (this.rContent == null || Pattern.matches(this.rContent, StringUtils.trimToEmpty(wxMessage.getContent())))
         &&
         (this.matcher == null || this.matcher.match(wxMessage))
       ;
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 e44406f4b1..50e30af6b7 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
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,6 +27,8 @@ public class WxMpMessageRouterRule {
 
   private String eventKey;
 
+  private String eventKeyRegex;
+
   private String content;
 
   private String rContent;
@@ -74,6 +77,14 @@ public WxMpMessageRouterRule eventKey(String eventKey) {
     return this;
   }
 
+  /**
+   * 如果eventKey匹配该正则表达式
+   */
+  public WxMpMessageRouterRule eventKeyRegex(String regex) {
+    this.eventKeyRegex = regex;
+    return this;
+  }
+
   /**
    * 如果content等于某值
    */
@@ -170,17 +181,17 @@ protected boolean test(WxMpXmlMessage wxMessage) {
     return
       (this.fromUser == null || this.fromUser.equals(wxMessage.getFromUser()))
         &&
-        (this.msgType == null || this.msgType.toLowerCase().equals((wxMessage.getMsgType() == null ? null : wxMessage.getMsgType().toLowerCase())))
+        (this.msgType == null || this.msgType.equalsIgnoreCase(wxMessage.getMsgType()))
+        &&
+        (this.event == null || this.event.equalsIgnoreCase(wxMessage.getEvent()))
         &&
-        (this.event == null || this.event.toLowerCase().equals((wxMessage.getEvent() == null ? null : wxMessage.getEvent().toLowerCase())))
+        (this.eventKey == null || this.eventKey.equalsIgnoreCase(wxMessage.getEventKey()))
         &&
-        (this.eventKey == null || this.eventKey.toLowerCase().equals((wxMessage.getEventKey() == null ? null : wxMessage.getEventKey().toLowerCase())))
+        (this.eventKeyRegex == null || Pattern.matches(this.eventKeyRegex, StringUtils.trimToEmpty(wxMessage.getEventKey())))
         &&
-        (this.content == null || this.content
-          .equals(wxMessage.getContent() == null ? null : wxMessage.getContent().trim()))
+        (this.content == null || this.content.equals(StringUtils.trimToNull(wxMessage.getContent())))
         &&
-        (this.rContent == null || Pattern
-          .matches(this.rContent, wxMessage.getContent() == null ? "" : wxMessage.getContent().trim()))
+        (this.rContent == null || Pattern.matches(this.rContent, StringUtils.trimToEmpty(wxMessage.getContent())))
         &&
         (this.matcher == null || this.matcher.match(wxMessage))
       ;
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
index 4360440f04..35d13ee1e9 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMessageRouterTest.java
@@ -39,6 +39,7 @@ public void prepare(boolean async, StringBuffer sb, WxMpMessageRouter router) {
       .rule().async(async).msgType(WxConsts.XML_MSG_TEXT).handler(new WxEchoMpMessageHandler(sb, WxConsts.XML_MSG_TEXT)).end()
       .rule().async(async).event(WxConsts.EVT_CLICK).handler(new WxEchoMpMessageHandler(sb, WxConsts.EVT_CLICK)).end()
       .rule().async(async).eventKey("KEY_1").handler(new WxEchoMpMessageHandler(sb, "KEY_1")).end()
+      .rule().async(async).eventKeyRegex("KEY_1*").handler(new WxEchoMpMessageHandler(sb, "KEY_123")).end()
       .rule().async(async).content("CONTENT_1").handler(new WxEchoMpMessageHandler(sb, "CONTENT_1")).end()
       .rule().async(async).rContent(".*bc.*").handler(new WxEchoMpMessageHandler(sb, "abcd")).end()
       .rule().async(async).matcher(new WxMpMessageMatcher() {

From f3752e56d89b880651f01c98bba709e58ae68910 Mon Sep 17 00:00:00 2001
From: mgcnrx11 <mgcnrx11@hotmail.com>
Date: Sat, 15 Jul 2017 18:53:23 +0800
Subject: [PATCH 44/85] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=8D=A1=E7=AE=A1=E7=90=86=E6=9C=8D=E5=8A=A1=E7=9A=84`?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF`?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=AE=9E=E7=8E=B0=20(#283)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修复UserInfo反序列化的bug，补充其单元测试

* 增加`更新会员信息`接口的实现

* 增加会员卡相关接口的测试类  包含下述方法： 1. 会员卡激活接口 2. 会员信息获取接口 3. 更新会员信息接口
---
 .../weixin/mp/api/WxMpMemberCardService.java  |  15 ++
 .../api/impl/WxMpMemberCardServiceImpl.java   |  26 +++
 .../mp/bean/membercard/NotifyOptional.java    |  73 ++++++++
 .../WxMpMemberCardUpdateMessage.java          | 156 ++++++++++++++++++
 .../WxMpMemberCardUpdateResult.java           |  82 +++++++++
 .../WxMpMemberCardUserInfoResult.java         |   6 +
 .../weixin/mp/util/json/WxMpGsonBuilder.java  |   2 +
 ...WxMpMemberCardUpdateResultGsonAdapter.java |  37 +++++
 ...MpMemberCardUserInfoResultGsonAdapter.java |   7 +-
 .../impl/WxMpMemberCardServiceImplTest.java   |  61 +++++++
 .../WxMpMemberCardUpdateResultTest.java       |  33 ++++
 .../WxMpMemberCardUserInfoResultTest.java     |  80 +++++++++
 12 files changed, 574 insertions(+), 4 deletions(-)
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java
 create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImplTest.java
 create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResultTest.java
 create mode 100644 weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResultTest.java

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java
index 89b9fd74ea..7cebb8c858 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java
@@ -2,6 +2,8 @@
 
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardActivatedMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateResult;
 import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult;
 
 /**
@@ -35,4 +37,17 @@ public interface WxMpMemberCardService {
    * @throws WxErrorException 接口调用失败抛出的异常
    */
   WxMpMemberCardUserInfoResult getUserInfo(String cardId, String code) throws WxErrorException;
+
+  /**
+   * 当会员持卡消费后，支持开发者调用该接口更新会员信息。会员卡交易后的每次信息变更需通过该接口通知微信，便于后续消息通知及其他扩展功能。
+   *
+   * 1.开发者可以同时传入add_bonus和bonus解决由于同步失败带来的幂等性问题。同时传入add_bonus和bonus时
+   * add_bonus作为积分变动消息中的变量值，而bonus作为卡面上的总积分额度显示。余额变动同理。
+   * 2.开发者可以传入is_notify_bonus控制特殊的积分对账变动不发送消息，余额变动同理。
+   *
+   * @param updateUserMessage 更新会员信息所需字段消息
+   * @return 调用返回的JSON字符串。
+   * @throws WxErrorException 接口调用失败抛出的异常
+   */
+  WxMpMemberCardUpdateResult updateUserMemberCard(WxMpMemberCardUpdateMessage updateUserMessage) throws WxErrorException;
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java
index 24c70ebe9f..b3a43a765a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java
@@ -9,6 +9,8 @@
 import me.chanjar.weixin.mp.api.WxMpMemberCardService;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardActivatedMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateResult;
 import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 import org.slf4j.Logger;
@@ -26,6 +28,7 @@ public class WxMpMemberCardServiceImpl implements WxMpMemberCardService {
 
   private static final String MEMBER_CARD_ACTIVATE = "https://api.weixin.qq.com/card/membercard/activate";
   private static final String MEMBER_CARD_USER_INFO_GET = "https://api.weixin.qq.com/card/membercard/userinfo/get";
+  private static final String MEMBER_CARD_UPDATE_USER = "https://api.weixin.qq.com/card/membercard/updateuser";
 
   private WxMpService wxMpService;
 
@@ -75,4 +78,27 @@ public WxMpMemberCardUserInfoResult getUserInfo(String cardId, String code) thro
       new TypeToken<WxMpMemberCardUserInfoResult>() {
       }.getType());
   }
+
+  /**
+   * 当会员持卡消费后，支持开发者调用该接口更新会员信息。会员卡交易后的每次信息变更需通过该接口通知微信，便于后续消息通知及其他扩展功能。
+   *
+   * 1.开发者可以同时传入add_bonus和bonus解决由于同步失败带来的幂等性问题。同时传入add_bonus和bonus时
+   * add_bonus作为积分变动消息中的变量值，而bonus作为卡面上的总积分额度显示。余额变动同理。
+   * 2.开发者可以传入is_notify_bonus控制特殊的积分对账变动不发送消息，余额变动同理。
+   *
+   * @param updateUserMessage 更新会员信息所需字段消息
+   * @return 调用返回的JSON字符串。
+   * @throws WxErrorException 接口调用失败抛出的异常
+   */
+  @Override
+  public WxMpMemberCardUpdateResult updateUserMemberCard(WxMpMemberCardUpdateMessage updateUserMessage)
+    throws WxErrorException {
+
+    String responseContent = this.getWxMpService().post(MEMBER_CARD_UPDATE_USER, GSON.toJson(updateUserMessage));
+
+    JsonElement tmpJsonElement = new JsonParser().parse(responseContent);
+    return WxMpGsonBuilder.INSTANCE.create().fromJson(tmpJsonElement,
+      new TypeToken<WxMpMemberCardUpdateResult>() {
+      }.getType());
+  }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java
new file mode 100644
index 0000000000..a8adae8ac7
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java
@@ -0,0 +1,73 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 控制原生消息结构体，包含各字段的消息控制字段。
+ *
+ * 用于 `7 更新会员信息` 的接口参数调用
+ * https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1451025283
+ *
+ * @author YuJian(mgcnrx11@gmail.com)
+ * @version 2017/7/15
+ */
+public class NotifyOptional {
+
+  // 积分变动时是否触发系统模板消息，默认为true
+  @SerializedName("is_notify_bonus")
+  private Boolean isNotifyBonus;
+
+  // 余额变动时是否触发系统模板消息，默认为true
+  @SerializedName("is_notify_balance")
+  private Boolean isNotifyBalance;
+
+  // 自定义group1变动时是否触发系统模板消息，默认为false。（2、3同理）
+  @SerializedName("is_notify_custom_field1")
+  private Boolean isNotifyCustomField1;
+
+  @SerializedName("is_notify_custom_field2")
+  private Boolean isNotifyCustomField2;
+
+  @SerializedName("is_notify_custom_field3")
+  private Boolean isNotifyCustomField3;
+
+  public Boolean getNotifyBonus() {
+    return isNotifyBonus;
+  }
+
+  public void setNotifyBonus(Boolean notifyBonus) {
+    isNotifyBonus = notifyBonus;
+  }
+
+  public Boolean getNotifyBalance() {
+    return isNotifyBalance;
+  }
+
+  public void setNotifyBalance(Boolean notifyBalance) {
+    isNotifyBalance = notifyBalance;
+  }
+
+  public Boolean getNotifyCustomField1() {
+    return isNotifyCustomField1;
+  }
+
+  public void setNotifyCustomField1(Boolean notifyCustomField1) {
+    isNotifyCustomField1 = notifyCustomField1;
+  }
+
+  public Boolean getNotifyCustomField2() {
+    return isNotifyCustomField2;
+  }
+
+  public void setNotifyCustomField2(Boolean notifyCustomField2) {
+    isNotifyCustomField2 = notifyCustomField2;
+  }
+
+  public Boolean getNotifyCustomField3() {
+    return isNotifyCustomField3;
+  }
+
+  public void setNotifyCustomField3(Boolean notifyCustomField3) {
+    isNotifyCustomField3 = notifyCustomField3;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java
new file mode 100644
index 0000000000..f4d410185d
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java
@@ -0,0 +1,156 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 更新会员信息所需字段消息。
+ *
+ * 1.开发者可以同时传入add_bonus和bonus解决由于同步失败带来的幂等性问题。同时传入add_bonus和bonus时
+ * add_bonus作为积分变动消息中的变量值，而bonus作为卡面上的总积分额度显示。余额变动同理。
+ * 2.开发者可以传入is_notify_bonus控制特殊的积分对账变动不发送消息，余额变动同理。
+ *
+ * @author YuJian(mgcnrx11@gmail.com)
+ * @version 2017/7/15
+ */
+public class WxMpMemberCardUpdateMessage {
+
+  // 领取会员卡用户获得的code
+  private String code;
+  // 卡券ID,自定义code卡券必填
+  @SerializedName("card_id")
+  private String cardId;
+  // 支持商家激活时针对单个会员卡分配自定义的会员卡背景
+  @SerializedName("background_pic_url")
+  private String backgroundPicUrl;
+  // 需要设置的积分全量值，传入的数值会直接显示
+  private Integer bonus;
+  // 本次积分变动值，传负数代表减少
+  @SerializedName("add_bonus")
+  private Integer addBounus;
+  // 商家自定义积分消耗记录，不超过14个汉字
+  @SerializedName("record_bonus")
+  private String recordBonus;
+  // 需要设置的余额全量值，传入的数值会直接显示在卡面
+  private Integer balance;
+  // 本次余额变动值，传负数代表减少
+  @SerializedName("add_balance")
+  private Integer addBalance;
+  // 商家自定义金额消耗记录，不超过14个汉字。
+  @SerializedName("record_balance")
+  private String recordBalance;
+
+  // 创建时字段custom_field定义类型的最新数值，限制为4个汉字，12字节。
+  @SerializedName("custom_field_value1")
+  private String customFieldValue1;
+  @SerializedName("custom_field_value2")
+  private String customFieldValue2;
+  @SerializedName("custom_field_value3")
+  private String customFieldValue3;
+
+  @SerializedName("notify_optional")
+  private NotifyOptional notifyOptional;
+
+  public String getCode() {
+    return code;
+  }
+
+  public void setCode(String code) {
+    this.code = code;
+  }
+
+  public String getCardId() {
+    return cardId;
+  }
+
+  public void setCardId(String cardId) {
+    this.cardId = cardId;
+  }
+
+  public String getBackgroundPicUrl() {
+    return backgroundPicUrl;
+  }
+
+  public void setBackgroundPicUrl(String backgroundPicUrl) {
+    this.backgroundPicUrl = backgroundPicUrl;
+  }
+
+  public Integer getBonus() {
+    return bonus;
+  }
+
+  public void setBonus(Integer bonus) {
+    this.bonus = bonus;
+  }
+
+  public Integer getAddBounus() {
+    return addBounus;
+  }
+
+  public void setAddBounus(Integer addBounus) {
+    this.addBounus = addBounus;
+  }
+
+  public String getRecordBonus() {
+    return recordBonus;
+  }
+
+  public void setRecordBonus(String recordBonus) {
+    this.recordBonus = recordBonus;
+  }
+
+  public Integer getBalance() {
+    return balance;
+  }
+
+  public void setBalance(Integer balance) {
+    this.balance = balance;
+  }
+
+  public Integer getAddBalance() {
+    return addBalance;
+  }
+
+  public void setAddBalance(Integer addBalance) {
+    this.addBalance = addBalance;
+  }
+
+  public String getRecordBalance() {
+    return recordBalance;
+  }
+
+  public void setRecordBalance(String recordBalance) {
+    this.recordBalance = recordBalance;
+  }
+
+  public String getCustomFieldValue1() {
+    return customFieldValue1;
+  }
+
+  public void setCustomFieldValue1(String customFieldValue1) {
+    this.customFieldValue1 = customFieldValue1;
+  }
+
+  public String getCustomFieldValue2() {
+    return customFieldValue2;
+  }
+
+  public void setCustomFieldValue2(String customFieldValue2) {
+    this.customFieldValue2 = customFieldValue2;
+  }
+
+  public String getCustomFieldValue3() {
+    return customFieldValue3;
+  }
+
+  public void setCustomFieldValue3(String customFieldValue3) {
+    this.customFieldValue3 = customFieldValue3;
+  }
+
+  public NotifyOptional getNotifyOptional() {
+    return notifyOptional;
+  }
+
+  public void setNotifyOptional(NotifyOptional notifyOptional) {
+    this.notifyOptional = notifyOptional;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java
new file mode 100644
index 0000000000..e615cb0721
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java
@@ -0,0 +1,82 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 用于 `7 更新会员信息` 的接口调用后的返回结果
+ * https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1451025283
+ *
+ * @author YuJian(mgcnrx11@gmail.com)
+ * @version 2017/7/15
+ */
+public class WxMpMemberCardUpdateResult  implements Serializable {
+
+  private static final long serialVersionUID = 9084886191442098311L;
+
+  private String errorCode;
+
+  private String errorMsg;
+
+  private String openId;
+
+  private Integer resultBonus;
+
+  private Integer resultBalance;
+
+  public String getErrorCode() {
+    return errorCode;
+  }
+
+  public void setErrorCode(String errorCode) {
+    this.errorCode = errorCode;
+  }
+
+  public String getErrorMsg() {
+    return errorMsg;
+  }
+
+  public void setErrorMsg(String errorMsg) {
+    this.errorMsg = errorMsg;
+  }
+
+  public String getOpenId() {
+    return openId;
+  }
+
+  public void setOpenId(String openId) {
+    this.openId = openId;
+  }
+
+  public Integer getResultBonus() {
+    return resultBonus;
+  }
+
+  public void setResultBonus(Integer resultBonus) {
+    this.resultBonus = resultBonus;
+  }
+
+  public Integer getResultBalance() {
+    return resultBalance;
+  }
+
+  public void setResultBalance(Integer resultBalance) {
+    this.resultBalance = resultBalance;
+  }
+
+  @Override
+  public String toString() {
+    return "WxMpMemberCardUpdateResult{" +
+      "errorCode='" + errorCode + '\'' +
+      ", errorMsg='" + errorMsg + '\'' +
+      ", openId='" + openId + '\'' +
+      ", resultBonus=" + resultBonus +
+      ", resultBalance=" + resultBalance +
+      '}';
+  }
+
+  public static WxMpMemberCardUpdateResult fromJson(String json) {
+    return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpMemberCardUpdateResult.class);
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
index b3691da6dd..1ddb57d34b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
@@ -1,5 +1,7 @@
 package me.chanjar.weixin.mp.bean.membercard;
 
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
 import java.io.Serializable;
 
 /**
@@ -133,5 +135,9 @@ public String toString() {
       ", hasActive=" + hasActive +
       '}';
   }
+
+  public static WxMpMemberCardUserInfoResult fromJson(String json) {
+    return WxMpGsonBuilder.INSTANCE.create().fromJson(json, WxMpMemberCardUserInfoResult.class);
+  }
 }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
index 8fca5a6a88..124845ed6b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpGsonBuilder.java
@@ -6,6 +6,7 @@
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserCumulate;
 import me.chanjar.weixin.mp.bean.datacube.WxDataCubeUserSummary;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateResult;
 import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult;
 import me.chanjar.weixin.mp.bean.material.*;
 import me.chanjar.weixin.mp.bean.result.*;
@@ -51,6 +52,7 @@ public class WxMpGsonBuilder {
     INSTANCE.registerTypeAdapter(WxMpTemplateIndustry.class, new WxMpIndustryGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpUserBlacklistGetResult.class, new WxUserBlacklistGetResultGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMemberCardUserInfoResult.class, new WxMpMemberCardUserInfoResultGsonAdapter());
+    INSTANCE.registerTypeAdapter(WxMpMemberCardUpdateResult.class, new WxMpMemberCardUpdateResultGsonAdapter());
   }
 
   public static Gson create() {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java
new file mode 100644
index 0000000000..dc068db1e8
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUpdateResultGsonAdapter.java
@@ -0,0 +1,37 @@
+package me.chanjar.weixin.mp.util.json;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import me.chanjar.weixin.common.util.json.GsonHelper;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateResult;
+
+import java.lang.reflect.Type;
+
+/**
+ * Json to WxMpMemberCardUpdateResult 的转换适配器
+ *
+ * @author YuJian
+ * @version 2017/7/15
+ */
+public class WxMpMemberCardUpdateResultGsonAdapter implements JsonDeserializer<WxMpMemberCardUpdateResult> {
+
+  @Override
+  public WxMpMemberCardUpdateResult deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext
+    jsonDeserializationContext) throws JsonParseException {
+
+    WxMpMemberCardUpdateResult result = new WxMpMemberCardUpdateResult();
+
+    JsonObject jsonObject = jsonElement.getAsJsonObject();
+
+    result.setOpenId(GsonHelper.getString(jsonObject, "openid"));
+    result.setErrorCode(GsonHelper.getString(jsonObject, "errcode"));
+    result.setErrorMsg(GsonHelper.getString(jsonObject, "errmsg"));
+    result.setResultBalance(GsonHelper.getInteger(jsonObject, "result_balance"));
+    result.setResultBonus(GsonHelper.getInteger(jsonObject, "result_bonus"));
+
+    return result;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java
index 021ea60226..5a97ee7496 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMemberCardUserInfoResultGsonAdapter.java
@@ -9,9 +9,9 @@
 import java.lang.reflect.Type;
 
 /**
- * Created by YuJian on 2017/7/11.
+ * Json to WxMpMemberCardUserInfoResult 的转换适配器
  *
- * @author YuJian
+ * @author YuJian(mgcnrx11@gmail.com)
  * @version 2017/7/11
  */
 public class WxMpMemberCardUserInfoResultGsonAdapter implements JsonDeserializer<WxMpMemberCardUserInfoResult> {
@@ -57,8 +57,7 @@ public WxMpMemberCardUserInfoResult deserialize(JsonElement jsonElement, Type ty
       JsonArray valueListArray = customField.getAsJsonArray("value_list");
       String[] valueList = new String[valueListArray.size()];
       for (int j = 0; j < valueListArray.size(); j++) {
-        JsonObject valueListObj = valueListArray.getAsJsonObject();
-        valueList[i] = valueListObj.getAsString();
+        valueList[j] = valueListArray.get(j).getAsString();
       }
       customNameValues.setValueList(valueList);
       customFieldListValues[i] = customNameValues;
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImplTest.java
new file mode 100644
index 0000000000..67eb5817cc
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImplTest.java
@@ -0,0 +1,61 @@
+package me.chanjar.weixin.mp.api.impl;
+
+import com.google.inject.Inject;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.test.ApiTestModule;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardActivatedMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateMessage;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUpdateResult;
+import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardUserInfoResult;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import static org.testng.AssertJUnit.assertNotNull;
+
+/**
+ * 会员卡相关接口的测试类。
+ * 数据均为测试数据，由于直接与调用微信的接口，需要填写真实数据进行测试才能通过。
+ */
+@Test
+@Guice(modules = ApiTestModule.class)
+public class WxMpMemberCardServiceImplTest {
+
+  @Inject
+  protected WxMpService wxService;
+  private String cardId = "abc";
+  private String code = "123";
+  private String openId = "xyz";
+
+  @Test
+  public void testActivateMemberCard() throws Exception {
+    WxMpMemberCardActivatedMessage activatedMessage = new WxMpMemberCardActivatedMessage();
+    activatedMessage.setMembershipNumber(openId);
+    activatedMessage.setCode(code);
+    activatedMessage.setCardId(cardId);
+    activatedMessage.setInitBonus(2000);
+    activatedMessage.setInitBonusRecord("测试激活送积分");
+    String response = this.wxService.getMemberCardService().activateMemberCard(activatedMessage);
+    assertNotNull(response);
+    System.out.println(response);
+  }
+
+  @Test
+  public void testGetUserInfo() throws Exception {
+    WxMpMemberCardUserInfoResult result = this.wxService.getMemberCardService().getUserInfo(cardId, code);
+    assertNotNull(result);
+    System.out.println(result);
+  }
+
+  @Test
+  public void testUpdateUserMemberCard() throws Exception {
+    WxMpMemberCardUpdateMessage updateMessage = new WxMpMemberCardUpdateMessage();
+    updateMessage.setAddBounus(100);
+    updateMessage.setBonus(1000);
+    updateMessage.setCardId(cardId);
+    updateMessage.setCode(code);
+    WxMpMemberCardUpdateResult result = this.wxService.getMemberCardService().updateUserMemberCard(updateMessage);
+    assertNotNull(result);
+    System.out.println(result);
+  }
+
+}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResultTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResultTest.java
new file mode 100644
index 0000000000..f7860e7c85
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResultTest.java
@@ -0,0 +1,33 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+/**
+ *
+ * @author YuJian
+ * @version 2017/7/15
+ */
+public class WxMpMemberCardUpdateResultTest {
+
+  @Test
+  public void testFromJson() throws Exception {
+    String json = "{\n" +
+      "    \"errcode\": 0,\n" +
+      "    \"errmsg\": \"ok\",\n" +
+      "    \"result_bonus\": 100,\n" +
+      "    \"result_balance\": 200,\n" +
+      "    \"openid\": \"oFS7Fjl0WsZ9AMZqrI80nbIq8xrA\"\n" +
+      "}";
+
+    WxMpMemberCardUpdateResult result = WxMpMemberCardUpdateResult.fromJson(json);
+
+    assertNotNull(result);
+    assertTrue(result.getErrorCode().equalsIgnoreCase("0"));
+
+    System.out.println(result);
+  }
+}
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResultTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResultTest.java
new file mode 100644
index 0000000000..da8ff3da36
--- /dev/null
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResultTest.java
@@ -0,0 +1,80 @@
+package me.chanjar.weixin.mp.bean.membercard;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+/**
+ *
+ * @author YuJian
+ * @version 2017/7/15
+ */
+public class WxMpMemberCardUserInfoResultTest {
+
+  @Test
+  public void testFromJson() throws Exception {
+    String json = "{\n" +
+      "  \"errcode\": 0,\n" +
+      "  \"errmsg\": \"ok\",\n" +
+      "  \"openid\": \"obLatjjwDolFj******wNqRXw\",\n" +
+      "  \"nickname\": \"*******\",\n" +
+      "  \"membership_number\": \"658*****445\",\n" +
+      "  \"bonus\": 995,\n" +
+      "  \"sex\": \"MALE\",\n" +
+      "  \"user_info\": {\n" +
+      "    \"common_field_list\": [\n" +
+      "      {\n" +
+      "        \"name\": \"USER_FORM_INFO_FLAG_MOBILE\",\n" +
+      "        \"value\": \"15*****518\"\n" +
+      "      },\n" +
+      "      {\n" +
+      "        \"name\": \"USER_FORM_INFO_FLAG_NAME\",\n" +
+      "        \"value\": \"HK\"\n" +
+      "      },\n" +
+      "      {\n" +
+      "        \"name\": \"USER_FORM_INFO_FLAG_EDUCATION_BACKGROUND\",\n" +
+      "        \"value\": \"研究生\"\n" +
+      "      }\n" +
+      "    ],\n" +
+      "    \"custom_field_list\": [\n" +
+      "      {\n" +
+      "        \"name\": \"兴趣\",\n" +
+      "        \"value\": \"钢琴\",\n" +
+      "        \"value_list\": []\n" +
+      "      },\n" +
+      "      {\n" +
+      "        \"name\": \"喜好\",\n" +
+      "        \"value\": \"郭敬明\",\n" +
+      "        \"value_list\": []\n" +
+      "      },\n" +
+      "      {\n" +
+      "        \"name\": \"职业\",\n" +
+      "        \"value\": \"\",\n" +
+      "        \"value_list\": [\n" +
+      "          \"赛车手\",\n" +
+      "          \"旅行家\"\n" +
+      "        ]\n" +
+      "      }\n" +
+      "    ]\n" +
+      "  },\n" +
+      "  \"user_card_status\": \"NORMAL\",\n" +
+      "  \"has_active\": false\n" +
+      "}";
+
+
+    WxMpMemberCardUserInfoResult userInfoResult = WxMpMemberCardUserInfoResult.fromJson(json);
+
+    assertNotNull(userInfoResult);
+    assertFalse(userInfoResult.getHasActive());
+    assertTrue(userInfoResult.getSex().equalsIgnoreCase("MALE"));
+    assertNotNull(userInfoResult.getUserInfo());
+    assertNotNull(userInfoResult.getUserInfo().getCommonFieldList());
+    assertNotNull(userInfoResult.getUserInfo().getCustomFieldList());
+    assertTrue(userInfoResult.getUserInfo().getCommonFieldList().length == 3);
+    assertTrue(userInfoResult.getUserInfo().getCustomFieldList()[2].getValueList()[0].equalsIgnoreCase("赛车手"));
+
+    System.out.println(userInfoResult);
+  }
+}

From 74e3cc569bb9cbdaf38f6f80e2907324321e389f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 15 Jul 2017 19:16:52 +0800
Subject: [PATCH 45/85] =?UTF-8?q?#178=20=E5=AE=9E=E7=8E=B0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BB=A3=E9=87=91=E5=88=B8=E6=89=B9=E6=AC=A1=E5=92=8C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coupon/WxPayCouponInfoQueryRequest.java   | 280 ++++++++++++++
 .../coupon/WxPayCouponInfoQueryResult.java    | 351 ++++++++++++++++++
 .../coupon/WxPayCouponStockQueryRequest.java  | 221 +++++++++++
 .../coupon/WxPayCouponStockQueryResult.java   | 288 ++++++++++++++
 .../wxpay/service/WxPayService.java           |  21 +-
 .../impl/WxPayServiceAbstractImpl.java        |  25 +-
 .../impl/WxPayServiceAbstractImplTest.java    |  21 +-
 7 files changed, 1201 insertions(+), 6 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryRequest.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryRequest.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryRequest.java
new file mode 100644
index 0000000000..3d83d0a6c6
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryRequest.java
@@ -0,0 +1,280 @@
+package com.github.binarywang.wxpay.bean.coupon;
+
+import com.github.binarywang.wxpay.bean.request.WxPayBaseRequest;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import me.chanjar.weixin.common.annotation.Required;
+
+/**
+ * <pre>
+ * 查询代金券信息请求对象类
+ * Created by Binary Wang on 2017-7-15.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@XStreamAlias("xml")
+public class WxPayCouponInfoQueryRequest  extends WxPayBaseRequest {
+  /**
+   * <pre>
+   * 字段名：代金券id
+   * 变量名：coupon_id
+   * 是否必填：是
+   * 示例值：1757
+   * 类型：String
+   * 说明：代金券id
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("coupon_id")
+  private String couponId;
+
+  /**
+   * <pre>
+   * 字段名：代金券批次号
+   * 变量名：stock_id
+   * 是否必填：是
+   * 示例值：58818
+   * 类型：String
+   * 说明：代金劵对应的批次号
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("stock_id")
+  private String stockId;
+
+  /**
+   * <pre>
+   * 字段名：用户openid
+   * 变量名：openid
+   * 是否必填：是
+   * 示例值：onqOjjrXT-776SpHnfexGm1_P7iE
+   * 类型：String
+   * 说明：Openid信息，用户在appid下的openid。
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("openid")
+  private String openid;
+
+  /**
+   * <pre>
+   * 字段名：操作员
+   * 变量名：op_user_id
+   * 是否必填：否
+   * 示例值：10000098
+   * 类型：String(32)
+   * 说明：操作员帐号, 默认为商户号,可在商户平台配置操作员对应的api权限
+   * </pre>
+   */
+  @XStreamAlias("op_user_id")
+  private String opUserId;
+
+  /**
+   * <pre>
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 示例值：
+   * 类型：String(32)
+   * 说明：微信支付分配的终端设备号
+   * </pre>
+   */
+  @XStreamAlias("device_info")
+  private String deviceInfo;
+
+  /**
+   * <pre>
+   * 字段名：协议版本
+   * 变量名：version
+   * 是否必填：否
+   * 示例值：1.0
+   * 类型：String(32)
+   * 说明：默认1.0
+   * </pre>
+   */
+  @XStreamAlias("version")
+  private String version;
+
+  /**
+   * <pre>
+   * 字段名：协议类型
+   * 变量名：type
+   * 是否必填：否
+   * 示例值：XML
+   * 类型：String(32)
+   * 说明：XML【目前仅支持默认XML】
+   * </pre>
+   */
+  @XStreamAlias("type")
+  private String type;
+
+  private WxPayCouponInfoQueryRequest(Builder builder) {
+    setAppid(builder.appid);
+    setMchId(builder.mchId);
+    setSubAppId(builder.subAppId);
+    setSubMchId(builder.subMchId);
+    setNonceStr(builder.nonceStr);
+    setSign(builder.sign);
+    setCouponId(builder.couponId);
+    setStockId(builder.stockId);
+    setOpenid(builder.openid);
+    setOpUserId(builder.opUserId);
+    setDeviceInfo(builder.deviceInfo);
+    setVersion(builder.version);
+    setType(builder.type);
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public String getCouponId() {
+    return this.couponId;
+  }
+
+  public void setCouponId(String couponId) {
+    this.couponId = couponId;
+  }
+
+  public String getStockId() {
+    return this.stockId;
+  }
+
+  public void setStockId(String stockId) {
+    this.stockId = stockId;
+  }
+
+  public String getOpenid() {
+    return this.openid;
+  }
+
+  public void setOpenid(String openid) {
+    this.openid = openid;
+  }
+
+  public String getOpUserId() {
+    return this.opUserId;
+  }
+
+  public void setOpUserId(String opUserId) {
+    this.opUserId = opUserId;
+  }
+
+  public String getDeviceInfo() {
+    return this.deviceInfo;
+  }
+
+  public void setDeviceInfo(String deviceInfo) {
+    this.deviceInfo = deviceInfo;
+  }
+
+  public String getVersion() {
+    return this.version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  public String getType() {
+    return this.type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  @Override
+  protected void checkConstraints() {
+    //do nothing
+  }
+
+
+  public static final class Builder {
+    private String appid;
+    private String mchId;
+    private String subAppId;
+    private String subMchId;
+    private String nonceStr;
+    private String sign;
+    private String couponId;
+    private String stockId;
+    private String openid;
+    private String opUserId;
+    private String deviceInfo;
+    private String version;
+    private String type;
+
+    private Builder() {
+    }
+
+    public Builder appid(String appid) {
+      this.appid = appid;
+      return this;
+    }
+
+    public Builder mchId(String mchId) {
+      this.mchId = mchId;
+      return this;
+    }
+
+    public Builder subAppId(String subAppId) {
+      this.subAppId = subAppId;
+      return this;
+    }
+
+    public Builder subMchId(String subMchId) {
+      this.subMchId = subMchId;
+      return this;
+    }
+
+    public Builder nonceStr(String nonceStr) {
+      this.nonceStr = nonceStr;
+      return this;
+    }
+
+    public Builder sign(String sign) {
+      this.sign = sign;
+      return this;
+    }
+
+    public Builder couponId(String couponId) {
+      this.couponId = couponId;
+      return this;
+    }
+
+    public Builder stockId(String stockId) {
+      this.stockId = stockId;
+      return this;
+    }
+
+    public Builder openid(String openid) {
+      this.openid = openid;
+      return this;
+    }
+
+    public Builder opUserId(String opUserId) {
+      this.opUserId = opUserId;
+      return this;
+    }
+
+    public Builder deviceInfo(String deviceInfo) {
+      this.deviceInfo = deviceInfo;
+      return this;
+    }
+
+    public Builder version(String version) {
+      this.version = version;
+      return this;
+    }
+
+    public Builder type(String type) {
+      this.type = type;
+      return this;
+    }
+
+    public WxPayCouponInfoQueryRequest build() {
+      return new WxPayCouponInfoQueryRequest(this);
+    }
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java
new file mode 100644
index 0000000000..bec1c9e10a
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponInfoQueryResult.java
@@ -0,0 +1,351 @@
+package com.github.binarywang.wxpay.bean.coupon;
+
+import com.github.binarywang.wxpay.bean.result.WxPayBaseResult;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+/**
+ * <pre>
+ * 查询代金券信息响应结果类
+ * Created by Binary Wang on 2017-7-15.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@XStreamAlias("xml")
+public class WxPayCouponInfoQueryResult extends WxPayBaseResult {
+  /**
+   * <pre>
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 示例值：123456sb
+   * 类型：String(32)
+   * 说明：微信支付分配的终端设备号，
+   * </pre>
+   */
+  @XStreamAlias("device_info")
+  private String deviceInfo;
+
+  /**
+   * <pre>
+   * 字段名：批次ID
+   * 变量名：coupon_stock_id
+   * 是否必填：是
+   * 示例值：1567
+   * 类型：String
+   * 说明：代金券批次Id
+   * </pre>
+   */
+  @XStreamAlias("coupon_stock_id")
+  private String couponStockId;
+
+  /**
+   * <pre>
+   * 字段名：代金券id
+   * 变量名：coupon_id
+   * 是否必填：是
+   * 示例值：4242
+   * 类型：String
+   * 说明：代金券id
+   * </pre>
+   */
+  @XStreamAlias("coupon_id")
+  private String couponId;
+
+  /**
+   * <pre>
+   * 字段名：代金券面额
+   * 变量名：coupon_value
+   * 是否必填：是
+   * 示例值：4
+   * 类型：Unsinged int
+   * 说明：代金券面值,单位是分
+   * </pre>
+   */
+  @XStreamAlias("coupon_value")
+  private Integer couponValue;
+
+  /**
+   * <pre>
+   * 字段名：代金券使用门槛
+   * 变量名：coupon_mininum
+   * 是否必填：是
+   * 示例值：10
+   * 类型：Unsinged int
+   * 说明：代金券使用最低限额,单位是分
+   * </pre>
+   */
+  @XStreamAlias("coupon_mininum")
+  private Integer couponMininum;
+
+  /**
+   * <pre>
+   * 字段名：代金券名称
+   * 变量名：coupon_name
+   * 是否必填：是
+   * 示例值：测试代金券
+   * 类型：String
+   * 说明：代金券名称
+   * </pre>
+   */
+  @XStreamAlias("coupon_name")
+  private String couponName;
+
+  /**
+   * <pre>
+   * 字段名：代金券状态
+   * 变量名：coupon_state
+   * 是否必填：是
+   * 示例值：SENDED
+   * 类型：int
+   * 说明：代金券状态：SENDED-可用，USED-已实扣，EXPIRED-已过期
+   * </pre>
+   */
+  @XStreamAlias("coupon_state")
+  private Integer couponState;
+
+  /**
+   * <pre>
+   * 字段名：代金券描述
+   * 变量名：coupon_desc
+   * 是否必填：是
+   * 示例值：微信支付-代金券
+   * 类型：String
+   * 说明：代金券描述
+   * </pre>
+   */
+  @XStreamAlias("coupon_desc")
+  private String couponDesc;
+
+  /**
+   * <pre>
+   * 字段名：实际优惠金额
+   * 变量名：coupon_use_value
+   * 是否必填：是
+   * 示例值：0
+   * 类型：Unsinged int
+   * 说明：代金券实际使用金额
+   * </pre>
+   */
+  @XStreamAlias("coupon_use_value")
+  private Integer couponUseValue;
+
+  /**
+   * <pre>
+   * 字段名：优惠剩余可用额
+   * 变量名：coupon_remain_value
+   * 是否必填：是
+   * 示例值：4
+   * 类型：Unsinged int
+   * 说明：代金券剩余金额：部分使用情况下，可能会存在券剩余金额
+   * </pre>
+   */
+  @XStreamAlias("coupon_remain_value")
+  private Integer couponRemainValue;
+
+  /**
+   * <pre>
+   * 字段名：生效开始时间
+   * 变量名：begin_time
+   * 是否必填：是
+   * 示例值：1943787483
+   * 类型：String
+   * 说明：格式为时间戳
+   * </pre>
+   */
+  @XStreamAlias("begin_time")
+  private String beginTime;
+
+  /**
+   * <pre>
+   * 字段名：生效结束时间
+   * 变量名：end_time
+   * 是否必填：是
+   * 示例值：1943787484
+   * 类型：String
+   * 说明：格式为时间戳
+   * </pre>
+   */
+  @XStreamAlias("end_time")
+  private String endTime;
+
+  /**
+   * <pre>
+   * 字段名：发放时间
+   * 变量名：send_time
+   * 是否必填：是
+   * 示例值：1943787420
+   * 类型：String
+   * 说明：格式为时间戳
+   * </pre>
+   */
+  @XStreamAlias("send_time")
+  private String sendTime;
+
+  /**
+   * <pre>
+   * 字段名：消耗方商户id
+   * 变量名：consumer_mch_id
+   * 是否必填：否
+   * 示例值：10000098
+   * 类型：String
+   * 说明：代金券使用后，消耗方商户id
+   * </pre>
+   */
+  @XStreamAlias("consumer_mch_id")
+  private String consumerMchId;
+
+  /**
+   * <pre>
+   * 字段名：发放来源
+   * 变量名：send_source
+   * 是否必填：是
+   * 示例值：FULL_SEND
+   * 类型：String
+   * 说明：代金券发放来源：FULL_SEND-满送 NORMAL-普通发放场景
+   * </pre>
+   */
+  @XStreamAlias("send_source")
+  private String sendSource;
+
+  /**
+   * <pre>
+   * 字段名：是否允许部分使用
+   * 变量名：is_partial_use
+   * 是否必填：否
+   * 示例值：1
+   * 类型：String
+   * 说明：该代金券是否允许部分使用标识：1-表示支持部分使用
+   * </pre>
+   */
+  @XStreamAlias("is_partial_use")
+  private String isPartialUse;
+
+  public String getDeviceInfo() {
+    return this.deviceInfo;
+  }
+
+  public void setDeviceInfo(String deviceInfo) {
+    this.deviceInfo = deviceInfo;
+  }
+
+  public String getCouponStockId() {
+    return this.couponStockId;
+  }
+
+  public void setCouponStockId(String couponStockId) {
+    this.couponStockId = couponStockId;
+  }
+
+  public String getCouponId() {
+    return this.couponId;
+  }
+
+  public void setCouponId(String couponId) {
+    this.couponId = couponId;
+  }
+
+  public Integer getCouponValue() {
+    return this.couponValue;
+  }
+
+  public void setCouponValue(Integer couponValue) {
+    this.couponValue = couponValue;
+  }
+
+  public Integer getCouponMininum() {
+    return this.couponMininum;
+  }
+
+  public void setCouponMininum(Integer couponMininum) {
+    this.couponMininum = couponMininum;
+  }
+
+  public String getCouponName() {
+    return this.couponName;
+  }
+
+  public void setCouponName(String couponName) {
+    this.couponName = couponName;
+  }
+
+  public Integer getCouponState() {
+    return this.couponState;
+  }
+
+  public void setCouponState(Integer couponState) {
+    this.couponState = couponState;
+  }
+
+  public String getCouponDesc() {
+    return this.couponDesc;
+  }
+
+  public void setCouponDesc(String couponDesc) {
+    this.couponDesc = couponDesc;
+  }
+
+  public Integer getCouponUseValue() {
+    return this.couponUseValue;
+  }
+
+  public void setCouponUseValue(Integer couponUseValue) {
+    this.couponUseValue = couponUseValue;
+  }
+
+  public Integer getCouponRemainValue() {
+    return this.couponRemainValue;
+  }
+
+  public void setCouponRemainValue(Integer couponRemainValue) {
+    this.couponRemainValue = couponRemainValue;
+  }
+
+  public String getBeginTime() {
+    return this.beginTime;
+  }
+
+  public void setBeginTime(String beginTime) {
+    this.beginTime = beginTime;
+  }
+
+  public String getEndTime() {
+    return this.endTime;
+  }
+
+  public void setEndTime(String endTime) {
+    this.endTime = endTime;
+  }
+
+  public String getSendTime() {
+    return this.sendTime;
+  }
+
+  public void setSendTime(String sendTime) {
+    this.sendTime = sendTime;
+  }
+
+  public String getConsumerMchId() {
+    return this.consumerMchId;
+  }
+
+  public void setConsumerMchId(String consumerMchId) {
+    this.consumerMchId = consumerMchId;
+  }
+
+  public String getSendSource() {
+    return this.sendSource;
+  }
+
+  public void setSendSource(String sendSource) {
+    this.sendSource = sendSource;
+  }
+
+  public String getIsPartialUse() {
+    return this.isPartialUse;
+  }
+
+  public void setIsPartialUse(String isPartialUse) {
+    this.isPartialUse = isPartialUse;
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryRequest.java
new file mode 100644
index 0000000000..24cec5523c
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryRequest.java
@@ -0,0 +1,221 @@
+package com.github.binarywang.wxpay.bean.coupon;
+
+import com.github.binarywang.wxpay.bean.request.WxPayBaseRequest;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import me.chanjar.weixin.common.annotation.Required;
+
+/**
+ * <pre>
+ * 查询代金券批次请求对象类
+ * Created by Binary Wang on 2017-7-15.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@XStreamAlias("xml")
+public class WxPayCouponStockQueryRequest extends WxPayBaseRequest {
+  /**
+   * <pre>
+   * 字段名：代金券批次id
+   * 变量名：coupon_stock_id
+   * 是否必填：是
+   * 示例值：1757
+   * 类型：String
+   * 说明：代金券批次id
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("coupon_stock_id")
+  private String couponStockId;
+
+  /**
+   * <pre>
+   * 字段名：操作员
+   * 变量名：op_user_id
+   * 是否必填：否
+   * 示例值：10000098
+   * 类型：String(32)
+   * 说明：操作员帐号, 默认为商户号,可在商户平台配置操作员对应的api权限
+   * </pre>
+   */
+  @XStreamAlias("op_user_id")
+  private String opUserId;
+
+  /**
+   * <pre>
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 示例值：
+   * 类型：String(32)
+   * 说明：微信支付分配的终端设备号
+   * </pre>
+   */
+  @XStreamAlias("device_info")
+  private String deviceInfo;
+
+  /**
+   * <pre>
+   * 字段名：协议版本
+   * 变量名：version
+   * 是否必填：否
+   * 示例值：1.0
+   * 类型：String(32)
+   * 说明：默认1.0
+   * </pre>
+   */
+  @XStreamAlias("version")
+  private String version;
+
+  /**
+   * <pre>
+   * 字段名：协议类型
+   * 变量名：type
+   * 是否必填：否
+   * 示例值：XML
+   * 类型：String(32)
+   * 说明：XML【目前仅支持默认XML】
+   * </pre>
+   */
+  @XStreamAlias("type")
+  private String type;
+
+  private WxPayCouponStockQueryRequest(Builder builder) {
+    setAppid(builder.appid);
+    setMchId(builder.mchId);
+    setSubAppId(builder.subAppId);
+    setSubMchId(builder.subMchId);
+    setNonceStr(builder.nonceStr);
+    setSign(builder.sign);
+    setCouponStockId(builder.couponStockId);
+    setOpUserId(builder.opUserId);
+    setDeviceInfo(builder.deviceInfo);
+    setVersion(builder.version);
+    setType(builder.type);
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public String getCouponStockId() {
+    return this.couponStockId;
+  }
+
+  public void setCouponStockId(String couponStockId) {
+    this.couponStockId = couponStockId;
+  }
+
+  public String getOpUserId() {
+    return this.opUserId;
+  }
+
+  public void setOpUserId(String opUserId) {
+    this.opUserId = opUserId;
+  }
+
+  public String getDeviceInfo() {
+    return this.deviceInfo;
+  }
+
+  public void setDeviceInfo(String deviceInfo) {
+    this.deviceInfo = deviceInfo;
+  }
+
+  public String getVersion() {
+    return this.version;
+  }
+
+  public void setVersion(String version) {
+    this.version = version;
+  }
+
+  public String getType() {
+    return this.type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  @Override
+  protected void checkConstraints() {
+    //do nothing
+  }
+
+  public static final class Builder {
+    private String appid;
+    private String mchId;
+    private String subAppId;
+    private String subMchId;
+    private String nonceStr;
+    private String sign;
+    private String couponStockId;
+    private String opUserId;
+    private String deviceInfo;
+    private String version;
+    private String type;
+
+    private Builder() {
+    }
+
+    public Builder appid(String appid) {
+      this.appid = appid;
+      return this;
+    }
+
+    public Builder mchId(String mchId) {
+      this.mchId = mchId;
+      return this;
+    }
+
+    public Builder subAppId(String subAppId) {
+      this.subAppId = subAppId;
+      return this;
+    }
+
+    public Builder subMchId(String subMchId) {
+      this.subMchId = subMchId;
+      return this;
+    }
+
+    public Builder nonceStr(String nonceStr) {
+      this.nonceStr = nonceStr;
+      return this;
+    }
+
+    public Builder sign(String sign) {
+      this.sign = sign;
+      return this;
+    }
+
+    public Builder couponStockId(String couponStockId) {
+      this.couponStockId = couponStockId;
+      return this;
+    }
+
+    public Builder opUserId(String opUserId) {
+      this.opUserId = opUserId;
+      return this;
+    }
+
+    public Builder deviceInfo(String deviceInfo) {
+      this.deviceInfo = deviceInfo;
+      return this;
+    }
+
+    public Builder version(String version) {
+      this.version = version;
+      return this;
+    }
+
+    public Builder type(String type) {
+      this.type = type;
+      return this;
+    }
+
+    public WxPayCouponStockQueryRequest build() {
+      return new WxPayCouponStockQueryRequest(this);
+    }
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java
new file mode 100644
index 0000000000..065c3f606d
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/coupon/WxPayCouponStockQueryResult.java
@@ -0,0 +1,288 @@
+package com.github.binarywang.wxpay.bean.coupon;
+
+import com.github.binarywang.wxpay.bean.result.WxPayBaseResult;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+/**
+ * <pre>
+ * 查询代金券批次响应结果类
+ * Created by Binary Wang on 2017-7-15.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@XStreamAlias("xml")
+public class WxPayCouponStockQueryResult extends WxPayBaseResult {
+  /**
+   * <pre>
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 示例值：123456sb
+   * 类型：String(32)
+   * 说明：微信支付分配的终端设备号
+   * </pre>
+   */
+  @XStreamAlias("device_info")
+  private String deviceInfo;
+
+  /**
+   * <pre>
+   * 字段名：代金券批次ID
+   * 变量名：coupon_stock_id
+   * 是否必填：是
+   * 示例值：1757
+   * 类型：String
+   * 说明：代金券批次Id
+   * </pre>
+   */
+  @XStreamAlias("coupon_stock_id")
+  private String couponStockId;
+
+  /**
+   * <pre>
+   * 字段名：代金券名称
+   * 变量名：coupon_name
+   * 是否必填：否
+   * 示例值：测试代金券
+   * 类型：String
+   * 说明：代金券名称
+   * </pre>
+   */
+  @XStreamAlias("coupon_name")
+  private String couponName;
+
+  /**
+   * <pre>
+   * 字段名：代金券面额
+   * 变量名：coupon_value
+   * 是否必填：是
+   * 示例值：5
+   * 类型：Unsinged int
+   * 说明：代金券面值,单位是分
+   * </pre>
+   */
+  @XStreamAlias("coupon_value")
+  private Integer couponValue;
+
+  /**
+   * <pre>
+   * 字段名：代金券使用最低限额
+   * 变量名：coupon_mininumn
+   * 是否必填：否
+   * 示例值：10
+   * 类型：Unsinged int
+   * 说明：代金券使用最低限额,单位是分
+   * </pre>
+   */
+  @XStreamAlias("coupon_mininumn")
+  private Integer couponMininumn;
+
+  /**
+   * <pre>
+   * 字段名：代金券批次状态
+   * 变量名：coupon_stock_status
+   * 是否必填：是
+   * 示例值：4
+   * 类型：int
+   * 说明：批次状态： 1-未激活；2-审批中；4-已激活；8-已作废；16-中止发放；
+   * </pre>
+   */
+  @XStreamAlias("coupon_stock_status")
+  private Integer couponStockStatus;
+
+  /**
+   * <pre>
+   * 字段名：代金券数量
+   * 变量名：coupon_total
+   * 是否必填：是
+   * 示例值：100
+   * 类型：Unsigned int
+   * 说明：代金券数量
+   * </pre>
+   */
+  @XStreamAlias("coupon_total")
+  private Integer couponTotal;
+
+  /**
+   * <pre>
+   * 字段名：代金券最大领取数量
+   * 变量名：max_quota
+   * 是否必填：否
+   * 示例值：1
+   * 类型：Unsigned int
+   * 说明：代金券每个人最多能领取的数量, 如果为0，则表示没有限制
+   * </pre>
+   */
+  @XStreamAlias("max_quota")
+  private Integer maxQuota;
+
+  /**
+   * <pre>
+   * 字段名：代金券已经发送的数量
+   * 变量名：is_send_num
+   * 是否必填：否
+   * 示例值：0
+   * 类型：Unsigned int
+   * 说明：代金券已经发送的数量
+   * </pre>
+   */
+  @XStreamAlias("is_send_num")
+  private Integer isSendNum;
+
+  /**
+   * <pre>
+   * 字段名：生效开始时间
+   * 变量名：begin_time
+   * 是否必填：是
+   * 示例值：1943787483
+   * 类型：String
+   * 说明：格式为时间戳
+   * </pre>
+   */
+  @XStreamAlias("begin_time")
+  private String beginTime;
+
+  /**
+   * <pre>
+   * 字段名：生效结束时间
+   * 变量名：end_time
+   * 是否必填：是
+   * 示例值：1943787490
+   * 类型：String
+   * 说明：格式为时间戳
+   * </pre>
+   */
+  @XStreamAlias("end_time")
+  private String endTime;
+
+  /**
+   * <pre>
+   * 字段名：创建时间
+   * 变量名：create_time
+   * 是否必填：是
+   * 示例值：1943787420
+   * 类型：String
+   * 说明：格式为时间戳
+   * </pre>
+   */
+  @XStreamAlias("create_time")
+  private String createTime;
+
+  /**
+   * <pre>
+   * 字段名：代金券预算额度
+   * 变量名：coupon_budget
+   * 是否必填：否
+   * 示例值：500
+   * 类型：Unsigned int
+   * 说明：代金券预算额度
+   * </pre>
+   */
+  @XStreamAlias("coupon_budget")
+  private Integer couponBudget;
+
+  public String getDeviceInfo() {
+    return this.deviceInfo;
+  }
+
+  public void setDeviceInfo(String deviceInfo) {
+    this.deviceInfo = deviceInfo;
+  }
+
+  public String getCouponStockId() {
+    return this.couponStockId;
+  }
+
+  public void setCouponStockId(String couponStockId) {
+    this.couponStockId = couponStockId;
+  }
+
+  public String getCouponName() {
+    return this.couponName;
+  }
+
+  public void setCouponName(String couponName) {
+    this.couponName = couponName;
+  }
+
+  public Integer getCouponValue() {
+    return this.couponValue;
+  }
+
+  public void setCouponValue(Integer couponValue) {
+    this.couponValue = couponValue;
+  }
+
+  public Integer getCouponMininumn() {
+    return this.couponMininumn;
+  }
+
+  public void setCouponMininumn(Integer couponMininumn) {
+    this.couponMininumn = couponMininumn;
+  }
+
+  public Integer getCouponStockStatus() {
+    return this.couponStockStatus;
+  }
+
+  public void setCouponStockStatus(Integer couponStockStatus) {
+    this.couponStockStatus = couponStockStatus;
+  }
+
+  public Integer getCouponTotal() {
+    return this.couponTotal;
+  }
+
+  public void setCouponTotal(Integer couponTotal) {
+    this.couponTotal = couponTotal;
+  }
+
+  public Integer getMaxQuota() {
+    return this.maxQuota;
+  }
+
+  public void setMaxQuota(Integer maxQuota) {
+    this.maxQuota = maxQuota;
+  }
+
+  public Integer getIsSendNum() {
+    return this.isSendNum;
+  }
+
+  public void setIsSendNum(Integer isSendNum) {
+    this.isSendNum = isSendNum;
+  }
+
+  public String getBeginTime() {
+    return this.beginTime;
+  }
+
+  public void setBeginTime(String beginTime) {
+    this.beginTime = beginTime;
+  }
+
+  public String getEndTime() {
+    return this.endTime;
+  }
+
+  public void setEndTime(String endTime) {
+    this.endTime = endTime;
+  }
+
+  public String getCreateTime() {
+    return this.createTime;
+  }
+
+  public void setCreateTime(String createTime) {
+    this.createTime = createTime;
+  }
+
+  public Integer getCouponBudget() {
+    return this.couponBudget;
+  }
+
+  public void setCouponBudget(Integer couponBudget) {
+    this.couponBudget = couponBudget;
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index f2106c7260..2eef29b85a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -1,7 +1,6 @@
 package com.github.binarywang.wxpay.service;
 
-import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
-import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
+import com.github.binarywang.wxpay.bean.coupon.*;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -351,4 +350,22 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
    * </pre>
    */
   WxPayCouponSendResult sendCoupon(WxPayCouponSendRequest request) throws WxPayException;
+
+  /**
+   * <pre>
+   * 查询代金券批次
+   * 接口请求链接：https://api.mch.weixin.qq.com/mmpaymkttransfers/query_coupon_stock
+   * 文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_4
+   * </pre>
+   */
+  WxPayCouponStockQueryResult queryCouponStock(WxPayCouponStockQueryRequest request) throws WxPayException;
+
+  /**
+   * <pre>
+   * 查询代金券信息
+   * 接口请求链接：https://api.mch.weixin.qq.com/mmpaymkttransfers/querycouponsinfo
+   * 文档地址：https://pay.weixin.qq.com/wiki/doc/api/tools/sp_coupon.php?chapter=12_5
+   * </pre>
+   */
+  WxPayCouponInfoQueryResult queryCouponInfo(WxPayCouponInfoQueryRequest request) throws WxPayException;
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index b1c31b8676..8eef35043c 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -1,8 +1,7 @@
 package com.github.binarywang.wxpay.service.impl;
 
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
-import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
-import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
+import com.github.binarywang.wxpay.bean.coupon.*;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -476,4 +475,26 @@ public WxPayCouponSendResult sendCoupon(WxPayCouponSendRequest request) throws W
     result.checkResult(this);
     return result;
   }
+
+  @Override
+  public WxPayCouponStockQueryResult queryCouponStock(WxPayCouponStockQueryRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/query_coupon_stock";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayCouponStockQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponStockQueryResult.class);
+    result.checkResult(this);
+    return result;
+  }
+
+  @Override
+  public WxPayCouponInfoQueryResult queryCouponInfo(WxPayCouponInfoQueryRequest request) throws WxPayException {
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/mmpaymkttransfers/querycouponsinfo";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayCouponInfoQueryResult result = WxPayBaseResult.fromXML(responseContent, WxPayCouponInfoQueryResult.class);
+    result.checkResult(this);
+    return result;
+  }
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
index cc6ab5a0b5..bbf444d901 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -1,8 +1,7 @@
 package com.github.binarywang.wxpay.service.impl;
 
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
-import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendRequest;
-import com.github.binarywang.wxpay.bean.coupon.WxPayCouponSendResult;
+import com.github.binarywang.wxpay.bean.coupon.*;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.exception.WxPayException;
@@ -283,4 +282,22 @@ public void testSendCoupon() throws Exception {
       .build());
     this.logger.info(result.toString());
   }
+
+  @Test
+  public void testQueryCouponStock() throws Exception {
+    WxPayCouponStockQueryResult result = this.payService.queryCouponStock(WxPayCouponStockQueryRequest.newBuilder()
+      .couponStockId("123")
+      .build());
+    this.logger.info(result.toString());
+  }
+
+  @Test
+  public void testQueryCouponInfo() throws Exception {
+    WxPayCouponInfoQueryResult result = this.payService.queryCouponInfo(WxPayCouponInfoQueryRequest.newBuilder()
+      .openid("onqOjjrXT-776SpHnfexGm1_P7iE")
+      .couponId("11")
+      .stockId("1121")
+      .build());
+    this.logger.info(result.toString());
+  }
 }

From b24c13d27242295de92082a3649fd3138be9e5d8 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 15 Jul 2017 19:23:32 +0800
Subject: [PATCH 46/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.6.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 2 +-
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b6ab1509b..0b78452d55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.5.BETA</version>
+  <version>2.7.6.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index a2f1195b9a..9299fa1ce7 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.5.BETA</version>
+    <version>2.7.6.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index b63055ebc2..6732165602 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.5.BETA</version>
+    <version>2.7.6.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index b3e0e88e15..181b505cd3 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.5.BETA</version>
+    <version>2.7.6.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index bd95d24728..16648606b2 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.5.BETA</version>
+    <version>2.7.6.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 7c695abc3e..4783621af5 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.5.BETA</version>
+    <version>2.7.6.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From bbfe3f005a0cab3cb339257639f3de2a7358bce6 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 20 Jul 2017 21:12:07 +0800
Subject: [PATCH 47/85] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=B6=E7=9A=84=E4=B9=B1=E7=A0=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../http/apache/ApacheMaterialUploadRequestExecutor.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialUploadRequestExecutor.java
index 474fcb9936..445ff2736e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialUploadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/apache/ApacheMaterialUploadRequestExecutor.java
@@ -8,6 +8,7 @@
 import me.chanjar.weixin.mp.bean.material.WxMpMaterial;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
 import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor;
+import org.apache.http.Consts;
 import org.apache.http.HttpHost;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -15,6 +16,7 @@
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 
 import java.io.File;
@@ -53,7 +55,8 @@ public WxMpMaterialUploadResult execute(String uri, WxMpMaterial material) throw
       .setMode(HttpMultipartMode.RFC6532);
     Map<String, String> form = material.getForm();
     if (material.getForm() != null) {
-      multipartEntityBuilder.addTextBody("description", WxGsonBuilder.create().toJson(form));
+      multipartEntityBuilder.addPart("description",
+        new StringBody(WxGsonBuilder.create().toJson(form), ContentType.create("text/plain", Consts.UTF_8)));
     }
 
     httpPost.setEntity(multipartEntityBuilder.build());

From 446b7f837b91bd40d2c7c691d5b0358f66b320cd Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 20 Jul 2017 21:21:54 +0800
Subject: [PATCH 48/85] =?UTF-8?q?#284=20=E6=8F=90=E5=8F=96=E5=85=B1?=
 =?UTF-8?q?=E5=90=8C=E4=BB=A3=E7=A0=81=E5=BF=AB=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WxPayServiceAbstractImpl.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index 8eef35043c..7c57e5edeb 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -24,6 +24,7 @@
  *  微信支付接口请求抽象实现类
  * Created by Binary Wang on 2017-7-8.
  * </pre>
+ *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public abstract class WxPayServiceAbstractImpl implements WxPayService {
@@ -196,6 +197,8 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
     }
 
     Map<String, String> payInfo = new HashMap<>();
+    String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
+    String nonceStr = String.valueOf(System.currentTimeMillis());
     if ("NATIVE".equals(request.getTradeType())) {
       payInfo.put("codeUrl", unifiedOrderResult.getCodeURL());
     } else if ("APP".equals(request.getTradeType())) {
@@ -207,8 +210,8 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
       configMap.put("prepayid", prepayId);
       configMap.put("partnerid", partnerid);
       configMap.put("package", "Sign=WXPay");
-      configMap.put("timestamp", String.valueOf(System.currentTimeMillis() / 1000));
-      configMap.put("noncestr", String.valueOf(System.currentTimeMillis()));
+      configMap.put("timestamp", timestamp);
+      configMap.put("noncestr", nonceStr);
       configMap.put("appid", appId);
       // 此map用于客户端与微信服务器交互
       payInfo.put("sign", SignUtils.createSign(configMap, this.getConfig().getMchKey()));
@@ -216,17 +219,18 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
       payInfo.put("partnerId", partnerid);
       payInfo.put("appId", appId);
       payInfo.put("packageValue", "Sign=WXPay");
-      payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
-      payInfo.put("nonceStr", String.valueOf(System.currentTimeMillis()));
+      payInfo.put("timeStamp", timestamp);
+      payInfo.put("nonceStr", nonceStr);
     } else if ("JSAPI".equals(request.getTradeType())) {
       payInfo.put("appId", unifiedOrderResult.getAppid());
       // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
-      payInfo.put("timeStamp", String.valueOf(System.currentTimeMillis() / 1000));
-      payInfo.put("nonceStr", String.valueOf(System.currentTimeMillis()));
+      payInfo.put("timeStamp", timestamp);
+      payInfo.put("nonceStr", nonceStr);
       payInfo.put("package", "prepay_id=" + prepayId);
       payInfo.put("signType", "MD5");
       payInfo.put("paySign", SignUtils.createSign(payInfo, this.getConfig().getMchKey()));
     }
+
     return payInfo;
   }
 

From 1a9b4a3f20ea0eb4e0a1c5266dfcffe94bcd8138 Mon Sep 17 00:00:00 2001
From: lwxian <lwxian_aha@163.com>
Date: Fri, 21 Jul 2017 10:24:45 +0800
Subject: [PATCH 49/85] =?UTF-8?q?#287=20=E4=BF=AE=E5=A4=8D=E5=AF=B9?=
 =?UTF-8?q?=E5=B8=90=E5=8D=95=E4=B8=8B=E8=BD=BDbug=EF=BC=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84=E5=AF=B9=E8=B1=A1=E6=B2=A1=E6=9C=89=E5=AF=B9?=
 =?UTF-8?q?=E5=B8=90=E5=8D=95=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

同时修复返回对账单的所有属性的值最后多余的空格；
---
 .../impl/WxPayServiceAbstractImpl.java        | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index 7c57e5edeb..9a75b46973 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -359,33 +359,34 @@ private WxPayBillResult billInformationDeal(String responseContent) {
     for (int i = 0; i < j; i++) {
       WxPayBillBaseResult wxPayBillBaseResult = new WxPayBillBaseResult();
 
-      wxPayBillBaseResult.setTradeTime(tempStr[k]);
-      wxPayBillBaseResult.setAppId(tempStr[k + 1]);
-      wxPayBillBaseResult.setMchId(tempStr[k + 2]);
-      wxPayBillBaseResult.setSubMchId(tempStr[k + 3]);
-      wxPayBillBaseResult.setDeviceInfo(tempStr[k + 4]);
-      wxPayBillBaseResult.setTransationId(tempStr[k + 5]);
-      wxPayBillBaseResult.setOutTradeNo(tempStr[k + 6]);
-      wxPayBillBaseResult.setOpenId(tempStr[k + 7]);
-      wxPayBillBaseResult.setTradeType(tempStr[k + 8]);
-      wxPayBillBaseResult.setTradeState(tempStr[k + 9]);
-      wxPayBillBaseResult.setBankType(tempStr[k + 10]);
-      wxPayBillBaseResult.setFeeType(tempStr[k + 11]);
-      wxPayBillBaseResult.setTotalFee(tempStr[k + 12]);
-      wxPayBillBaseResult.setCouponFee(tempStr[k + 13]);
-      wxPayBillBaseResult.setRefundId(tempStr[k + 14]);
-      wxPayBillBaseResult.setOutRefundNo(tempStr[k + 15]);
-      wxPayBillBaseResult.setSettlementRefundFee(tempStr[k + 16]);
-      wxPayBillBaseResult.setCouponRefundFee(tempStr[k + 17]);
-      wxPayBillBaseResult.setRefundChannel(tempStr[k + 18]);
-      wxPayBillBaseResult.setRefundState(tempStr[k + 19]);
-      wxPayBillBaseResult.setBody(tempStr[k + 20]);
-      wxPayBillBaseResult.setAttach(tempStr[k + 21]);
-      wxPayBillBaseResult.setPoundage(tempStr[k + 22]);
-      wxPayBillBaseResult.setPoundageRate(tempStr[k + 23]);
+      wxPayBillBaseResult.setTradeTime(tempStr[k].trim());
+      wxPayBillBaseResult.setAppId(tempStr[k + 1].trim());
+      wxPayBillBaseResult.setMchId(tempStr[k + 2].trim());
+      wxPayBillBaseResult.setSubMchId(tempStr[k + 3].trim());
+      wxPayBillBaseResult.setDeviceInfo(tempStr[k + 4].trim());
+      wxPayBillBaseResult.setTransationId(tempStr[k + 5].trim());
+      wxPayBillBaseResult.setOutTradeNo(tempStr[k + 6].trim());
+      wxPayBillBaseResult.setOpenId(tempStr[k + 7].trim());
+      wxPayBillBaseResult.setTradeType(tempStr[k + 8].trim());
+      wxPayBillBaseResult.setTradeState(tempStr[k + 9].trim());
+      wxPayBillBaseResult.setBankType(tempStr[k + 10].trim());
+      wxPayBillBaseResult.setFeeType(tempStr[k + 11].trim());
+      wxPayBillBaseResult.setTotalFee(tempStr[k + 12].trim());
+      wxPayBillBaseResult.setCouponFee(tempStr[k + 13].trim());
+      wxPayBillBaseResult.setRefundId(tempStr[k + 14].trim());
+      wxPayBillBaseResult.setOutRefundNo(tempStr[k + 15].trim());
+      wxPayBillBaseResult.setSettlementRefundFee(tempStr[k + 16].trim());
+      wxPayBillBaseResult.setCouponRefundFee(tempStr[k + 17].trim());
+      wxPayBillBaseResult.setRefundChannel(tempStr[k + 18].trim());
+      wxPayBillBaseResult.setRefundState(tempStr[k + 19].trim());
+      wxPayBillBaseResult.setBody(tempStr[k + 20].trim());
+      wxPayBillBaseResult.setAttach(tempStr[k + 21].trim());
+      wxPayBillBaseResult.setPoundage(tempStr[k + 22].trim());
+      wxPayBillBaseResult.setPoundageRate(tempStr[k + 23].trim());
       wxPayBillBaseResultLst.add(wxPayBillBaseResult);
       k += t.length;
     }
+    wxPayBillResult.setWxPayBillBaseResultLst(wxPayBillBaseResultLst);
     /*
      * 总交易单数,总交易额,总退款金额,总代金券或立减优惠退款金额,手续费总金额 `2,`0.02,`0.0,`0.0,`0
      */

From 6638ca74272e9ca6f8cc2f0a2cb6b78e7153c953 Mon Sep 17 00:00:00 2001
From: Hyseen <Hsin_6050@163.com>
Date: Wed, 26 Jul 2017 14:34:57 +0800
Subject: [PATCH 50/85] =?UTF-8?q?#289=20=E5=A2=9E=E5=8A=A0=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=9A=84=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E5=80=BC=E6=94=AF=E6=8C=81=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 更新接口：临时二维码的场景值支持字符串

* 新增临时二维码的场景值为字符串的单元测试
---
 .../weixin/mp/api/WxMpQrcodeService.java      | 12 +++++++
 .../mp/api/impl/WxMpQrcodeServiceImpl.java    | 33 +++++++++++++++++++
 .../api/impl/WxMpQrcodeServiceImplTest.java   | 16 +++++++++
 3 files changed, 61 insertions(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpQrcodeService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpQrcodeService.java
index e2e17eb359..37ed7dcd12 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpQrcodeService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpQrcodeService.java
@@ -26,6 +26,18 @@ public interface WxMpQrcodeService {
    */
   WxMpQrCodeTicket qrCodeCreateTmpTicket(int sceneId, Integer expireSeconds) throws WxErrorException;
 
+
+  /**
+   * <pre>
+   * 换取临时二维码ticket
+   * 详情请见: <a href="https://mp.weixin.qq.com/wiki?action=doc&id=mp1443433542&t=0.9274944716856435">生成带参数的二维码</a>
+   * </pre>
+   *
+   * @param sceneStr      场景值ID（字符串形式的ID），字符串类型，长度限制为1到64
+   * @param expireSeconds 该二维码有效时间，以秒为单位。 最大不超过2592000（即30天），此字段如果不填，则默认有效期为30秒。
+   */
+  WxMpQrCodeTicket qrCodeCreateTmpTicket(String sceneStr, Integer expireSeconds) throws WxErrorException;
+
   /**
    * <pre>
    * 换取永久二维码ticket
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java
index 817a0b68f2..5f6c3ad54f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImpl.java
@@ -7,6 +7,7 @@
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
 import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.UnsupportedEncodingException;
@@ -54,6 +55,38 @@ public WxMpQrCodeTicket qrCodeCreateTmpTicket(int sceneId, Integer expireSeconds
     return WxMpQrCodeTicket.fromJson(responseContent);
   }
 
+
+  @Override
+  public WxMpQrCodeTicket qrCodeCreateTmpTicket(String sceneStr, Integer expireSeconds) throws WxErrorException {
+    if (StringUtils.isBlank(sceneStr)) {
+      throw new WxErrorException(WxError.newBuilder().setErrorCode(-1).setErrorMsg("临时二维码场景值不能为空！").build());
+    }
+
+    //expireSeconds 该二维码有效时间，以秒为单位。 最大不超过2592000（即30天），此字段如果不填，则默认有效期为30秒。
+    if (expireSeconds != null && expireSeconds > 2592000) {
+      throw new WxErrorException(WxError.newBuilder().setErrorCode(-1)
+        .setErrorMsg("临时二维码有效时间最大不能超过2592000（即30天）！").build());
+    }
+
+    if (expireSeconds == null) {
+      expireSeconds = 30;
+    }
+
+    String url = API_URL_PREFIX + "/create";
+    JsonObject json = new JsonObject();
+    json.addProperty("action_name", "QR_STR_SCENE");
+    json.addProperty("expire_seconds", expireSeconds);
+
+    JsonObject actionInfo = new JsonObject();
+    JsonObject scene = new JsonObject();
+    scene.addProperty("scene_str", sceneStr);
+    actionInfo.add("scene", scene);
+    json.add("action_info", actionInfo);
+    String responseContent = this.wxMpService.post(url, json.toString());
+    return WxMpQrCodeTicket.fromJson(responseContent);
+  }
+
+
   @Override
   public WxMpQrCodeTicket qrCodeCreateLastTicket(int sceneId) throws WxErrorException {
     if (sceneId < 1 || sceneId > 100000) {
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImplTest.java
index c61e38339c..216eec77f0 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpQrcodeServiceImplTest.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.test.ApiTestModule;
 import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.*;
 import org.testng.annotations.*;
 
@@ -26,6 +27,11 @@ public Object[][] sceneIds() {
     return new Object[][]{{-1}, {0}, {1}, {200000}};
   }
 
+  @DataProvider
+  public Object[][] sceneStrs() {
+    return new Object[][]{{null}, {""}, {"test"}, {RandomStringUtils.randomAlphanumeric(100)}};
+  }
+
   @Test(dataProvider = "sceneIds")
   public void testQrCodeCreateTmpTicket(int sceneId) throws WxErrorException {
     WxMpQrCodeTicket ticket = this.wxService.getQrcodeService().qrCodeCreateTmpTicket(sceneId, null);
@@ -35,6 +41,16 @@ public void testQrCodeCreateTmpTicket(int sceneId) throws WxErrorException {
     System.out.println(ticket);
   }
 
+
+  @Test(dataProvider = "sceneStrs")
+  public void testQrCodeCreateTmpTicketWithSceneStr(String sceneStr) throws WxErrorException {
+    WxMpQrCodeTicket ticket = this.wxService.getQrcodeService().qrCodeCreateTmpTicket(sceneStr, null);
+    Assert.assertNotNull(ticket.getUrl());
+    Assert.assertNotNull(ticket.getTicket());
+    Assert.assertTrue(ticket.getExpire_seconds() != -1);
+    System.out.println(ticket);
+  }
+
   @Test(dataProvider = "sceneIds")
   public void testQrCodeCreateLastTicket(int sceneId) throws WxErrorException {
     WxMpQrCodeTicket ticket = this.wxService.getQrcodeService().qrCodeCreateLastTicket(sceneId);

From ab5f573ca0e2b9b50ba08d80b4a6bbe42325bc09 Mon Sep 17 00:00:00 2001
From: forfuns <forfuns@users.noreply.github.com>
Date: Thu, 27 Jul 2017 17:24:48 +0800
Subject: [PATCH 51/85] =?UTF-8?q?#292=20=E5=A2=9E=E5=8A=A0=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E7=A0=81=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 更新小程序二维码（小程序码）接口
修复小程序模板推送读取错误字段导致的NullPoint

* 更新小程序二维码（小程序码）接口
修复小程序模板推送读取错误字段导致的NullPoint

* 更正WxMaMsgService接口逻辑

* 使用IDEA对miniapp做了批量格式化
---
 .../weixin/common/util/fs/FileUtils.java      |  2 +-
 .../wx/miniapp/api/WxMaQrcodeService.java     | 83 +++++++++++++++++++
 .../api/impl/WxMaQrcodeServiceImpl.java       | 47 +++++++++++
 .../bean/WxMaJscode2SessionResult.java        | 15 +++-
 .../wx/miniapp/bean/WxMaQrcode.java           |  2 +-
 .../wx/miniapp/bean/WxMaQrcodeWrapper.java    | 16 ++++
 .../wx/miniapp/bean/WxMaWxcode.java           | 64 ++++++++++++++
 .../wx/miniapp/bean/WxMaWxcodeLimit.java      | 68 +++++++++++++++
 .../wx/miniapp/builder/ImageBuilder.java      |  2 +-
 .../message/WxMaMessageInterceptor.java       |  2 +-
 .../util/http/QrCodeRequestExecutor.java      |  6 +-
 .../util/json/WxMaKefuMessageGsonAdapter.java |  1 -
 .../api/impl/WxMaMsgServiceImplTest.java      |  3 +-
 .../api/impl/WxMaQrcodeServiceImplTest.java   | 12 +++
 .../wx/miniapp/bean/WxMaMessageTest.java      |  1 -
 .../wx/miniapp/demo/WxMaDemoServer.java       |  4 +-
 16 files changed, 314 insertions(+), 14 deletions(-)
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcodeWrapper.java
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcode.java
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcodeLimit.java

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
index df031b3371..37ee5ebe4b 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
@@ -24,7 +24,7 @@ public static File createTmpFile(InputStream inputStream, String name, String ex
       tmpFile = File.createTempFile(name, '.' + ext, tmpDirFile);
     }
 
-    tmpFile.deleteOnExit();
+//    tmpFile.deleteOnExit();
 
     try (FileOutputStream fos = new FileOutputStream(tmpFile)) {
       int read = 0;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaQrcodeService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaQrcodeService.java
index 822f5de8a4..c2222bc93e 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaQrcodeService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaQrcodeService.java
@@ -7,6 +7,9 @@
 /**
  * <pre>
  * 二维码相关操作接口
+ *
+ * 接口A（createWxCode）加上接口C（createQrcode），总共生成的码数量限制为100,000，请谨慎调用。
+ *
  * 文档地址：https://mp.weixin.qq.com/debug/wxadoc/dev/api/qrcode.html
  * </pre>
  *
@@ -15,6 +18,7 @@
 public interface WxMaQrcodeService {
 
   /**
+   * 接口C
    * <pre>
    * 获取小程序页面二维码
    * 适用于需要的码数量较少的业务场景
@@ -27,4 +31,83 @@ public interface WxMaQrcodeService {
    * @param width 默认430 二维码的宽度
    */
   File createQrcode(String path, int width) throws WxErrorException;
+
+  File createQrcode(String path) throws WxErrorException;
+
+  /**
+   * 接口A
+   * 获取小程序码
+   *
+   * @param path      不能为空，最大长度 128 字节
+   * @param width     默认430 二维码的宽度
+   * @param autoColor 默认true 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
+   * @param lineColor auth_color 为 false 时生效，使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"}
+   * @return
+   * @throws WxErrorException
+   */
+  File createWxCode(String path, int width, boolean autoColor, LineColor lineColor) throws WxErrorException;
+
+  File createWxCode(String path, int width) throws WxErrorException;
+
+  File createWxCode(String path) throws WxErrorException;
+
+  /**
+   * 接口B
+   * 获取小程序码（永久有效、数量暂无限制）
+   * <p>
+   * 通过该接口生成的小程序码，永久有效，数量暂无限制。
+   * 用户扫描该码进入小程序后，将统一打开首页，开发者需在对应页面根据获取的码中 scene 字段的值，再做处理逻辑。
+   * 使用如下代码可以获取到二维码中的 scene 字段的值。
+   * 调试阶段可以使用开发工具的条件编译自定义参数 scene=xxxx 进行模拟，开发工具模拟时的 scene 的参数值需要进行 urlencode
+   *
+   * @param scene     最大32个可见字符，只支持数字，大小写英文以及部分特殊字符：!#$&'()*+,/:;=?@-._~，其它字符请自行编码为合法字符（因不支持%，中文无法使用 urlencode 处理，请使用其他编码方式）
+   * @param page      必须是已经发布的小程序页面，例如 "pages/index/index" ,如果不填写这个字段，默认跳主页面
+   * @param width     默认false 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
+   * @param autoColor 默认true 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
+   * @param lineColor auth_color 为 false 时生效，使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"}
+   * @return
+   * @throws WxErrorException
+   */
+  File createWxCodeLimit(String scene, String page, int width, boolean autoColor, LineColor lineColor) throws WxErrorException;
+
+  File createWxCodeLimit(String scene, String page) throws WxErrorException;
+
+  /**
+   * lineColor 包装类
+   * 用于描述二维码（小程序码）颜色（RGB参数值），详情请查看文档
+   */
+  public static class LineColor {
+
+    private String r = "0", g = "0", b = "0";
+
+    public LineColor(String r, String g, String b) {
+      this.r = r;
+      this.g = g;
+      this.b = b;
+    }
+
+    public String getR() {
+      return r;
+    }
+
+    public void setR(String r) {
+      this.r = r;
+    }
+
+    public String getG() {
+      return g;
+    }
+
+    public void setG(String g) {
+      this.g = g;
+    }
+
+    public String getB() {
+      return b;
+    }
+
+    public void setB(String b) {
+      this.b = b;
+    }
+  }
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java
index f0fc36af16..fd58855b3d 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImpl.java
@@ -3,6 +3,8 @@
 import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaQrcode;
+import cn.binarywang.wx.miniapp.bean.WxMaWxcode;
+import cn.binarywang.wx.miniapp.bean.WxMaWxcodeLimit;
 import cn.binarywang.wx.miniapp.util.http.QrCodeRequestExecutor;
 import me.chanjar.weixin.common.exception.WxErrorException;
 
@@ -25,4 +27,49 @@ public File createQrcode(String path, int width) throws WxErrorException {
       url, new WxMaQrcode(path, width));
   }
 
+  @Override
+  public File createQrcode(String path) throws WxErrorException {
+    return this.createQrcode(path, 430);
+  }
+
+  @Override
+  public File createWxCode(String path, int width, boolean autoColor, LineColor lineColor) throws WxErrorException {
+    String url = "https://api.weixin.qq.com/wxa/getwxacode";
+    WxMaWxcode wxMaWxcode = new WxMaWxcode();
+    wxMaWxcode.setPath(path);
+    wxMaWxcode.setWidth(width);
+    wxMaWxcode.setAutoColor(autoColor);
+    wxMaWxcode.setLineColor(lineColor);
+    return this.wxMaService.execute(new QrCodeRequestExecutor(this.wxMaService.getRequestHttp()),
+      url, wxMaWxcode);
+  }
+
+  @Override
+  public File createWxCode(String path, int width) throws WxErrorException {
+    return this.createWxCode(path, width, true, null);
+  }
+
+  @Override
+  public File createWxCode(String path) throws WxErrorException {
+    return this.createWxCode(path, 430, true, null);
+  }
+
+  @Override
+  public File createWxCodeLimit(String scene, String page, int width, boolean autoColor, LineColor lineColor) throws WxErrorException {
+    String url = "http://api.weixin.qq.com/wxa/getwxacodeunlimit";
+    WxMaWxcodeLimit wxMaWxcodeLimit = new WxMaWxcodeLimit();
+    wxMaWxcodeLimit.setScene(scene);
+    wxMaWxcodeLimit.setPage(page);
+    wxMaWxcodeLimit.setWidth(width);
+    wxMaWxcodeLimit.setAutoColor(autoColor);
+    wxMaWxcodeLimit.setLineColor(lineColor);
+    return this.wxMaService.execute(new QrCodeRequestExecutor(this.wxMaService.getRequestHttp()),
+      url, wxMaWxcodeLimit);
+  }
+
+  @Override
+  public File createWxCodeLimit(String scene, String page) throws WxErrorException {
+    return this.createWxCodeLimit(scene, page, 430, true, null);
+  }
+
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaJscode2SessionResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaJscode2SessionResult.java
index 4b9cc93d6b..471e6c46ec 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaJscode2SessionResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaJscode2SessionResult.java
@@ -18,6 +18,13 @@ public class WxMaJscode2SessionResult {
   @SerializedName("openid")
   private String openid;
 
+  @SerializedName("unionid")
+  private String unionid;
+
+  public static WxMaJscode2SessionResult fromJson(String json) {
+    return WxMaGsonBuilder.create().fromJson(json, WxMaJscode2SessionResult.class);
+  }
+
   public String getSessionKey() {
     return sessionKey;
   }
@@ -42,8 +49,12 @@ public void setOpenid(String openid) {
     this.openid = openid;
   }
 
-  public static WxMaJscode2SessionResult fromJson(String json) {
-    return WxMaGsonBuilder.create().fromJson(json, WxMaJscode2SessionResult.class);
+  public String getUnionid() {
+    return unionid;
+  }
+
+  public void setUnionid(String unionid) {
+    this.unionid = unionid;
   }
 
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcode.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcode.java
index 83050f0619..a047d7c8b1 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcode.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcode.java
@@ -7,7 +7,7 @@
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
-public class WxMaQrcode implements Serializable {
+public class WxMaQrcode extends WxMaQrcodeWrapper implements Serializable {
   private static final long serialVersionUID = 5777119669111011584L;
   private String path;
   private int width = 430;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcodeWrapper.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcodeWrapper.java
new file mode 100644
index 0000000000..37c5c5db88
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaQrcodeWrapper.java
@@ -0,0 +1,16 @@
+package cn.binarywang.wx.miniapp.bean;
+
+import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
+
+/**
+ * 微信二维码（小程序码）包装器
+ * Created by Element on 2017/7/27.
+ */
+public abstract class WxMaQrcodeWrapper {
+
+  @Override
+  public String toString() {
+    return WxMaGsonBuilder.create().toJson(this);
+  }
+
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcode.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcode.java
new file mode 100644
index 0000000000..9ea674ed98
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcode.java
@@ -0,0 +1,64 @@
+package cn.binarywang.wx.miniapp.bean;
+
+import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
+import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+
+/**
+ * Created by Element on 2017/7/27.
+ */
+public class WxMaWxcode extends WxMaQrcodeWrapper implements Serializable {
+
+  private static final long serialVersionUID = 1287399621649210322L;
+  private String path;
+  private int width = 430;
+
+  @SerializedName("auto_color")
+  private boolean autoColor = true;
+
+  @SerializedName("line_color")
+  private WxMaQrcodeService.LineColor lineColor = new WxMaQrcodeService.LineColor("0", "0", "0");
+
+  public static WxMaWxcode fromJson(String json) {
+    return WxMaGsonBuilder.create().fromJson(json, WxMaWxcode.class);
+  }
+
+  public static long getSerialVersionUID() {
+    return serialVersionUID;
+  }
+
+  public String getPath() {
+    return path;
+  }
+
+  public void setPath(String path) {
+    this.path = path;
+  }
+
+  public int getWidth() {
+    return width;
+  }
+
+  public void setWidth(int width) {
+    this.width = width;
+  }
+
+  public boolean isAutoColor() {
+    return autoColor;
+  }
+
+  public void setAutoColor(boolean autoColor) {
+    this.autoColor = autoColor;
+  }
+
+  public WxMaQrcodeService.LineColor getLineColor() {
+    return lineColor;
+  }
+
+  public void setLineColor(WxMaQrcodeService.LineColor lineColor) {
+    this.lineColor = lineColor;
+  }
+
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcodeLimit.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcodeLimit.java
new file mode 100644
index 0000000000..7619fe46f2
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaWxcodeLimit.java
@@ -0,0 +1,68 @@
+package cn.binarywang.wx.miniapp.bean;
+
+import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
+import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+
+import java.io.Serializable;
+
+/**
+ * Created by Element on 2017/7/27.
+ */
+public class WxMaWxcodeLimit extends WxMaQrcodeWrapper implements Serializable {
+  private static final long serialVersionUID = 4782193774524960401L;
+  private String scene;
+  private String page;
+
+  private int width = 430;
+
+  @SerializedName("auto_color")
+  private boolean autoColor = true;
+
+  @SerializedName("line_color")
+  private WxMaQrcodeService.LineColor lineColor = new WxMaQrcodeService.LineColor("0", "0", "0");
+
+  public static WxMaWxcodeLimit fromJson(String json) {
+    return WxMaGsonBuilder.create().fromJson(json, WxMaWxcodeLimit.class);
+  }
+
+  public String getPage() {
+    return page;
+  }
+
+  public void setPage(String page) {
+    this.page = page;
+  }
+
+  public String getScene() {
+    return scene;
+  }
+
+  public void setScene(String scene) {
+    this.scene = scene;
+  }
+
+  public int getWidth() {
+    return width;
+  }
+
+  public void setWidth(int width) {
+    this.width = width;
+  }
+
+  public boolean isAutoColor() {
+    return autoColor;
+  }
+
+  public void setAutoColor(boolean autoColor) {
+    this.autoColor = autoColor;
+  }
+
+  public WxMaQrcodeService.LineColor getLineColor() {
+    return lineColor;
+  }
+
+  public void setLineColor(WxMaQrcodeService.LineColor lineColor) {
+    this.lineColor = lineColor;
+  }
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/builder/ImageBuilder.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/builder/ImageBuilder.java
index 219e3fd43b..a903e97c43 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/builder/ImageBuilder.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/builder/ImageBuilder.java
@@ -10,7 +10,7 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder> {
   private String mediaId;
 
   public ImageBuilder() {
-    this.msgType =  WxMaConstants.KefuMsgType.IMAGE;
+    this.msgType = WxMaConstants.KefuMsgType.IMAGE;
   }
 
   public ImageBuilder mediaId(String media_id) {
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageInterceptor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageInterceptor.java
index 1b220a0baa..3443862fe1 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageInterceptor.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageInterceptor.java
@@ -17,7 +17,7 @@ public interface WxMaMessageInterceptor {
   /**
    * 拦截微信消息
    *
-   * @param context        上下文，如果handler或interceptor之间有信息要传递，可以用这个
+   * @param context 上下文，如果handler或interceptor之间有信息要传递，可以用这个
    * @return true代表OK，false代表不OK
    */
   boolean intercept(WxMaMessage wxMessage,
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java
index 7883ffda9b..dc482dff25 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java
@@ -1,6 +1,6 @@
 package cn.binarywang.wx.miniapp.util.http;
 
-import cn.binarywang.wx.miniapp.bean.WxMaQrcode;
+import cn.binarywang.wx.miniapp.bean.WxMaQrcodeWrapper;
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.fs.FileUtils;
@@ -25,7 +25,7 @@
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
-public class QrCodeRequestExecutor implements RequestExecutor<File, WxMaQrcode> {
+public class QrCodeRequestExecutor implements RequestExecutor<File, WxMaQrcodeWrapper> {
   protected RequestHttp<CloseableHttpClient, HttpHost> requestHttp;
 
   public QrCodeRequestExecutor(RequestHttp requestHttp) {
@@ -33,7 +33,7 @@ public QrCodeRequestExecutor(RequestHttp requestHttp) {
   }
 
   @Override
-  public File execute(String uri, WxMaQrcode ticket) throws WxErrorException, IOException {
+  public File execute(String uri, WxMaQrcodeWrapper ticket) throws WxErrorException, IOException {
     HttpPost httpPost = new HttpPost(uri);
     if (requestHttp.getRequestHttpProxy() != null) {
       httpPost
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaKefuMessageGsonAdapter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaKefuMessageGsonAdapter.java
index 33c46d63cd..829469f872 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaKefuMessageGsonAdapter.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/json/WxMaKefuMessageGsonAdapter.java
@@ -14,7 +14,6 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Type;
 
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImplTest.java
index 9604a25691..37e3608bff 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaMsgServiceImplTest.java
@@ -9,7 +9,8 @@
 import com.google.inject.Inject;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.exception.WxErrorException;
-import org.testng.annotations.*;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImplTest.java
index 48dad9362a..eba65f7c34 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaQrcodeServiceImplTest.java
@@ -23,4 +23,16 @@ public void testCreateQrCode() throws Exception {
     System.out.println(qrCode);
   }
 
+  @Test
+  public void testCreateWxCode() throws Exception {
+    final File wxCode = this.wxService.getQrcodeService().createWxCode("111", 122);
+    System.out.println(wxCode);
+  }
+
+  @Test
+  public void testCreateWxCodeLimit() throws Exception {
+    final File wxCode = this.wxService.getQrcodeService().createWxCodeLimit("111", null);
+    System.out.println(wxCode);
+  }
+
 }
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java
index 881091a1df..cdf989a6af 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/bean/WxMaMessageTest.java
@@ -1,6 +1,5 @@
 package cn.binarywang.wx.miniapp.bean;
 
-import cn.binarywang.wx.miniapp.bean.WxMaMessage;
 import me.chanjar.weixin.common.api.WxConsts;
 import org.testng.annotations.Test;
 
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/demo/WxMaDemoServer.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/demo/WxMaDemoServer.java
index fe986c8e71..f6dcbae27b 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/demo/WxMaDemoServer.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/demo/WxMaDemoServer.java
@@ -2,8 +2,8 @@
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.bean.WxMaMessage;
 import cn.binarywang.wx.miniapp.bean.WxMaKefuMessage;
+import cn.binarywang.wx.miniapp.bean.WxMaMessage;
 import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.constant.WxMaConstants;
@@ -69,7 +69,7 @@ public void handle(WxMaMessage wxMessage, Map<String, Object> context,
       }
     }
   };
-  
+
   private static final WxMaMessageHandler qrcodeHandler = new WxMaMessageHandler() {
     @Override
     public void handle(WxMaMessage wxMessage, Map<String, Object> context,

From bceabfb77e52fa1cdb6e3ad021043629988b2bb7 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 27 Jul 2017 17:19:19 +0800
Subject: [PATCH 52/85] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=BC=81=E4=B8=9A=E4=BB=98=E6=AC=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/request/WxEntPayRequest.java   | 258 +++++++++++++-----
 .../impl/WxPayServiceAbstractImplTest.java    |  10 +-
 2 files changed, 200 insertions(+), 68 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayRequest.java
index fd43fb1aaa..7897ad02da 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxEntPayRequest.java
@@ -1,18 +1,12 @@
 package com.github.binarywang.wxpay.bean.request;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import me.chanjar.weixin.common.annotation.Required;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
 /**
  * <pre>
  * 企业付款请求对象
- * 注释中各行每个字段描述对应如下：
- * <li>字段名
- * <li>变量名
- * <li>是否必填
- * <li>类型
- * <li>示例值
- * <li>描述
  * </pre>
  * Created by Binary Wang on 2016/10/02.
  *
@@ -22,12 +16,12 @@
 public class WxEntPayRequest extends WxPayBaseRequest {
   /**
    * <pre>
-   * 公众账号appid
-   * mch_appid
-   * 是
-   * wx8888888888888888
-   * String
-   * 微信分配的公众账号ID（企业号corpid即为此appId）
+   * 字段名：公众账号appid
+   * 变量名：mch_appid
+   * 是否必填：是
+   * 示例值：wx8888888888888888
+   * 类型：String
+   * 描述：微信分配的公众账号ID（企业号corpid即为此appId）
    * </pre>
    */
   @XStreamAlias("mch_appid")
@@ -35,12 +29,12 @@ public class WxEntPayRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   *  商户号
-   *  mchid
-   *  是
-   *  1900000109
-   *  String(32)
-   *  微信支付分配的商户号
+   * 字段名：商户号
+   * 变量名：mchid
+   * 是否必填：是
+   * 示例值：1900000109
+   * 类型：String(32)
+   * 描述：微信支付分配的商户号
    * </pre>
    */
   @XStreamAlias("mchid")
@@ -48,12 +42,12 @@ public class WxEntPayRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 设备号
-   * device_info
-   * 否
-   * 13467007045764
-   * String(32)
-   * 微信支付分配的终端设备号
+   * 字段名：设备号
+   * 变量名：device_info
+   * 是否必填：否
+   * 示例值：13467007045764
+   * 类型：String(32)
+   * 描述：微信支付分配的终端设备号
    * </pre>
    */
   @XStreamAlias("device_info")
@@ -61,53 +55,56 @@ public class WxEntPayRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 商户订单号
-   * partner_trade_no
-   * 是
-   * 10000098201411111234567890
-   * String
-   * 商户订单号
+   * 字段名：商户订单号
+   * 变量名：partner_trade_no
+   * 是否必填：是
+   * 示例值：10000098201411111234567890
+   * 类型：String
+   * 描述：商户订单号
    * </pre>
    */
+  @Required
   @XStreamAlias("partner_trade_no")
   private String partnerTradeNo;
 
   /**
    * <pre>
-   * 需保持唯一性 用户openid
-   * openid
-   * 是
-   * oxTWIuGaIt6gTKsQRLau2M0yL16E
-   * String
-   * 商户appid下，某用户的openid
+   * 字段名：需保持唯一性 用户openid
+   * 变量名：openid
+   * 是否必填：是
+   * 示例值：oxTWIuGaIt6gTKsQRLau2M0yL16E
+   * 类型：String
+   * 描述：商户appid下，某用户的openid
    * </pre>
    */
+  @Required
   @XStreamAlias("openid")
   private String openid;
 
   /**
    * <pre>
-   * 校验用户姓名选项
-   * check_name
-   * 是
-   * OPTION_CHECK
-   * String
-   * NO_CHECK：不校验真实姓名 
+   * 字段名：校验用户姓名选项
+   * 变量名：check_name
+   * 是否必填：是
+   * 示例值：OPTION_CHECK
+   * 类型：String
+   * 描述：NO_CHECK：不校验真实姓名 
    * FORCE_CHECK：强校验真实姓名（未实名认证的用户会校验失败，无法转账） 
    * OPTION_CHECK：针对已实名认证的用户才校验真实姓名（未实名认证用户不校验，可以转账成功）
    * </pre>
    */
+  @Required
   @XStreamAlias("check_name")
   private String checkName;
 
   /**
    * <pre>
-   * 收款用户姓名
-   * re_user_name
-   * 可选
-   * 马花花
-   * String
-   * 收款用户真实姓名。
+   * 字段名：收款用户姓名
+   * 变量名：re_user_name
+   * 是否必填：可选
+   * 示例值：马花花
+   * 类型：String
+   * 描述：收款用户真实姓名。
    * 如果check_name设置为FORCE_CHECK或OPTION_CHECK，  则必填用户真实姓名
    * </pre>
    */
@@ -116,43 +113,71 @@ public class WxEntPayRequest extends WxPayBaseRequest {
 
   /**
    * <pre>
-   * 金额
-   * amount
-   * 是
-   * 10099
-   * int
-   * 企业付款金额， 单位为分
+   * 字段名：金额
+   * 变量名：amount
+   * 是否必填：是
+   * 示例值：10099
+   * 类型：int
+   * 描述：企业付款金额， 单位为分
    * </pre>
    */
+  @Required
   @XStreamAlias("amount")
   private Integer amount;
 
   /**
    * <pre>
-   * 企业付款描述信息
-   * desc
-   * 是
-   * 理赔
-   * String
-   * 企业付款操作说明信息。必填。
+   * 字段名：企业付款描述信息
+   * 变量名：desc
+   * 是否必填：是
+   * 示例值：理赔
+   * 类型：String
+   * 描述：企业付款操作说明信息。必填。
    * </pre>
    */
+  @Required
   @XStreamAlias("desc")
   private String description;
 
   /**
    * <pre>
-   * Ip地址
-   * spbill_create_ip
-   * 是
-   * 192.168.0.1
-   * String(32)
-   * 调用接口的机器Ip地址
+   * 字段名：Ip地址
+   * 变量名：spbill_create_ip
+   * 是否必填：是
+   * 示例值：192.168.0.1
+   * 类型：String(32)
+   * 描述：调用接口的机器Ip地址
    * </pre>
    */
+  @Required
   @XStreamAlias("spbill_create_ip")
   private String spbillCreateIp;
 
+  public WxEntPayRequest() {
+  }
+
+  private WxEntPayRequest(Builder builder) {
+    setAppid(builder.appid);
+    setMchId(builder.mchId);
+    setSubAppId(builder.subAppId);
+    setSubMchId(builder.subMchId);
+    setNonceStr(builder.nonceStr);
+    setSign(builder.sign);
+    mchAppid = builder.mchAppid;
+    setMchId(builder.mchId);
+    setDeviceInfo(builder.deviceInfo);
+    setPartnerTradeNo(builder.partnerTradeNo);
+    setOpenid(builder.openid);
+    setCheckName(builder.checkName);
+    setReUserName(builder.reUserName);
+    setAmount(builder.amount);
+    setDescription(builder.description);
+    setSpbillCreateIp(builder.spbillCreateIp);
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
 
   @Override
   protected void checkConstraints() {
@@ -248,4 +273,103 @@ public String toString() {
     return ToStringUtils.toSimpleString(this);
   }
 
+  public static final class Builder {
+    private String appid;
+    private String mchId;
+    private String deviceInfo;
+    private String partnerTradeNo;
+    private String openid;
+    private String checkName;
+    private String reUserName;
+    private Integer amount;
+    private String description;
+    private String spbillCreateIp;
+    private String subAppId;
+    private String subMchId;
+    private String nonceStr;
+    private String sign;
+    private String mchAppid;
+
+    private Builder() {
+    }
+
+    public Builder appid(String appid) {
+      this.appid = appid;
+      return this;
+    }
+
+    public Builder mchId(String mchId) {
+      this.mchId = mchId;
+      return this;
+    }
+
+    public Builder deviceInfo(String deviceInfo) {
+      this.deviceInfo = deviceInfo;
+      return this;
+    }
+
+    public Builder partnerTradeNo(String partnerTradeNo) {
+      this.partnerTradeNo = partnerTradeNo;
+      return this;
+    }
+
+    public Builder openid(String openid) {
+      this.openid = openid;
+      return this;
+    }
+
+    public Builder checkName(String checkName) {
+      this.checkName = checkName;
+      return this;
+    }
+
+    public Builder reUserName(String reUserName) {
+      this.reUserName = reUserName;
+      return this;
+    }
+
+    public Builder amount(Integer amount) {
+      this.amount = amount;
+      return this;
+    }
+
+    public Builder description(String description) {
+      this.description = description;
+      return this;
+    }
+
+    public Builder spbillCreateIp(String spbillCreateIp) {
+      this.spbillCreateIp = spbillCreateIp;
+      return this;
+    }
+
+    public WxEntPayRequest build() {
+      return new WxEntPayRequest(this);
+    }
+
+    public Builder subAppId(String subAppId) {
+      this.subAppId = subAppId;
+      return this;
+    }
+
+    public Builder subMchId(String subMchId) {
+      this.subMchId = subMchId;
+      return this;
+    }
+
+    public Builder nonceStr(String nonceStr) {
+      this.nonceStr = nonceStr;
+      return this;
+    }
+
+    public Builder sign(String sign) {
+      this.sign = sign;
+      return this;
+    }
+
+    public Builder mchAppid(String mchAppid) {
+      this.mchAppid = mchAppid;
+      return this;
+    }
+  }
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
index bbf444d901..9b57d77b1c 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -170,7 +170,15 @@ public void testCloseOrder() throws WxPayException {
    */
   @Test
   public void testEntPay() throws WxPayException {
-    WxEntPayRequest request = new WxEntPayRequest();
+    WxEntPayRequest request = WxEntPayRequest.newBuilder()
+      .partnerTradeNo("Eb6Aep7uVTdbkJqrP4")
+      .openid("ojOQA0y9o-Eb6Aep7uVTdbkJqrP4")
+      .amount(1)
+      .spbillCreateIp("10.10.10.10")
+      .checkName("NO_CHECK")
+      .description("描述信息")
+      .build();
+
     this.logger.info(this.payService.entPay(request).toString());
   }
 

From d6e1ad4e0535c989f44c52d77df15aa03c23a888 Mon Sep 17 00:00:00 2001
From: dylanleung <0095103cn@gmail.com>
Date: Sun, 30 Jul 2017 22:39:20 -0500
Subject: [PATCH 53/85] =?UTF-8?q?#293=20=E9=87=8D=E6=9E=84OkHttp=E7=9A=84?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DJSApi=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update travis settings

* feat(okhttp): 修改okhttp底层调用方法

直接用OkHttpClient代替connect.使客户端单一化.Okhttp 自动管理连接池优化

* feat(log,jsApi): 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题

添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题

#293
---
 .../OkHttpMediaDownloadRequestExecutor.java   | 33 ++++-------
 .../OkHttpMediaUploadRequestExecutor.java     | 23 ++------
 .../OkHttpSimpleGetRequestExecutor.java       | 25 ++------
 .../OkHttpSimplePostRequestExecutor.java      | 27 ++-------
 .../cp/api/impl/WxCpServiceOkHttpImpl.java    | 50 ++++++++--------
 .../mp/api/impl/AbstractWxMpServiceImpl.java  |  3 +-
 .../mp/api/impl/WxMpServiceOkHttpImpl.java    | 52 ++++++++--------
 .../OkhttpMaterialDeleteRequestExecutor.java  | 23 ++------
 ...OkhttpMaterialNewsInfoRequestExecutor.java | 20 +------
 .../OkhttpMaterialUploadRequestExecutor.java  | 27 ++++-----
 ...khttpMaterialVideoInfoRequestExecutor.java | 24 +++-----
 ...lVoiceAndImageDownloadRequestExecutor.java | 59 ++++++-------------
 .../OkhttpMediaImgUploadRequestExecutor.java  | 25 +++-----
 .../okhttp/OkhttpQrCodeRequestExecutor.java   | 33 ++++-------
 .../weixin/mp/api/WxMpBaseAPITest.java        |  6 ++
 .../chanjar/weixin/mp/api/WxMpJsAPITest.java  |  6 +-
 .../weixin/mp/api/test/ApiTestModule.java     |  3 +-
 17 files changed, 159 insertions(+), 280 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
index 97f8cb02c5..e5346c2a26 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
@@ -6,7 +6,11 @@
 import me.chanjar.weixin.common.util.http.MediaDownloadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import okhttp3.*;
+import okio.BufferedSink;
+import okio.Okio;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -18,7 +22,8 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 
   public OkHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
@@ -27,6 +32,7 @@ public OkHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFi
 
   @Override
   public File execute(String uri, String queryParam) throws WxErrorException, IOException {
+    logger.debug("OkHttpMediaDownloadRequestExecutor is running");
     if (queryParam != null) {
       if (uri.indexOf('?') == -1) {
         uri += '?';
@@ -34,23 +40,8 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx
       uri += uri.endsWith("?") ? queryParam : '&' + queryParam;
     }
 
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
     //得到httpClient
-    OkHttpClient client = clientBuilder.build();
+    OkHttpClient client = requestHttp.getRequestHttpClient();
 
     Request request = new Request.Builder().url(uri).get().build();
 
@@ -66,10 +57,12 @@ public Request authenticate(Route route, Response response) throws IOException {
     if (StringUtils.isBlank(fileName)) {
       return null;
     }
-
-    InputStream inputStream = new ByteArrayInputStream(response.body().bytes());
     String[] nameAndExt = fileName.split("\\.");
-    return FileUtils.createTmpFile(inputStream, nameAndExt[0], nameAndExt[1], super.tmpDirFile);
+    File file = File.createTempFile(nameAndExt[0], nameAndExt[1], super.tmpDirFile);
+    try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {
+      sink.writeAll(response.body().source());
+    }
+    return file;
   }
 
   private String getFileName(Response response) throws WxErrorException {
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java
index 91b36d7da6..9edeee89be 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaUploadRequestExecutor.java
@@ -6,6 +6,8 @@
 import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,7 +15,8 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkHttpMediaUploadRequestExecutor extends MediaUploadRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkHttpMediaUploadRequestExecutor extends MediaUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
   public OkHttpMediaUploadRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
@@ -21,23 +24,9 @@ public OkHttpMediaUploadRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public WxMediaUploadResult execute(String uri, File file) throws WxErrorException, IOException {
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
+    logger.debug("OkHttpMediaUploadRequestExecutor is running");
     //得到httpClient
-    OkHttpClient client = clientBuilder.build();
+    OkHttpClient client = requestHttp.getRequestHttpClient();
 
     RequestBody body = new MultipartBody.Builder()
       .setType(MediaType.parse("multipart/form-data"))
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java
index bbb5d43754..e468c609c8 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimpleGetRequestExecutor.java
@@ -5,13 +5,16 @@
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 /**
  * Created by ecoolper on 2017/5/4.
  */
-public class OkHttpSimpleGetRequestExecutor extends SimpleGetRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkHttpSimpleGetRequestExecutor extends SimpleGetRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
   public OkHttpSimpleGetRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
@@ -19,6 +22,7 @@ public OkHttpSimpleGetRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public String execute(String uri, String queryParam) throws WxErrorException, IOException {
+    logger.debug("OkHttpSimpleGetRequestExecutor is running");
     if (queryParam != null) {
       if (uri.indexOf('?') == -1) {
         uri += '?';
@@ -26,26 +30,9 @@ public String execute(String uri, String queryParam) throws WxErrorException, IO
       uri += uri.endsWith("?") ? queryParam : '&' + queryParam;
     }
 
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
     //得到httpClient
-    OkHttpClient client = clientBuilder.build();
-
+    OkHttpClient client = requestHttp.getRequestHttpClient();
     Request request = new Request.Builder().url(uri).build();
-
     Response response = client.newCall(request).execute();
     String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimplePostRequestExecutor.java
index 9d153117c5..bc54d7b4cd 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimplePostRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpSimplePostRequestExecutor.java
@@ -5,13 +5,16 @@
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 /**
  * Created by ecoolper on 2017/5/4.
  */
-public class OkHttpSimplePostRequestExecutor extends SimplePostRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkHttpSimplePostRequestExecutor extends SimplePostRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
   public OkHttpSimplePostRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
@@ -19,27 +22,9 @@ public OkHttpSimplePostRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public String execute(String uri, String postEntity) throws WxErrorException, IOException {
-    ConnectionPool pool = requestHttp.getRequestHttpClient();
-    final OkHttpProxyInfo proxyInfo = requestHttp.getRequestHttpProxy();
-
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(pool);
-    //设置代理
-    if (proxyInfo != null) {
-      clientBuilder.proxy(proxyInfo.getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(proxyInfo.getProxyUsername(), proxyInfo.getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
+    logger.debug("OkHttpSimplePostRequestExecutor running");
     //得到httpClient
-    OkHttpClient client = clientBuilder.build();
-
+    OkHttpClient client = requestHttp.getRequestHttpClient();
 
     MediaType mediaType = MediaType.parse("text/plain; charset=utf-8");
     RequestBody body = RequestBody.create(mediaType, postEntity);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
index 4dd66d9d86..2b8ae0c4af 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
@@ -7,16 +7,20 @@
 import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo;
 import me.chanjar.weixin.cp.config.WxCpConfigStorage;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
-public class WxCpServiceOkHttpImpl extends AbstractWxCpServiceImpl<ConnectionPool, OkHttpProxyInfo> {
-  protected ConnectionPool httpClient;
+public class WxCpServiceOkHttpImpl extends AbstractWxCpServiceImpl<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+  protected OkHttpClient httpClient;
   protected OkHttpProxyInfo httpProxy;
 
 
   @Override
-  public ConnectionPool getRequestHttpClient() {
+  public OkHttpClient getRequestHttpClient() {
     return httpClient;
   }
 
@@ -32,6 +36,7 @@ public HttpType getRequestType() {
 
   @Override
   public String getAccessToken(boolean forceRefresh) throws WxErrorException {
+    logger.debug("WxCpServiceOkHttpImpl is running");
     if (forceRefresh) {
       this.configStorage.expireAccessToken();
     }
@@ -41,24 +46,8 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
           String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?"
             + "&corpid=" + this.configStorage.getCorpId()
             + "&corpsecret=" + this.configStorage.getCorpSecret();
-
-          OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(httpClient);
-          //设置代理
-          if (httpProxy != null) {
-            clientBuilder.proxy(getRequestHttpProxy().getProxy());
-          }
-          //设置授权
-          clientBuilder.authenticator(new Authenticator() {
-            @Override
-            public Request authenticate(Route route, Response response) throws IOException {
-              String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
-              return response.request().newBuilder()
-                .header("Authorization", credential)
-                .build();
-            }
-          });
           //得到httpClient
-          OkHttpClient client = clientBuilder.build();
+          OkHttpClient client = getRequestHttpClient();
           //请求的request
           Request request = new Request.Builder().url(url).get().build();
           Response response = null;
@@ -88,13 +77,24 @@ public Request authenticate(Route route, Response response) throws IOException {
 
   @Override
   public void initHttp() {
-    WxCpConfigStorage configStorage = this.configStorage;
+    logger.debug("WxCpServiceOkHttpImpl initHttp");
+    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
+    //设置代理
+    if (httpProxy != null) {
+      clientBuilder.proxy(getRequestHttpProxy().getProxy());
 
-    if (configStorage.getHttpProxyHost() != null && configStorage.getHttpProxyPort() > 0) {
-      httpProxy = new OkHttpProxyInfo(OkHttpProxyInfo.ProxyType.SOCKS5, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
+      //设置授权
+      clientBuilder.authenticator(new Authenticator() {
+        @Override
+        public Request authenticate(Route route, Response response) throws IOException {
+          String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
+          return response.request().newBuilder()
+            .header("Authorization", credential)
+            .build();
+        }
+      });
     }
-
-    httpClient = new ConnectionPool();
+    httpClient = clientBuilder.build();
   }
 
   @Override
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
index cc965026c4..25eeeadce4 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
@@ -66,10 +66,9 @@ public String getJsapiTicket() throws WxErrorException {
 
   @Override
   public String getJsapiTicket(boolean forceRefresh) throws WxErrorException {
-    Lock lock = this.getWxMpConfigStorage().getJsapiTicketLock();
+    Lock lock = this.getWxMpConfigStorage().getAccessTokenLock();
     try {
       lock.lock();
-
       if (forceRefresh) {
         this.getWxMpConfigStorage().expireJsapiTicket();
       }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
index 81fb848909..dbb957b84c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
@@ -8,16 +8,21 @@
 import me.chanjar.weixin.mp.api.WxMpConfigStorage;
 import me.chanjar.weixin.mp.api.WxMpService;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.concurrent.locks.Lock;
 
-public class WxMpServiceOkHttpImpl extends AbstractWxMpServiceImpl<ConnectionPool, OkHttpProxyInfo> {
-  private ConnectionPool httpClient;
+public class WxMpServiceOkHttpImpl extends AbstractWxMpServiceImpl<OkHttpClient, OkHttpProxyInfo> {
+
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+  private OkHttpClient httpClient;
   private OkHttpProxyInfo httpProxy;
 
   @Override
-  public ConnectionPool getRequestHttpClient() {
+  public OkHttpClient getRequestHttpClient() {
     return httpClient;
   }
 
@@ -33,6 +38,7 @@ public HttpType getRequestType() {
 
   @Override
   public String getAccessToken(boolean forceRefresh) throws WxErrorException {
+    logger.debug("WxMpServiceOkHttpImpl is running");
     Lock lock = this.getWxMpConfigStorage().getAccessTokenLock();
     try {
       lock.lock();
@@ -45,26 +51,8 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
         String url = String.format(WxMpService.GET_ACCESS_TOKEN_URL,
           this.getWxMpConfigStorage().getAppId(), this.getWxMpConfigStorage().getSecret());
 
-        OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(httpClient);
-        //设置代理
-        if (httpProxy != null) {
-          clientBuilder.proxy(getRequestHttpProxy().getProxy());
-        }
-        //设置授权
-        clientBuilder.authenticator(new Authenticator() {
-          @Override
-          public Request authenticate(Route route, Response response) throws IOException {
-            String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
-            return response.request().newBuilder()
-              .header("Authorization", credential)
-              .build();
-          }
-        });
-        //得到httpClient
-        OkHttpClient client = clientBuilder.build();
-
         Request request = new Request.Builder().url(url).get().build();
-        Response response = client.newCall(request).execute();
+        Response response = getRequestHttpClient().newCall(request).execute();
         String resultContent = response.body().string();
         WxError error = WxError.fromJson(resultContent);
         if (error.getErrorCode() != 0) {
@@ -84,13 +72,29 @@ public Request authenticate(Route route, Response response) throws IOException {
 
   @Override
   public void initHttp() {
+    logger.debug("WxMpServiceOkHttpImpl initHttp");
     WxMpConfigStorage configStorage = this.getWxMpConfigStorage();
 
     if (configStorage.getHttpProxyHost() != null && configStorage.getHttpProxyPort() > 0) {
-      httpProxy = new OkHttpProxyInfo(OkHttpProxyInfo.ProxyType.SOCKS5, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
+      httpProxy = OkHttpProxyInfo.socks5Proxy(configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
     }
+    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
+    //设置代理
+    if (httpProxy != null) {
+      clientBuilder.proxy(getRequestHttpProxy().getProxy());
 
-    httpClient = new ConnectionPool();
+      //设置授权
+      clientBuilder.authenticator(new Authenticator() {
+        @Override
+        public Request authenticate(Route route, Response response) throws IOException {
+          String credential = Credentials.basic(httpProxy.getProxyUsername(), httpProxy.getProxyPassword());
+          return response.request().newBuilder()
+            .header("Authorization", credential)
+            .build();
+        }
+      });
+    }
+    httpClient = clientBuilder.build();
   }
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java
index 61d4d18b37..40ac27465e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialDeleteRequestExecutor.java
@@ -6,13 +6,16 @@
 import me.chanjar.weixin.common.util.http.okhttp.OkHttpProxyInfo;
 import me.chanjar.weixin.mp.util.http.MaterialDeleteRequestExecutor;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkhttpMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkhttpMaterialDeleteRequestExecutor extends MaterialDeleteRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 
   public OkhttpMaterialDeleteRequestExecutor(RequestHttp requestHttp) {
@@ -21,23 +24,9 @@ public OkhttpMaterialDeleteRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public Boolean execute(String uri, String materialId) throws WxErrorException, IOException {
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
+    logger.debug("OkhttpMaterialDeleteRequestExecutor is running");
     //得到httpClient
-    OkHttpClient client = clientBuilder.build();
+    OkHttpClient client = requestHttp.getRequestHttpClient();
 
     RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build();
     Request request = new Request.Builder().url(uri).post(requestBody).build();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java
index a0a1c05231..3f46ab7880 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialNewsInfoRequestExecutor.java
@@ -16,7 +16,7 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkhttpMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkhttpMaterialNewsInfoRequestExecutor extends MaterialNewsInfoRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
   private final Logger logger = LoggerFactory.getLogger(this.getClass());
   public OkhttpMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
@@ -24,23 +24,9 @@ public OkhttpMaterialNewsInfoRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public WxMpMaterialNews execute(String uri, String materialId) throws WxErrorException, IOException {
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
+
     //得到httpClient
-    OkHttpClient client = clientBuilder.build();
+    OkHttpClient client = requestHttp.getRequestHttpClient();
 
     RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build();
     Request request = new Request.Builder().url(uri).post(requestBody).build();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java
index 3770aa1b67..ef4bcbb299 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialUploadRequestExecutor.java
@@ -9,6 +9,8 @@
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
 import me.chanjar.weixin.mp.util.http.MaterialUploadRequestExecutor;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -18,13 +20,16 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkhttpMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkhttpMaterialUploadRequestExecutor extends MaterialUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
   public OkhttpMaterialUploadRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
 
   @Override
   public WxMpMaterialUploadResult execute(String uri, WxMpMaterial material) throws WxErrorException, IOException {
+    logger.debug("OkhttpMaterialUploadRequestExecutor is running");
     if (material == null) {
       throw new WxErrorException(WxError.newBuilder().setErrorMsg("非法请求，material参数为空").build());
     }
@@ -33,21 +38,9 @@ public WxMpMaterialUploadResult execute(String uri, WxMpMaterial material) throw
       throw new FileNotFoundException();
     }
 
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
+    //得到httpClient
+
+    OkHttpClient client = requestHttp.getRequestHttpClient();
 
     MultipartBody.Builder bodyBuilder = new MultipartBody.Builder()
       .setType(MediaType.parse("multipart/form-data"))
@@ -60,7 +53,7 @@ public Request authenticate(Route route, Response response) throws IOException {
     }
 
     Request request = new Request.Builder().url(uri).post(bodyBuilder.build()).build();
-    Response response = clientBuilder.build().newCall(request).execute();
+    Response response = client.newCall(request).execute();
     String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java
index 90c775bac6..79dd12be53 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVideoInfoRequestExecutor.java
@@ -7,36 +7,26 @@
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialVideoInfoResult;
 import me.chanjar.weixin.mp.util.http.MaterialVideoInfoRequestExecutor;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkhttpMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkhttpMaterialVideoInfoRequestExecutor extends MaterialVideoInfoRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
   public OkhttpMaterialVideoInfoRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
 
   @Override
   public WxMpMaterialVideoInfoResult execute(String uri, String materialId) throws WxErrorException, IOException {
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
+    logger.debug("OkhttpMaterialVideoInfoRequestExecutor is running");
     //得到httpClient
-    OkHttpClient client = clientBuilder.build();
+    OkHttpClient client = requestHttp.getRequestHttpClient();
 
     RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build();
     Request request = new Request.Builder().url(uri).post(requestBody).build();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java
index 1d0a5f7f65..8c48139183 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMaterialVoiceAndImageDownloadRequestExecutor.java
@@ -7,62 +7,39 @@
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import me.chanjar.weixin.mp.util.http.MaterialVoiceAndImageDownloadRequestExecutor;
 import okhttp3.*;
+import okio.BufferedSink;
+import okio.Okio;
 import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
+import java.io.*;
 
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkhttpMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkhttpMaterialVoiceAndImageDownloadRequestExecutor extends MaterialVoiceAndImageDownloadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
   public OkhttpMaterialVoiceAndImageDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
     super(requestHttp, tmpDirFile);
   }
 
   @Override
   public InputStream execute(String uri, String materialId) throws WxErrorException, IOException {
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
-    //得到httpClient
-    OkHttpClient client = clientBuilder.build();
-
+    logger.debug("OkhttpMaterialVoiceAndImageDownloadRequestExecutor is running");
+    OkHttpClient client = requestHttp.getRequestHttpClient();
     RequestBody requestBody = new FormBody.Builder().add("media_id", materialId).build();
     Request request = new Request.Builder().url(uri).get().post(requestBody).build();
     Response response = client.newCall(request).execute();
-
-    try (InputStream inputStream = new ByteArrayInputStream(response.body().bytes())) {
-
-      // 下载媒体文件出错
-      byte[] responseContent = IOUtils.toByteArray(inputStream);
-      String responseContentString = new String(responseContent, StandardCharsets.UTF_8);
-      if (responseContentString.length() < 100) {
-        try {
-          WxError wxError = WxGsonBuilder.create().fromJson(responseContentString, WxError.class);
-          if (wxError.getErrorCode() != 0) {
-            throw new WxErrorException(wxError);
-          }
-        } catch (com.google.gson.JsonSyntaxException ex) {
-          return new ByteArrayInputStream(responseContent);
-        }
-      }
-      return new ByteArrayInputStream(responseContent);
+    String contentTypeHeader = response.header("Content-Type");
+    if ("text/plain".equals(contentTypeHeader)) {
+      String responseContent = response.body().string();
+      throw new WxErrorException(WxError.fromJson(responseContent));
+    }
+    try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); BufferedSink sink = Okio.buffer(Okio.sink(outputStream))) {
+      sink.writeAll(response.body().source());
+      return new ByteArrayInputStream(outputStream.toByteArray());
     }
   }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java
index 3b10f63bcf..f8e5859287 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpMediaImgUploadRequestExecutor.java
@@ -7,6 +7,8 @@
 import me.chanjar.weixin.mp.bean.material.WxMediaImgUploadResult;
 import me.chanjar.weixin.mp.util.http.MediaImgUploadRequestExecutor;
 import okhttp3.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -14,7 +16,8 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkhttpMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkhttpMediaImgUploadRequestExecutor extends MediaImgUploadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
   public OkhttpMediaImgUploadRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
@@ -22,21 +25,9 @@ public OkhttpMediaImgUploadRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public WxMediaImgUploadResult execute(String uri, File file) throws WxErrorException, IOException {
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
+    logger.debug("OkhttpMediaImgUploadRequestExecutor is running");
+    //得到httpClient
+    OkHttpClient client = requestHttp.getRequestHttpClient();
 
     RequestBody body = new MultipartBody.Builder()
       .setType(MediaType.parse("multipart/form-data"))
@@ -46,7 +37,7 @@ public Request authenticate(Route route, Response response) throws IOException {
       .build();
 
     Request request = new Request.Builder().url(uri).post(body).build();
-    Response response = clientBuilder.build().newCall(request).execute();
+    Response response = client.newCall(request).execute();
     String responseContent = response.body().string();
     WxError error = WxError.fromJson(responseContent);
     if (error.getErrorCode() != 0) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
index f401b021cc..2f9bcc7437 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
@@ -9,6 +9,10 @@
 import me.chanjar.weixin.mp.util.http.QrCodeRequestExecutor;
 
 import okhttp3.*;
+import okio.BufferedSink;
+import okio.Okio;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -19,31 +23,18 @@
 /**
  * Created by ecoolper on 2017/5/5.
  */
-public class OkhttpQrCodeRequestExecutor extends QrCodeRequestExecutor<ConnectionPool, OkHttpProxyInfo> {
+public class OkhttpQrCodeRequestExecutor extends QrCodeRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
+  private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
   public OkhttpQrCodeRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
 
   @Override
   public File execute(String uri, WxMpQrCodeTicket data) throws WxErrorException, IOException {
-    OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder().connectionPool(requestHttp.getRequestHttpClient());
-    //设置代理
-    if (requestHttp.getRequestHttpProxy() != null) {
-      clientBuilder.proxy(requestHttp.getRequestHttpProxy().getProxy());
-    }
-    //设置授权
-    clientBuilder.authenticator(new Authenticator() {
-      @Override
-      public Request authenticate(Route route, Response response) throws IOException {
-        String credential = Credentials.basic(requestHttp.getRequestHttpProxy().getProxyUsername(), requestHttp.getRequestHttpProxy().getProxyPassword());
-        return response.request().newBuilder()
-          .header("Authorization", credential)
-          .build();
-      }
-    });
+    logger.debug("OkhttpQrCodeRequestExecutor is running");
     //得到httpClient
-    OkHttpClient client = clientBuilder.build();
-
+    OkHttpClient client = requestHttp.getRequestHttpClient();
     Request request = new Request.Builder().url(uri).get().build();
     Response response = client.newCall(request).execute();
     String contentTypeHeader = response.header("Content-Type");
@@ -51,8 +42,10 @@ public Request authenticate(Route route, Response response) throws IOException {
       String responseContent = response.body().string();
       throw new WxErrorException(WxError.fromJson(responseContent));
     }
-    try (InputStream inputStream = new ByteArrayInputStream(response.body().bytes())) {
-      return FileUtils.createTmpFile(inputStream, UUID.randomUUID().toString(), "jpg");
+    File temp = File.createTempFile(UUID.randomUUID().toString(), ".png");
+    try (BufferedSink sink = Okio.buffer(Okio.sink(temp))) {
+      sink.writeAll(response.body().source());
     }
+    return temp;
   }
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
index c8b616fa96..7fb10716f0 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpBaseAPITest.java
@@ -29,4 +29,10 @@ public void testRefreshAccessToken() throws WxErrorException {
     Assert.assertTrue(StringUtils.isNotBlank(after));
   }
 
+  public void testJsapiTicket() throws WxErrorException {
+    String jsapiTicket = this.wxService.getJsapiTicket(false);
+    System.out.println(jsapiTicket);
+    Assert.assertNotNull(jsapiTicket);
+  }
+
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java
index 9fd3227893..e6be87302d 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpJsAPITest.java
@@ -20,11 +20,7 @@ public class WxMpJsAPITest {
   protected WxMpService wxService;
 
 
-  public void testJsapiTicket() throws WxErrorException {
-    String jsapiTicket = this.wxService.getJsapiTicket(false);
-    System.out.println(jsapiTicket);
-    Assert.assertNotNull(jsapiTicket);
-  }
+
 
   public void test() {
     long timestamp = 1419835025l;
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java
index 036c534adc..2a9421a499 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/test/ApiTestModule.java
@@ -7,6 +7,7 @@
 import me.chanjar.weixin.mp.api.WxMpConfigStorage;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceApacheHttpClientImpl;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceOkHttpImpl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,7 +20,7 @@ public void configure(Binder binder) {
     try (InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml")) {
       TestConfigStorage config = this.fromXml(TestConfigStorage.class, is1);
       config.setAccessTokenLock(new ReentrantLock());
-      WxMpService wxService = new WxMpServiceApacheHttpClientImpl();
+      WxMpService wxService = new WxMpServiceOkHttpImpl();
       wxService.setWxMpConfigStorage(config);
 
       binder.bind(WxMpService.class).toInstance(wxService);

From e886ba09f6e6a201a469d7b706bc583b5fdf4f21 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 31 Jul 2017 17:42:17 +0800
Subject: [PATCH 54/85] =?UTF-8?q?=E9=9D=9E=E6=B3=95=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?WxPayException?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/bean/request/WxPayBaseRequest.java   | 2 +-
 .../wxpay/bean/request/WxPayDownloadBillRequest.java      | 7 ++++---
 .../wxpay/bean/request/WxPayOrderQueryRequest.java        | 5 +++--
 .../wxpay/bean/request/WxPayOrderReverseRequest.java      | 5 +++--
 .../wxpay/bean/request/WxPayRefundQueryRequest.java       | 5 +++--
 .../binarywang/wxpay/bean/request/WxPayRefundRequest.java | 6 +++---
 .../wxpay/bean/request/WxPayUnifiedOrderRequest.java      | 8 ++++----
 .../binarywang/wxpay/bean/result/WxPayBaseResult.java     | 7 +++----
 .../com/github/binarywang/wxpay/config/WxPayConfig.java   | 4 ++--
 .../wxpay/service/impl/WxPayServiceAbstractImpl.java      | 2 +-
 .../wxpay/service/impl/WxPayServiceAbstractImplTest.java  | 2 +-
 11 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
index b0c2e85d5c..cc0490d22e 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
@@ -122,7 +122,7 @@ protected void checkFields() throws WxPayException {
   /**
    * 检查约束情况
    */
-  protected abstract void checkConstraints();
+  protected abstract void checkConstraints() throws WxPayException;
 
   public String getAppid() {
     return this.appid;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java
index ed02060f83..2838284c80 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import me.chanjar.weixin.common.annotation.Required;
 import org.apache.commons.lang3.ArrayUtils;
@@ -128,13 +129,13 @@ public void setTarType(String tarType) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if (StringUtils.isNotBlank(this.getTarType()) && !"GZIP".equals(this.getTarType())) {
-      throw new IllegalArgumentException("tar_type值如果存在，只能为GZIP");
+      throw new WxPayException("tar_type值如果存在，只能为GZIP");
     }
 
     if (!ArrayUtils.contains(BILL_TYPE, this.getBillType())) {
-      throw new IllegalArgumentException(String.format("bill_tpye目前必须为%s其中之一,实际值：%s",
+      throw new WxPayException(String.format("bill_tpye目前必须为%s其中之一,实际值：%s",
         Arrays.toString(BILL_TYPE), this.getBillType()));
     }
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java
index 499727995e..e7767da607 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderQueryRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
@@ -64,10 +65,10 @@ public void setOutTradeNo(String outTradeNo) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if ((StringUtils.isBlank(transactionId) && StringUtils.isBlank(outTradeNo)) ||
       (StringUtils.isNotBlank(transactionId) && StringUtils.isNotBlank(outTradeNo))) {
-      throw new IllegalArgumentException("transaction_id 和 out_trade_no 不能同时存在或同时为空，必须二选一");
+      throw new WxPayException("transaction_id 和 out_trade_no 不能同时存在或同时为空，必须二选一");
     }
   }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java
index 6aef2aa0fa..075295238e 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayOrderReverseRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
@@ -91,9 +92,9 @@ public void setSignType(String signType) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if (StringUtils.isBlank(transactionId) && StringUtils.isBlank(outTradeNo)) {
-      throw new IllegalArgumentException("transaction_id 和 out_trade_no不能同时为空！");
+      throw new WxPayException("transaction_id 和 out_trade_no不能同时为空！");
     }
   }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java
index 1efa23db7a..00545f004c 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundQueryRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import org.apache.commons.lang3.StringUtils;
 
@@ -135,12 +136,12 @@ public void setRefundId(String refundId) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if ((StringUtils.isBlank(transactionId) && StringUtils.isBlank(outTradeNo)
       && StringUtils.isBlank(outRefundNo) && StringUtils.isBlank(refundId)) ||
       (StringUtils.isNotBlank(transactionId) && StringUtils.isNotBlank(outTradeNo)
         && StringUtils.isNotBlank(outRefundNo) && StringUtils.isNotBlank(refundId))) {
-      throw new IllegalArgumentException("transaction_id，out_trade_no，out_refund_no，refund_id 必须四选一");
+      throw new WxPayException("transaction_id，out_trade_no，out_refund_no，refund_id 必须四选一");
     }
 
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
index 7fae6fa0f5..66808738ca 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayRefundRequest.java
@@ -271,16 +271,16 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
     if (StringUtils.isNotBlank(this.getRefundAccount())) {
       if (!ArrayUtils.contains(REFUND_ACCOUNT, this.getRefundAccount())) {
-        throw new IllegalArgumentException(String.format("refund_account目前必须为%s其中之一,实际值：%s",
+        throw new WxPayException(String.format("refund_account目前必须为%s其中之一,实际值：%s",
           Arrays.toString(REFUND_ACCOUNT), this.getRefundAccount()));
       }
     }
 
     if (StringUtils.isBlank(this.getOutTradeNo()) && StringUtils.isBlank(this.getTransactionId())) {
-      throw new IllegalArgumentException("transaction_id 和 out_trade_no 不能同时为空，必须提供一个");
+      throw new WxPayException("transaction_id 和 out_trade_no 不能同时为空，必须提供一个");
     }
   }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
index 7c927425de..8061556cc7 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayUnifiedOrderRequest.java
@@ -500,18 +500,18 @@ public void setSceneInfo(String sceneInfo) {
   }
 
   @Override
-  protected void checkConstraints() {
+  protected void checkConstraints() throws WxPayException {
 //    if (!ArrayUtils.contains(TRADE_TYPES, this.getTradeType())) {
-//      throw new IllegalArgumentException(String.format("trade_type目前必须为%s其中之一,实际值：%s",
+//      throw new WxPayException(String.format("trade_type目前必须为%s其中之一,实际值：%s",
 //        Arrays.toString(TRADE_TYPES), this.getTradeType()));
 //    }
 
     if ("JSAPI".equals(this.getTradeType()) && this.getOpenid() == null) {
-      throw new IllegalArgumentException("当 trade_type是'JSAPI'时未指定openid");
+      throw new WxPayException("当 trade_type是'JSAPI'时未指定openid");
     }
 
     if ("NATIVE".equals(this.getTradeType()) && this.getProductId() == null) {
-      throw new IllegalArgumentException("当 trade_type是'NATIVE'时未指定product_id");
+      throw new WxPayException("当 trade_type是'NATIVE'时未指定product_id");
     }
   }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java
index 802e22b312..d4b96dc408 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayBaseResult.java
@@ -316,8 +316,8 @@ public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayExcep
     }
 
     //校验结果是否成功
-    if (!"SUCCESS".equalsIgnoreCase(getReturnCode())
-      || !"SUCCESS".equalsIgnoreCase(getResultCode())) {
+    if (!StringUtils.equalsAny(StringUtils.trimToEmpty(getReturnCode()).toUpperCase(), "SUCCESS", "")
+      || !StringUtils.equalsAny(StringUtils.trimToEmpty(getResultCode()).toUpperCase(), "SUCCESS", "")) {
       StringBuilder errorMsg = new StringBuilder();
       if (getReturnCode() != null) {
         errorMsg.append("返回代码：").append(getReturnCode());
@@ -335,8 +335,7 @@ public void checkResult(WxPayServiceAbstractImpl wxPayService) throws WxPayExcep
         errorMsg.append("，错误详情：").append(getErrCodeDes());
       }
 
-      this.getLogger().error("\n结果业务代码异常，返回結果：{},\n{}",
-        map, errorMsg.toString());
+      this.getLogger().error("\n结果业务代码异常，返回結果：{},\n{}", map, errorMsg.toString());
       throw WxPayException.from(this);
     }
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
index aeab939a06..b51f28e94a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
@@ -160,11 +160,11 @@ public void setUseSandboxEnv(boolean useSandboxEnv) {
 
   public SSLContext initSSLContext() throws WxPayException {
     if (StringUtils.isBlank(mchId)) {
-      throw new IllegalArgumentException("请确保商户号mchId已设置");
+      throw new WxPayException("请确保商户号mchId已设置");
     }
 
     if (StringUtils.isBlank(this.keyPath)) {
-      throw new IllegalArgumentException("请确保证书文件地址keyPath已配置");
+      throw new WxPayException("请确保证书文件地址keyPath已配置");
     }
 
     InputStream inputStream;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index 9a75b46973..616f860988 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -161,7 +161,7 @@ public WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo)
   @Override
   public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException {
     if (StringUtils.isBlank(outTradeNo)) {
-      throw new IllegalArgumentException("out_trade_no不能为空");
+      throw new WxPayException("out_trade_no不能为空");
     }
 
     WxPayOrderCloseRequest request = new WxPayOrderCloseRequest();
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
index 9b57d77b1c..7ac35a6061 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -139,7 +139,7 @@ public void testUnifiedOrder() throws WxPayException {
       .unifiedOrder(WxPayUnifiedOrderRequest.newBuilder()
         .body("我去")
         .totalFee(1)
-        .spbillCreateIp("111111")
+        .spbillCreateIp("11.1.11.1")
         .notifyURL("111111")
         .tradeType("JSAPI")
         .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())

From 111196baaf6101f6463f2d13c9e052988d463643 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 31 Jul 2017 17:44:48 +0800
Subject: [PATCH 55/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.7.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 2 +-
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0b78452d55..8bd9de49e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.6.BETA</version>
+  <version>2.7.7.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 9299fa1ce7..f93c89abb8 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.6.BETA</version>
+    <version>2.7.7.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 6732165602..6e0a3e27b2 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.6.BETA</version>
+    <version>2.7.7.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 181b505cd3..bc75c8f7f9 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.6.BETA</version>
+    <version>2.7.7.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 16648606b2..18de637004 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.6.BETA</version>
+    <version>2.7.7.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 4783621af5..0a65663c6b 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.6.BETA</version>
+    <version>2.7.7.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 7a374c0ed47a9921ce32c9592f807c84c02b3453 Mon Sep 17 00:00:00 2001
From: dylanleung <0095103cn@gmail.com>
Date: Mon, 31 Jul 2017 05:18:15 -0500
Subject: [PATCH 56/85] =?UTF-8?q?#295=20=E4=BF=AE=E5=A4=8D=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E6=96=87=E4=BB=B6=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update travis settings

* feat(okhttp): 修改okhttp底层调用方法

直接用OkHttpClient代替connect.使客户端单一化.Okhttp 自动管理连接池优化

* feat(log,jsApi): 添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题

添加log debug 标记明确下调用底层效果,修复jsAPI Lock 为null 问题

#293

* fix(File): 修复文件关闭

修复文件关闭

* Update OkHttpMediaDownloadRequestExecutor.java
---
 .../main/java/me/chanjar/weixin/common/util/fs/FileUtils.java   | 2 +-
 .../util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java    | 1 +
 .../weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
index 37ee5ebe4b..df031b3371 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/fs/FileUtils.java
@@ -24,7 +24,7 @@ public static File createTmpFile(InputStream inputStream, String name, String ex
       tmpFile = File.createTempFile(name, '.' + ext, tmpDirFile);
     }
 
-//    tmpFile.deleteOnExit();
+    tmpFile.deleteOnExit();
 
     try (FileOutputStream fos = new FileOutputStream(tmpFile)) {
       int read = 0;
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
index e5346c2a26..246ce4dcc0 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
@@ -62,6 +62,7 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx
     try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {
       sink.writeAll(response.body().source());
     }
+    file.deleteOnExit();
     return file;
   }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
index 2f9bcc7437..6feb137925 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/okhttp/OkhttpQrCodeRequestExecutor.java
@@ -46,6 +46,8 @@ public File execute(String uri, WxMpQrCodeTicket data) throws WxErrorException,
     try (BufferedSink sink = Okio.buffer(Okio.sink(temp))) {
       sink.writeAll(response.body().source());
     }
+    temp.deleteOnExit();
+
     return temp;
   }
 }

From a2d5786b598be7ab6700ed2fd1d8b210027f18e8 Mon Sep 17 00:00:00 2001
From: Bob <rememberber@gmail.com>
Date: Tue, 1 Aug 2017 12:03:38 +0800
Subject: [PATCH 57/85] =?UTF-8?q?#297=20WxMpMenu=E7=B1=BB=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=9E=E7=8E=B0=E5=BA=8F=E5=88=97=E5=8C=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
index 366ca2f1ba..3c154726fa 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
@@ -6,6 +6,7 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -15,7 +16,10 @@
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
  * </pre>
  */
-public class WxMpMenu {
+public class WxMpMenu implements Serializable{
+
+  private static final long serialVersionUID = -5794350513426702252L;
+
   @SerializedName("menu")
   private WxMpConditionalMenu menu;
 

From 761859c930d5d6ae26b72a57847b844e4669c156 Mon Sep 17 00:00:00 2001
From: Bob <rememberber@gmail.com>
Date: Tue, 1 Aug 2017 13:00:46 +0800
Subject: [PATCH 58/85] =?UTF-8?q?#298=20WxMpMenu=E7=9A=84=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E7=B1=BBWxMpConditionalMenu=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BA=8F=E5=88=97=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
index 3c154726fa..6c7d3e8650 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
@@ -55,7 +55,10 @@ public String toJson() {
     return WxGsonBuilder.create().toJson(this);
   }
 
-  public static class WxMpConditionalMenu {
+  public static class WxMpConditionalMenu implements Serializable {
+
+    private static final long serialVersionUID = -2279946921755382289L;
+
     @SerializedName("button")
     private List<WxMenuButton> buttons;
     @SerializedName("matchrule")

From 56557bf074d0dd55e9a6351cdbd3f513b2e0ac04 Mon Sep 17 00:00:00 2001
From: Bob <rememberber@gmail.com>
Date: Tue, 8 Aug 2017 10:39:02 +0800
Subject: [PATCH 59/85] =?UTF-8?q?#302=20WxMpXmlOutNewsMessage=E7=B1=BB?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=86=85=E9=83=A8=E7=B1=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=BA=8F=E5=88=97=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/bean/message/WxMpXmlOutNewsMessage.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java
index 1d4fb0c767..8865a39358 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -39,7 +40,9 @@ public List<Item> getArticles() {
 
 
   @XStreamAlias("item")
-  public static class Item {
+  public static class Item implements Serializable {
+
+    private static final long serialVersionUID = -4971456355028904754L;
 
     @XStreamAlias("Title")
     @XStreamConverter(value = XStreamCDataConverter.class)

From baf53dc0f8b7b941aace4fa80cb4c9ae96933b14 Mon Sep 17 00:00:00 2001
From: kakotor <kakotor@gmail.com>
Date: Thu, 10 Aug 2017 12:25:10 +0800
Subject: [PATCH 60/85] =?UTF-8?q?DefaultApacheHttpClientBuilder=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8D=95=E4=BE=8B=E6=A8=A1=E5=BC=8F=20(#310)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DefaultApacheHttpClientBuilder.java       | 23 +++++--
 .../DefaultApacheHttpClientBuilderTest.java   | 64 +++++++++++++++++++
 2 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 weixin-java-common/src/test/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilderTest.java

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java
index b328ede9af..19c79bdcf2 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilder.java
@@ -68,13 +68,16 @@ public boolean retryRequest(IOException exception, int executionCount, HttpConte
    * 闲置连接监控线程
    */
   private IdleConnectionMonitorThread idleConnectionMonitorThread;
-  private HttpClientBuilder httpClientBuilder;
+  /**
+   * 持有client对象,仅初始化一次,避免多service实例的时候造成重复初始化的问题
+   */
+  private CloseableHttpClient closeableHttpClient;
 
   private DefaultApacheHttpClientBuilder() {
   }
 
   public static DefaultApacheHttpClientBuilder get() {
-    return new DefaultApacheHttpClientBuilder();
+    return DefaultApacheHttpClientBuilder.SingletonHolder.INSTANCE;
   }
 
   @Override
@@ -219,7 +222,7 @@ private synchronized void prepare() {
     this.idleConnectionMonitorThread.setDaemon(true);
     this.idleConnectionMonitorThread.start();
 
-    this.httpClientBuilder = HttpClients.custom()
+    HttpClientBuilder httpClientBuilder = HttpClients.custom()
       .setConnectionManager(connectionManager)
       .setConnectionManagerShared(true)
       .setSSLSocketFactory(this.buildSSLConnectionSocketFactory())
@@ -240,12 +243,13 @@ private synchronized void prepare() {
         new AuthScope(this.httpProxyHost, this.httpProxyPort),
         new UsernamePasswordCredentials(this.httpProxyUsername,
           this.httpProxyPassword));
-      this.httpClientBuilder.setDefaultCredentialsProvider(provider);
+      httpClientBuilder.setDefaultCredentialsProvider(provider);
     }
 
     if (StringUtils.isNotBlank(this.userAgent)) {
-      this.httpClientBuilder.setUserAgent(this.userAgent);
+      httpClientBuilder.setUserAgent(this.userAgent);
     }
+    this.closeableHttpClient = httpClientBuilder.build();
     prepared.set(true);
   }
 
@@ -277,7 +281,14 @@ public CloseableHttpClient build() {
     if (!prepared.get()) {
       prepare();
     }
-    return this.httpClientBuilder.build();
+    return this.closeableHttpClient;
+  }
+
+  /**
+   * DefaultApacheHttpClientBuilder 改为单例模式,并持有唯一的CloseableHttpClient(仅首次调用创建)
+   */
+  private static class SingletonHolder {
+    private static final DefaultApacheHttpClientBuilder INSTANCE = new DefaultApacheHttpClientBuilder();
   }
 
   public static class IdleConnectionMonitorThread extends Thread {
diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilderTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilderTest.java
new file mode 100644
index 0000000000..24a45eea09
--- /dev/null
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/http/apache/DefaultApacheHttpClientBuilderTest.java
@@ -0,0 +1,64 @@
+package me.chanjar.weixin.common.util.http.apache;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DefaultApacheHttpClientBuilderTest {
+  @Test
+  public void testBuild() throws Exception {
+    DefaultApacheHttpClientBuilder builder1 = DefaultApacheHttpClientBuilder.get();
+    DefaultApacheHttpClientBuilder builder2 = DefaultApacheHttpClientBuilder.get();
+    Assert.assertSame(builder1, builder2, "DefaultApacheHttpClientBuilder为单例,获取到的对象应该相同");
+    List<TestThread> threadList = new ArrayList<>(10);
+    for (int i = 0; i < 10; i++) {
+      TestThread thread = new TestThread();
+      thread.start();
+      threadList.add(thread);
+    }
+    for (TestThread testThread : threadList) {
+      testThread.join();
+      Assert.assertNotEquals(-1,testThread.getRespState(),"请求响应code不应为-1");
+    }
+
+    for (int i = 1; i < threadList.size(); i++) {
+      TestThread thread1 = threadList.get(i - 1);
+      TestThread thread2 = threadList.get(i);
+      Assert.assertSame(
+        thread1.getClient(),
+        thread2.getClient(),
+        "DefaultApacheHttpClientBuilder为单例,并持有了相同的HttpClient"
+      );
+    }
+  }
+
+
+  public static class TestThread extends Thread {
+    private CloseableHttpClient client;
+    private int respState = -1;
+
+    @Override
+    public void run() {
+      client = DefaultApacheHttpClientBuilder.get().build();
+      HttpGet httpGet = new HttpGet("http://www.sina.com.cn/");
+      try (CloseableHttpResponse resp = client.execute(httpGet)){
+        respState = resp.getStatusLine().getStatusCode();
+      } catch (IOException ignored) {
+      }
+    }
+
+    public CloseableHttpClient getClient() {
+      return client;
+    }
+
+    public int getRespState() {
+      return respState;
+    }
+  }
+}

From c482443f8b6ee564efbe3fc5b2ea919b3412ec64 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 11 Aug 2017 11:59:38 +0800
Subject: [PATCH 61/85] =?UTF-8?q?#300=20=E4=BF=AE=E5=A4=8D=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=A4=9A=E5=AA=92=E4=BD=93=E6=96=87=E4=BB=B6=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=90=8E=E7=BC=80=E5=90=8D=E6=97=B6=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/util/http/HttpResponseProxy.java   | 88 +++++++++++++++++++
 .../ApacheMediaDownloadRequestExecutor.java   | 25 ++----
 .../JoddHttpMediaDownloadRequestExecutor.java | 25 ++----
 .../OkHttpMediaDownloadRequestExecutor.java   | 33 ++-----
 4 files changed, 107 insertions(+), 64 deletions(-)
 create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java
new file mode 100644
index 0000000000..a75aa963e0
--- /dev/null
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/HttpResponseProxy.java
@@ -0,0 +1,88 @@
+package me.chanjar.weixin.common.util.http;
+
+import jodd.http.HttpResponse;
+import me.chanjar.weixin.common.bean.result.WxError;
+import me.chanjar.weixin.common.exception.WxErrorException;
+import okhttp3.Response;
+import org.apache.http.Header;
+import org.apache.http.client.methods.CloseableHttpResponse;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * <pre>
+ * 三种http框架的response代理类，方便提取公共方法
+ * Created by Binary Wang on 2017-8-3.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class HttpResponseProxy {
+  private CloseableHttpResponse apacheHttpResponse;
+  private HttpResponse joddHttpResponse;
+  private Response okHttpResponse;
+
+  public HttpResponseProxy(CloseableHttpResponse apacheHttpResponse) {
+    this.apacheHttpResponse = apacheHttpResponse;
+  }
+
+  public HttpResponseProxy(HttpResponse joddHttpResponse) {
+    this.joddHttpResponse = joddHttpResponse;
+  }
+
+  public HttpResponseProxy(Response okHttpResponse) {
+    this.okHttpResponse = okHttpResponse;
+  }
+
+  public String getFileName() throws WxErrorException {
+    //由于对象只能由一个构造方法实现，因此三个response对象必定且只有一个不为空
+    if (this.apacheHttpResponse != null) {
+      return this.getFileName(this.apacheHttpResponse);
+    }
+
+    if (this.joddHttpResponse != null) {
+      return this.getFileName(this.joddHttpResponse);
+    }
+
+    if (this.okHttpResponse != null) {
+      return this.getFileName(this.okHttpResponse);
+    }
+
+    //cannot happen
+    return null;
+  }
+
+  private String getFileName(CloseableHttpResponse response) throws WxErrorException {
+    Header[] contentDispositionHeader = response.getHeaders("Content-disposition");
+    if (contentDispositionHeader == null || contentDispositionHeader.length == 0) {
+      throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
+    }
+
+    return this.extractFileNameFromContentString(contentDispositionHeader[0].getValue());
+  }
+
+  private String getFileName(HttpResponse response) throws WxErrorException {
+    String content = response.header("Content-disposition");
+    return this.extractFileNameFromContentString(content);
+  }
+
+  private String getFileName(Response response) throws WxErrorException {
+    String content = response.header("Content-disposition");
+    return this.extractFileNameFromContentString(content);
+  }
+
+  private String extractFileNameFromContentString(String content) throws WxErrorException {
+    if (content == null || content.length() == 0) {
+      throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
+    }
+
+    Pattern p = Pattern.compile(".*filename=\"(.*)\"");
+    Matcher m = p.matcher(content);
+    if (m.matches()) {
+      return m.group(1);
+    }
+    throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
+  }
+
+}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaDownloadRequestExecutor.java
index 6a928648e5..0a5a504873 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaDownloadRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheMediaDownloadRequestExecutor.java
@@ -3,8 +3,10 @@
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.fs.FileUtils;
+import me.chanjar.weixin.common.util.http.HttpResponseProxy;
 import me.chanjar.weixin.common.util.http.MediaDownloadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpHost;
@@ -17,15 +19,12 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Created by ecoolper on 2017/5/5.
  */
 public class ApacheMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<CloseableHttpClient, HttpHost> {
 
-
   public ApacheMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
     super(requestHttp, tmpDirFile);
   }
@@ -57,31 +56,17 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx
         }
       }
 
-      String fileName = getFileName(response);
+      String fileName = new HttpResponseProxy(response).getFileName();
       if (StringUtils.isBlank(fileName)) {
         return null;
       }
 
-      String[] nameAndExt = fileName.split("\\.");
-      return FileUtils.createTmpFile(inputStream, nameAndExt[0], nameAndExt[1], super.tmpDirFile);
+      return FileUtils.createTmpFile(inputStream, FilenameUtils.getBaseName(fileName), FilenameUtils.getExtension(fileName),
+        super.tmpDirFile);
 
     } finally {
       httpGet.releaseConnection();
     }
   }
 
-  private String getFileName(CloseableHttpResponse response) throws WxErrorException {
-    Header[] contentDispositionHeader = response.getHeaders("Content-disposition");
-    if (contentDispositionHeader == null || contentDispositionHeader.length == 0) {
-      throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
-    }
-
-    Pattern p = Pattern.compile(".*filename=\"(.*)\"");
-    Matcher m = p.matcher(contentDispositionHeader[0].getValue());
-    if (m.matches()) {
-      return m.group(1);
-    }
-    throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
-  }
-
 }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java
index edbee76678..bbd8bec47c 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpMediaDownloadRequestExecutor.java
@@ -5,27 +5,25 @@
 import jodd.http.HttpResponse;
 import jodd.http.ProxyInfo;
 import jodd.util.StringPool;
-
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.util.fs.FileUtils;
+import me.chanjar.weixin.common.util.http.HttpResponseProxy;
 import me.chanjar.weixin.common.util.http.MediaDownloadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Created by ecoolper on 2017/5/5.
  */
 public class JoddHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<HttpConnectionProvider, ProxyInfo> {
 
-
   public JoddHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
     super(requestHttp, tmpDirFile);
   }
@@ -54,28 +52,15 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx
       throw new WxErrorException(WxError.fromJson(response.bodyText()));
     }
 
-    String fileName = getFileName(response);
+    String fileName = new HttpResponseProxy(response).getFileName();
     if (StringUtils.isBlank(fileName)) {
       return null;
     }
 
     InputStream inputStream = new ByteArrayInputStream(response.bodyBytes());
-    String[] nameAndExt = fileName.split("\\.");
-    return FileUtils.createTmpFile(inputStream, nameAndExt[0], nameAndExt[1], super.tmpDirFile);
+    return FileUtils.createTmpFile(inputStream, FilenameUtils.getBaseName(fileName), FilenameUtils.getExtension(fileName),
+      super.tmpDirFile);
   }
 
-  private String getFileName(HttpResponse response) throws WxErrorException {
-    String content = response.header("Content-disposition");
-    if (content == null || content.length() == 0) {
-      throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
-    }
-
-    Pattern p = Pattern.compile(".*filename=\"(.*)\"");
-    Matcher m = p.matcher(content);
-    if (m.matches()) {
-      return m.group(1);
-    }
-    throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
-  }
 
 }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
index 246ce4dcc0..0923527b71 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/okhttp/OkHttpMediaDownloadRequestExecutor.java
@@ -2,22 +2,21 @@
 
 import me.chanjar.weixin.common.bean.result.WxError;
 import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.common.util.fs.FileUtils;
+import me.chanjar.weixin.common.util.http.HttpResponseProxy;
 import me.chanjar.weixin.common.util.http.MediaDownloadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
-import okhttp3.*;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import okio.BufferedSink;
 import okio.Okio;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Created by ecoolper on 2017/5/5.
@@ -25,7 +24,6 @@
 public class OkHttpMediaDownloadRequestExecutor extends MediaDownloadRequestExecutor<OkHttpClient, OkHttpProxyInfo> {
   private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-
   public OkHttpMediaDownloadRequestExecutor(RequestHttp requestHttp, File tmpDirFile) {
     super(requestHttp, tmpDirFile);
   }
@@ -53,12 +51,13 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx
       throw new WxErrorException(WxError.fromJson(response.body().string()));
     }
 
-    String fileName = getFileName(response);
+    String fileName = new HttpResponseProxy(response).getFileName();
     if (StringUtils.isBlank(fileName)) {
       return null;
     }
-    String[] nameAndExt = fileName.split("\\.");
-    File file = File.createTempFile(nameAndExt[0], nameAndExt[1], super.tmpDirFile);
+
+    File file = File.createTempFile(FilenameUtils.getBaseName(fileName), FilenameUtils.getExtension(fileName),
+      super.tmpDirFile);
     try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {
       sink.writeAll(response.body().source());
     }
@@ -66,18 +65,4 @@ public File execute(String uri, String queryParam) throws WxErrorException, IOEx
     return file;
   }
 
-  private String getFileName(Response response) throws WxErrorException {
-    String content = response.header("Content-disposition");
-    if (content == null || content.length() == 0) {
-      throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
-    }
-
-    Pattern p = Pattern.compile(".*filename=\"(.*)\"");
-    Matcher m = p.matcher(content);
-    if (m.matches()) {
-      return m.group(1);
-    }
-    throw new WxErrorException(WxError.newBuilder().setErrorMsg("无法获取到文件名").build());
-  }
-
 }

From 8337230dd2aa45666bd316fe459fa791dccc408b Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 14 Aug 2017 15:02:49 +0800
Subject: [PATCH 62/85] =?UTF-8?q?#305=20=E4=BF=AE=E5=A4=8D=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E5=8F=98=E6=80=81=E7=9A=84=E6=8B=8D=E7=85=A7=E6=88=96?=
 =?UTF-8?q?=E5=8F=91=E5=9B=BE=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/bean/WxCpXmlMessage.java        |   2 +
 .../weixin/cp/bean/WxCpXmlMessageTest.java    |  97 ++++++++-----
 .../mp/bean/message/WxMpXmlMessage.java       |   2 +
 .../mp/bean/message/WxMpXmlMessageTest.java   | 131 +++++++++---------
 4 files changed, 133 insertions(+), 99 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java
index 8b7ee5f166..117cf4115b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java
@@ -164,6 +164,8 @@ public class WxCpXmlMessage implements Serializable {
   private SendLocationInfo sendLocationInfo = new SendLocationInfo();
 
   protected static WxCpXmlMessage fromXml(String xml) {
+    //修改微信变态的消息内容格式，方便解析
+    xml = xml.replace("</PicList><PicList>", "");
     return XStreamTransformer.fromXml(WxCpXmlMessage.class, xml);
   }
 
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java
index 74b526160b..87e16d773a 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/bean/WxCpXmlMessageTest.java
@@ -1,8 +1,9 @@
 package me.chanjar.weixin.cp.bean;
 
 import me.chanjar.weixin.common.api.WxConsts;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.testng.annotations.*;
+
+import static org.testng.Assert.*;
 
 @Test
 public class WxCpXmlMessageTest {
@@ -54,38 +55,66 @@ public void testFromXml() {
       + "</SendLocationInfo>"
       + "</xml>";
     WxCpXmlMessage wxMessage = WxCpXmlMessage.fromXml(xml);
-    Assert.assertEquals(wxMessage.getToUserName(), "toUser");
-    Assert.assertEquals(wxMessage.getFromUserName(), "fromUser");
-    Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860l));
-    Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
-    Assert.assertEquals(wxMessage.getContent(), "this is a test");
-    Assert.assertEquals(wxMessage.getMsgId(), new Long(1234567890123456l));
-    Assert.assertEquals(wxMessage.getPicUrl(), "this is a url");
-    Assert.assertEquals(wxMessage.getMediaId(), "media_id");
-    Assert.assertEquals(wxMessage.getFormat(), "Format");
-    Assert.assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
-    Assert.assertEquals(wxMessage.getLocationX(), new Double(23.134521d));
-    Assert.assertEquals(wxMessage.getLocationY(), new Double(113.358803d));
-    Assert.assertEquals(wxMessage.getScale(), new Double(20));
-    Assert.assertEquals(wxMessage.getLabel(), "位置信息");
-    Assert.assertEquals(wxMessage.getDescription(), "公众平台官网链接");
-    Assert.assertEquals(wxMessage.getUrl(), "url");
-    Assert.assertEquals(wxMessage.getTitle(), "公众平台官网链接");
-    Assert.assertEquals(wxMessage.getEvent(), "subscribe");
-    Assert.assertEquals(wxMessage.getEventKey(), "qrscene_123123");
-    Assert.assertEquals(wxMessage.getTicket(), "TICKET");
-    Assert.assertEquals(wxMessage.getLatitude(), new Double(23.137466));
-    Assert.assertEquals(wxMessage.getLongitude(), new Double(113.352425));
-    Assert.assertEquals(wxMessage.getPrecision(), new Double(119.385040));
-    Assert.assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
-    Assert.assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
-    Assert.assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1l));
-    Assert.assertEquals(wxMessage.getSendPicsInfo().getPicList().get(0).getPicMd5Sum(), "1b5f7c23b5bf75682a53e7b6d163e185");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLocationX(), "23");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");
+    assertEquals(wxMessage.getToUserName(), "toUser");
+    assertEquals(wxMessage.getFromUserName(), "fromUser");
+    assertEquals(wxMessage.getCreateTime(), new Long(1348831860l));
+    assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
+    assertEquals(wxMessage.getContent(), "this is a test");
+    assertEquals(wxMessage.getMsgId(), new Long(1234567890123456l));
+    assertEquals(wxMessage.getPicUrl(), "this is a url");
+    assertEquals(wxMessage.getMediaId(), "media_id");
+    assertEquals(wxMessage.getFormat(), "Format");
+    assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
+    assertEquals(wxMessage.getLocationX(), 23.134521d);
+    assertEquals(wxMessage.getLocationY(), 113.358803d);
+    assertEquals(wxMessage.getScale(), 20d);
+    assertEquals(wxMessage.getLabel(), "位置信息");
+    assertEquals(wxMessage.getDescription(), "公众平台官网链接");
+    assertEquals(wxMessage.getUrl(), "url");
+    assertEquals(wxMessage.getTitle(), "公众平台官网链接");
+    assertEquals(wxMessage.getEvent(), "subscribe");
+    assertEquals(wxMessage.getEventKey(), "qrscene_123123");
+    assertEquals(wxMessage.getTicket(), "TICKET");
+    assertEquals(wxMessage.getLatitude(), 23.137466);
+    assertEquals(wxMessage.getLongitude(), 113.352425);
+    assertEquals(wxMessage.getPrecision(), 119.385040);
+    assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
+    assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
+    assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1l));
+    assertEquals(wxMessage.getSendPicsInfo().getPicList().get(0).getPicMd5Sum(), "1b5f7c23b5bf75682a53e7b6d163e185");
+    assertEquals(wxMessage.getSendLocationInfo().getLocationX(), "23");
+    assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");
+    assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");
+    assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");
+    assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");
   }
 
+  public void testSendPicsInfo() {
+    String xml = "<xml>" +
+      "<ToUserName><![CDATA[wx45a0972125658be9]]></ToUserName>" +
+      "<FromUserName><![CDATA[xiaohe]]></FromUserName>" +
+      "<CreateTime>1502012364</CreateTime>" +
+      "<MsgType><![CDATA[event]]></MsgType>" +
+      "<AgentID>1000004</AgentID>" +
+      "<Event><![CDATA[pic_weixin]]></Event>" +
+      "<EventKey><![CDATA[faceSimilarity]]></EventKey>" +
+      "<SendPicsInfo>" +
+      "<PicList><item><PicMd5Sum><![CDATA[aef52ae501537e552725c5d7f99c1741]]></PicMd5Sum></item></PicList>" +
+      "<PicList><item><PicMd5Sum><![CDATA[c4564632a4fab91378c39bea6aad6f9e]]></PicMd5Sum></item></PicList>" +
+      "<Count>2</Count>" +
+      "</SendPicsInfo>" +
+      "</xml>";
+    WxCpXmlMessage wxMessage = WxCpXmlMessage.fromXml(xml.replace("</PicList><PicList>",""));
+    assertEquals(wxMessage.getToUserName(), "wx45a0972125658be9");
+    assertEquals(wxMessage.getFromUserName(), "xiaohe");
+    assertEquals(wxMessage.getCreateTime(), new Long(1502012364L));
+    assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_EVENT);
+    assertEquals(wxMessage.getAgentId(), Integer.valueOf(1000004));
+    assertEquals(wxMessage.getEvent(), "pic_weixin");
+    assertEquals(wxMessage.getEventKey(), "faceSimilarity");
+    assertNotNull(wxMessage.getSendPicsInfo());
+    assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(2L));
+    assertEquals(wxMessage.getSendPicsInfo().getPicList().get(0).getPicMd5Sum(), "aef52ae501537e552725c5d7f99c1741");
+    assertEquals(wxMessage.getSendPicsInfo().getPicList().get(1).getPicMd5Sum(), "c4564632a4fab91378c39bea6aad6f9e");
+  }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
index 262399b8f4..730310185c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
@@ -425,6 +425,8 @@ public class WxMpXmlMessage implements Serializable {
   private Integer deviceStatus;
 
   public static WxMpXmlMessage fromXml(String xml) {
+    //修改微信变态的消息内容格式，方便解析
+    xml = xml.replace("</PicList><PicList>", "");
     return XStreamTransformer.fromXml(WxMpXmlMessage.class, xml);
   }
 
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessageTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessageTest.java
index bbb8ce83ee..9c2bbf56ac 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessageTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessageTest.java
@@ -1,9 +1,10 @@
 package me.chanjar.weixin.mp.bean.message;
 
 import me.chanjar.weixin.common.api.WxConsts;
-import org.testng.*;
 import org.testng.annotations.*;
 
+import static org.testng.Assert.*;
+
 @Test
 public class WxMpXmlMessageTest {
 
@@ -54,38 +55,38 @@ public void testFromXml() {
       + "</SendLocationInfo>"
       + "</xml>";
     WxMpXmlMessage wxMessage = WxMpXmlMessage.fromXml(xml);
-    Assert.assertEquals(wxMessage.getToUser(), "toUser");
-    Assert.assertEquals(wxMessage.getFromUser(), "fromUser");
-    Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860L));
-    Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
-    Assert.assertEquals(wxMessage.getContent(), "this is a test");
-    Assert.assertEquals(wxMessage.getMsgId(), new Long(1234567890123456L));
-    Assert.assertEquals(wxMessage.getPicUrl(), "this is a url");
-    Assert.assertEquals(wxMessage.getMediaId(), "media_id");
-    Assert.assertEquals(wxMessage.getFormat(), "Format");
-    Assert.assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
-    Assert.assertEquals(wxMessage.getLocationX(), 23.134521d);
-    Assert.assertEquals(wxMessage.getLocationY(), 113.358803d);
-    Assert.assertEquals(wxMessage.getScale(), 20d);
-    Assert.assertEquals(wxMessage.getLabel(), "位置信息");
-    Assert.assertEquals(wxMessage.getDescription(), "公众平台官网链接");
-    Assert.assertEquals(wxMessage.getUrl(), "url");
-    Assert.assertEquals(wxMessage.getTitle(), "公众平台官网链接");
-    Assert.assertEquals(wxMessage.getEvent(), "subscribe");
-    Assert.assertEquals(wxMessage.getEventKey(), "qrscene_123123");
-    Assert.assertEquals(wxMessage.getTicket(), "TICKET");
-    Assert.assertEquals(wxMessage.getLatitude(), 23.137466);
-    Assert.assertEquals(wxMessage.getLongitude(), 113.352425);
-    Assert.assertEquals(wxMessage.getPrecision(), 119.385040);
-    Assert.assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
-    Assert.assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
-    Assert.assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L));
-    Assert.assertEquals(wxMessage.getSendPicsInfo().getPicList().get(0).getPicMd5Sum(), "1b5f7c23b5bf75682a53e7b6d163e185");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLocationX(), "23");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");
+    assertEquals(wxMessage.getToUser(), "toUser");
+    assertEquals(wxMessage.getFromUser(), "fromUser");
+    assertEquals(wxMessage.getCreateTime(), new Long(1348831860L));
+    assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
+    assertEquals(wxMessage.getContent(), "this is a test");
+    assertEquals(wxMessage.getMsgId(), new Long(1234567890123456L));
+    assertEquals(wxMessage.getPicUrl(), "this is a url");
+    assertEquals(wxMessage.getMediaId(), "media_id");
+    assertEquals(wxMessage.getFormat(), "Format");
+    assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
+    assertEquals(wxMessage.getLocationX(), 23.134521d);
+    assertEquals(wxMessage.getLocationY(), 113.358803d);
+    assertEquals(wxMessage.getScale(), 20d);
+    assertEquals(wxMessage.getLabel(), "位置信息");
+    assertEquals(wxMessage.getDescription(), "公众平台官网链接");
+    assertEquals(wxMessage.getUrl(), "url");
+    assertEquals(wxMessage.getTitle(), "公众平台官网链接");
+    assertEquals(wxMessage.getEvent(), "subscribe");
+    assertEquals(wxMessage.getEventKey(), "qrscene_123123");
+    assertEquals(wxMessage.getTicket(), "TICKET");
+    assertEquals(wxMessage.getLatitude(), 23.137466);
+    assertEquals(wxMessage.getLongitude(), 113.352425);
+    assertEquals(wxMessage.getPrecision(), 119.385040);
+    assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
+    assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
+    assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L));
+    assertEquals(wxMessage.getSendPicsInfo().getPicList().get(0).getPicMd5Sum(), "1b5f7c23b5bf75682a53e7b6d163e185");
+    assertEquals(wxMessage.getSendLocationInfo().getLocationX(), "23");
+    assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");
+    assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");
+    assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");
+    assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");
   }
 
   public void testFromXml2() {
@@ -135,38 +136,38 @@ public void testFromXml2() {
       + "</SendLocationInfo>"
       + "</xml>";
     WxMpXmlMessage wxMessage = WxMpXmlMessage.fromXml(xml);
-    Assert.assertEquals(wxMessage.getToUser(), "toUser");
-    Assert.assertEquals(wxMessage.getFromUser(), "fromUser");
-    Assert.assertEquals(wxMessage.getCreateTime(), new Long(1348831860L));
-    Assert.assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
-    Assert.assertEquals(wxMessage.getContent(), "this is a test");
-    Assert.assertEquals(wxMessage.getMsgId(), new Long(1234567890123456L));
-    Assert.assertEquals(wxMessage.getPicUrl(), "this is a url");
-    Assert.assertEquals(wxMessage.getMediaId(), "media_id");
-    Assert.assertEquals(wxMessage.getFormat(), "Format");
-    Assert.assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
-    Assert.assertEquals(wxMessage.getLocationX(), 23.134521d);
-    Assert.assertEquals(wxMessage.getLocationY(), 113.358803d);
-    Assert.assertEquals(wxMessage.getScale(), 20d);
-    Assert.assertEquals(wxMessage.getLabel(), "位置信息");
-    Assert.assertEquals(wxMessage.getDescription(), "公众平台官网链接");
-    Assert.assertEquals(wxMessage.getUrl(), "url");
-    Assert.assertEquals(wxMessage.getTitle(), "公众平台官网链接");
-    Assert.assertEquals(wxMessage.getEvent(), "subscribe");
-    Assert.assertEquals(wxMessage.getEventKey(), "qrscene_123123");
-    Assert.assertEquals(wxMessage.getTicket(), "TICKET");
-    Assert.assertEquals(wxMessage.getLatitude(), 23.137466);
-    Assert.assertEquals(wxMessage.getLongitude(), 113.352425);
-    Assert.assertEquals(wxMessage.getPrecision(), 119.385040);
-    Assert.assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
-    Assert.assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
-    Assert.assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L));
-    Assert.assertEquals(wxMessage.getSendPicsInfo().getPicList().get(0).getPicMd5Sum(), "1b5f7c23b5bf75682a53e7b6d163e185");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLocationX(), "23");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");
-    Assert.assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");
+    assertEquals(wxMessage.getToUser(), "toUser");
+    assertEquals(wxMessage.getFromUser(), "fromUser");
+    assertEquals(wxMessage.getCreateTime(), new Long(1348831860L));
+    assertEquals(wxMessage.getMsgType(), WxConsts.XML_MSG_TEXT);
+    assertEquals(wxMessage.getContent(), "this is a test");
+    assertEquals(wxMessage.getMsgId(), new Long(1234567890123456L));
+    assertEquals(wxMessage.getPicUrl(), "this is a url");
+    assertEquals(wxMessage.getMediaId(), "media_id");
+    assertEquals(wxMessage.getFormat(), "Format");
+    assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
+    assertEquals(wxMessage.getLocationX(), 23.134521d);
+    assertEquals(wxMessage.getLocationY(), 113.358803d);
+    assertEquals(wxMessage.getScale(), 20d);
+    assertEquals(wxMessage.getLabel(), "位置信息");
+    assertEquals(wxMessage.getDescription(), "公众平台官网链接");
+    assertEquals(wxMessage.getUrl(), "url");
+    assertEquals(wxMessage.getTitle(), "公众平台官网链接");
+    assertEquals(wxMessage.getEvent(), "subscribe");
+    assertEquals(wxMessage.getEventKey(), "qrscene_123123");
+    assertEquals(wxMessage.getTicket(), "TICKET");
+    assertEquals(wxMessage.getLatitude(), 23.137466);
+    assertEquals(wxMessage.getLongitude(), 113.352425);
+    assertEquals(wxMessage.getPrecision(), 119.385040);
+    assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
+    assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
+    assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L));
+    assertEquals(wxMessage.getSendPicsInfo().getPicList().get(0).getPicMd5Sum(), "1b5f7c23b5bf75682a53e7b6d163e185");
+    assertEquals(wxMessage.getSendLocationInfo().getLocationX(), "23");
+    assertEquals(wxMessage.getSendLocationInfo().getLocationY(), "113");
+    assertEquals(wxMessage.getSendLocationInfo().getScale(), "15");
+    assertEquals(wxMessage.getSendLocationInfo().getLabel(), " 广州市海珠区客村艺苑路 106号");
+    assertEquals(wxMessage.getSendLocationInfo().getPoiname(), "wo de poi");
   }
 
 }

From 50fc24a0b35c50d4867bcdef687baacd01920d08 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 14 Aug 2017 15:14:13 +0800
Subject: [PATCH 63/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.8.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 2 +-
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8bd9de49e5..fd6312842c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.7.BETA</version>
+  <version>2.7.8.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index f93c89abb8..bd7bb51cee 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.7.BETA</version>
+    <version>2.7.8.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 6e0a3e27b2..330a34b098 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.7.BETA</version>
+    <version>2.7.8.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index bc75c8f7f9..11ab7d392e 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.7.BETA</version>
+    <version>2.7.8.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 18de637004..d8aa707aee 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.7.BETA</version>
+    <version>2.7.8.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 0a65663c6b..74704e6a87 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.7.BETA</version>
+    <version>2.7.8.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 5316d97d4f402fe237d40c321b4a7454edd2baa3 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 14 Aug 2017 15:31:50 +0800
Subject: [PATCH 64/85] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=8D=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=E7=9A=84=E7=B1=BB=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...bstractWxCpServiceImpl.java => WxCpServiceAbstractImpl.java} | 2 +-
 .../weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java     | 2 +-
 .../me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java  | 2 +-
 .../me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java    | 2 +-
 ...bstractWxMpServiceImpl.java => WxMpServiceAbstractImpl.java} | 2 +-
 .../weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java     | 2 +-
 .../me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java  | 2 +-
 .../me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/{AbstractWxCpServiceImpl.java => WxCpServiceAbstractImpl.java} (99%)
 rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/{AbstractWxMpServiceImpl.java => WxMpServiceAbstractImpl.java} (99%)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/AbstractWxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
similarity index 99%
rename from weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/AbstractWxCpServiceImpl.java
rename to weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
index be1b311857..a1f07e68cc 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/AbstractWxCpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
@@ -30,7 +30,7 @@
 import java.io.InputStream;
 import java.util.List;
 
-public abstract class AbstractWxCpServiceImpl<H, P> implements WxCpService, RequestHttp<H, P> {
+public abstract class WxCpServiceAbstractImpl<H, P> implements WxCpService, RequestHttp<H, P> {
   protected final Logger log = LoggerFactory.getLogger(this.getClass());
 
   private WxCpUserService userService = new WxCpUserServiceImpl(this);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java
index d9388f0345..fc6249662b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java
@@ -17,7 +17,7 @@
 
 import java.io.IOException;
 
-public class WxCpServiceApacheHttpClientImpl extends AbstractWxCpServiceImpl<CloseableHttpClient, HttpHost> {
+public class WxCpServiceApacheHttpClientImpl extends WxCpServiceAbstractImpl<CloseableHttpClient, HttpHost> {
   protected CloseableHttpClient httpClient;
   protected HttpHost httpProxy;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
index 3000916fac..5a14eb27fe 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
@@ -7,7 +7,7 @@
 import me.chanjar.weixin.common.util.http.HttpType;
 import me.chanjar.weixin.cp.config.WxCpConfigStorage;
 
-public class WxCpServiceJoddHttpImpl extends AbstractWxCpServiceImpl<HttpConnectionProvider, ProxyInfo> {
+public class WxCpServiceJoddHttpImpl extends WxCpServiceAbstractImpl<HttpConnectionProvider, ProxyInfo> {
   protected HttpConnectionProvider httpClient;
   protected ProxyInfo httpProxy;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
index 2b8ae0c4af..2ad4c72015 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
@@ -12,7 +12,7 @@
 
 import java.io.IOException;
 
-public class WxCpServiceOkHttpImpl extends AbstractWxCpServiceImpl<OkHttpClient, OkHttpProxyInfo> {
+public class WxCpServiceOkHttpImpl extends WxCpServiceAbstractImpl<OkHttpClient, OkHttpProxyInfo> {
   private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
   protected OkHttpClient httpClient;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
similarity index 99%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
index 25eeeadce4..fbf3861e00 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/AbstractWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.util.concurrent.locks.Lock;
 
-public abstract class AbstractWxMpServiceImpl<H, P> implements WxMpService, RequestHttp<H, P> {
+public abstract class WxMpServiceAbstractImpl<H, P> implements WxMpService, RequestHttp<H, P> {
 
   private static final JsonParser JSON_PARSER = new JsonParser();
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java
index d929b0974c..ceb0b783e2 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java
@@ -21,7 +21,7 @@
 /**
  * apache-http方式实现
  */
-public class WxMpServiceApacheHttpClientImpl extends AbstractWxMpServiceImpl<CloseableHttpClient, HttpHost> {
+public class WxMpServiceApacheHttpClientImpl extends WxMpServiceAbstractImpl<CloseableHttpClient, HttpHost> {
   private CloseableHttpClient httpClient;
   private HttpHost httpProxy;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
index 5c0fb75300..0551db67c6 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
@@ -14,7 +14,7 @@
 /**
  * jodd-http方式实现
  */
-public class WxMpServiceJoddHttpImpl extends AbstractWxMpServiceImpl<HttpConnectionProvider, ProxyInfo> {
+public class WxMpServiceJoddHttpImpl extends WxMpServiceAbstractImpl<HttpConnectionProvider, ProxyInfo> {
   private HttpConnectionProvider httpClient;
   private ProxyInfo httpProxy;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
index dbb957b84c..9f2a17add1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
@@ -14,7 +14,7 @@
 import java.io.IOException;
 import java.util.concurrent.locks.Lock;
 
-public class WxMpServiceOkHttpImpl extends AbstractWxMpServiceImpl<OkHttpClient, OkHttpProxyInfo> {
+public class WxMpServiceOkHttpImpl extends WxMpServiceAbstractImpl<OkHttpClient, OkHttpProxyInfo> {
 
   private final Logger logger = LoggerFactory.getLogger(this.getClass());
 

From cf8fb4c106addc26bdab5d42c704e7b40b0200c3 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 16 Aug 2017 10:20:06 +0800
Subject: [PATCH 65/85] =?UTF-8?q?=E6=B7=BB=E5=8A=A0buttons=E7=9A=84getter?=
 =?UTF-8?q?=E5=92=8Csetter=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java
index 588e8a9c05..699a41ecfb 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java
@@ -24,6 +24,14 @@ public String toString() {
     return ToStringUtils.toSimpleString(this);
   }
 
+  public List<WxMpSelfMenuButton> getButtons() {
+    return this.buttons;
+  }
+
+  public void setButtons(List<WxMpSelfMenuButton> buttons) {
+    this.buttons = buttons;
+  }
+
   public static class WxMpSelfMenuButton {
     /**
      * <pre>

From e6a3f60bb28382556a62fc3da7f7f1a0dd830e45 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 16 Aug 2017 10:20:21 +0800
Subject: [PATCH 66/85] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java
index cee28b73ba..4a666eff1b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpUserTagService.java
@@ -76,7 +76,7 @@ WxTagListUser tagListUser(Long tagId, String nextOpenid)
    * <pre>
    * 批量为用户取消标签
    * 详情请见：<a href="http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140837&token=&lang=zh_CN">用户标签管理</a>
-   * 接口url格式： https://api.weixin.qq.com/cgi-bin/tags/members/batchtagging?access_token=ACCESS_TOKEN
+   * 接口url格式： https://api.weixin.qq.com/cgi-bin/tags/members/batchuntagging?access_token=ACCESS_TOKEN
    * </pre>
    */
   boolean batchUntagging(Long tagId, String[] openids) throws WxErrorException;

From 2a7c97786f712d092acb77eb092167df2635a92c Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 16 Aug 2017 19:26:21 +0800
Subject: [PATCH 67/85] =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E7=BE=A4=E5=8F=91?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=88=B0?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=85=B6=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=B1=BB=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/api/WxMpMassMessageService.java | 95 +++++++++++++++++++
 .../me/chanjar/weixin/mp/api/WxMpService.java | 83 +---------------
 .../api/impl/WxMpMassMessageServiceImpl.java  | 58 +++++++++++
 .../mp/api/impl/WxMpServiceAbstractImpl.java  | 36 ++-----
 .../WxMpMassMessageServiceImplTest.java}      | 63 ++++++------
 weixin-java-mp/src/test/resources/testng.xml  |  2 +-
 6 files changed, 197 insertions(+), 140 deletions(-)
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMassMessageService.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImpl.java
 rename weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/{WxMpMassMessageAPITest.java => impl/WxMpMassMessageServiceImplTest.java} (80%)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMassMessageService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMassMessageService.java
new file mode 100644
index 0000000000..e4a57de99b
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMassMessageService.java
@@ -0,0 +1,95 @@
+package me.chanjar.weixin.mp.api;
+
+import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.mp.bean.*;
+import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
+
+/**
+ * <pre>
+ * 群发消息服务类
+ * Created by Binary Wang on 2017-8-16.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public interface WxMpMassMessageService {
+  /**
+   * 上传群发用的图文消息
+   */
+  String MEDIA_UPLOAD_NEWS_URL = "https://api.weixin.qq.com/cgi-bin/media/uploadnews";
+  /**
+   * 上传群发用的视频
+   */
+  String MEDIA_UPLOAD_VIDEO_URL = "https://api.weixin.qq.com/cgi-bin/media/uploadvideo";
+  /**
+   * 分组群发消息
+   */
+  String MESSAGE_MASS_SENDALL_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/sendall";
+  /**
+   * 按openId列表群发消息
+   */
+  String MESSAGE_MASS_SEND_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/send";
+  /**
+   * 群发消息预览接口
+   */
+  String MESSAGE_MASS_PREVIEW_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/preview";
+
+  /**
+   * <pre>
+   * 上传群发用的图文消息，上传后才能群发图文消息
+   *
+   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
+   * </pre>
+   *
+   * @see #massGroupMessageSend(WxMpMassTagMessage)
+   * @see #massOpenIdsMessageSend(WxMpMassOpenIdsMessage)
+   */
+  WxMpMassUploadResult massNewsUpload(WxMpMassNews news) throws WxErrorException;
+
+  /**
+   * <pre>
+   * 上传群发用的视频，上传后才能群发视频消息
+   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
+   * </pre>
+   *
+   * @see #massGroupMessageSend(WxMpMassTagMessage)
+   * @see #massOpenIdsMessageSend(WxMpMassOpenIdsMessage)
+   */
+  WxMpMassUploadResult massVideoUpload(WxMpMassVideo video) throws WxErrorException;
+
+  /**
+   * <pre>
+   * 分组群发消息
+   * 如果发送图文消息，必须先使用 {@link #massNewsUpload(WxMpMassNews)} 获得media_id，然后再发送
+   * 如果发送视频消息，必须先使用 {@link #massVideoUpload(WxMpMassVideo)} 获得media_id，然后再发送
+   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
+   * </pre>
+   */
+  WxMpMassSendResult massGroupMessageSend(WxMpMassTagMessage message) throws WxErrorException;
+
+  /**
+   * <pre>
+   * 按openId列表群发消息
+   * 如果发送图文消息，必须先使用 {@link #massNewsUpload(WxMpMassNews)} 获得media_id，然后再发送
+   * 如果发送视频消息，必须先使用 {@link #massVideoUpload(WxMpMassVideo)} 获得media_id，然后再发送
+   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
+   * </pre>
+   */
+  WxMpMassSendResult massOpenIdsMessageSend(WxMpMassOpenIdsMessage message) throws WxErrorException;
+
+  /**
+   * <pre>
+   * 群发消息预览接口
+   * 开发者可通过该接口发送消息给指定用户，在手机端查看消息的样式和排版。为了满足第三方平台开发者的需求，在保留对openID预览能力的同时，增加了对指定微信号发送预览的能力，但该能力每日调用次数有限制（100次），请勿滥用。
+   * 接口调用请求说明
+   *  http请求方式: POST
+   *  https://api.weixin.qq.com/cgi-bin/message/mass/preview?access_token=ACCESS_TOKEN
+   * 详情请见：http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
+   * </pre>
+   *
+   * @return wxMpMassSendResult
+   */
+  WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception;
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index e4da721c8e..f684f4e8a4 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -20,26 +20,6 @@ public interface WxMpService {
    * 获得jsapi_ticket
    */
   String GET_JSAPI_TICKET_URL = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?type=jsapi";
-  /**
-   * 上传群发用的图文消息
-   */
-  String MEDIA_UPLOAD_NEWS_URL = "https://api.weixin.qq.com/cgi-bin/media/uploadnews";
-  /**
-   * 上传群发用的视频
-   */
-  String MEDIA_UPLOAD_VIDEO_URL = "https://api.weixin.qq.com/cgi-bin/media/uploadvideo";
-  /**
-   * 分组群发消息
-   */
-  String MESSAGE_MASS_SENDALL_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/sendall";
-  /**
-   * 按openId列表群发消息
-   */
-  String MESSAGE_MASS_SEND_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/send";
-  /**
-   * 群发消息预览接口
-   */
-  String MESSAGE_MASS_PREVIEW_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/preview";
   /**
    * 长链接转短链接接口
    */
@@ -141,63 +121,6 @@ public interface WxMpService {
    */
   WxJsapiSignature createJsapiSignature(String url) throws WxErrorException;
 
-  /**
-   * <pre>
-   * 上传群发用的图文消息，上传后才能群发图文消息
-   *
-   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
-   * </pre>
-   *
-   * @see #massGroupMessageSend(me.chanjar.weixin.mp.bean.WxMpMassTagMessage)
-   * @see #massOpenIdsMessageSend(me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage)
-   */
-  WxMpMassUploadResult massNewsUpload(WxMpMassNews news) throws WxErrorException;
-
-  /**
-   * <pre>
-   * 上传群发用的视频，上传后才能群发视频消息
-   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
-   * </pre>
-   *
-   * @see #massGroupMessageSend(me.chanjar.weixin.mp.bean.WxMpMassTagMessage)
-   * @see #massOpenIdsMessageSend(me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage)
-   */
-  WxMpMassUploadResult massVideoUpload(WxMpMassVideo video) throws WxErrorException;
-
-  /**
-   * <pre>
-   * 分组群发消息
-   * 如果发送图文消息，必须先使用 {@link #massNewsUpload(me.chanjar.weixin.mp.bean.WxMpMassNews)} 获得media_id，然后再发送
-   * 如果发送视频消息，必须先使用 {@link #massVideoUpload(me.chanjar.weixin.mp.bean.WxMpMassVideo)} 获得media_id，然后再发送
-   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
-   * </pre>
-   */
-  WxMpMassSendResult massGroupMessageSend(WxMpMassTagMessage message) throws WxErrorException;
-
-  /**
-   * <pre>
-   * 按openId列表群发消息
-   * 如果发送图文消息，必须先使用 {@link #massNewsUpload(me.chanjar.weixin.mp.bean.WxMpMassNews)} 获得media_id，然后再发送
-   * 如果发送视频消息，必须先使用 {@link #massVideoUpload(me.chanjar.weixin.mp.bean.WxMpMassVideo)} 获得media_id，然后再发送
-   * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
-   * </pre>
-   */
-  WxMpMassSendResult massOpenIdsMessageSend(WxMpMassOpenIdsMessage message) throws WxErrorException;
-
-  /**
-   * <pre>
-   * 群发消息预览接口
-   * 开发者可通过该接口发送消息给指定用户，在手机端查看消息的样式和排版。为了满足第三方平台开发者的需求，在保留对openID预览能力的同时，增加了对指定微信号发送预览的能力，但该能力每日调用次数有限制（100次），请勿滥用。
-   * 接口调用请求说明
-   *  http请求方式: POST
-   *  https://api.weixin.qq.com/cgi-bin/message/mass/preview?access_token=ACCESS_TOKEN
-   * 详情请见：http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140549&token=&lang=zh_CN
-   * </pre>
-   *
-   * @return wxMpMassSendResult
-   */
-  WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception;
-
   /**
    * <pre>
    * 长链接转短链接接口
@@ -451,5 +374,9 @@ public interface WxMpService {
    */
   RequestHttp getRequestHttp();
 
-
+  /**
+   * 返回群发消息相关接口方法的实现类对象，以方便调用其各个接口
+   * @return WxMpMassMessageService
+   */
+  WxMpMassMessageService getMassMessageService();
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImpl.java
new file mode 100644
index 0000000000..015c465c0f
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImpl.java
@@ -0,0 +1,58 @@
+package me.chanjar.weixin.mp.api.impl;
+
+import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpMassMessageService;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.*;
+import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
+import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * <pre>
+ * 群发消息服务类
+ * Created by Binary Wang on 2017-8-16.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxMpMassMessageServiceImpl implements WxMpMassMessageService {
+  protected final Logger log = LoggerFactory.getLogger(this.getClass());
+  private WxMpService wxMpService;
+
+  public WxMpMassMessageServiceImpl(WxMpService wxMpService) {
+    this.wxMpService = wxMpService;
+  }
+
+  @Override
+  public WxMpMassUploadResult massNewsUpload(WxMpMassNews news) throws WxErrorException {
+    String responseContent = this.wxMpService.post(MEDIA_UPLOAD_NEWS_URL, news.toJson());
+    return WxMpMassUploadResult.fromJson(responseContent);
+  }
+
+  @Override
+  public WxMpMassUploadResult massVideoUpload(WxMpMassVideo video) throws WxErrorException {
+    String responseContent = this.wxMpService.post(MEDIA_UPLOAD_VIDEO_URL, video.toJson());
+    return WxMpMassUploadResult.fromJson(responseContent);
+  }
+
+  @Override
+  public WxMpMassSendResult massGroupMessageSend(WxMpMassTagMessage message) throws WxErrorException {
+    String responseContent = this.wxMpService.post(WxMpMassMessageService.MESSAGE_MASS_SENDALL_URL, message.toJson());
+    return WxMpMassSendResult.fromJson(responseContent);
+  }
+
+  @Override
+  public WxMpMassSendResult massOpenIdsMessageSend(WxMpMassOpenIdsMessage message) throws WxErrorException {
+    String responseContent = this.wxMpService.post(MESSAGE_MASS_SEND_URL, message.toJson());
+    return WxMpMassSendResult.fromJson(responseContent);
+  }
+
+  @Override
+  public WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception {
+    String responseContent = this.wxMpService.post(MESSAGE_MASS_PREVIEW_URL, wxMpMassPreviewMessage.toJson());
+    return WxMpMassSendResult.fromJson(responseContent);
+  }
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
index fbf3861e00..91dff9babb 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
@@ -43,6 +43,7 @@ public abstract class WxMpServiceAbstractImpl<H, P> implements WxMpService, Requ
   private WxMpDeviceService deviceService = new WxMpDeviceServiceImpl(this);
   private WxMpShakeService shakeService = new WxMpShakeServiceImpl(this);
   private WxMpMemberCardService memberCardService = new WxMpMemberCardServiceImpl(this);
+  private WxMpMassMessageService massMessageService = new WxMpMassMessageServiceImpl(this);
 
   private int retrySleepMillis = 1000;
   private int maxRetryTimes = 5;
@@ -108,36 +109,6 @@ public String getAccessToken() throws WxErrorException {
     return getAccessToken(false);
   }
 
-  @Override
-  public WxMpMassUploadResult massNewsUpload(WxMpMassNews news) throws WxErrorException {
-    String responseContent = this.post(WxMpService.MEDIA_UPLOAD_NEWS_URL, news.toJson());
-    return WxMpMassUploadResult.fromJson(responseContent);
-  }
-
-  @Override
-  public WxMpMassUploadResult massVideoUpload(WxMpMassVideo video) throws WxErrorException {
-    String responseContent = this.post(WxMpService.MEDIA_UPLOAD_VIDEO_URL, video.toJson());
-    return WxMpMassUploadResult.fromJson(responseContent);
-  }
-
-  @Override
-  public WxMpMassSendResult massGroupMessageSend(WxMpMassTagMessage message) throws WxErrorException {
-    String responseContent = this.post(WxMpService.MESSAGE_MASS_SENDALL_URL, message.toJson());
-    return WxMpMassSendResult.fromJson(responseContent);
-  }
-
-  @Override
-  public WxMpMassSendResult massOpenIdsMessageSend(WxMpMassOpenIdsMessage message) throws WxErrorException {
-    String responseContent = this.post(WxMpService.MESSAGE_MASS_SEND_URL, message.toJson());
-    return WxMpMassSendResult.fromJson(responseContent);
-  }
-
-  @Override
-  public WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception {
-    String responseContent = this.post(WxMpService.MESSAGE_MASS_PREVIEW_URL, wxMpMassPreviewMessage.toJson());
-    return WxMpMassSendResult.fromJson(responseContent);
-  }
-
   @Override
   public String shortUrl(String long_url) throws WxErrorException {
     JsonObject o = new JsonObject();
@@ -415,4 +386,9 @@ public WxMpMemberCardService getMemberCardService() {
   public RequestHttp getRequestHttp() {
     return this;
   }
+
+  @Override
+  public WxMpMassMessageService getMassMessageService() {
+    return this.massMessageService;
+  }
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImplTest.java
similarity index 80%
rename from weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
rename to weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImplTest.java
index dd7541ff8c..b896723ab0 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/WxMpMassMessageAPITest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImplTest.java
@@ -1,9 +1,10 @@
-package me.chanjar.weixin.mp.api;
+package me.chanjar.weixin.mp.api.impl;
 
 import com.google.inject.Inject;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
 import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.test.ApiTestModule;
 import me.chanjar.weixin.mp.api.test.TestConfigStorage;
 import me.chanjar.weixin.mp.api.test.TestConstants;
@@ -13,21 +14,21 @@
 import me.chanjar.weixin.mp.bean.WxMpMassVideo;
 import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
 import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
-import org.testng.*;
 import org.testng.annotations.*;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+import static org.testng.Assert.*;
+
 /**
  * 测试群发消息
  *
  * @author chanjarster
  */
-@Test(groups = "massAPI", dependsOnGroups = {"baseAPI", "mediaAPI", "groupAPI"})
+@Test
 @Guice(modules = ApiTestModule.class)
-public class WxMpMassMessageAPITest {
-
+public class WxMpMassMessageServiceImplTest {
   @Inject
   protected WxMpService wxService;
 
@@ -41,10 +42,10 @@ public void testTextMassOpenIdsMessageSend() throws WxErrorException {
     massMessage.setContent("测试群发消息\n欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
     massMessage.getToUsers().add(configProvider.getOpenid());
 
-    WxMpMassSendResult massResult = this.wxService
+    WxMpMassSendResult massResult = this.wxService.getMassMessageService()
       .massOpenIdsMessageSend(massMessage);
-    Assert.assertNotNull(massResult);
-    Assert.assertNotNull(massResult.getMsgId());
+    assertNotNull(massResult);
+    assertNotNull(massResult.getMsgId());
   }
 
   @Test(dataProvider = "massMessages")
@@ -57,10 +58,10 @@ public void testMediaMassOpenIdsMessageSend(String massMsgType, String mediaId)
     massMessage.setMediaId(mediaId);
     massMessage.getToUsers().add(configProvider.getOpenid());
 
-    WxMpMassSendResult massResult = this.wxService
+    WxMpMassSendResult massResult = this.wxService.getMassMessageService()
       .massOpenIdsMessageSend(massMessage);
-    Assert.assertNotNull(massResult);
-    Assert.assertNotNull(massResult.getMsgId());
+    assertNotNull(massResult);
+    assertNotNull(massResult.getMsgId());
   }
 
   @Test
@@ -71,10 +72,10 @@ public void testTextMassGroupMessageSend() throws WxErrorException {
     massMessage
       .setTagId(this.wxService.getUserTagService().tagGet().get(0).getId());
 
-    WxMpMassSendResult massResult = this.wxService
+    WxMpMassSendResult massResult = this.wxService.getMassMessageService()
       .massGroupMessageSend(massMessage);
-    Assert.assertNotNull(massResult);
-    Assert.assertNotNull(massResult.getMsgId());
+    assertNotNull(massResult);
+    assertNotNull(massResult.getMsgId());
   }
 
   @Test(dataProvider = "massMessages")
@@ -85,10 +86,10 @@ public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)
     massMessage.setMediaId(mediaId);
     massMessage.setTagId(this.wxService.getUserTagService().tagGet().get(0).getId());
 
-    WxMpMassSendResult massResult = this.wxService
+    WxMpMassSendResult massResult = this.wxService.getMassMessageService()
       .massGroupMessageSend(massMessage);
-    Assert.assertNotNull(massResult);
-    Assert.assertNotNull(massResult.getMsgId());
+    assertNotNull(massResult);
+    assertNotNull(massResult.getMsgId());
   }
 
   @DataProvider
@@ -103,17 +104,17 @@ public Object[][] massMessages() throws WxErrorException, IOException {
       // 上传视频到媒体库
       WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
         .mediaUpload(WxConsts.MEDIA_VIDEO, TestConstants.FILE_MP4, inputStream);
-      Assert.assertNotNull(uploadMediaRes);
-      Assert.assertNotNull(uploadMediaRes.getMediaId());
+      assertNotNull(uploadMediaRes);
+      assertNotNull(uploadMediaRes.getMediaId());
 
       // 把视频变成可被群发的媒体
       WxMpMassVideo video = new WxMpMassVideo();
       video.setTitle("测试标题");
       video.setDescription("测试描述");
       video.setMediaId(uploadMediaRes.getMediaId());
-      WxMpMassUploadResult uploadResult = this.wxService.massVideoUpload(video);
-      Assert.assertNotNull(uploadResult);
-      Assert.assertNotNull(uploadResult.getMediaId());
+      WxMpMassUploadResult uploadResult = this.wxService.getMassMessageService().massVideoUpload(video);
+      assertNotNull(uploadResult);
+      assertNotNull(uploadResult.getMediaId());
       messages[0] = new Object[]{WxConsts.MASS_MSG_VIDEO, uploadResult.getMediaId()};
     }
 
@@ -124,8 +125,8 @@ public Object[][] massMessages() throws WxErrorException, IOException {
       .getSystemResourceAsStream("mm.jpeg")) {
       WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
         .mediaUpload(WxConsts.MEDIA_IMAGE, TestConstants.FILE_JPG, inputStream);
-      Assert.assertNotNull(uploadMediaRes);
-      Assert.assertNotNull(uploadMediaRes.getMediaId());
+      assertNotNull(uploadMediaRes);
+      assertNotNull(uploadMediaRes.getMediaId());
       messages[1] = new Object[]{WxConsts.MASS_MSG_IMAGE, uploadMediaRes.getMediaId()};
     }
 
@@ -136,8 +137,8 @@ public Object[][] massMessages() throws WxErrorException, IOException {
       .getSystemResourceAsStream("mm.mp3")) {
       WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
         .mediaUpload(WxConsts.MEDIA_VOICE, TestConstants.FILE_MP3, inputStream);
-      Assert.assertNotNull(uploadMediaRes);
-      Assert.assertNotNull(uploadMediaRes.getMediaId());
+      assertNotNull(uploadMediaRes);
+      assertNotNull(uploadMediaRes.getMediaId());
       messages[2] = new Object[]{WxConsts.MASS_MSG_VOICE, uploadMediaRes.getMediaId()};
     }
 
@@ -149,8 +150,8 @@ public Object[][] massMessages() throws WxErrorException, IOException {
       // 上传照片到媒体库
       WxMediaUploadResult uploadMediaRes = this.wxService.getMaterialService()
         .mediaUpload(WxConsts.MEDIA_IMAGE, TestConstants.FILE_JPG, inputStream);
-      Assert.assertNotNull(uploadMediaRes);
-      Assert.assertNotNull(uploadMediaRes.getMediaId());
+      assertNotNull(uploadMediaRes);
+      assertNotNull(uploadMediaRes.getMediaId());
 
       // 上传图文消息
       WxMpMassNews news = new WxMpMassNews();
@@ -170,10 +171,10 @@ public Object[][] massMessages() throws WxErrorException, IOException {
       article2.setDigest("摘要2");
       news.addArticle(article2);
 
-      WxMpMassUploadResult massUploadResult = this.wxService
+      WxMpMassUploadResult massUploadResult = this.wxService.getMassMessageService()
         .massNewsUpload(news);
-      Assert.assertNotNull(massUploadResult);
-      Assert.assertNotNull(uploadMediaRes.getMediaId());
+      assertNotNull(massUploadResult);
+      assertNotNull(uploadMediaRes.getMediaId());
       messages[3] = new Object[]{WxConsts.MASS_MSG_NEWS, massUploadResult.getMediaId()};
     }
 
diff --git a/weixin-java-mp/src/test/resources/testng.xml b/weixin-java-mp/src/test/resources/testng.xml
index d864635569..ea264e6717 100644
--- a/weixin-java-mp/src/test/resources/testng.xml
+++ b/weixin-java-mp/src/test/resources/testng.xml
@@ -5,7 +5,7 @@
     <classes>
       <class name="me.chanjar.weixin.mp.api.WxMpBusyRetryTest"/>
       <class name="me.chanjar.weixin.mp.api.WxMpBaseAPITest"/>
-      <class name="me.chanjar.weixin.mp.api.WxMpMassMessageAPITest"/>
+      <class name="me.chanjar.weixin.mp.api.impl.WxMpMassMessageServiceImplTest"/>
       <class name="me.chanjar.weixin.mp.api.impl.WxMpUserServiceImplTest"/>
       <class name="me.chanjar.weixin.mp.api.impl.WxMpQrcodeServiceImplTest"/>
       <class name="me.chanjar.weixin.mp.api.WxMpShortUrlAPITest"/>

From 657c87be532a6495c3a09c346426c59bbfeb4d70 Mon Sep 17 00:00:00 2001
From: forfuns <forfuns@users.noreply.github.com>
Date: Thu, 17 Aug 2017 15:33:45 +0800
Subject: [PATCH 68/85] =?UTF-8?q?#315=20=E4=BF=AE=E6=94=B9messageSend?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=BB=8EwxCpConfi?=
 =?UTF-8?q?gStorage=E8=8E=B7=E5=8F=96agentId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/api/impl/WxCpServiceAbstractImpl.java       | 4 ++++
 .../java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
index a1f07e68cc..43c3415ef1 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
@@ -131,6 +131,10 @@ public WxJsapiSignature createJsapiSignature(String url) throws WxErrorException
   @Override
   public WxCpMessageSendResult messageSend(WxCpMessage message) throws WxErrorException {
     String url = "https://qyapi.weixin.qq.com/cgi-bin/message/send";
+    Integer agentId = message.getAgentId();
+    if(null == agentId){
+      message.setAgentId(this.getWxCpConfigStorage().getAgentId());
+    }
     return WxCpMessageSendResult.fromJson(this.post(url, message.toJson()));
   }
 
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java
index 1e0d40b05b..0cecc01588 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/WxCpMessageAPITest.java
@@ -20,7 +20,8 @@
 public class WxCpMessageAPITest {
 
   @Inject
-  protected WxCpServiceImpl wxService;
+  protected WxCpService wxService;
+
   private ApiTestModule.WxXmlCpInMemoryConfigStorage configStorage;
 
   @BeforeTest
@@ -30,7 +31,7 @@ public void setup() {
 
   public void testSendMessage() throws WxErrorException {
     WxCpMessage message = new WxCpMessage();
-    message.setAgentId(configStorage.getAgentId());
+//    message.setAgentId(configStorage.getAgentId());
     message.setMsgType(WxConsts.CUSTOM_MSG_TEXT);
     message.setToUser(configStorage.getUserId());
     message.setContent("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
@@ -43,10 +44,11 @@ public void testSendMessage() throws WxErrorException {
     System.out.println(messageSendResult.getInvalidTagList());
   }
 
+  @Test
   public void testSendMessage1() throws WxErrorException {
     WxCpMessage message = WxCpMessage
       .TEXT()
-      .agentId(configStorage.getAgentId())
+//      .agentId(configStorage.getAgentId())
       .toUser(configStorage.getUserId())
       .content("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>")
       .build();

From 9ee671e6e6619cae96c8881fd675c6dbff5d28f5 Mon Sep 17 00:00:00 2001
From: forfuns <forfuns@users.noreply.github.com>
Date: Fri, 18 Aug 2017 11:11:12 +0800
Subject: [PATCH 69/85] =?UTF-8?q?#317=20=E4=BF=AE=E5=A4=8D=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=AF=B7=E6=B1=82=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E6=97=B6=E5=AF=B9=E9=94=99=E8=AF=AF=E7=B1=BB=E5=9E=8B=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=EF=BC=88text/plain=20=E6=94=B9=E4=B8=BA=20app/json?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 更新messageSend自动向wxCpConfigStorage里获取agentId

* 修复小程序请求二维码时对错误类型检查（text/plain 改为 app/json）

* 修复小程序请求二维码时对错误类型检查（text/plain 改为 app/json）
---
 .../binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java
index dc482dff25..3c026f4a18 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/http/QrCodeRequestExecutor.java
@@ -48,7 +48,7 @@ public File execute(String uri, WxMaQrcodeWrapper ticket) throws WxErrorExceptio
          InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response);) {
       Header[] contentTypeHeader = response.getHeaders("Content-Type");
       if (contentTypeHeader != null && contentTypeHeader.length > 0
-        && ContentType.TEXT_PLAIN.getMimeType().equals(contentTypeHeader[0].getValue())) {
+        && ContentType.APPLICATION_JSON.getMimeType().equals(contentTypeHeader[0].getValue())) {
         String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
         throw new WxErrorException(WxError.fromJson(responseContent));
       }

From c81bbae288b2e32dd52217ba8d9346bec9aa9317 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 22 Aug 2017 23:29:57 +0800
Subject: [PATCH 70/85] =?UTF-8?q?#318=20WxMpService=E5=92=8C=20WxCpService?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BE=9B=E5=AF=B9?=
 =?UTF-8?q?=E5=90=84=E4=B8=AA=E5=85=B7=E4=BD=93service=E7=9A=84setter?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E4=BB=A5=E4=BE=BF=E4=BA=8E=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/cp/api/WxCpService.java | 12 +++
 .../cp/api/impl/WxCpServiceAbstractImpl.java  | 30 ++++++++
 .../me/chanjar/weixin/mp/api/WxMpService.java | 30 ++++++++
 .../mp/api/impl/WxMpServiceAbstractImpl.java  | 75 +++++++++++++++++++
 4 files changed, 147 insertions(+)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
index 880a92b06e..03df947dc2 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java
@@ -458,4 +458,16 @@ WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputStream i
    * http请求对象
    */
   RequestHttp getRequestHttp();
+
+  void setUserService(WxCpUserService userService);
+
+  void setDepartmentService(WxCpDepartmentService departmentService);
+
+  void setMediaService(WxCpMediaService mediaService);
+
+  void setMenuService(WxCpMenuService menuService);
+
+  void setOauth2Service(WxCpOAuth2Service oauth2Service);
+
+  void setTagService(WxCpTagService tagService);
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
index 43c3415ef1..83bc5e13c6 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceAbstractImpl.java
@@ -544,4 +544,34 @@ public List<WxCpDepart> departGet() throws WxErrorException {
   public RequestHttp getRequestHttp() {
     return this;
   }
+
+  @Override
+  public void setUserService(WxCpUserService userService) {
+    this.userService = userService;
+  }
+
+  @Override
+  public void setDepartmentService(WxCpDepartmentService departmentService) {
+    this.departmentService = departmentService;
+  }
+
+  @Override
+  public void setMediaService(WxCpMediaService mediaService) {
+    this.mediaService = mediaService;
+  }
+
+  @Override
+  public void setMenuService(WxCpMenuService menuService) {
+    this.menuService = menuService;
+  }
+
+  @Override
+  public void setOauth2Service(WxCpOAuth2Service oauth2Service) {
+    this.oauth2Service = oauth2Service;
+  }
+
+  @Override
+  public void setTagService(WxCpTagService tagService) {
+    this.tagService = tagService;
+  }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
index f684f4e8a4..914c902d44 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpService.java
@@ -379,4 +379,34 @@ public interface WxMpService {
    * @return WxMpMassMessageService
    */
   WxMpMassMessageService getMassMessageService();
+
+  void setKefuService(WxMpKefuService kefuService);
+
+  void setMaterialService(WxMpMaterialService materialService);
+
+  void setMenuService(WxMpMenuService menuService);
+
+  void setUserService(WxMpUserService userService);
+
+  void setTagService(WxMpUserTagService tagService);
+
+  void setQrCodeService(WxMpQrcodeService qrCodeService);
+
+  void setCardService(WxMpCardService cardService);
+
+  void setStoreService(WxMpStoreService storeService);
+
+  void setDataCubeService(WxMpDataCubeService dataCubeService);
+
+  void setBlackListService(WxMpUserBlacklistService blackListService);
+
+  void setTemplateMsgService(WxMpTemplateMsgService templateMsgService);
+
+  void setDeviceService(WxMpDeviceService deviceService);
+
+  void setShakeService(WxMpShakeService shakeService);
+
+  void setMemberCardService(WxMpMemberCardService memberCardService);
+
+  void setMassMessageService(WxMpMassMessageService massMessageService);
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
index 91dff9babb..e4482d5aa7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceAbstractImpl.java
@@ -391,4 +391,79 @@ public RequestHttp getRequestHttp() {
   public WxMpMassMessageService getMassMessageService() {
     return this.massMessageService;
   }
+
+  @Override
+  public void setKefuService(WxMpKefuService kefuService) {
+    this.kefuService = kefuService;
+  }
+
+  @Override
+  public void setMaterialService(WxMpMaterialService materialService) {
+    this.materialService = materialService;
+  }
+
+  @Override
+  public void setMenuService(WxMpMenuService menuService) {
+    this.menuService = menuService;
+  }
+
+  @Override
+  public void setUserService(WxMpUserService userService) {
+    this.userService = userService;
+  }
+
+  @Override
+  public void setTagService(WxMpUserTagService tagService) {
+    this.tagService = tagService;
+  }
+
+  @Override
+  public void setQrCodeService(WxMpQrcodeService qrCodeService) {
+    this.qrCodeService = qrCodeService;
+  }
+
+  @Override
+  public void setCardService(WxMpCardService cardService) {
+    this.cardService = cardService;
+  }
+
+  @Override
+  public void setStoreService(WxMpStoreService storeService) {
+    this.storeService = storeService;
+  }
+
+  @Override
+  public void setDataCubeService(WxMpDataCubeService dataCubeService) {
+    this.dataCubeService = dataCubeService;
+  }
+
+  @Override
+  public void setBlackListService(WxMpUserBlacklistService blackListService) {
+    this.blackListService = blackListService;
+  }
+
+  @Override
+  public void setTemplateMsgService(WxMpTemplateMsgService templateMsgService) {
+    this.templateMsgService = templateMsgService;
+  }
+
+  @Override
+  public void setDeviceService(WxMpDeviceService deviceService) {
+    this.deviceService = deviceService;
+  }
+
+  @Override
+  public void setShakeService(WxMpShakeService shakeService) {
+    this.shakeService = shakeService;
+  }
+
+  @Override
+  public void setMemberCardService(WxMpMemberCardService memberCardService) {
+    this.memberCardService = memberCardService;
+  }
+
+  @Override
+  public void setMassMessageService(WxMpMassMessageService massMessageService) {
+    this.massMessageService = massMessageService;
+  }
 }

From 09ed3652131e4c33c90c07cf56d2db9d984293c7 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 22 Aug 2017 23:43:21 +0800
Subject: [PATCH 71/85] =?UTF-8?q?#312=20=E6=B7=BB=E5=8A=A0=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=BE=A4=E5=8F=91=20=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/api/WxMpMassMessageService.java | 24 +++++++++++++++++++
 .../api/impl/WxMpMassMessageServiceImpl.java  |  9 +++++++
 .../impl/WxMpMassMessageServiceImplTest.java  |  5 ++++
 3 files changed, 38 insertions(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMassMessageService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMassMessageService.java
index e4a57de99b..6d1f025728 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMassMessageService.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMassMessageService.java
@@ -34,6 +34,10 @@ public interface WxMpMassMessageService {
    * 群发消息预览接口
    */
   String MESSAGE_MASS_PREVIEW_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/preview";
+  /**
+   * 删除群发接口
+   */
+  String MESSAGE_MASS_DELETE_URL = "https://api.weixin.qq.com/cgi-bin/message/mass/delete";
 
   /**
    * <pre>
@@ -92,4 +96,24 @@ public interface WxMpMassMessageService {
    */
   WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPreviewMessage) throws Exception;
 
+  /**
+   * <pre>
+   * 删除群发
+   * 群发之后，随时可以通过该接口删除群发。
+   * 请注意：
+   * 1、只有已经发送成功的消息才能删除
+   * 2、删除消息是将消息的图文详情页失效，已经收到的用户，还是能在其本地看到消息卡片。
+   * 3、删除群发消息只能删除图文消息和视频消息，其他类型的消息一经发送，无法删除。
+   * 4、如果多次群发发送的是一个图文消息，那么删除其中一次群发，就会删除掉这个图文消息也，导致所有群发都失效
+   * 接口调用请求说明：
+   *  http请求方式: POST
+   *  https://api.weixin.qq.com/cgi-bin/message/mass/delete?access_token=ACCESS_TOKEN
+   * 详情请见：https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1481187827_i0l21
+   * </pre>
+   *
+   * @param msgId        发送出去的消息ID
+   * @param articleIndex 要删除的文章在图文消息中的位置，第一篇编号为1，该字段不填或填0会删除全部文章
+   */
+  void delete(Integer msgId, Integer articleIndex) throws Exception;
+
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImpl.java
index 015c465c0f..c54fcc768c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImpl.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.api.impl;
 
+import com.google.gson.JsonObject;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpMassMessageService;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -55,4 +56,12 @@ public WxMpMassSendResult massMessagePreview(WxMpMassPreviewMessage wxMpMassPrev
     return WxMpMassSendResult.fromJson(responseContent);
   }
 
+  @Override
+  public void delete(Integer msgId, Integer articleIndex) throws Exception {
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("msg_id", msgId);
+    jsonObject.addProperty("article_idx", articleIndex);
+    this.wxMpService.post(MESSAGE_MASS_DELETE_URL, jsonObject.toString());
+  }
+
 }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImplTest.java
index b896723ab0..3b6c048981 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpMassMessageServiceImplTest.java
@@ -181,4 +181,9 @@ public Object[][] massMessages() throws WxErrorException, IOException {
     return messages;
   }
 
+  @Test
+  public void testMassDelete() throws Exception {
+    this.wxService.getMassMessageService().delete(1,2);
+  }
+
 }

From 66c786d4e6253e6d569b65c8e336b4553a115ef8 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 23 Aug 2017 00:02:16 +0800
Subject: [PATCH 72/85] =?UTF-8?q?#307=20=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=A8=A1=E5=9D=97=E4=B8=AD=E5=A2=9E=E5=8A=A0http=20pr?=
 =?UTF-8?q?oxy=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/config/WxPayConfig.java  | 36 +++++++++++++++++++
 .../impl/WxPayServiceApacheHttpImpl.java      | 16 +++++++++
 2 files changed, 52 insertions(+)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
index b51f28e94a..d512cbe78e 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
@@ -39,6 +39,10 @@ public class WxPayConfig {
   private SSLContext sslContext;
   private String keyPath;
   private boolean useSandboxEnv = false;
+  private String httpProxyHost;
+  private Integer httpProxyPort;
+  private String httpProxyUsername;
+  private String httpProxyPassword;
 
   public String getKeyPath() {
     return keyPath;
@@ -227,4 +231,36 @@ public int getHttpTimeout() {
   public void setHttpTimeout(int httpTimeout) {
     this.httpTimeout = httpTimeout;
   }
+
+  public String getHttpProxyHost() {
+    return httpProxyHost;
+  }
+
+  public void setHttpProxyHost(String httpProxyHost) {
+    this.httpProxyHost = httpProxyHost;
+  }
+
+  public Integer getHttpProxyPort() {
+    return httpProxyPort;
+  }
+
+  public void setHttpProxyPort(Integer httpProxyPort) {
+    this.httpProxyPort = httpProxyPort;
+  }
+
+  public String getHttpProxyUsername() {
+    return httpProxyUsername;
+  }
+
+  public void setHttpProxyUsername(String httpProxyUsername) {
+    this.httpProxyUsername = httpProxyUsername;
+  }
+
+  public String getHttpProxyPassword() {
+    return httpProxyPassword;
+  }
+
+  public void setHttpProxyPassword(String httpProxyPassword) {
+    this.httpProxyPassword = httpProxyPassword;
+  }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
index c5da982c13..09c414f437 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
@@ -1,12 +1,17 @@
 package com.github.binarywang.wxpay.service.impl;
 
 import com.github.binarywang.wxpay.exception.WxPayException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.conn.ssl.DefaultHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
@@ -41,12 +46,23 @@ protected String post(String url, String requestStr, boolean useKey) throws WxPa
       }
 
       HttpPost httpPost = new HttpPost(url);
+
       httpPost.setConfig(RequestConfig.custom()
         .setConnectionRequestTimeout(this.getConfig().getHttpConnectionTimeout())
         .setConnectTimeout(this.getConfig().getHttpConnectionTimeout())
         .setSocketTimeout(this.getConfig().getHttpTimeout())
         .build());
 
+      if (StringUtils.isNotBlank(this.config.getHttpProxyHost())
+        && StringUtils.isNotBlank(this.config.getHttpProxyUsername())) {
+        // 使用代理服务器 需要用户认证的代理服务器
+        CredentialsProvider provider = new BasicCredentialsProvider();
+        provider.setCredentials(
+          new AuthScope(this.config.getHttpProxyHost(), this.config.getHttpProxyPort()),
+          new UsernamePasswordCredentials(this.config.getHttpProxyUsername(), this.config.getHttpProxyPassword()));
+        httpClientBuilder.setDefaultCredentialsProvider(provider);
+      }
+
       try (CloseableHttpClient httpclient = httpClientBuilder.build()) {
         httpPost.setEntity(new StringEntity(new String(requestStr.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1)));
         try (CloseableHttpResponse response = httpclient.execute(httpPost)) {

From ad5873047801c39effdc12ef2579aaf0427e9817 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 23 Aug 2017 21:35:23 +0800
Subject: [PATCH 73/85] =?UTF-8?q?#307=20=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=A8=A1=E5=9D=97=E4=B8=AD=E5=A2=9E=E5=8A=A0http=20pr?=
 =?UTF-8?q?oxy=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/WxPayServiceApacheHttpImpl.java       |  2 +-
 .../service/impl/WxPayServiceJoddHttpImpl.java | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
index 09c414f437..14ef7c120a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
@@ -54,7 +54,7 @@ protected String post(String url, String requestStr, boolean useKey) throws WxPa
         .build());
 
       if (StringUtils.isNotBlank(this.config.getHttpProxyHost())
-        && StringUtils.isNotBlank(this.config.getHttpProxyUsername())) {
+        && this.config.getHttpProxyPort() > 0) {
         // 使用代理服务器 需要用户认证的代理服务器
         CredentialsProvider provider = new BasicCredentialsProvider();
         provider.setCredentials(
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
index 29008e26bd..7e7d31d91a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
@@ -1,9 +1,13 @@
 package com.github.binarywang.wxpay.service.impl;
 
 import com.github.binarywang.wxpay.exception.WxPayException;
+import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
+import jodd.http.ProxyInfo;
+import jodd.http.ProxyInfo.ProxyType;
 import jodd.http.net.SSLSocketHttpConnectionProvider;
+import jodd.http.net.SocketHttpConnectionProvider;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.net.ssl.SSLContext;
@@ -31,7 +35,19 @@ protected String post(String url, String requestStr, boolean useKey) throws WxPa
         if (null == sslContext) {
           sslContext = this.getConfig().initSSLContext();
         }
-        request.withConnectionProvider(new SSLSocketHttpConnectionProvider(sslContext));
+        final SSLSocketHttpConnectionProvider provider = new SSLSocketHttpConnectionProvider(sslContext);
+        request.withConnectionProvider(provider);
+      }
+
+      if (StringUtils.isNotBlank(this.config.getHttpProxyHost()) && this.config.getHttpProxyPort() > 0) {
+        ProxyInfo httpProxy = new ProxyInfo(ProxyType.HTTP, this.config.getHttpProxyHost(), this.config.getHttpProxyPort(),
+          this.config.getHttpProxyUsername(), this.config.getHttpProxyPassword());
+        HttpConnectionProvider provider = request.connectionProvider();
+        if (null == provider) {
+          provider = new SocketHttpConnectionProvider();
+        }
+        provider.useProxy(httpProxy);
+        request.withConnectionProvider(provider);
       }
 
       String responseString = this.getResponseString(request.send());

From 630a4d5fa9f94c2e4e189aa150845994584f066e Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 23 Aug 2017 21:54:28 +0800
Subject: [PATCH 74/85] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=B8=B4=E6=97=B6?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC2.7.9.BETA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 4 ++--
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd6312842c..a10e3adc99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.8.BETA</version>
+  <version>2.7.9.BETA</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
@@ -288,7 +288,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.7-SNAPSHOT</version>
+            <version>1.6</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index bd7bb51cee..1b3be7dac3 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.8.BETA</version>
+    <version>2.7.9.BETA</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 330a34b098..f035d15b7a 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.8.BETA</version>
+    <version>2.7.9.BETA</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 11ab7d392e..3c4a36751d 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.8.BETA</version>
+    <version>2.7.9.BETA</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index d8aa707aee..9f658a8fbf 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.8.BETA</version>
+    <version>2.7.9.BETA</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 74704e6a87..a1f01be6e9 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.8.BETA</version>
+    <version>2.7.9.BETA</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 7daeff2aa78fc92ad613b509c1b6454af00adcd8 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 24 Aug 2017 11:23:21 +0800
Subject: [PATCH 75/85] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8A=BD=E5=8F=96=E9=83=A8=E5=88=86=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/WxPayDownloadBillRequest.java     | 12 +--
 .../wxpay/constant/WxPayConstants.java        | 87 +++++++++++++++++++
 .../impl/WxPayServiceAbstractImpl.java        | 37 ++++----
 .../impl/WxPayServiceAbstractImplTest.java    | 86 +++++++++---------
 4 files changed, 157 insertions(+), 65 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java
index 2838284c80..33e410cdd8 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayDownloadBillRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.request;
 
+import com.github.binarywang.wxpay.constant.WxPayConstants.BillType;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import me.chanjar.weixin.common.annotation.Required;
@@ -17,7 +18,8 @@
  */
 @XStreamAlias("xml")
 public class WxPayDownloadBillRequest extends WxPayBaseRequest {
-  private static final String[] BILL_TYPE = new String[]{"ALL", "REFUND", "SUCCESS"};
+  private static final String[] BILL_TYPES = new String[]{BillType.ALL, BillType.SUCCESS, BillType.REFUND, BillType.RECHARGE_REFUND};
+  private static final String TAR_TYPE_GZIP = "GZIP";
 
   /**
    * <pre>
@@ -130,13 +132,13 @@ public void setTarType(String tarType) {
 
   @Override
   protected void checkConstraints() throws WxPayException {
-    if (StringUtils.isNotBlank(this.getTarType()) && !"GZIP".equals(this.getTarType())) {
+    if (StringUtils.isNotBlank(this.getTarType()) && !TAR_TYPE_GZIP.equals(this.getTarType())) {
       throw new WxPayException("tar_type值如果存在，只能为GZIP");
     }
 
-    if (!ArrayUtils.contains(BILL_TYPE, this.getBillType())) {
-      throw new WxPayException(String.format("bill_tpye目前必须为%s其中之一,实际值：%s",
-        Arrays.toString(BILL_TYPE), this.getBillType()));
+    if (!ArrayUtils.contains(BILL_TYPES, this.getBillType())) {
+      throw new WxPayException(String.format("bill_type目前必须为%s其中之一,实际值：%s",
+        Arrays.toString(BILL_TYPES), this.getBillType()));
     }
   }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
new file mode 100644
index 0000000000..dc8ce23b8e
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
@@ -0,0 +1,87 @@
+package com.github.binarywang.wxpay.constant;
+
+/**
+ * <pre>
+ * 微信支付常量类
+ * Created by Binary Wang on 2017-8-24.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxPayConstants {
+  /**
+   * 校验用户姓名选项，企业付款时使用
+   */
+  public static class CheckNameOption {
+    /**
+     * 不校验真实姓名
+     */
+    public static final String NO_CHECK = "NO_CHECK";
+
+    /**
+     * 强校验真实姓名
+     */
+    public static final String FORCE_CHECK = "FORCE_CHECK";
+  }
+
+  /**
+   * 订单类型
+   */
+  public static class BillType {
+    /**
+     * 查询红包时使用：通过商户订单号获取红包信息
+     */
+    public static final String MCHT = "MCHT";
+
+    //以下为下载对账单时的账单类型
+    /**
+     * 返回当日所有订单信息，默认值
+     */
+    public static final String ALL = "ALL";
+    /**
+     * 返回当日成功支付的订单
+     */
+    public static final String SUCCESS = "SUCCESS";
+    /**
+     * 返回当日退款订单
+     */
+    public static final String REFUND = "REFUND";
+    /**
+     * 返回当日充值退款订单（相比其他对账单多一栏“返还手续费”）
+     */
+    public static final String RECHARGE_REFUND = "RECHARGE_REFUND";
+  }
+
+  /**
+   * 交易类型
+   */
+  public static class TradeType {
+    /**
+     * 原生扫码支付
+     */
+    public static final String NATIVE = "NATIVE";
+
+    /**
+     * App支付
+     */
+    public static final String APP = "APP";
+
+    /**
+     * 公众号支付
+     */
+    public static final String JSAPI = "JSAPI";
+
+    /**
+     * 刷卡支付，刷卡支付有单独的支付接口，不调用统一下单接口
+     */
+    public static final String MICROPAY = "MICROPAY";
+  }
+
+  /**
+   * 签名类型
+   */
+  public static class SignType {
+    public static final String HMAC_SHA256 = "HMAC-SHA256";
+    public static final String MD5 = "MD5";
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index 616f860988..357cad09ff 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -5,6 +5,9 @@
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.constant.WxPayConstants.BillType;
+import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
+import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.util.SignUtils;
@@ -129,7 +132,7 @@ public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request) throw
   public WxPayRedpackQueryResult queryRedpack(String mchBillNo) throws WxPayException {
     WxPayRedpackQueryRequest request = new WxPayRedpackQueryRequest();
     request.setMchBillNo(mchBillNo);
-    request.setBillType("MCHT");
+    request.setBillType(BillType.MCHT);
     request.checkAndSign(this.getConfig());
 
     String url = this.getPayBaseUrl() + "/mmpaymkttransfers/gethbinfo";
@@ -199,35 +202,36 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
     Map<String, String> payInfo = new HashMap<>();
     String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
     String nonceStr = String.valueOf(System.currentTimeMillis());
-    if ("NATIVE".equals(request.getTradeType())) {
+    if (TradeType.NATIVE.equals(request.getTradeType())) {
       payInfo.put("codeUrl", unifiedOrderResult.getCodeURL());
-    } else if ("APP".equals(request.getTradeType())) {
+    } else if (TradeType.APP.equals(request.getTradeType())) {
       // APP支付绑定的是微信开放平台上的账号，APPID为开放平台上绑定APP后发放的参数
       String appId = getConfig().getAppId();
       Map<String, String> configMap = new HashMap<>();
       // 此map用于参与调起sdk支付的二次签名,格式全小写，timestamp只能是10位,格式固定，切勿修改
-      String partnerid = getConfig().getMchId();
+      String partnerId = getConfig().getMchId();
       configMap.put("prepayid", prepayId);
-      configMap.put("partnerid", partnerid);
-      configMap.put("package", "Sign=WXPay");
+      configMap.put("partnerid", partnerId);
+      String packageValue = "Sign=WXPay";
+      configMap.put("package", packageValue);
       configMap.put("timestamp", timestamp);
       configMap.put("noncestr", nonceStr);
       configMap.put("appid", appId);
       // 此map用于客户端与微信服务器交互
       payInfo.put("sign", SignUtils.createSign(configMap, this.getConfig().getMchKey()));
       payInfo.put("prepayId", prepayId);
-      payInfo.put("partnerId", partnerid);
+      payInfo.put("partnerId", partnerId);
       payInfo.put("appId", appId);
-      payInfo.put("packageValue", "Sign=WXPay");
+      payInfo.put("packageValue", packageValue);
       payInfo.put("timeStamp", timestamp);
       payInfo.put("nonceStr", nonceStr);
-    } else if ("JSAPI".equals(request.getTradeType())) {
+    } else if (TradeType.JSAPI.equals(request.getTradeType())) {
       payInfo.put("appId", unifiedOrderResult.getAppid());
       // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
       payInfo.put("timeStamp", timestamp);
       payInfo.put("nonceStr", nonceStr);
       payInfo.put("package", "prepay_id=" + prepayId);
-      payInfo.put("signType", "MD5");
+      payInfo.put("signType", SignType.MD5);
       payInfo.put("paySign", SignUtils.createSign(payInfo, this.getConfig().getMchKey()));
     }
 
@@ -278,7 +282,6 @@ public String createScanPayQrcodeMode1(String productId) {
     String sign = SignUtils.createSign(params, this.getConfig().getMchKey());
     params.put("sign", sign);
 
-
     for (String key : params.keySet()) {
       codeUrl.append(key + "=" + params.get(key) + "&");
     }
@@ -327,8 +330,7 @@ public WxPayBillResult downloadBill(String billDate, String billType, String tar
       result.checkResult(this);
       return null;
     } else {
-      WxPayBillResult wxPayBillResult = billInformationDeal(responseContent);
-      return wxPayBillResult;
+      return billInformationDeal(responseContent);
     }
   }
 
@@ -346,10 +348,8 @@ private WxPayBillResult billInformationDeal(String responseContent) {
      * 交易时间:2017-04-06 01:00:02 公众账号ID: 商户号: 子商户号:0 设备号:WEB 微信订单号: 商户订单号:2017040519091071873216 用户标识: 交易类型:NATIVE
      * 交易状态:REFUND 付款银行:CFT 货币种类:CNY 总金额:0.00 企业红包金额:0.00 微信退款单号: 商户退款单号:20170406010000933 退款金额:0.01 企业红包退款金额:0.00
      * 退款类型:ORIGINAL 退款状态:SUCCESS 商品名称: 商户数据包: 手续费:0.00000 费率 :0.60%
+     * 参考以上格式进行取值
      */
-
-    // 参考以上格式进行取值
-
     List<WxPayBillBaseResult> wxPayBillBaseResultLst = new LinkedList<>();
     String newStr = listStr.replaceAll(",", " "); // 去空格
     String[] tempStr = newStr.split("`"); // 数据分组
@@ -387,12 +387,11 @@ private WxPayBillResult billInformationDeal(String responseContent) {
       k += t.length;
     }
     wxPayBillResult.setWxPayBillBaseResultLst(wxPayBillBaseResultLst);
+
     /*
      * 总交易单数,总交易额,总退款金额,总代金券或立减优惠退款金额,手续费总金额 `2,`0.02,`0.0,`0.0,`0
+     * 参考以上格式进行取值
      */
-
-    // 参考以上格式进行取值
-
     String totalStr = objStr.replaceAll(",", " ");
     String[] totalTempStr = totalStr.split("`");
     wxPayBillResult.setTotalRecord(totalTempStr[1]);
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
index 7ac35a6061..6d110a0ecd 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -4,6 +4,10 @@
 import com.github.binarywang.wxpay.bean.coupon.*;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.github.binarywang.wxpay.constant.WxPayConstants.BillType;
+import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
+import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.testbase.ApiTestModule;
@@ -33,23 +37,58 @@ public class WxPayServiceAbstractImplTest {
   @Inject
   private WxPayService payService;
 
+  /**
+   * Test method for {@link WxPayService#unifiedOrder(WxPayUnifiedOrderRequest)}.
+   */
+  @Test
+  public void testUnifiedOrder() throws WxPayException {
+    WxPayUnifiedOrderResult result = this.payService
+      .unifiedOrder(WxPayUnifiedOrderRequest.newBuilder()
+        .body("我去")
+        .totalFee(1)
+        .spbillCreateIp("11.1.11.1")
+        .notifyURL("111111")
+        .tradeType(TradeType.JSAPI)
+        .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())
+        .outTradeNo("1111112")
+        .build());
+    this.logger.info(result.toString());
+  }
+
   @Test
   public void testGetPayInfo() throws Exception {
     Map<String, String> payInfo = this.payService.getPayInfo(WxPayUnifiedOrderRequest.newBuilder()
       .body("我去")
       .totalFee(1)
-      .spbillCreateIp("111111")
+      .spbillCreateIp("1.11.1.11")
       .notifyURL("111111")
-      .tradeType("JSAPI")
-      .outTradeNo("111111")
+      .tradeType(TradeType.JSAPI)
+      .outTradeNo("1111113")
       .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())
       .build());
     this.logger.info(payInfo.toString());
   }
 
+  /**
+   * Test method for {@link WxPayService#queryOrder(String, String)} .
+   */
+  @Test
+  public void testQueryOrder() throws WxPayException {
+    this.logger.info(this.payService.queryOrder("11212121", null).toString());
+    this.logger.info(this.payService.queryOrder(null, "11111").toString());
+  }
+
+  /**
+   * Test method for {@link WxPayService#closeOrder(String)} .
+   */
+  @Test
+  public void testCloseOrder() throws WxPayException {
+    this.logger.info(this.payService.closeOrder("11212121").toString());
+  }
+
   @Test
   public void testDownloadBill() throws Exception {
-    WxPayBillResult wxPayBillResult = this.payService.downloadBill("20170101", "ALL", "GZIP", "1111111");
+    WxPayBillResult wxPayBillResult = this.payService.downloadBill("20170101", BillType.ALL, "GZIP", "1111111");
     //前一天没有账单记录返回null
     assertNotNull(wxPayBillResult);
     //必填字段为空时，抛出异常
@@ -60,7 +99,7 @@ public void testDownloadBill() throws Exception {
   public void testReport() throws Exception {
     WxPayReportRequest request = new WxPayReportRequest();
     request.setInterfaceUrl("hahahah");
-    request.setSignType("HMAC-SHA256");//貌似接口未校验此字段
+    request.setSignType(SignType.HMAC_SHA256);//貌似接口未校验此字段
     request.setExecuteTime(1000);
     request.setReturnCode("aaa");
     request.setResultCode("aaa");
@@ -130,41 +169,6 @@ public void testQueryRedpack() throws Exception {
     this.logger.info(redpackResult.toString());
   }
 
-  /**
-   * Test method for {@link WxPayService#unifiedOrder(WxPayUnifiedOrderRequest)}.
-   */
-  @Test
-  public void testUnifiedOrder() throws WxPayException {
-    WxPayUnifiedOrderResult result = this.payService
-      .unifiedOrder(WxPayUnifiedOrderRequest.newBuilder()
-        .body("我去")
-        .totalFee(1)
-        .spbillCreateIp("11.1.11.1")
-        .notifyURL("111111")
-        .tradeType("JSAPI")
-        .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())
-        .outTradeNo("111111")
-        .build());
-    this.logger.info(result.toString());
-  }
-
-  /**
-   * Test method for {@link WxPayService#queryOrder(String, String)} .
-   */
-  @Test
-  public void testQueryOrder() throws WxPayException {
-    this.logger.info(this.payService.queryOrder("11212121", null).toString());
-    this.logger.info(this.payService.queryOrder(null, "11111").toString());
-  }
-
-  /**
-   * Test method for {@link WxPayService#closeOrder(String)} .
-   */
-  @Test
-  public void testCloseOrder() throws WxPayException {
-    this.logger.info(this.payService.closeOrder("11212121").toString());
-  }
-
   /**
    * Test method for {@link WxPayService#entPay(WxEntPayRequest)}.
    */
@@ -175,7 +179,7 @@ public void testEntPay() throws WxPayException {
       .openid("ojOQA0y9o-Eb6Aep7uVTdbkJqrP4")
       .amount(1)
       .spbillCreateIp("10.10.10.10")
-      .checkName("NO_CHECK")
+      .checkName(WxPayConstants.CheckNameOption.NO_CHECK)
       .description("描述信息")
       .build();
 

From bdf7f796e7a230d2f8022ea380ceead3df21950b Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 24 Aug 2017 16:29:33 +0800
Subject: [PATCH 76/85] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=89=A9=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/config/WxPayConfig.java     | 16 ++++++++--------
 .../service/impl/WxPayServiceApacheHttpImpl.java |  8 ++++----
 .../service/impl/WxPayServiceJoddHttpImpl.java   | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
index d512cbe78e..7d8cd5e1e3 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
@@ -163,20 +163,20 @@ public void setUseSandboxEnv(boolean useSandboxEnv) {
   }
 
   public SSLContext initSSLContext() throws WxPayException {
-    if (StringUtils.isBlank(mchId)) {
+    if (StringUtils.isBlank(this.getMchId())) {
       throw new WxPayException("请确保商户号mchId已设置");
     }
 
-    if (StringUtils.isBlank(this.keyPath)) {
+    if (StringUtils.isBlank(this.getKeyPath())) {
       throw new WxPayException("请确保证书文件地址keyPath已配置");
     }
 
     InputStream inputStream;
     final String prefix = "classpath:";
-    String fileHasProblemMsg = "证书文件【" + this.keyPath + "】有问题，请核实！";
-    String fileNotFoundMsg = "证书文件【" + this.keyPath + "】不存在，请核实！";
-    if (this.keyPath.startsWith(prefix)) {
-      String path = StringUtils.removeFirst(this.keyPath, prefix);
+    String fileHasProblemMsg = "证书文件【" + this.getKeyPath() + "】有问题，请核实！";
+    String fileNotFoundMsg = "证书文件【" + this.getKeyPath() + "】不存在，请核实！";
+    if (this.getKeyPath().startsWith(prefix)) {
+      String path = StringUtils.removeFirst(this.getKeyPath(), prefix);
       if (!path.startsWith("/")) {
         path = "/" + path;
       }
@@ -186,7 +186,7 @@ public SSLContext initSSLContext() throws WxPayException {
       }
     } else {
       try {
-        File file = new File(this.keyPath);
+        File file = new File(this.getKeyPath());
         if (!file.exists()) {
           throw new WxPayException(fileNotFoundMsg);
         }
@@ -199,7 +199,7 @@ public SSLContext initSSLContext() throws WxPayException {
 
     try {
       KeyStore keystore = KeyStore.getInstance("PKCS12");
-      char[] partnerId2charArray = mchId.toCharArray();
+      char[] partnerId2charArray = this.getMchId().toCharArray();
       keystore.load(inputStream, partnerId2charArray);
       this.sslContext = SSLContexts.custom().loadKeyMaterial(keystore, partnerId2charArray).build();
       return this.sslContext;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
index 14ef7c120a..7d8dfcf7c4 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
@@ -53,13 +53,13 @@ protected String post(String url, String requestStr, boolean useKey) throws WxPa
         .setSocketTimeout(this.getConfig().getHttpTimeout())
         .build());
 
-      if (StringUtils.isNotBlank(this.config.getHttpProxyHost())
-        && this.config.getHttpProxyPort() > 0) {
+      if (StringUtils.isNotBlank(this.getConfig().getHttpProxyHost())
+        && this.getConfig().getHttpProxyPort() > 0) {
         // 使用代理服务器 需要用户认证的代理服务器
         CredentialsProvider provider = new BasicCredentialsProvider();
         provider.setCredentials(
-          new AuthScope(this.config.getHttpProxyHost(), this.config.getHttpProxyPort()),
-          new UsernamePasswordCredentials(this.config.getHttpProxyUsername(), this.config.getHttpProxyPassword()));
+          new AuthScope(this.getConfig().getHttpProxyHost(), this.getConfig().getHttpProxyPort()),
+          new UsernamePasswordCredentials(this.getConfig().getHttpProxyUsername(), this.getConfig().getHttpProxyPassword()));
         httpClientBuilder.setDefaultCredentialsProvider(provider);
       }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
index 7e7d31d91a..553d858c04 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
@@ -26,8 +26,8 @@ protected String post(String url, String requestStr, boolean useKey) throws WxPa
     try {
       HttpRequest request = HttpRequest
         .post(url)
-        .timeout(this.config.getHttpTimeout())
-        .connectionTimeout(this.config.getHttpConnectionTimeout())
+        .timeout(this.getConfig().getHttpTimeout())
+        .connectionTimeout(this.getConfig().getHttpConnectionTimeout())
         .bodyText(requestStr);
 
       if (useKey) {
@@ -39,9 +39,9 @@ protected String post(String url, String requestStr, boolean useKey) throws WxPa
         request.withConnectionProvider(provider);
       }
 
-      if (StringUtils.isNotBlank(this.config.getHttpProxyHost()) && this.config.getHttpProxyPort() > 0) {
-        ProxyInfo httpProxy = new ProxyInfo(ProxyType.HTTP, this.config.getHttpProxyHost(), this.config.getHttpProxyPort(),
-          this.config.getHttpProxyUsername(), this.config.getHttpProxyPassword());
+      if (StringUtils.isNotBlank(this.getConfig().getHttpProxyHost()) && this.getConfig().getHttpProxyPort() > 0) {
+        ProxyInfo httpProxy = new ProxyInfo(ProxyType.HTTP, this.getConfig().getHttpProxyHost(), this.getConfig().getHttpProxyPort(),
+          this.getConfig().getHttpProxyUsername(), this.getConfig().getHttpProxyPassword());
         HttpConnectionProvider provider = request.connectionProvider();
         if (null == provider) {
           provider = new SocketHttpConnectionProvider();

From 077e44534c0bdcc3706b1b131fd88dd36331db0f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 25 Aug 2017 15:08:30 +0800
Subject: [PATCH 77/85] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E5=BE=AE=E4=BF=A1=E7=9A=84?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=92=8C=E5=93=8D=E5=BA=94=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95getWxApiData()=EF=BC=8C=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E4=BD=BF=E7=94=A8=E8=80=85=E8=8E=B7=E5=8F=96=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E8=AF=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/bean/WxPayApiData.java   | 87 +++++++++++++++++++
 .../wxpay/service/WxPayService.java           |  6 ++
 .../impl/WxPayServiceAbstractImpl.java        | 13 +++
 .../impl/WxPayServiceApacheHttpImpl.java      |  9 +-
 .../impl/WxPayServiceJoddHttpImpl.java        |  3 +
 .../impl/WxPayServiceAbstractImplTest.java    |  1 +
 .../wxpay/testbase/ApiTestModule.java         |  9 +-
 7 files changed, 123 insertions(+), 5 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayApiData.java

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayApiData.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayApiData.java
new file mode 100644
index 0000000000..ab1dec718c
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayApiData.java
@@ -0,0 +1,87 @@
+package com.github.binarywang.wxpay.bean;
+
+/**
+ * <pre>
+ * 微信支付接口请求数据封装对象
+ * Created by Binary Wang on 2017-8-25.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxPayApiData {
+  /**
+   * 接口请求地址
+   */
+  private String url;
+
+  /**
+   * 请求数据
+   */
+  private String requestData;
+
+  /**
+   * 响应数据
+   */
+  private String responseData;
+
+  /**
+   * 接口请求异常信息
+   */
+  private String exceptionMsg;
+
+  /**
+   * @param url          接口请求地址
+   * @param requestData  请求数据
+   * @param responseData 响应数据
+   * @param exceptionMsg 接口请求异常信息
+   */
+  public WxPayApiData(String url, String requestData, String responseData, String exceptionMsg) {
+    this.url = url;
+    this.requestData = requestData;
+    this.responseData = responseData;
+    this.exceptionMsg = exceptionMsg;
+  }
+
+  public String getUrl() {
+    return this.url;
+  }
+
+  public void setUrl(String url) {
+    this.url = url;
+  }
+
+  public String getRequestData() {
+    return this.requestData;
+  }
+
+  public void setRequestData(String requestData) {
+    this.requestData = requestData;
+  }
+
+  public String getResponseData() {
+    return this.responseData;
+  }
+
+  public void setResponseData(String responseData) {
+    this.responseData = responseData;
+  }
+
+  public String getExceptionMsg() {
+    return this.exceptionMsg;
+  }
+
+  public void setExceptionMsg(String exceptionMsg) {
+    this.exceptionMsg = exceptionMsg;
+  }
+
+  @Override
+  public String toString() {
+    if (this.exceptionMsg != null) {
+      return String.format("\n【请求地址】：%s\n【请求数据】：%s\n【异常信息】：%s",
+        this, url, this.requestData, this.exceptionMsg);
+    }
+
+    return String.format("\n【请求地址】：%s\n【请求数据】：%s\n【响应数据】：%s",
+      this.url, this.requestData, this.responseData);
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index 2eef29b85a..bf599ba175 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.service;
 
+import com.github.binarywang.wxpay.bean.WxPayApiData;
 import com.github.binarywang.wxpay.bean.coupon.*;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
@@ -368,4 +369,9 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
    * </pre>
    */
   WxPayCouponInfoQueryResult queryCouponInfo(WxPayCouponInfoQueryRequest request) throws WxPayException;
+
+  /**
+   * 获取微信请求数据，方便接口调用方获取处理
+   */
+  WxPayApiData getWxApiData();
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index 357cad09ff..27d4d2dd6f 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -1,6 +1,7 @@
 package com.github.binarywang.wxpay.service.impl;
 
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
+import com.github.binarywang.wxpay.bean.WxPayApiData;
 import com.github.binarywang.wxpay.bean.coupon.*;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
@@ -33,6 +34,7 @@
 public abstract class WxPayServiceAbstractImpl implements WxPayService {
   private static final String PAY_BASE_URL = "https://api.mch.weixin.qq.com";
   protected final Logger log = LoggerFactory.getLogger(this.getClass());
+  protected static ThreadLocal<WxPayApiData> wxApiData = new ThreadLocal<>();
 
   protected WxPayConfig config;
 
@@ -501,4 +503,15 @@ public WxPayCouponInfoQueryResult queryCouponInfo(WxPayCouponInfoQueryRequest re
     result.checkResult(this);
     return result;
   }
+
+  @Override
+  public WxPayApiData getWxApiData() {
+    try {
+      return wxApiData.get();
+    }finally {
+      //一般来说，接口请求会在一个线程内进行，这种情况下，每个线程get的会是之前所存入的数据，
+      // 但以防万一有同一线程多次请求的问题，所以每次获取完数据后移除对应数据
+      wxApiData.remove();
+    }
+  }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
index 7d8dfcf7c4..1b3284f95f 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.service.impl;
 
+import com.github.binarywang.wxpay.bean.WxPayApiData;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.auth.AuthScope;
@@ -66,15 +67,17 @@ protected String post(String url, String requestStr, boolean useKey) throws WxPa
       try (CloseableHttpClient httpclient = httpClientBuilder.build()) {
         httpPost.setEntity(new StringEntity(new String(requestStr.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1)));
         try (CloseableHttpResponse response = httpclient.execute(httpPost)) {
-          String result = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-          this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, result);
-          return result;
+          String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+          this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, responseString);
+          wxApiData.set(new WxPayApiData(url, requestStr, responseString, null));
+          return responseString;
         }
       } finally {
         httpPost.releaseConnection();
       }
     } catch (Exception e) {
       this.log.error("\n【请求地址】：{}\n【请求数据】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
+      wxApiData.set(new WxPayApiData(url, requestStr, null, e.getMessage()));
       throw new WxPayException(e.getMessage(), e);
     }
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
index 553d858c04..bbe024a309 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.service.impl;
 
+import com.github.binarywang.wxpay.bean.WxPayApiData;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;
@@ -53,9 +54,11 @@ protected String post(String url, String requestStr, boolean useKey) throws WxPa
       String responseString = this.getResponseString(request.send());
 
       this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, responseString);
+      wxApiData.set(new WxPayApiData(url, requestStr, responseString, null));
       return responseString;
     } catch (Exception e) {
       this.log.error("\n【请求地址】：{}\n【请求数据】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
+      wxApiData.set(new WxPayApiData(url, requestStr, null, e.getMessage()));
       throw new WxPayException(e.getMessage(), e);
     }
   }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
index 6d110a0ecd..de0fe10e2c 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -53,6 +53,7 @@ public void testUnifiedOrder() throws WxPayException {
         .outTradeNo("1111112")
         .build());
     this.logger.info(result.toString());
+    this.logger.warn(this.payService.getWxApiData().toString());
   }
 
   @Test
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/ApiTestModule.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/ApiTestModule.java
index d5a028d1fb..207dc194f5 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/ApiTestModule.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/testbase/ApiTestModule.java
@@ -12,11 +12,16 @@
 import java.io.InputStream;
 
 public class ApiTestModule implements Module {
+  private static final String TEST_CONFIG_XML = "test-config.xml";
 
   @Override
   public void configure(Binder binder) {
-    try (InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml")) {
-      XmlWxPayConfig config = this.fromXml(XmlWxPayConfig.class, is1);
+    try (InputStream inputStream = ClassLoader.getSystemResourceAsStream(TEST_CONFIG_XML)) {
+      if (inputStream == null) {
+        throw new RuntimeException("测试配置文件【" + TEST_CONFIG_XML + "】未找到");
+      }
+
+      XmlWxPayConfig config = this.fromXml(XmlWxPayConfig.class, inputStream);
       WxPayService wxService = new WxPayServiceImpl();
       wxService.setConfig(config);
 

From b79370ac603661c46537549e0b1df2a236841492 Mon Sep 17 00:00:00 2001
From: Nick Wong <a465625179@yeah.net>
Date: Sat, 26 Aug 2017 20:11:30 +0800
Subject: [PATCH 78/85] =?UTF-8?q?#324:=20=E4=BF=AE=E5=A4=8D=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E5=BC=8F=E5=88=B7=E6=96=B0access=5Ftoken=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/api/impl/WxMpServiceApacheHttpClientImpl.java       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java
index ceb0b783e2..dd8aaf6114 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceApacheHttpClientImpl.java
@@ -65,12 +65,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
     Lock lock = this.getWxMpConfigStorage().getAccessTokenLock();
     try {
       lock.lock();
-
-      if (forceRefresh) {
-        this.getWxMpConfigStorage().expireAccessToken();
-      }
-
-      if (this.getWxMpConfigStorage().isAccessTokenExpired()) {
+      if (this.getWxMpConfigStorage().isAccessTokenExpired() || forceRefresh) {
         String url = String.format(WxMpService.GET_ACCESS_TOKEN_URL,
           this.getWxMpConfigStorage().getAppId(), this.getWxMpConfigStorage().getSecret());
         try {

From 532c1af1592c54b582abaad28e812c441eccb8bf Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 26 Aug 2017 20:16:30 +0800
Subject: [PATCH 79/85] =?UTF-8?q?#324:=20=E4=BF=AE=E5=A4=8D=E5=88=86?=
 =?UTF-8?q?=E5=B8=83=E5=BC=8F=E5=88=B7=E6=96=B0access=5Ftoken=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java | 5 +----
 .../chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java | 5 +----
 .../chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java   | 5 +----
 .../cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java  | 6 +-----
 .../chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java | 6 +-----
 .../chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java   | 6 +-----
 6 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java
index fc6249662b..af32f5fb5d 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceApacheHttpClientImpl.java
@@ -38,10 +38,7 @@ public HttpType getRequestType() {
 
   @Override
   public String getAccessToken(boolean forceRefresh) throws WxErrorException {
-    if (forceRefresh) {
-      this.configStorage.expireAccessToken();
-    }
-    if (this.configStorage.isAccessTokenExpired()) {
+    if (this.configStorage.isAccessTokenExpired() || forceRefresh) {
       synchronized (this.globalAccessTokenRefreshLock) {
         if (this.configStorage.isAccessTokenExpired()) {
           String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?"
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
index 5a14eb27fe..3e7c4bc5b8 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceJoddHttpImpl.java
@@ -29,10 +29,7 @@ public HttpType getRequestType() {
 
   @Override
   public String getAccessToken(boolean forceRefresh) throws WxErrorException {
-    if (forceRefresh) {
-      this.configStorage.expireAccessToken();
-    }
-    if (this.configStorage.isAccessTokenExpired()) {
+    if (this.configStorage.isAccessTokenExpired() || forceRefresh) {
       synchronized (this.globalAccessTokenRefreshLock) {
         if (this.configStorage.isAccessTokenExpired()) {
           String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?"
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
index 2ad4c72015..f8476ff5af 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceOkHttpImpl.java
@@ -37,10 +37,7 @@ public HttpType getRequestType() {
   @Override
   public String getAccessToken(boolean forceRefresh) throws WxErrorException {
     logger.debug("WxCpServiceOkHttpImpl is running");
-    if (forceRefresh) {
-      this.configStorage.expireAccessToken();
-    }
-    if (this.configStorage.isAccessTokenExpired()) {
+    if (this.configStorage.isAccessTokenExpired() || forceRefresh) {
       synchronized (this.globalAccessTokenRefreshLock) {
         if (this.configStorage.isAccessTokenExpired()) {
           String url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?"
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
index 023306634b..106f020e53 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java
@@ -87,11 +87,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
     try {
       lock.lock();
 
-      if (forceRefresh) {
-        this.getWxMaConfig().expireAccessToken();
-      }
-
-      if (this.getWxMaConfig().isAccessTokenExpired()) {
+      if (this.getWxMaConfig().isAccessTokenExpired() || forceRefresh) {
         String url = String.format(WxMaService.GET_ACCESS_TOKEN_URL, this.getWxMaConfig().getAppid(),
           this.getWxMaConfig().getSecret());
         try {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
index 0551db67c6..f146c365e8 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceJoddHttpImpl.java
@@ -51,11 +51,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
     try {
       lock.lock();
 
-      if (forceRefresh) {
-        this.getWxMpConfigStorage().expireAccessToken();
-      }
-
-      if (this.getWxMpConfigStorage().isAccessTokenExpired()) {
+      if (this.getWxMpConfigStorage().isAccessTokenExpired() || forceRefresh) {
         String url = String.format(WxMpService.GET_ACCESS_TOKEN_URL,
           this.getWxMpConfigStorage().getAppId(), this.getWxMpConfigStorage().getSecret());
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
index 9f2a17add1..9066dc8d17 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceOkHttpImpl.java
@@ -43,11 +43,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
     try {
       lock.lock();
 
-      if (forceRefresh) {
-        this.getWxMpConfigStorage().expireAccessToken();
-      }
-
-      if (this.getWxMpConfigStorage().isAccessTokenExpired()) {
+      if (this.getWxMpConfigStorage().isAccessTokenExpired() || forceRefresh) {
         String url = String.format(WxMpService.GET_ACCESS_TOKEN_URL,
           this.getWxMpConfigStorage().getAppId(), this.getWxMpConfigStorage().getSecret());
 

From 8881cefb12b6d1b355b33b94ca824825d93f6493 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 26 Aug 2017 21:01:28 +0800
Subject: [PATCH 80/85] =?UTF-8?q?#322=20=E4=B8=BAme.chanjar.weixin.mp.bean?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84bean=E7=B1=BB=E5=AE=9E=E7=8E=B0Serializable?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=B9=B6=E5=A2=9E=E5=8A=A0serialVer?=
 =?UTF-8?q?sionUID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/mp/bean/WxMpCard.java   |  5 +-
 .../chanjar/weixin/mp/bean/WxMpMassNews.java  |  5 +-
 .../mp/bean/WxMpMassPreviewMessage.java       |  1 +
 .../weixin/mp/bean/WxMpMassTagMessage.java    |  2 +-
 .../chanjar/weixin/mp/bean/WxMpMassVideo.java |  5 +-
 .../weixin/mp/bean/WxMpSemanticQuery.java     |  5 +-
 .../weixin/mp/bean/WxMpShakeInfoResult.java   |  1 +
 .../weixin/mp/bean/WxMpShakeQuery.java        |  4 +-
 .../chanjar/weixin/mp/bean/WxMpUserQuery.java | 16 +++---
 .../datacube/WxDataCubeArticleResult.java     |  3 +-
 .../bean/datacube/WxDataCubeArticleTotal.java |  3 +-
 .../WxDataCubeArticleTotalDetail.java         |  5 +-
 .../bean/datacube/WxDataCubeBaseResult.java   | 14 +++--
 .../datacube/WxDataCubeInterfaceResult.java   |  3 +-
 .../mp/bean/datacube/WxDataCubeMsgResult.java |  3 +-
 .../bean/datacube/WxDataCubeUserCumulate.java |  1 -
 .../mp/bean/device/AbstractDeviceBean.java    |  6 ++-
 .../weixin/mp/bean/device/BaseResp.java       |  2 +
 .../weixin/mp/bean/device/RespMsg.java        |  2 +
 .../weixin/mp/bean/device/TransMsgResp.java   |  2 +
 .../weixin/mp/bean/device/WxDevice.java       |  6 ++-
 .../mp/bean/device/WxDeviceAuthorize.java     |  2 +
 .../bean/device/WxDeviceAuthorizeResult.java  |  2 +
 .../weixin/mp/bean/device/WxDeviceBind.java   |  2 +
 .../bean/device/WxDeviceBindDeviceResult.java |  2 +
 .../mp/bean/device/WxDeviceBindResult.java    |  2 +
 .../weixin/mp/bean/device/WxDeviceMsg.java    |  2 +
 .../mp/bean/device/WxDeviceOpenIdResult.java  |  2 +
 .../mp/bean/device/WxDeviceQrCodeResult.java  |  2 +
 .../mp/bean/kefu/result/WxMpKfList.java       |  5 +-
 .../mp/bean/kefu/result/WxMpKfMsgList.java    |  5 +-
 .../mp/bean/kefu/result/WxMpKfMsgRecord.java  |  6 ++-
 .../mp/bean/kefu/result/WxMpKfOnlineList.java |  5 +-
 .../mp/bean/kefu/result/WxMpKfSession.java    |  6 ++-
 .../kefu/result/WxMpKfSessionGetResult.java   |  6 ++-
 .../bean/kefu/result/WxMpKfSessionList.java   |  5 +-
 .../result/WxMpKfSessionWaitCaseList.java     |  5 +-
 .../bean/material/WxMediaImgUploadResult.java |  3 --
 .../weixin/mp/bean/material/WxMpMaterial.java |  4 +-
 .../material/WxMpMaterialArticleUpdate.java   |  5 +-
 .../material/WxMpMaterialCountResult.java     |  1 +
 .../WxMpMaterialFileBatchGetResult.java       |  1 +
 .../material/WxMpMaterialVideoInfoResult.java |  5 +-
 .../bean/membercard/MemberCardUserInfo.java   |  5 +-
 .../weixin/mp/bean/membercard/NameValues.java |  6 ++-
 .../mp/bean/membercard/NotifyOptional.java    | 19 +++++--
 .../WxMpMemberCardActivatedMessage.java       | 53 ++++++++++++++-----
 .../WxMpMemberCardUpdateMessage.java          | 47 ++++++++++++----
 .../WxMpMemberCardUpdateResult.java           | 13 ++---
 .../WxMpMemberCardUserInfoResult.java         | 16 ++----
 .../bean/menu/WxMpGetSelfMenuInfoResult.java  |  6 ++-
 .../chanjar/weixin/mp/bean/menu/WxMpMenu.java |  4 +-
 .../weixin/mp/bean/menu/WxMpSelfMenuInfo.java |  5 +-
 .../weixin/mp/bean/message/HardWare.java      |  6 ++-
 .../weixin/mp/bean/message/ScanCodeInfo.java  |  7 ++-
 .../mp/bean/message/SendLocationInfo.java     |  5 +-
 .../weixin/mp/bean/message/SendPicsInfo.java  | 10 +++-
 .../mp/bean/message/WxMpXmlMessage.java       |  1 -
 .../bean/message/WxMpXmlOutImageMessage.java  |  5 +-
 .../mp/bean/message/WxMpXmlOutMessage.java    |  1 -
 .../bean/message/WxMpXmlOutMusicMessage.java  |  5 +-
 .../bean/message/WxMpXmlOutNewsMessage.java   |  5 +-
 .../bean/message/WxMpXmlOutTextMessage.java   |  5 +-
 .../WxMpXmlOutTransferKefuMessage.java        |  5 +-
 .../bean/message/WxMpXmlOutVideoMessage.java  | 10 ++--
 .../bean/message/WxMpXmlOutVoiceMessage.java  |  5 +-
 .../weixin/mp/bean/result/WxMpCardResult.java |  4 --
 .../bean/result/WxMpCurrentAutoReplyInfo.java | 33 +++++++++---
 .../mp/bean/result/WxMpMassSendResult.java    |  1 +
 .../mp/bean/result/WxMpMassUploadResult.java  |  8 ++-
 .../mp/bean/result/WxMpOAuth2AccessToken.java | 14 +----
 .../mp/bean/result/WxMpQrCodeTicket.java      |  5 +-
 .../bean/result/WxMpSemanticQueryResult.java  |  5 +-
 .../weixin/mp/bean/result/WxMpUser.java       |  2 +-
 .../result/WxMpUserBlacklistGetResult.java    |  5 +-
 .../weixin/mp/bean/result/WxMpUserList.java   |  4 +-
 .../mp/bean/store/WxMpStoreBaseInfo.java      | 22 ++++++--
 .../weixin/mp/bean/store/WxMpStoreInfo.java   |  6 ++-
 .../mp/bean/store/WxMpStoreListResult.java    |  9 +++-
 .../weixin/mp/bean/tag/WxTagListUser.java     | 12 +++--
 .../chanjar/weixin/mp/bean/tag/WxUserTag.java | 11 ++--
 .../weixin/mp/bean/template/WxMpTemplate.java |  9 ++--
 .../mp/bean/template/WxMpTemplateData.java    |  2 +-
 .../bean/template/WxMpTemplateIndustry.java   |  1 +
 .../mp/bean/template/WxMpTemplateMessage.java |  4 +-
 85 files changed, 369 insertions(+), 204 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java
index bc50ce059e..76fc4a6451 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpCard.java
@@ -3,13 +3,16 @@
 
 import me.chanjar.weixin.common.util.ToStringUtils;
 
+import java.io.Serializable;
+
 /**
  * 微信卡券
  *
  * @author YuJian
  * @version 15/11/11
  */
-public class WxMpCard {
+public class WxMpCard implements Serializable{
+  private static final long serialVersionUID = 9214301870017772921L;
 
   private String cardId;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java
index dc1acd3bd3..bb19f0e79e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassNews.java
@@ -13,11 +13,8 @@
  * @author chanjarster
  */
 public class WxMpMassNews implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 565937155013581016L;
+
   private List<WxMpMassNewsArticle> articles = new ArrayList<>();
 
   public List<WxMpMassNewsArticle> getArticles() {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java
index d70ac57071..503bdec43b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassPreviewMessage.java
@@ -9,6 +9,7 @@
  */
 public class WxMpMassPreviewMessage implements Serializable {
   private static final long serialVersionUID = 9095211638358424020L;
+
   private String toWxUserName;
   private String toWxUserOpenid;
   private String msgType;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassTagMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassTagMessage.java
index cdf14f79bd..acf9d0f4c1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassTagMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassTagMessage.java
@@ -10,8 +10,8 @@
  * @author chanjarster
  */
 public class WxMpMassTagMessage implements Serializable {
-
   private static final long serialVersionUID = -6625914040986749286L;
+
   private Long tagId;
   private String msgType;
   private String content;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java
index 38eef7c8a1..1683be5bdf 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpMassVideo.java
@@ -10,11 +10,8 @@
  * @author chanjarster
  */
 public class WxMpMassVideo implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 9153925016061915637L;
+
   private String mediaId;
   private String title;
   private String description;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java
index f4b1c3da00..8c18a6a9ea 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpSemanticQuery.java
@@ -12,11 +12,8 @@
  * @author Daniel Qian
  */
 public class WxMpSemanticQuery implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 7685873048199870690L;
+
   private String query;
   private String category;
   private Float latitude;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeInfoResult.java
index ac94b457b0..5fb2ab1735 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeInfoResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeInfoResult.java
@@ -11,6 +11,7 @@
  * @author rememberber
  */
 public class WxMpShakeInfoResult implements Serializable {
+  private static final long serialVersionUID = -1604561297395395468L;
 
   private Integer errcode;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeQuery.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeQuery.java
index bb9d326fad..0f4aeadd19 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeQuery.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpShakeQuery.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -10,7 +11,8 @@
  *
  * @author rememberber
  */
-public class WxMpShakeQuery {
+public class WxMpShakeQuery implements Serializable {
+  private static final long serialVersionUID = 4316527352035275412L;
 
   private String ticket;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java
index 800e03e915..243163c28b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/WxMpUserQuery.java
@@ -14,7 +14,9 @@
  *
  * @author LiuJunGuang
  */
-public class WxMpUserQuery {
+public class WxMpUserQuery implements Serializable {
+  private static final long serialVersionUID = -1344224837373149313L;
+
   private List<WxMpUserQueryParam> queryParamList = new ArrayList<>();
 
   public WxMpUserQuery() {
@@ -24,7 +26,7 @@ public WxMpUserQuery() {
   /**
    * 语言使用默认(zh_CN)
    *
-   * @param openids
+   * @param openids openid列表
    */
   public WxMpUserQuery(List<String> openids) {
     super();
@@ -34,7 +36,7 @@ public WxMpUserQuery(List<String> openids) {
   /**
    * 添加OpenId列表，语言使用默认(zh_CN)
    *
-   * @param openids
+   * @param openids openid列表
    * @return {@link WxMpUserQuery}
    */
   public WxMpUserQuery add(List<String> openids) {
@@ -47,7 +49,7 @@ public WxMpUserQuery add(List<String> openids) {
   /**
    * 添加一个OpenId
    *
-   * @param openid
+   * @param openid openid
    * @param lang   国家地区语言版本，zh_CN 简体，zh_TW 繁体，en 英语
    * @return {@link WxMpUserQuery}
    */
@@ -63,7 +65,7 @@ public WxMpUserQuery add(String openid, String lang) {
    * 该方法默认lang = zh_CN
    * </pre>
    *
-   * @param openid
+   * @param openid openid
    * @return {@link WxMpUserQuery}
    */
   public WxMpUserQuery add(String openid) {
@@ -74,7 +76,7 @@ public WxMpUserQuery add(String openid) {
   /**
    * 删除指定的OpenId，语言使用默认(zh_CN)
    *
-   * @param openid
+   * @param openid openid
    * @return {@link WxMpUserQuery}
    */
   public WxMpUserQuery remove(String openid) {
@@ -85,7 +87,7 @@ public WxMpUserQuery remove(String openid) {
   /**
    * 删除指定的OpenId
    *
-   * @param openid
+   * @param openid openid
    * @param lang   国家地区语言版本，zh_CN 简体，zh_TW 繁体，en 英语
    * @return {@link WxMpUserQuery}
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java
index fe6627d244..e6518064bb 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleResult.java
@@ -14,8 +14,7 @@
  *         Created by Binary Wang on 2016/8/24.
  */
 public class WxDataCubeArticleResult extends WxDataCubeBaseResult {
-
-  private static final JsonParser JSON_PARSER = new JsonParser();
+  private static final long serialVersionUID = -9222452497954511765L;
 
   /**
    * ref_hour
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java
index eee6240f7b..a059c45f3b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotal.java
@@ -14,8 +14,7 @@
  *         Created by Binary Wang on 2016/8/24.
  */
 public class WxDataCubeArticleTotal extends WxDataCubeBaseResult {
-
-  private static final JsonParser JSON_PARSER = new JsonParser();
+  private static final long serialVersionUID = -7634365687303052699L;
 
   /**
    * msgid
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java
index 27f9b8aa12..86897427d1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeArticleTotalDetail.java
@@ -2,13 +2,16 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 /**
  * 获取图文群发总数据接口(getarticletotal)中的详细字段
  *
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
  *         Created by Binary Wang on 2016/8/24.
  */
-public class WxDataCubeArticleTotalDetail {
+public class WxDataCubeArticleTotalDetail implements Serializable{
+  private static final long serialVersionUID = -5136169129771430052L;
 
   /**
    * stat_date
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java
index 25fbcc62a9..cfc8636143 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeBaseResult.java
@@ -1,15 +1,23 @@
 package me.chanjar.weixin.mp.bean.datacube;
 
+import com.google.gson.JsonParser;
 import com.google.gson.annotations.SerializedName;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
+import java.io.Serializable;
+
 /**
- * 统计接口的共用属性类
+ * <pre>
+ *  统计接口的共用属性类
+ *  Created by Binary Wang on 2016/8/25.
+ * </pre>
  *
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
- *         Created by Binary Wang on 2016/8/25.
  */
-public class WxDataCubeBaseResult {
+public abstract class WxDataCubeBaseResult implements Serializable {
+  private static final long serialVersionUID = 8780389911053297600L;
+  protected static final JsonParser JSON_PARSER = new JsonParser();
+
   /**
    * ref_date
    * 数据的日期，需在begin_date和end_date之间
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java
index 9606c6f98d..fce9fc2018 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeInterfaceResult.java
@@ -14,8 +14,7 @@
  *         Created by Binary Wang on 2016/8/30.
  */
 public class WxDataCubeInterfaceResult extends WxDataCubeBaseResult {
-
-  private static final JsonParser JSON_PARSER = new JsonParser();
+  private static final long serialVersionUID = 597734329161281398L;
 
   /**
    * ref_hour
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java
index b3592190dc..4800c9c422 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeMsgResult.java
@@ -14,8 +14,7 @@
  *         Created by Binary Wang on 2016/8/29.
  */
 public class WxDataCubeMsgResult extends WxDataCubeBaseResult {
-
-  private static final JsonParser JSON_PARSER = new JsonParser();
+  private static final long serialVersionUID = 6932121822150573659L;
 
   /**
    * ref_hour
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserCumulate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserCumulate.java
index 32f8d5f5c0..d3237a3b6e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserCumulate.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/datacube/WxDataCubeUserCumulate.java
@@ -16,7 +16,6 @@
  * </pre>
  */
 public class WxDataCubeUserCumulate implements Serializable {
-
   private static final JsonParser JSON_PARSER = new JsonParser();
 
   private static final long serialVersionUID = -3570981300225093657L;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/AbstractDeviceBean.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/AbstractDeviceBean.java
index 3a327069bc..4aef452270 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/AbstractDeviceBean.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/AbstractDeviceBean.java
@@ -2,10 +2,14 @@
 
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * Created by keungtung on 14/12/2016.
  */
-public abstract class AbstractDeviceBean {
+public abstract class AbstractDeviceBean implements Serializable{
+  private static final long serialVersionUID = 4359729626772515385L;
+
   public String toJson() {
     return WxGsonBuilder.create().toJson(this);
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java
index 4b6e52d85c..7d1fd8aa77 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/BaseResp.java
@@ -6,6 +6,8 @@
  * Created by keungtung on 10/12/2016.
  */
 public class BaseResp extends AbstractDeviceBean {
+  private static final long serialVersionUID = 4252655933699659073L;
+
   @SerializedName("base_info")
   private BaseInfo baseInfo;
   @SerializedName("errcode")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java
index 1932e1d166..9c62d36f93 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/RespMsg.java
@@ -7,6 +7,8 @@
  */
 
 public class RespMsg extends AbstractDeviceBean {
+  private static final long serialVersionUID = -4241272701707684136L;
+
   @SerializedName("ret_code")
   private Integer retCode;
   @SerializedName("error_info")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java
index 31525f6bad..1572da75ac 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/TransMsgResp.java
@@ -7,6 +7,8 @@
  * Created by keungtung on 14/12/2016.
  */
 public class TransMsgResp extends AbstractDeviceBean {
+  private static final long serialVersionUID = 5386954916622816491L;
+
   private Integer ret;
   @SerializedName("ret_info")
   private String retInfo;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java
index c0f95dbf2a..4527d368d2 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDevice.java
@@ -2,10 +2,14 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 /**
  * Created by keungtung on 10/12/2016.
  */
-public class WxDevice {
+public class WxDevice implements Serializable {
+  private static final long serialVersionUID = -3284819760735456195L;
+
   private String id;
   private String mac;
   @SerializedName("connect_protocol")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java
index 0318754e57..055e41c879 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorize.java
@@ -10,6 +10,8 @@
  * Created by keungtung on 10/12/2016.
  */
 public class WxDeviceAuthorize extends AbstractDeviceBean {
+  private static final long serialVersionUID = 8786321356569903887L;
+
   @SerializedName("device_num")
   private String deviceNum;
   @SerializedName("op_type")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java
index 83ea27c5b2..560f5498bb 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceAuthorizeResult.java
@@ -8,6 +8,8 @@
  * Created by keungtung on 10/12/2016.
  */
 public class WxDeviceAuthorizeResult extends AbstractDeviceBean {
+  private static final long serialVersionUID = 9105294570912249811L;
+
   private List<BaseResp> resp;
 
   public static WxDeviceAuthorizeResult fromJson(String response) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java
index 1acf59628a..4945cfbbf2 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBind.java
@@ -6,6 +6,8 @@
  * Created by keungtung on 10/12/2016.
  */
 public class WxDeviceBind extends AbstractDeviceBean {
+  private static final long serialVersionUID = 467559769037590880L;
+
   private String ticket;
   @SerializedName("device_id")
   private String deviceId;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java
index d0ed2dcd60..52c5f45609 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindDeviceResult.java
@@ -9,6 +9,8 @@
  * Created by keungtung on 16/12/2016.
  */
 public class WxDeviceBindDeviceResult extends AbstractDeviceBean {
+  private static final long serialVersionUID = 725870295905935355L;
+
   @SerializedName("resp_msg")
   private RespMsg respMsg;
   @SerializedName("openid")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java
index 2cbf007835..c26e9c85d1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceBindResult.java
@@ -7,6 +7,8 @@
  * Created by keungtung on 10/12/2016.
  */
 public class WxDeviceBindResult extends AbstractDeviceBean {
+  private static final long serialVersionUID = 4687725146279339359L;
+
   @SerializedName("base_resp")
   private BaseResp baseResp;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java
index 680209fd71..182cb27241 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceMsg.java
@@ -7,6 +7,8 @@
  * Created by keungtung on 10/12/2016.
  */
 public class WxDeviceMsg extends AbstractDeviceBean {
+  private static final long serialVersionUID = -5567110858455277963L;
+
   @SerializedName("device_type")
   private String deviceType;
   @SerializedName("device_id")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java
index 0a23eddd3a..a2ea56c080 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceOpenIdResult.java
@@ -9,6 +9,8 @@
  * Created by keungtung on 16/12/2016.
  */
 public class WxDeviceOpenIdResult extends AbstractDeviceBean {
+  private static final long serialVersionUID = 4980885167833836220L;
+
   @SerializedName("errcode")
   private Integer errCode;
   @SerializedName("errmsg")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java
index ff3028be4f..8d6efac90b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/device/WxDeviceQrCodeResult.java
@@ -7,6 +7,8 @@
  * Created by keungtung on 10/12/2016.
  */
 public class WxDeviceQrCodeResult extends AbstractDeviceBean {
+  private static final long serialVersionUID = -4312858303060918266L;
+
   @SerializedName("deviceid")
   private String deviceId;
   @SerializedName("qrticket")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfList.java
index b5cef947a9..5cce093dfc 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfList.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfList.java
@@ -4,12 +4,15 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author Binary Wang
  */
-public class WxMpKfList {
+public class WxMpKfList implements Serializable {
+  private static final long serialVersionUID = -8194193505173564894L;
+
   @SerializedName("kf_list")
   private List<WxMpKfInfo> kfList;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java
index 02d249192f..253652a883 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgList.java
@@ -4,12 +4,15 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * Created by Binary Wang on 2016/7/15.
  */
-public class WxMpKfMsgList {
+public class WxMpKfMsgList implements Serializable {
+  private static final long serialVersionUID = 4524296707435188202L;
+
   @SerializedName("recordlist")
   private List<WxMpKfMsgRecord> records;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java
index c7ada50081..1b32164879 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfMsgRecord.java
@@ -3,10 +3,14 @@
 import com.google.gson.annotations.SerializedName;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
+import java.io.Serializable;
+
 /**
  * Created by Binary Wang on 2016/7/18.
  */
-public class WxMpKfMsgRecord {
+public class WxMpKfMsgRecord implements Serializable {
+  private static final long serialVersionUID = -280692188908528688L;
+
   /**
    * worker	完整客服帐号，格式为：帐号前缀@公众号微信号
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfOnlineList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfOnlineList.java
index 1f7545cbfa..6778520c2b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfOnlineList.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfOnlineList.java
@@ -4,12 +4,15 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author Binary Wang
  */
-public class WxMpKfOnlineList {
+public class WxMpKfOnlineList implements Serializable {
+  private static final long serialVersionUID = -6154705288500854617L;
+
   @SerializedName("kf_online_list")
   private List<WxMpKfInfo> kfOnlineList;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSession.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSession.java
index 500fc7577a..b36edb9f2d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSession.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSession.java
@@ -3,10 +3,14 @@
 import com.google.gson.annotations.SerializedName;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
+import java.io.Serializable;
+
 /**
  * @author Binary Wang
  */
-public class WxMpKfSession {
+public class WxMpKfSession implements Serializable {
+  private static final long serialVersionUID = 7804332813164994062L;
+
   /**
    * kf_account 正在接待的客服，为空表示没有人在接待
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionGetResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionGetResult.java
index b0177acdfd..d6ed763e9f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionGetResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionGetResult.java
@@ -4,10 +4,14 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * @author Binary Wang
  */
-public class WxMpKfSessionGetResult {
+public class WxMpKfSessionGetResult implements Serializable {
+  private static final long serialVersionUID = 8474846575200033152L;
+
   /**
    * kf_account 正在接待的客服，为空表示没有人在接待
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionList.java
index dd03668695..f1eb4dd7cb 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionList.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionList.java
@@ -4,12 +4,15 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author Binary Wang
  */
-public class WxMpKfSessionList {
+public class WxMpKfSessionList implements Serializable {
+  private static final long serialVersionUID = -7680371346226640206L;
+
   /**
    * 会话列表
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionWaitCaseList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionWaitCaseList.java
index 562113f191..7dd8def8cf 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionWaitCaseList.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/kefu/result/WxMpKfSessionWaitCaseList.java
@@ -4,12 +4,15 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author Binary Wang
  */
-public class WxMpKfSessionWaitCaseList {
+public class WxMpKfSessionWaitCaseList implements Serializable {
+  private static final long serialVersionUID = 2432132626631361922L;
+
   /**
    * count 未接入会话数量
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMediaImgUploadResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMediaImgUploadResult.java
index 387a791ac6..1110a1f16b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMediaImgUploadResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMediaImgUploadResult.java
@@ -8,9 +8,6 @@
  * @author miller
  */
 public class WxMediaImgUploadResult implements Serializable {
-  /**
-   *
-   */
   private static final long serialVersionUID = 1996392453428768829L;
   private String url;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterial.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterial.java
index 8725510a84..e176620f43 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterial.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterial.java
@@ -1,10 +1,12 @@
 package me.chanjar.weixin.mp.bean.material;
 
 import java.io.File;
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-public class WxMpMaterial {
+public class WxMpMaterial implements Serializable {
+  private static final long serialVersionUID = -1651816949780969485L;
 
   private String name;
   private File file;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialArticleUpdate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialArticleUpdate.java
index 371b7e0d30..f2f7aa1201 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialArticleUpdate.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialArticleUpdate.java
@@ -5,11 +5,8 @@
 import java.io.Serializable;
 
 public class WxMpMaterialArticleUpdate implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = -7611963949517780270L;
+
   private String mediaId;
   private int index;
   private WxMpMaterialNews.WxMpMaterialNewsArticle articles;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialCountResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialCountResult.java
index 6dd74889ca..4a74b6b64b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialCountResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialCountResult.java
@@ -6,6 +6,7 @@
 
 public class WxMpMaterialCountResult implements Serializable {
   private static final long serialVersionUID = -5568772662085874138L;
+
   private int voiceCount;
   private int videoCount;
   private int imageCount;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialFileBatchGetResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialFileBatchGetResult.java
index 5df9f4546c..b08a0ce3c4 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialFileBatchGetResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialFileBatchGetResult.java
@@ -8,6 +8,7 @@
 
 public class WxMpMaterialFileBatchGetResult implements Serializable {
   private static final long serialVersionUID = -560388368297267884L;
+
   private int totalCount;
   private int itemCount;
   private List<WxMaterialFileBatchGetNewsItem> items;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialVideoInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialVideoInfoResult.java
index be5dd3f844..e0558cc888 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialVideoInfoResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpMaterialVideoInfoResult.java
@@ -5,11 +5,8 @@
 import java.io.Serializable;
 
 public class WxMpMaterialVideoInfoResult implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 1269131745333792202L;
+
   private String title;
   private String description;
   private String downUrl;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java
index 336008b085..b9c771c487 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/MemberCardUserInfo.java
@@ -1,9 +1,12 @@
 package me.chanjar.weixin.mp.bean.membercard;
 
+import java.io.Serializable;
+
 /**
  * Created by YuJian on 2017/7/11.
  */
-public class MemberCardUserInfo {
+public class MemberCardUserInfo implements Serializable {
+  private static final long serialVersionUID = -4259196162619282129L;
 
   private NameValues[] commonFieldList;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java
index ae30d7a9a4..a5c62e5e6a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NameValues.java
@@ -1,9 +1,13 @@
 package me.chanjar.weixin.mp.bean.membercard;
 
+import java.io.Serializable;
+
 /**
  * Created by YuJian on 2017/7/11.
  */
-public class NameValues {
+public class NameValues implements Serializable{
+  private static final long serialVersionUID = -8529369702944594330L;
+
   private String name;
 
   private String value;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java
index a8adae8ac7..e44ec4b5ac 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/NotifyOptional.java
@@ -2,26 +2,37 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 /**
+ * <pre>
  * 控制原生消息结构体，包含各字段的消息控制字段。
  *
  * 用于 `7 更新会员信息` 的接口参数调用
  * https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1451025283
+ * </pre>
  *
  * @author YuJian(mgcnrx11@gmail.com)
  * @version 2017/7/15
  */
-public class NotifyOptional {
+public class NotifyOptional implements Serializable {
+  private static final long serialVersionUID = 4488842021504939176L;
 
-  // 积分变动时是否触发系统模板消息，默认为true
+  /**
+   * 积分变动时是否触发系统模板消息，默认为true
+   */
   @SerializedName("is_notify_bonus")
   private Boolean isNotifyBonus;
 
-  // 余额变动时是否触发系统模板消息，默认为true
+  /**
+   * 余额变动时是否触发系统模板消息，默认为true
+   */
   @SerializedName("is_notify_balance")
   private Boolean isNotifyBalance;
 
-  // 自定义group1变动时是否触发系统模板消息，默认为false。（2、3同理）
+  /**
+   * 自定义group1变动时是否触发系统模板消息，默认为false。（2、3同理）
+   */
   @SerializedName("is_notify_custom_field1")
   private Boolean isNotifyCustomField1;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java
index 8040224a09..0c782e3c51 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardActivatedMessage.java
@@ -2,47 +2,74 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 /**
  * 会员卡激活接口的参数
  *
  * @author YuJian(mgcnrx11@hotmail.com)
  * @version 2017/7/8
  */
-public class WxMpMemberCardActivatedMessage {
+public class WxMpMemberCardActivatedMessage implements Serializable {
+  private static final long serialVersionUID = -5972713484594266480L;
 
-  // 会员卡编号，由开发者填入，作为序列号显示在用户的卡包里。可与Code码保持等值。
+  /**
+   * 会员卡编号，由开发者填入，作为序列号显示在用户的卡包里。可与Code码保持等值。
+   */
   @SerializedName("membership_number")
   private String membershipNumber;
-  // 领取会员卡用户获得的code
+  /**
+   * 领取会员卡用户获得的code
+   */
   private String code;
-  // 卡券ID,自定义code卡券必填
+  /**
+   * 卡券ID,自定义code卡券必填
+   */
   @SerializedName("card_id")
   private String cardId;
-  // 商家自定义会员卡背景图，须先调用上传图片接口将背景图上传至CDN，否则报错。卡面设计请遵循微信会员卡自定义背景设计规范
+  /**
+   * 商家自定义会员卡背景图，须先调用上传图片接口将背景图上传至CDN，否则报错。卡面设计请遵循微信会员卡自定义背景设计规范
+   */
   @SerializedName("background_pic_url")
   private String backgroundPicUrl;
-  // 激活后的有效起始时间。若不填写默认以创建时的 data_info 为准。Unix时间戳格式。
+  /**
+   * 激活后的有效起始时间。若不填写默认以创建时的 data_info 为准。Unix时间戳格式。
+   */
   @SerializedName("activate_begin_time")
   private Integer activateBeginTime;
-  // 激活后的有效截至时间。若不填写默认以创建时的 data_info 为准。Unix时间戳格式。
+  /**
+   * 激活后的有效截至时间。若不填写默认以创建时的 data_info 为准。Unix时间戳格式。
+   */
   @SerializedName("activate_end_time")
   private Integer activateEndTime;
-  // 初始积分，不填为0。
+  /**
+   * 初始积分，不填为0。
+   */
   @SerializedName("init_bonus")
   private Integer initBonus;
-  // 积分同步说明。
+  /**
+   * 积分同步说明。
+   */
   @SerializedName("init_bonus_record")
   private String initBonusRecord;
-  // 初始余额，不填为0。
+  /**
+   * 初始余额，不填为0。
+   */
   @SerializedName("init_balance")
   private Integer initBalance;
-  // 创建时字段custom_field1定义类型的初始值，限制为4个汉字，12字节。
+  /**
+   * 创建时字段custom_field1定义类型的初始值，限制为4个汉字，12字节。
+   */
   @SerializedName("init_custom_field_value1")
   private String initCustomFieldValue1;
-  // 创建时字段custom_field2定义类型的初始值，限制为4个汉字，12字节。
+  /**
+   * 创建时字段custom_field2定义类型的初始值，限制为4个汉字，12字节。
+   */
   @SerializedName("init_custom_field_value2")
   private String initCustomFieldValue2;
-  // 创建时字段custom_field3定义类型的初始值，限制为4个汉字，12字节。
+  /**
+   * 创建时字段custom_field3定义类型的初始值，限制为4个汉字，12字节。
+   */
   @SerializedName("init_custom_field_value3")
   private String initCustomFieldValue3;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java
index f4d410185d..313ba66282 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateMessage.java
@@ -2,44 +2,69 @@
 
 import com.google.gson.annotations.SerializedName;
 
+import java.io.Serializable;
+
 /**
+ * <pre>
  * 更新会员信息所需字段消息。
  *
  * 1.开发者可以同时传入add_bonus和bonus解决由于同步失败带来的幂等性问题。同时传入add_bonus和bonus时
  * add_bonus作为积分变动消息中的变量值，而bonus作为卡面上的总积分额度显示。余额变动同理。
  * 2.开发者可以传入is_notify_bonus控制特殊的积分对账变动不发送消息，余额变动同理。
+ * </pre>
  *
  * @author YuJian(mgcnrx11@gmail.com)
  * @version 2017/7/15
  */
-public class WxMpMemberCardUpdateMessage {
+public class WxMpMemberCardUpdateMessage implements Serializable {
+  private static final long serialVersionUID = 4953923160718911058L;
 
-  // 领取会员卡用户获得的code
+  /**
+   * 领取会员卡用户获得的code
+   */
   private String code;
-  // 卡券ID,自定义code卡券必填
+  /**
+   * 卡券ID,自定义code卡券必填
+   */
   @SerializedName("card_id")
   private String cardId;
-  // 支持商家激活时针对单个会员卡分配自定义的会员卡背景
+  /**
+   * 支持商家激活时针对单个会员卡分配自定义的会员卡背景
+   */
   @SerializedName("background_pic_url")
   private String backgroundPicUrl;
-  // 需要设置的积分全量值，传入的数值会直接显示
+  /**
+   * 需要设置的积分全量值，传入的数值会直接显示
+   */
   private Integer bonus;
-  // 本次积分变动值，传负数代表减少
+  /**
+   * 本次积分变动值，传负数代表减少
+   */
   @SerializedName("add_bonus")
   private Integer addBounus;
-  // 商家自定义积分消耗记录，不超过14个汉字
+  /**
+   * 商家自定义积分消耗记录，不超过14个汉字
+   */
   @SerializedName("record_bonus")
   private String recordBonus;
-  // 需要设置的余额全量值，传入的数值会直接显示在卡面
+  /**
+   * 需要设置的余额全量值，传入的数值会直接显示在卡面
+   */
   private Integer balance;
-  // 本次余额变动值，传负数代表减少
+  /**
+   * 本次余额变动值，传负数代表减少
+   */
   @SerializedName("add_balance")
   private Integer addBalance;
-  // 商家自定义金额消耗记录，不超过14个汉字。
+  /**
+   * 商家自定义金额消耗记录，不超过14个汉字。
+   */
   @SerializedName("record_balance")
   private String recordBalance;
 
-  // 创建时字段custom_field定义类型的最新数值，限制为4个汉字，12字节。
+  /**
+   * 创建时字段custom_field定义类型的最新数值，限制为4个汉字，12字节。
+   */
   @SerializedName("custom_field_value1")
   private String customFieldValue1;
   @SerializedName("custom_field_value2")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java
index e615cb0721..2cbe2efb2f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUpdateResult.java
@@ -1,17 +1,20 @@
 package me.chanjar.weixin.mp.bean.membercard;
 
+import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
 
 /**
+ * <pre>
  * 用于 `7 更新会员信息` 的接口调用后的返回结果
  * https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1451025283
+ * </pre>
  *
  * @author YuJian(mgcnrx11@gmail.com)
  * @version 2017/7/15
  */
-public class WxMpMemberCardUpdateResult  implements Serializable {
+public class WxMpMemberCardUpdateResult implements Serializable {
 
   private static final long serialVersionUID = 9084886191442098311L;
 
@@ -67,13 +70,7 @@ public void setResultBalance(Integer resultBalance) {
 
   @Override
   public String toString() {
-    return "WxMpMemberCardUpdateResult{" +
-      "errorCode='" + errorCode + '\'' +
-      ", errorMsg='" + errorMsg + '\'' +
-      ", openId='" + openId + '\'' +
-      ", resultBonus=" + resultBonus +
-      ", resultBalance=" + resultBalance +
-      '}';
+    return ToStringUtils.toSimpleString(this);
   }
 
   public static WxMpMemberCardUpdateResult fromJson(String json) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
index 1ddb57d34b..82a24cd297 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/WxMpMemberCardUserInfoResult.java
@@ -1,13 +1,16 @@
 package me.chanjar.weixin.mp.bean.membercard;
 
+import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
 
 /**
+ * <pre>
  * 拉取会员信息返回的结果
  *
  * 字段格式参考https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1451025283  6.2.1小节的步骤5
+ * </pre>
  *
  * @author YuJian
  * @version 2017/7/9
@@ -122,18 +125,7 @@ public void setHasActive(Boolean hasActive) {
 
   @Override
   public String toString() {
-    return "WxMpMemberCardUserInfoResult{" +
-      "errorCode='" + errorCode + '\'' +
-      ", errorMsg='" + errorMsg + '\'' +
-      ", openId='" + openId + '\'' +
-      ", nickname='" + nickname + '\'' +
-      ", membershipNumber='" + membershipNumber + '\'' +
-      ", bonus=" + bonus +
-      ", sex='" + sex + '\'' +
-      ", userInfo=" + userInfo +
-      ", userCardStatus='" + userCardStatus + '\'' +
-      ", hasActive=" + hasActive +
-      '}';
+    return ToStringUtils.toSimpleString(this);
   }
 
   public static WxMpMemberCardUserInfoResult fromJson(String json) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpGetSelfMenuInfoResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpGetSelfMenuInfoResult.java
index b78d2dc378..295a782696 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpGetSelfMenuInfoResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpGetSelfMenuInfoResult.java
@@ -4,13 +4,17 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  * Created by Binary Wang on 2016-11-25.
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
  * </pre>
  */
-public class WxMpGetSelfMenuInfoResult {
+public class WxMpGetSelfMenuInfoResult implements Serializable {
+  private static final long serialVersionUID = -5612495636936835166L;
+
   @SerializedName("selfmenu_info")
   private WxMpSelfMenuInfo selfMenuInfo;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
index 6c7d3e8650..5e93d7e0d6 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpMenu.java
@@ -16,8 +16,7 @@
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
  * </pre>
  */
-public class WxMpMenu implements Serializable{
-
+public class WxMpMenu implements Serializable {
   private static final long serialVersionUID = -5794350513426702252L;
 
   @SerializedName("menu")
@@ -56,7 +55,6 @@ public String toJson() {
   }
 
   public static class WxMpConditionalMenu implements Serializable {
-
     private static final long serialVersionUID = -2279946921755382289L;
 
     @SerializedName("button")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java
index 699a41ecfb..c278bd4c1a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/menu/WxMpSelfMenuInfo.java
@@ -3,6 +3,7 @@
 import com.google.gson.annotations.SerializedName;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,7 +13,9 @@
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
  * </pre>
  */
-public class WxMpSelfMenuInfo {
+public class WxMpSelfMenuInfo implements Serializable {
+  private static final long serialVersionUID = -81203094124202901L;
+
   /**
    * 菜单按钮
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/HardWare.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/HardWare.java
index 32dfcd7e2f..1ef3ee6b7c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/HardWare.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/HardWare.java
@@ -5,6 +5,8 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  *  Created by BinaryWang on 2017/5/4.
@@ -13,7 +15,9 @@
  * @author Binary Wang
  */
 @XStreamAlias("HardWare")
-public class HardWare {
+public class HardWare implements Serializable{
+  private static final long serialVersionUID = -1295785297354896461L;
+
   /**
    * 消息展示，目前支持myrank(排行榜)
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/ScanCodeInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/ScanCodeInfo.java
index ddebffdf61..c5c32cb522 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/ScanCodeInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/ScanCodeInfo.java
@@ -5,6 +5,8 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  *  Created by BinaryWang on 2017/5/4.
@@ -13,7 +15,9 @@
  * @author Binary Wang
  */
 @XStreamAlias("ScanCodeInfo")
-public class ScanCodeInfo {
+public class ScanCodeInfo implements Serializable {
+  private static final long serialVersionUID = 4745181270645050122L;
+
   @XStreamAlias("ScanType")
   @XStreamConverter(value = XStreamCDataConverter.class)
   private String scanType;
@@ -30,7 +34,6 @@ public String toString() {
    * 扫描类型，一般是qrcode
    */
   public String getScanType() {
-
     return this.scanType;
   }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendLocationInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendLocationInfo.java
index a397ab8193..8ecb3c8bff 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendLocationInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendLocationInfo.java
@@ -5,6 +5,8 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
+import java.io.Serializable;
+
 /**
  * <pre>
  *  Created by BinaryWang on 2017/5/4.
@@ -13,7 +15,8 @@
  * @author Binary Wang
  */
 @XStreamAlias("SendLocationInfo")
-public class SendLocationInfo {
+public class SendLocationInfo implements Serializable {
+  private static final long serialVersionUID = 6633214140499161130L;
 
   @XStreamAlias("Location_X")
   @XStreamConverter(value = XStreamCDataConverter.class)
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendPicsInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendPicsInfo.java
index 3461355c9a..cf5c374edf 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendPicsInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/SendPicsInfo.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -16,9 +17,12 @@
  * @author Binary Wang
  */
 @XStreamAlias("SendPicsInfo")
-public class SendPicsInfo {
+public class SendPicsInfo implements Serializable {
+  private static final long serialVersionUID = -4572837013294199227L;
+
   @XStreamAlias("PicList")
   protected final List<Item> picList = new ArrayList<>();
+
   @XStreamAlias("Count")
   private Long count;
 
@@ -40,7 +44,9 @@ public List<Item> getPicList() {
   }
 
   @XStreamAlias("item")
-  public static class Item {
+  public static class Item implements Serializable {
+    private static final long serialVersionUID = 7706235740094081194L;
+
     @XStreamAlias("PicMd5Sum")
     @XStreamConverter(value = XStreamCDataConverter.class)
     private String picMd5Sum;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
index 730310185c..2ea17b9e07 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessage.java
@@ -25,7 +25,6 @@
  */
 @XStreamAlias("xml")
 public class WxMpXmlMessage implements Serializable {
-
   private static final long serialVersionUID = -3586245291677274914L;
 
   ///////////////////////
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java
index f3a0740767..c18508b527 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutImageMessage.java
@@ -7,11 +7,8 @@
 
 @XStreamAlias("xml")
 public class WxMpXmlOutImageMessage extends WxMpXmlOutMessage {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = -2684778597067990723L;
+
   @XStreamAlias("Image")
   @XStreamConverter(value = XStreamMediaIdConverter.class)
   private String mediaId;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMessage.java
index ad5d5bd5ca..c84cc665b9 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMessage.java
@@ -12,7 +12,6 @@
 
 @XStreamAlias("xml")
 public abstract class WxMpXmlOutMessage implements Serializable {
-
   private static final long serialVersionUID = -381382011286216263L;
 
   @XStreamAlias("ToUserName")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java
index c9bd003681..2676e69077 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutMusicMessage.java
@@ -7,11 +7,8 @@
 
 @XStreamAlias("xml")
 public class WxMpXmlOutMusicMessage extends WxMpXmlOutMessage {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = -4159937804975448945L;
+
   @XStreamAlias("Music")
   protected final Music music = new Music();
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java
index 8865a39358..797b042525 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutNewsMessage.java
@@ -11,11 +11,8 @@
 
 @XStreamAlias("xml")
 public class WxMpXmlOutNewsMessage extends WxMpXmlOutMessage {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = -4604402850905714772L;
+
   @XStreamAlias("Articles")
   protected final List<Item> articles = new ArrayList<>();
   @XStreamAlias("ArticleCount")
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java
index 877ed2605c..7c98c625e7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTextMessage.java
@@ -7,11 +7,8 @@
 
 @XStreamAlias("xml")
 public class WxMpXmlOutTextMessage extends WxMpXmlOutMessage {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = -3972786455288763361L;
+
   @XStreamAlias("Content")
   @XStreamConverter(value = XStreamCDataConverter.class)
   private String content;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java
index 1c5f72d6d9..3a3cfc4b4c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutTransferKefuMessage.java
@@ -5,6 +5,8 @@
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
+import java.io.Serializable;
+
 @XStreamAlias("xml")
 public class WxMpXmlOutTransferKefuMessage extends WxMpXmlOutMessage {
   private static final long serialVersionUID = 1850903037285841322L;
@@ -25,7 +27,8 @@ public void setTransInfo(TransInfo transInfo) {
   }
 
   @XStreamAlias("TransInfo")
-  public static class TransInfo {
+  public static class TransInfo implements Serializable {
+    private static final long serialVersionUID = -6317885617135706056L;
 
     @XStreamAlias("KfAccount")
     @XStreamConverter(value = XStreamCDataConverter.class)
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java
index adf8849094..346cd5b160 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVideoMessage.java
@@ -5,13 +5,12 @@
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 
+import java.io.Serializable;
+
 @XStreamAlias("xml")
 public class WxMpXmlOutVideoMessage extends WxMpXmlOutMessage {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 1745902309380113978L;
+
   @XStreamAlias("Video")
   protected final Video video = new Video();
 
@@ -45,7 +44,8 @@ public void setDescription(String description) {
 
 
   @XStreamAlias("Video")
-  public static class Video {
+  public static class Video implements Serializable {
+    private static final long serialVersionUID = -6445448977569651183L;
 
     @XStreamAlias("MediaId")
     @XStreamConverter(value = XStreamCDataConverter.class)
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java
index ec354ddfe1..a810e5a0f1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/message/WxMpXmlOutVoiceMessage.java
@@ -7,11 +7,8 @@
 
 @XStreamAlias("xml")
 public class WxMpXmlOutVoiceMessage extends WxMpXmlOutMessage {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 240367390249860551L;
+
   @XStreamAlias("Voice")
   @XStreamConverter(value = XStreamMediaIdConverter.class)
   private String mediaId;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCardResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCardResult.java
index b39d2fed29..5684557bea 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCardResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCardResult.java
@@ -12,10 +12,6 @@
  * @version 15/11/11
  */
 public class WxMpCardResult implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = -7950878428289035637L;
 
   private String errorCode;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java
index 6738b8bc4a..563dc6aca8 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpCurrentAutoReplyInfo.java
@@ -7,6 +7,7 @@
 import me.chanjar.weixin.common.util.json.WxDateTypeAdapter;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
@@ -17,7 +18,9 @@
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  * </pre>
  */
-public class WxMpCurrentAutoReplyInfo {
+public class WxMpCurrentAutoReplyInfo implements Serializable {
+  private static final long serialVersionUID = 8294705001262751638L;
+
   @Override
   public String toString() {
     return ToStringUtils.toSimpleString(this);
@@ -84,7 +87,9 @@ public void setKeywordAutoReplyInfo(KeywordAutoReplyInfo keywordAutoReplyInfo) {
     this.keywordAutoReplyInfo = keywordAutoReplyInfo;
   }
 
-  public static class AutoReplyRule {
+  public static class AutoReplyRule implements Serializable {
+    private static final long serialVersionUID = -6415971838145909046L;
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
@@ -147,7 +152,9 @@ public void setReplyListInfo(List<ReplyInfo> replyListInfo) {
     }
   }
 
-  public static class ReplyInfo {
+  public static class ReplyInfo implements Serializable {
+    private static final long serialVersionUID = -3429575601599101690L;
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
@@ -184,7 +191,9 @@ public void setNewsInfo(NewsInfo newsInfo) {
     }
   }
 
-  public static class NewsInfo {
+  public static class NewsInfo implements Serializable {
+    private static final long serialVersionUID = 2958827725972593328L;
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
@@ -201,7 +210,9 @@ public void setList(List<NewsItem> list) {
     }
   }
 
-  public static class NewsItem {
+  public static class NewsItem implements Serializable {
+    private static final long serialVersionUID = -680356309029767176L;
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
@@ -277,7 +288,9 @@ public void setTitle(String title) {
     }
   }
 
-  public static class KeywordInfo {
+  public static class KeywordInfo implements Serializable {
+    private static final long serialVersionUID = 7720246983986706379L;
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
@@ -313,7 +326,9 @@ public void setContent(String content) {
     }
   }
 
-  public static class KeywordAutoReplyInfo {
+  public static class KeywordAutoReplyInfo implements Serializable {
+    private static final long serialVersionUID = -8789197949404753083L;
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
@@ -330,7 +345,9 @@ public void setList(List<AutoReplyRule> list) {
     }
   }
 
-  public static class AutoReplyInfo {
+  public static class AutoReplyInfo implements Serializable {
+    private static final long serialVersionUID = 4993719555937843712L;
+
     @Override
     public String toString() {
       return ToStringUtils.toSimpleString(this);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java
index 9341fdfbf7..56cfd13d97 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassSendResult.java
@@ -18,6 +18,7 @@
  */
 public class WxMpMassSendResult implements Serializable {
   private static final long serialVersionUID = -4816336807575562818L;
+
   private String errorCode;
   private String errorMsg;
   private String msgId;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassUploadResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassUploadResult.java
index 9862c43cc7..f8ca889652 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassUploadResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpMassUploadResult.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.bean.result;
 
+import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
@@ -13,11 +14,8 @@
  * @author chanjarster
  */
 public class WxMpMassUploadResult implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 6568157943644994029L;
+
   private String type;
   private String mediaId;
   private long createdAt;
@@ -52,7 +50,7 @@ public void setCreatedAt(long createdAt) {
 
   @Override
   public String toString() {
-    return "WxUploadResult [type=" + this.type + ", media_id=" + this.mediaId + ", created_at=" + this.createdAt + "]";
+    return ToStringUtils.toSimpleString(this);
   }
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
index b485710a9f..3f49397975 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpOAuth2AccessToken.java
@@ -1,14 +1,11 @@
 package me.chanjar.weixin.mp.bean.result;
 
+import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
 
 public class WxMpOAuth2AccessToken implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = -1345910558078620805L;
 
   private String accessToken;
@@ -77,13 +74,6 @@ public void setUnionId(String unionId) {
 
   @Override
   public String toString() {
-    return "WxMpOAuth2AccessToken{" +
-      "accessToken='" + this.accessToken + '\'' +
-      ", expiresTime=" + this.expiresIn +
-      ", refreshToken='" + this.refreshToken + '\'' +
-      ", openId='" + this.openId + '\'' +
-      ", scope='" + this.scope + '\'' +
-      ", unionId='" + this.unionId + '\'' +
-      '}';
+    return ToStringUtils.toSimpleString(this);
   }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java
index fc7d071332..7ba6151c3e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpQrCodeTicket.java
@@ -10,11 +10,8 @@
  * @author chanjarster
  */
 public class WxMpQrCodeTicket implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 5777119669111011584L;
+
   protected String ticket;
   protected int expire_seconds = -1;
   protected String url;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java
index 8fd5442c9a..723ea7adc9 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpSemanticQueryResult.java
@@ -12,11 +12,8 @@
  * @author Daniel Qian
  */
 public class WxMpSemanticQueryResult implements Serializable {
-
-  /**
-   *
-   */
   private static final long serialVersionUID = 4811088544804441365L;
+
   private String query;
   private String type;
   private String semantic;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
index f2ba9268b6..e9e2bae6c1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUser.java
@@ -16,8 +16,8 @@
  * @author chanjarster
  */
 public class WxMpUser implements Serializable {
-
   private static final long serialVersionUID = 5788154322646488738L;
+
   private Boolean subscribe;
   private String openId;
   private String nickname;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java
index 3cfbc00915..5fe0a9448b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserBlacklistGetResult.java
@@ -2,13 +2,16 @@
 
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * @author miller
  */
-public class WxMpUserBlacklistGetResult {
+public class WxMpUserBlacklistGetResult implements Serializable {
+  private static final long serialVersionUID = -8780216463588687626L;
+
   protected int total = -1;
   protected int count = -1;
   protected List<String> openidList = new ArrayList<>();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
index 2f630e5ba5..6e367aeca1 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/result/WxMpUserList.java
@@ -2,6 +2,7 @@
 
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,7 +11,8 @@
  *
  * @author chanjarster
  */
-public class WxMpUserList {
+public class WxMpUserList implements Serializable {
+  private static final long serialVersionUID = 1389073042674901032L;
 
   protected long total = -1;
   protected int count = -1;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java
index b385fbd0c4..155942a79b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreBaseInfo.java
@@ -7,16 +7,21 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
 /**
- * 门店基础信息
+ * <pre>
+ *  门店基础信息
+ *  Created by Binary Wang on 2016-09-23.
+ * </pre>
  *
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
- *         Created by Binary Wang on 2016-09-23.
  */
-public class WxMpStoreBaseInfo {
+public class WxMpStoreBaseInfo implements Serializable {
+  private static final long serialVersionUID = 829577606838118218L;
+
   /**
    * sid
    * 商户自己的id，用于后续审核通过收到poi_id 的通知时，做对应关系。请商户自己保证唯一识别性
@@ -351,12 +356,21 @@ public void setPoiId(String poiId) {
     this.poiId = poiId;
   }
 
-  public static class WxMpStorePhoto {
+  public static class WxMpStorePhoto implements Serializable {
+    private static final long serialVersionUID = -2942447907614186861L;
     /**
      * 照片url
      */
     @SerializedName("photo_url")
     private String photoUrl;
+
+    public String getPhotoUrl() {
+      return photoUrl;
+    }
+
+    public void setPhotoUrl(String photoUrl) {
+      this.photoUrl = photoUrl;
+    }
   }
 
   public static class WxMpStoreBaseInfoBuilder {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java
index 8f0b040191..fcbb9aa5ea 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreInfo.java
@@ -3,7 +3,11 @@
 import com.google.gson.annotations.SerializedName;
 import me.chanjar.weixin.common.util.ToStringUtils;
 
-public class WxMpStoreInfo {
+import java.io.Serializable;
+
+public class WxMpStoreInfo implements Serializable{
+  private static final long serialVersionUID = 7300598931768355461L;
+
   @SerializedName("base_info")
   private WxMpStoreBaseInfo baseInfo;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java
index 3b2c2fc157..6ebb58901f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/store/WxMpStoreListResult.java
@@ -4,15 +4,20 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
+ * <pre>
  * 门店列表结果类
+ * Created by Binary Wang on 2016-09-27.
+ * </pre>
  *
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
- *         Created by Binary Wang on 2016-09-27.
  */
-public class WxMpStoreListResult {
+public class WxMpStoreListResult implements Serializable {
+  private static final long serialVersionUID = 5388907559949538663L;
+
   /**
    * 错误码，0为正常
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java
index 952b764c9c..a1bd50660e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxTagListUser.java
@@ -4,15 +4,19 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
+ * <pre>
  * 获取标签下粉丝列表的结果对象
+ * Created by Binary Wang on 2016-09-19.
+ * </pre>
  *
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
- *         Created by Binary Wang on 2016-09-19.
  */
-public class WxTagListUser {
+public class WxTagListUser implements Serializable {
+  private static final long serialVersionUID = -4551768374200676112L;
 
   /**
    * "count":2,这次获取的粉丝数量
@@ -67,7 +71,9 @@ public void setNextOpenid(String nextOpenid) {
     this.nextOpenid = nextOpenid;
   }
 
-  public static class WxTagListUserData {
+  public static class WxTagListUserData implements Serializable {
+    private static final long serialVersionUID = -8584537400336245701L;
+
     /**
      * openid 列表
      */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
index 59d2458fbc..a06a1ce40a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/tag/WxUserTag.java
@@ -5,15 +5,20 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
- * 用户标签对象
+ * <pre>
+ *  用户标签对象
+ *  Created by Binary Wang on 2016/9/2.
+ * </pre>
  *
  * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
- *         Created by Binary Wang on 2016/9/2.
  */
-public class WxUserTag {
+public class WxUserTag implements Serializable {
+  private static final long serialVersionUID = -7722428695667031252L;
+
   /**
    * id	标签id，由微信分配
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java
index 38761f3d4e..079210775a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplate.java
@@ -6,18 +6,21 @@
 import me.chanjar.weixin.common.util.ToStringUtils;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * <pre>
  * 模板列表信息
  * Created by Binary Wang on 2016-10-17.
- * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
  * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">binarywang(Binary Wang)</a>
  */
-public class WxMpTemplate {
-
+public class WxMpTemplate implements Serializable {
   private static final JsonParser JSON_PARSER = new JsonParser();
+  private static final long serialVersionUID = -7366474522571199372L;
+
   /**
    * template_id
    * 模板ID
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateData.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateData.java
index 0eb0eaa58d..f9d81e4028 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateData.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateData.java
@@ -6,8 +6,8 @@
  * @author Daniel Qian
  */
 public class WxMpTemplateData implements Serializable {
-
   private static final long serialVersionUID = 6301835292940277870L;
+
   private String name;
   private String value;
   private String color;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustry.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustry.java
index 63576fc2ce..b142c3f70f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustry.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustry.java
@@ -11,6 +11,7 @@
  */
 public class WxMpTemplateIndustry implements Serializable {
   private static final long serialVersionUID = -7700398224795914722L;
+
   private Industry primaryIndustry;
   private Industry secondIndustry;
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java
index 70034a63b4..95d619a486 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateMessage.java
@@ -97,7 +97,9 @@ public String toJson() {
     return WxMpGsonBuilder.INSTANCE.create().toJson(this);
   }
 
-  public static class MiniProgram {
+  public static class MiniProgram implements Serializable {
+    private static final long serialVersionUID = -7945254706501974849L;
+
     private String appid;
     private String pagePath;
 

From b9262c93c48af4ea4792b0b48348472b396bf021 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Fri, 1 Sep 2017 19:18:08 +0800
Subject: [PATCH 81/85] =?UTF-8?q?#319=20=E5=A2=9E=E5=8A=A0=E2=80=9C?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=BB=93=E6=9E=9C=E9=80=9A=E7=9F=A5=E2=80=9C?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95=EF=BC=8C=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=B0=83=E6=95=B4=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/util/crypto/WxCryptUtil.java       |  15 +-
 .../WxPayNotifyResponse.java}                 |  15 +-
 .../{ => notify}/WxPayOrderNotifyCoupon.java  |   2 +-
 .../WxPayOrderNotifyResult.java               |   5 +-
 .../bean/notify/WxPayRefundNotifyResult.java  | 372 ++++++++++++++++++
 .../wxpay/bean/order/WxPayAppOrderResult.java | 145 +++++++
 .../wxpay/bean/order/WxPayMpOrderResult.java  | 133 +++++++
 .../bean/order/WxPayNativeOrderResult.java    |  48 +++
 .../bean/result/WxPayUnifiedOrderResult.java  |   2 +-
 .../wxpay/constant/WxPayConstants.java        |  16 +
 .../WxPayOrderNotifyResultConverter.java      |   4 +-
 .../wxpay/service/WxPayService.java           |  25 +-
 .../impl/WxPayServiceAbstractImpl.java        |  89 ++++-
 .../WxPayOrderNotifyResultTest.java           |   3 +-
 .../notify/WxPayRefundNotifyResultTest.java   |  70 ++++
 .../impl/WxPayServiceAbstractImplTest.java    |   6 +
 16 files changed, 918 insertions(+), 32 deletions(-)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{WxPayOrderNotifyResponse.java => notify/WxPayNotifyResponse.java} (79%)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{ => notify}/WxPayOrderNotifyCoupon.java (96%)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/{result => notify}/WxPayOrderNotifyResult.java (98%)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayAppOrderResult.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMpOrderResult.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayNativeOrderResult.java
 rename weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/{result => notify}/WxPayOrderNotifyResultTest.java (95%)
 create mode 100644 weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResultTest.java

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
index e362e64b2f..c91e8ac089 100755
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/crypto/WxCryptUtil.java
@@ -47,7 +47,6 @@ protected DocumentBuilder initialValue() {
   protected String appidOrCorpid;
 
   public WxCryptUtil() {
-    super();
   }
 
   /**
@@ -106,7 +105,7 @@ private static int bytesNetworkOrder2Number(byte[] bytesInNetworkOrder) {
   private static String genRandomStr() {
     String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
     Random random = new Random();
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < 16; i++) {
       int number = random.nextInt(base.length());
       sb.append(base.charAt(number));
@@ -148,12 +147,11 @@ public String encrypt(String plainText) {
     String encryptedXml = encrypt(genRandomStr(), plainText);
 
     // 生成安全签名
-    String timeStamp = Long.toString(System.currentTimeMillis() / 1000l);
+    String timeStamp = Long.toString(System.currentTimeMillis() / 1000L);
     String nonce = genRandomStr();
 
     String signature = SHA1.gen(this.token, timeStamp, nonce, encryptedXml);
-    String result = generateXml(encryptedXml, signature, timeStamp, nonce);
-    return result;
+    return generateXml(encryptedXml, signature, timeStamp, nonce);
   }
 
   /**
@@ -194,9 +192,7 @@ protected String encrypt(String randomStr, String plainText) {
       byte[] encrypted = cipher.doFinal(unencrypted);
 
       // 使用BASE64对加密后的字符串进行编码
-      String base64Encrypted = base64.encodeToString(encrypted);
-
-      return base64Encrypted;
+      return base64.encodeToString(encrypted);
     } catch (Exception e) {
       throw new RuntimeException(e);
     }
@@ -228,8 +224,7 @@ public String decrypt(String msgSignature, String timeStamp, String nonce, Strin
     }
 
     // 解密
-    String result = decrypt(cipherText);
-    return result;
+    return decrypt(cipherText);
   }
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayOrderNotifyResponse.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponse.java
similarity index 79%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayOrderNotifyResponse.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponse.java
index e369293195..e7a7ea9099 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayOrderNotifyResponse.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponse.java
@@ -1,4 +1,4 @@
-package com.github.binarywang.wxpay.bean;
+package com.github.binarywang.wxpay.bean.notify;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
@@ -7,8 +7,11 @@
 import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 import me.chanjar.weixin.common.util.xml.XStreamInitializer;
 
+/**
+ * 微信支付订单和退款的异步通知共用的响应类
+ */
 @XStreamAlias("xml")
-public class WxPayOrderNotifyResponse {
+public class WxPayNotifyResponse {
   @XStreamOmitField
   private transient static final String FAIL = "FAIL";
   @XStreamOmitField
@@ -21,25 +24,25 @@ public class WxPayOrderNotifyResponse {
   @XStreamAlias("return_msg")
   private String returnMsg;
 
-  public WxPayOrderNotifyResponse() {
+  public WxPayNotifyResponse() {
     super();
   }
 
-  public WxPayOrderNotifyResponse(String returnCode, String returnMsg) {
+  public WxPayNotifyResponse(String returnCode, String returnMsg) {
     super();
     this.returnCode = returnCode;
     this.returnMsg = returnMsg;
   }
 
   public static String fail(String msg) {
-    WxPayOrderNotifyResponse response = new WxPayOrderNotifyResponse(FAIL, msg);
+    WxPayNotifyResponse response = new WxPayNotifyResponse(FAIL, msg);
     XStream xstream = XStreamInitializer.getInstance();
     xstream.autodetectAnnotations(true);
     return xstream.toXML(response);
   }
 
   public static String success(String msg) {
-    WxPayOrderNotifyResponse response = new WxPayOrderNotifyResponse(SUCCESS, msg);
+    WxPayNotifyResponse response = new WxPayNotifyResponse(SUCCESS, msg);
     XStream xstream = XStreamInitializer.getInstance();
     xstream.autodetectAnnotations(true);
     return xstream.toXML(response);
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayOrderNotifyCoupon.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyCoupon.java
similarity index 96%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayOrderNotifyCoupon.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyCoupon.java
index c2b4e22e74..cd948dfbac 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/WxPayOrderNotifyCoupon.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyCoupon.java
@@ -1,4 +1,4 @@
-package com.github.binarywang.wxpay.bean;
+package com.github.binarywang.wxpay.bean.notify;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java
similarity index 98%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java
index a411cd2c70..54657ac6ae 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResult.java
@@ -1,6 +1,6 @@
-package com.github.binarywang.wxpay.bean.result;
+package com.github.binarywang.wxpay.bean.notify;
 
-import com.github.binarywang.wxpay.bean.WxPayOrderNotifyCoupon;
+import com.github.binarywang.wxpay.bean.result.WxPayBaseResult;
 import com.github.binarywang.wxpay.converter.WxPayOrderNotifyResultConverter;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
@@ -20,7 +20,6 @@
  */
 @XStreamAlias("xml")
 public class WxPayOrderNotifyResult extends WxPayBaseResult implements Serializable {
-
   private static final long serialVersionUID = 5389718115223345496L;
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java
new file mode 100644
index 0000000000..392c10144c
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResult.java
@@ -0,0 +1,372 @@
+package com.github.binarywang.wxpay.bean.notify;
+
+import com.github.binarywang.wxpay.bean.result.WxPayBaseResult;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import me.chanjar.weixin.common.util.ToStringUtils;
+import me.chanjar.weixin.common.util.xml.XStreamInitializer;
+import org.apache.commons.codec.binary.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+
+/**
+ * <pre>
+ *  退款结果通知对象
+ *  Created by BinaryWang on 2017/8/27.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@XStreamAlias("xml")
+public class WxPayRefundNotifyResult extends WxPayBaseResult implements Serializable {
+  private static final long serialVersionUID = 4651725860079259186L;
+
+  /**
+   * 从xml字符串创建bean对象
+   *
+   * @param xmlString xml字符串
+   * @param mchKey    商户密钥
+   */
+  public static WxPayRefundNotifyResult fromXML(String xmlString, String mchKey) throws WxPayException {
+    WxPayRefundNotifyResult result = WxPayBaseResult.fromXML(xmlString, WxPayRefundNotifyResult.class);
+    String reqInfoString = result.getReqInfoString();
+    try {
+      Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+
+      final MessageDigest md5 = MessageDigest.getInstance("MD5");
+      md5.update(mchKey.getBytes());
+      final String keyMd5String = new BigInteger(1, md5.digest()).toString(16).toLowerCase();
+      SecretKeySpec key = new SecretKeySpec(keyMd5String.getBytes(), "AES");
+      cipher.init(Cipher.DECRYPT_MODE, key);
+      result.setReqInfo(ReqInfo.fromXML(new String(cipher.doFinal(Base64.decodeBase64(reqInfoString)))));
+    } catch (Exception e) {
+      throw new WxPayException("解密退款通知加密信息时出错", e);
+    }
+
+    return result;
+  }
+
+  /**
+   * <pre>
+   * 字段名：加密信息
+   * 变量名：req_info
+   * 是否必填：是
+   * 类型：String(1024)
+   * 描述：加密信息请用商户证书与商户秘钥进行解密
+   * </pre>
+   */
+  @XStreamAlias("req_info")
+  private String reqInfoString;
+
+  private ReqInfo reqInfo;
+
+  /**
+   * 加密信息字段解密后的内容
+   */
+  @XStreamAlias("root")
+  public static class ReqInfo {
+    @Override
+    public String toString() {
+      return ToStringUtils.toSimpleString(this);
+    }
+
+    /**
+     * <pre>
+     * 字段名：微信订单号
+     * 变量名：transaction_id
+     * 是否必填：是
+     * 类型：String(32)
+     * 示例值：1217752501201407033233368018
+     * 描述：微信订单号
+     * </pre>
+     */
+    @XStreamAlias("transaction_id")
+    private String transactionId;
+
+    /**
+     * <pre>
+     * 字段名：商户订单号
+     * 变量名：out_trade_no
+     * 是否必填：是
+     * 类型：String(32)
+     * 示例值：1217752501201407033233368018
+     * 描述：商户系统内部的订单号
+     * </pre>
+     */
+    @XStreamAlias("out_trade_no")
+    private String outTradeNo;
+
+    /**
+     * <pre>
+     * 字段名：微信退款单号
+     * 变量名：refund_id
+     * 是否必填：是
+     * 类型：String(28)
+     * 示例值：1217752501201407033233368018
+     * 描述：微信退款单号
+     * </pre>
+     */
+    @XStreamAlias("refund_id")
+    private String refundId;
+
+    /**
+     * <pre>
+     * 字段名：商户退款单号
+     * 变量名：out_refund_no
+     * 是否必填：是
+     * 类型：String(64)
+     * 示例值：1217752501201407033233368018
+     * 描述：商户退款单号
+     * </pre>
+     */
+    @XStreamAlias("out_refund_no")
+    private String outRefundNo;
+
+    /**
+     * <pre>
+     * 字段名：订单金额
+     * 变量名：total_fee
+     * 是否必填：是
+     * 类型：Int
+     * 示例值：100
+     * 描述：订单总金额，单位为分，只能为整数，详见支付金额
+     * </pre>
+     */
+    @XStreamAlias("total_fee")
+    private Integer totalFee;
+
+    /**
+     * <pre>
+     * 字段名：结订单金额
+     * 变量名：settlement_total_fee
+     * 是否必填：否
+     * 类型：Int
+     * 示例值：100
+     * 描述：当该订单有使用非充值券时，返回此字段。应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
+     * </pre>
+     */
+    @XStreamAlias("settlement_total_fee")
+    private Integer settlementTotalFee;
+
+    /**
+     * <pre>
+     * 字段名：申请退款金额
+     * 变量名：refund_fee
+     * 是否必填：是
+     * 类型：Int
+     * 示例值：100
+     * 描述：退款总金额,单位为分
+     * </pre>
+     */
+    @XStreamAlias("refund_fee")
+    private Integer refundFee;
+
+    /**
+     * <pre>
+     * 字段名：退款金额
+     * 变量名：settlement_refund_fee
+     * 是否必填：是
+     * 类型：Int
+     * 示例值：100
+     * 描述：退款金额=申请退款金额-非充值代金券退款金额，退款金额<=申请退款金额
+     * </pre>
+     */
+    @XStreamAlias("settlement_refund_fee")
+    private Integer settlementRefundFee;
+
+    /**
+     * <pre>
+     * 字段名：退款状态
+     * 变量名：refund_status
+     * 是否必填：是
+     * 类型：String(16)
+     * 示例值：SUCCESS
+     * 描述：SUCCESS-退款成功，CHANGE-退款异常，REFUNDCLOSE—退款关闭
+     * </pre>
+     */
+    @XStreamAlias("refund_status")
+    private String refundStatus;
+
+    /**
+     * <pre>
+     * 字段名：退款成功时间
+     * 变量名：success_time
+     * 是否必填：否
+     * 类型： String(20)
+     * 示例值：20160725152626
+     * 描述：-
+     */
+    @XStreamAlias("success_time")
+    private String successTime;
+
+    /**
+     * <pre>
+     * 字段名：退款入账账户
+     * 变量名：refund_recv_accout
+     * 是否必填：是
+     * 类型：String(64)
+     * 示例值：招商银行信用卡0403
+     * 描述：取当前退款单的退款入账方，1）退回银行卡：{银行名称}{卡类型}{卡尾号}，2）退回支付用户零钱:支付用户零钱 ，3）退还商户: 商户基本账户，商户结算银行账户，4）退回支付用户零钱通: 支付用户零钱通
+     * </pre>
+     */
+    @XStreamAlias("refund_recv_accout")
+    private String refundRecvAccout;
+
+    /**
+     * <pre>
+     * 字段名：退款资金来源
+     * 变量名：refund_account
+     * 是否必填：是
+     * 类型：String(30)
+     * 示例值：REFUND_SOURCE_RECHARGE_FUNDS
+     * 描述：REFUND_SOURCE_RECHARGE_FUNDS 可用余额退款/基本账户，REFUND_SOURCE_UNSETTLED_FUNDS 未结算资金退款
+     * </pre>
+     */
+    @XStreamAlias("refund_account")
+    private String refundAccount;
+
+    /**
+     * <pre>
+     * 字段名：退款发起来源
+     * 变量名：refund_request_source
+     * 是否必填：是
+     * 类型：String(30)
+     * 示例值：API
+     * 描述：API接口，VENDOR_PLATFORM商户平台
+     * </pre>
+     */
+    @XStreamAlias("refund_request_source")
+    private String refundRequestSource;
+
+    public String getTransactionId() {
+      return transactionId;
+    }
+
+    public void setTransactionId(String transactionId) {
+      this.transactionId = transactionId;
+    }
+
+    public String getOutTradeNo() {
+      return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+      this.outTradeNo = outTradeNo;
+    }
+
+    public String getRefundId() {
+      return refundId;
+    }
+
+    public void setRefundId(String refundId) {
+      this.refundId = refundId;
+    }
+
+    public String getOutRefundNo() {
+      return outRefundNo;
+    }
+
+    public void setOutRefundNo(String outRefundNo) {
+      this.outRefundNo = outRefundNo;
+    }
+
+    public Integer getTotalFee() {
+      return totalFee;
+    }
+
+    public void setTotalFee(Integer totalFee) {
+      this.totalFee = totalFee;
+    }
+
+    public Integer getSettlementTotalFee() {
+      return settlementTotalFee;
+    }
+
+    public void setSettlementTotalFee(Integer settlementTotalFee) {
+      this.settlementTotalFee = settlementTotalFee;
+    }
+
+    public Integer getRefundFee() {
+      return refundFee;
+    }
+
+    public void setRefundFee(Integer refundFee) {
+      this.refundFee = refundFee;
+    }
+
+    public Integer getSettlementRefundFee() {
+      return settlementRefundFee;
+    }
+
+    public void setSettlementRefundFee(Integer settlementRefundFee) {
+      this.settlementRefundFee = settlementRefundFee;
+    }
+
+    public String getRefundStatus() {
+      return refundStatus;
+    }
+
+    public void setRefundStatus(String refundStatus) {
+      this.refundStatus = refundStatus;
+    }
+
+    public String getSuccessTime() {
+      return successTime;
+    }
+
+    public void setSuccessTime(String successTime) {
+      this.successTime = successTime;
+    }
+
+    public String getRefundRecvAccout() {
+      return refundRecvAccout;
+    }
+
+    public void setRefundRecvAccout(String refundRecvAccout) {
+      this.refundRecvAccout = refundRecvAccout;
+    }
+
+    public String getRefundAccount() {
+      return refundAccount;
+    }
+
+    public void setRefundAccount(String refundAccount) {
+      this.refundAccount = refundAccount;
+    }
+
+    public String getRefundRequestSource() {
+      return refundRequestSource;
+    }
+
+    public void setRefundRequestSource(String refundRequestSource) {
+      this.refundRequestSource = refundRequestSource;
+    }
+
+    public static ReqInfo fromXML(String xmlString) {
+      XStream xstream = XStreamInitializer.getInstance();
+      xstream.processAnnotations(ReqInfo.class);
+      return (ReqInfo) xstream.fromXML(xmlString);
+    }
+  }
+
+  public String getReqInfoString() {
+    return reqInfoString;
+  }
+
+  public void setReqInfoString(String reqInfoString) {
+    this.reqInfoString = reqInfoString;
+  }
+
+  public ReqInfo getReqInfo() {
+    return reqInfo;
+  }
+
+  public void setReqInfo(ReqInfo reqInfo) {
+    this.reqInfo = reqInfo;
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayAppOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayAppOrderResult.java
new file mode 100644
index 0000000000..6688d602c9
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayAppOrderResult.java
@@ -0,0 +1,145 @@
+package com.github.binarywang.wxpay.bean.order;
+
+/**
+ * <pre>
+ * APP支付调用统一下单接口后的组装所需参数的实现类
+ * 参考 https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=9_12
+ * Created by Binary Wang on 2017-9-1.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxPayAppOrderResult {
+  private String sign;
+  private String prepayId;
+  private String partnerId;
+  private String appId;
+  private String packageValue;
+  private String timeStamp;
+  private String nonceStr;
+
+  public WxPayAppOrderResult() {
+  }
+
+  private WxPayAppOrderResult(Builder builder) {
+    setSign(builder.sign);
+    setPrepayId(builder.prepayId);
+    setPartnerId(builder.partnerId);
+    setAppId(builder.appId);
+    setPackageValue(builder.packageValue);
+    setTimeStamp(builder.timeStamp);
+    setNonceStr(builder.nonceStr);
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public String getSign() {
+    return this.sign;
+  }
+
+  public void setSign(String sign) {
+    this.sign = sign;
+  }
+
+  public String getPrepayId() {
+    return this.prepayId;
+  }
+
+  public void setPrepayId(String prepayId) {
+    this.prepayId = prepayId;
+  }
+
+  public String getPartnerId() {
+    return this.partnerId;
+  }
+
+  public void setPartnerId(String partnerId) {
+    this.partnerId = partnerId;
+  }
+
+  public String getAppId() {
+    return this.appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public String getPackageValue() {
+    return this.packageValue;
+  }
+
+  public void setPackageValue(String packageValue) {
+    this.packageValue = packageValue;
+  }
+
+  public String getTimeStamp() {
+    return this.timeStamp;
+  }
+
+  public void setTimeStamp(String timeStamp) {
+    this.timeStamp = timeStamp;
+  }
+
+  public String getNonceStr() {
+    return this.nonceStr;
+  }
+
+  public void setNonceStr(String nonceStr) {
+    this.nonceStr = nonceStr;
+  }
+
+  public static final class Builder {
+    private String sign;
+    private String prepayId;
+    private String partnerId;
+    private String appId;
+    private String packageValue;
+    private String timeStamp;
+    private String nonceStr;
+
+    private Builder() {
+    }
+
+    public Builder sign(String sign) {
+      this.sign = sign;
+      return this;
+    }
+
+    public Builder prepayId(String prepayId) {
+      this.prepayId = prepayId;
+      return this;
+    }
+
+    public Builder partnerId(String partnerId) {
+      this.partnerId = partnerId;
+      return this;
+    }
+
+    public Builder appId(String appId) {
+      this.appId = appId;
+      return this;
+    }
+
+    public Builder packageValue(String packageValue) {
+      this.packageValue = packageValue;
+      return this;
+    }
+
+    public Builder timeStamp(String timeStamp) {
+      this.timeStamp = timeStamp;
+      return this;
+    }
+
+    public Builder nonceStr(String nonceStr) {
+      this.nonceStr = nonceStr;
+      return this;
+    }
+
+    public WxPayAppOrderResult build() {
+      return new WxPayAppOrderResult(this);
+    }
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMpOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMpOrderResult.java
new file mode 100644
index 0000000000..d1ebdee051
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMpOrderResult.java
@@ -0,0 +1,133 @@
+package com.github.binarywang.wxpay.bean.order;
+
+/**
+ * <pre>
+ * 微信公众号支付进行统一下单后组装所需参数的类
+ * 文档地址：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6
+ * Created by Binary Wang on 2017-9-1.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxPayMpOrderResult {
+  private String appId;
+  private String timeStamp;
+  private String nonceStr;
+  /**
+   * 由于package为java保留关键字，因此改为packageValue
+   */
+  private String packageValue;
+  private String signType;
+  private String paySign;
+
+  private WxPayMpOrderResult(Builder builder) {
+    setAppId(builder.appId);
+    setTimeStamp(builder.timeStamp);
+    setNonceStr(builder.nonceStr);
+    setPackageValue(builder.packageValue);
+    setSignType(builder.signType);
+    setPaySign(builder.paySign);
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public String getAppId() {
+    return this.appId;
+  }
+
+  public void setAppId(String appId) {
+    this.appId = appId;
+  }
+
+  public String getTimeStamp() {
+    return this.timeStamp;
+  }
+
+  public void setTimeStamp(String timeStamp) {
+    this.timeStamp = timeStamp;
+  }
+
+  public String getNonceStr() {
+    return this.nonceStr;
+  }
+
+  public void setNonceStr(String nonceStr) {
+    this.nonceStr = nonceStr;
+  }
+
+  public String getPackageValue() {
+    return this.packageValue;
+  }
+
+  public void setPackageValue(String packageValue) {
+    this.packageValue = packageValue;
+  }
+
+  public String getSignType() {
+    return this.signType;
+  }
+
+  public void setSignType(String signType) {
+    this.signType = signType;
+  }
+
+  public String getPaySign() {
+    return this.paySign;
+  }
+
+  public void setPaySign(String paySign) {
+    this.paySign = paySign;
+  }
+
+  public WxPayMpOrderResult() {
+  }
+
+
+  public static final class Builder {
+    private String appId;
+    private String timeStamp;
+    private String nonceStr;
+    private String packageValue;
+    private String signType;
+    private String paySign;
+
+    private Builder() {
+    }
+
+    public Builder appId(String appId) {
+      this.appId = appId;
+      return this;
+    }
+
+    public Builder timeStamp(String timeStamp) {
+      this.timeStamp = timeStamp;
+      return this;
+    }
+
+    public Builder nonceStr(String nonceStr) {
+      this.nonceStr = nonceStr;
+      return this;
+    }
+
+    public Builder packageValue(String packageValue) {
+      this.packageValue = packageValue;
+      return this;
+    }
+
+    public Builder signType(String signType) {
+      this.signType = signType;
+      return this;
+    }
+
+    public Builder paySign(String paySign) {
+      this.paySign = paySign;
+      return this;
+    }
+
+    public WxPayMpOrderResult build() {
+      return new WxPayMpOrderResult(this);
+    }
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayNativeOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayNativeOrderResult.java
new file mode 100644
index 0000000000..3eb0e3748a
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayNativeOrderResult.java
@@ -0,0 +1,48 @@
+package com.github.binarywang.wxpay.bean.order;
+
+/**
+ * <pre>
+ * 微信扫码支付统一下单后发起支付拼接所需参数实现类
+ * Created by Binary Wang on 2017-9-1.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class WxPayNativeOrderResult {
+  private String codeUrl;
+
+  private WxPayNativeOrderResult(Builder builder) {
+    setCodeUrl(builder.codeUrl);
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public String getCodeUrl() {
+    return this.codeUrl;
+  }
+
+  public void setCodeUrl(String codeUrl) {
+    this.codeUrl = codeUrl;
+  }
+
+  public WxPayNativeOrderResult() {
+  }
+
+  public static final class Builder {
+    private String codeUrl;
+
+    private Builder() {
+    }
+
+    public Builder codeUrl(String codeUrl) {
+      this.codeUrl = codeUrl;
+      return this;
+    }
+
+    public WxPayNativeOrderResult build() {
+      return new WxPayNativeOrderResult(this);
+    }
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java
index 92c98bda48..d8ab2ab6df 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayUnifiedOrderResult.java
@@ -5,7 +5,7 @@
 /**
  * <pre>
  * 在发起微信支付前，需要调用统一下单接口，获取"预支付交易会话标识"返回的结果
- * 统一下单(详见http://com.github.binarywang.wechat.pay.bean.pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
+ * 统一下单(详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
  * </pre>
  *
  * @author chanjarster
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
index dc8ce23b8e..64842b1456 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
@@ -71,6 +71,11 @@ public static class TradeType {
      */
     public static final String JSAPI = "JSAPI";
 
+    /**
+     * H5支付
+     */
+    public static final String MWEB = "MWEB";
+
     /**
      * 刷卡支付，刷卡支付有单独的支付接口，不调用统一下单接口
      */
@@ -84,4 +89,15 @@ public static class SignType {
     public static final String HMAC_SHA256 = "HMAC-SHA256";
     public static final String MD5 = "MD5";
   }
+
+
+  /**
+   * 限定支付方式
+   */
+  public static class LimitPay {
+    /**
+     * no_credit--指定不能使用信用卡支付
+     */
+    public static final String NO_CREDIT = "no_credit";
+  }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/converter/WxPayOrderNotifyResultConverter.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/converter/WxPayOrderNotifyResultConverter.java
index 0e375bd62f..fe35ed2129 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/converter/WxPayOrderNotifyResultConverter.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/converter/WxPayOrderNotifyResultConverter.java
@@ -1,7 +1,7 @@
 package com.github.binarywang.wxpay.converter;
 
-import com.github.binarywang.wxpay.bean.WxPayOrderNotifyCoupon;
-import com.github.binarywang.wxpay.bean.result.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyCoupon;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index bf599ba175..0605edfc24 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -2,6 +2,8 @@
 
 import com.github.binarywang.wxpay.bean.WxPayApiData;
 import com.github.binarywang.wxpay.bean.coupon.*;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -22,7 +24,7 @@ public interface WxPayService {
 
   /**
    * <pre>
-   * 查询订单(详见https://com.github.binarywang.wechat.pay.bean.pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_2)
+   * 查询订单(详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_2)
    * 该接口提供所有微信支付订单的查询，商户可以通过查询订单接口主动查询订单状态，完成下一步的业务逻辑。
    * 需要调用查询接口的情况：
    * ◆ 当商户后台、网络、服务器等出现异常，商户系统最终未接收到支付通知；
@@ -54,7 +56,7 @@ public interface WxPayService {
   WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException;
 
   /**
-   * 统一下单(详见http://com.github.binarywang.wechat.pay.bean.pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1)
+   * 统一下单(详见https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=9_1)
    * 在发起微信支付前，需要调用统一下单接口，获取"预支付交易会话标识"
    * 接口地址：https://api.mch.weixin.qq.com/pay/unifiedorder
    *
@@ -64,7 +66,7 @@ public interface WxPayService {
 
   /**
    * 该接口调用“统一下单”接口，并拼装发起支付请求需要的参数
-   * 详见http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN
+   * 详见https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=8_5
    *
    * @param request 请求对象，注意一些参数如appid、mchid等不用设置，方法内会自动从配置对象中获取到（前提是对应配置中已经设置）
    */
@@ -113,11 +115,24 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
     throws WxPayException;
 
   /**
-   * 读取支付结果通知
-   * 详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7
+   * @deprecated  use WxPayService#parseOrderNotifyResult(String) instead
+   * @see WxPayService#parseOrderNotifyResult(String)
    */
+  @Deprecated
   WxPayOrderNotifyResult getOrderNotifyResult(String xmlData) throws WxPayException;
 
+  /**
+   * 解析支付结果通知
+   * 详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7
+   */
+  WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) throws WxPayException;
+
+  /**
+   * 解析退款结果通知
+   * 详见https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_16&index=9
+   */
+  WxPayRefundNotifyResult parseRefundNotifyResult(String xmlData) throws WxPayException;
+
   /**
    * 发送微信红包给个人用户
    * <pre>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index 27d4d2dd6f..f0b22d194d 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -3,6 +3,11 @@
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
 import com.github.binarywang.wxpay.bean.WxPayApiData;
 import com.github.binarywang.wxpay.bean.coupon.*;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
+import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -97,11 +102,17 @@ public WxPayRefundQueryResult refundQuery(String transactionId, String outTradeN
   }
 
   @Override
+  @Deprecated
   public WxPayOrderNotifyResult getOrderNotifyResult(String xmlData) throws WxPayException {
+    return this.parseOrderNotifyResult(xmlData);
+  }
+
+  @Override
+  public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) throws WxPayException {
     try {
-      log.debug("微信支付回调参数详细：{}", xmlData);
+      log.debug("微信支付异步通知请求参数：{}", xmlData);
       WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
-      log.debug("微信支付回调结果对象：{}", result);
+      log.debug("微信支付异步通知请求解析后的对象：{}", result);
       result.checkResult(this);
       return result;
     } catch (WxPayException e) {
@@ -113,6 +124,19 @@ public WxPayOrderNotifyResult getOrderNotifyResult(String xmlData) throws WxPayE
     }
   }
 
+  @Override
+  public WxPayRefundNotifyResult parseRefundNotifyResult(String xmlData) throws WxPayException {
+    try {
+      log.debug("微信支付退款异步通知参数：{}", xmlData);
+      WxPayRefundNotifyResult result = WxPayRefundNotifyResult.fromXML(xmlData, this.getConfig().getMchKey());
+      log.debug("微信支付退款异步通知解析后的对象：{}", result);
+      return result;
+    } catch (Exception e) {
+      log.error(e.getMessage(), e);
+      throw new WxPayException("发生异常，" + e.getMessage(), e);
+    }
+  }
+
   @Override
   public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request) throws WxPayException {
     request.checkAndSign(this.getConfig());
@@ -181,6 +205,65 @@ public WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxPayException
     return result;
   }
 
+  public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException {
+    WxPayUnifiedOrderResult unifiedOrderResult = this.unifiedOrder(request);
+    String prepayId = unifiedOrderResult.getPrepayId();
+    if (StringUtils.isBlank(prepayId)) {
+      throw new RuntimeException(String.format("无法获取prepay id，错误代码： '%s'，信息：%s。",
+        unifiedOrderResult.getErrCode(), unifiedOrderResult.getErrCodeDes()));
+    }
+
+    String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
+    String nonceStr = String.valueOf(System.currentTimeMillis());
+    Object payResult = null;
+    switch (request.getTradeType()) {
+      case TradeType.NATIVE: {
+        payResult = WxPayNativeOrderResult.newBuilder().codeUrl(unifiedOrderResult.getCodeURL())
+          .build();
+        break;
+      }
+      case TradeType.APP: {
+        // APP支付绑定的是微信开放平台上的账号，APPID为开放平台上绑定APP后发放的参数
+        String appId = this.getConfig().getAppId();
+        Map<String, String> configMap = new HashMap<>();
+        // 此map用于参与调起sdk支付的二次签名,格式全小写，timestamp只能是10位,格式固定，切勿修改
+        String partnerId = getConfig().getMchId();
+        configMap.put("prepayid", prepayId);
+        configMap.put("partnerid", partnerId);
+        String packageValue = "Sign=WXPay";
+        configMap.put("package", packageValue);
+        configMap.put("timestamp", timestamp);
+        configMap.put("noncestr", nonceStr);
+        configMap.put("appid", appId);
+
+        payResult = WxPayAppOrderResult.newBuilder()
+          .sign(SignUtils.createSign(configMap, this.getConfig().getMchKey()))
+          .prepayId(prepayId)
+          .partnerId(partnerId)
+          .appId(appId)
+          .packageValue(packageValue)
+          .timeStamp(timestamp)
+          .nonceStr(nonceStr)
+          .build();
+        break;
+      }
+      case TradeType.JSAPI: {
+        payResult = WxPayMpOrderResult.newBuilder()
+          .appId(unifiedOrderResult.getAppid())
+          .timeStamp(timestamp)
+          .nonceStr(nonceStr)
+          .packageValue("prepay_id=" + prepayId)
+          .signType(SignType.MD5)
+          .build();
+        ((WxPayMpOrderResult) payResult)
+          .setPaySign(SignUtils.createSign(payResult, this.getConfig().getMchKey()));
+        break;
+      }
+    }
+
+    return (T) payResult;
+  }
+
   @Override
   public WxPayUnifiedOrderResult unifiedOrder(WxPayUnifiedOrderRequest request) throws WxPayException {
     request.checkAndSign(this.getConfig());
@@ -508,7 +591,7 @@ public WxPayCouponInfoQueryResult queryCouponInfo(WxPayCouponInfoQueryRequest re
   public WxPayApiData getWxApiData() {
     try {
       return wxApiData.get();
-    }finally {
+    } finally {
       //一般来说，接口请求会在一个线程内进行，这种情况下，每个线程get的会是之前所存入的数据，
       // 但以防万一有同一线程多次请求的问题，所以每次获取完数据后移除对应数据
       wxApiData.remove();
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResultTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResultTest.java
similarity index 95%
rename from weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResultTest.java
rename to weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResultTest.java
index 389b374d9e..384de4c983 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/result/WxPayOrderNotifyResultTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayOrderNotifyResultTest.java
@@ -1,5 +1,6 @@
-package com.github.binarywang.wxpay.bean.result;
+package com.github.binarywang.wxpay.bean.notify;
 
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import org.testng.*;
 import org.testng.annotations.*;
 
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResultTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResultTest.java
new file mode 100644
index 0000000000..cd1777f836
--- /dev/null
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayRefundNotifyResultTest.java
@@ -0,0 +1,70 @@
+package com.github.binarywang.wxpay.bean.notify;
+
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.testbase.ApiTestModule;
+import org.apache.commons.codec.binary.Base64;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import javax.inject.Inject;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+
+import static org.testng.Assert.assertNotNull;
+
+/**
+ * <pre>
+ *  Created by BinaryWang on 2017/8/27.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Test
+@Guice(modules = ApiTestModule.class)
+public class WxPayRefundNotifyResultTest {
+  @Inject
+  private WxPayConfig wxPayConfig;
+
+  public void testFromXML() throws WxPayException {
+    String xmlString = "<xml>" +
+      "<return_code>SUCCESS</return_code>" +
+      "<appid><![CDATA[****]]></appid>" +
+      "<mch_id><![CDATA[****]]></mch_id>" +
+      "<nonce_str><![CDATA[1ee38e38b04990449808688cf3a763b7]]></nonce_str>" +
+      "<req_info><![CDATA[q1QZlV5j/4I7CsJ3voq1zDgVAuzNM/Gg5JYHcpMZCLtg9KQlB6vShzsh8tgK60dU6yG2WVa0zeSDlK4B7wJCad1lUUP8Ar0Hm18M1ZEjw5vQU17wMzypRM0M9A4CcRLBezRZYzCka9CAH90E2FZ74y6VRe4DNR87t5n3DWVtSbWTBoaFUexHtNs6pyrqX77VvbilIyLZMv5ZYQYOobbQ1U3kime5He7ShEWZ0GPI3gq+z/ZOLsnIdJ5bsT4kokhq/531hSoZ5006vxRGGXnhJt8IYiG7R+oSQxZOYqYR5SKWF+0z2/g0zzM2QQlT2ynLWvBKvdVCLlgCjFN1DF4z/7IEK5FAISFP0GGF51hYw/LofL3ftlD7h7jvjOIgH5viJ0yFGmGCEFHcLKqg0DPXmzwXIrkgQSSQPsuZ6UbHUUG0L8YTRgLnl2FwNFskJIaNx0179Il6xveR1sCXbwSDGvGN78sFuQMztbnx+gFu6VYgv7C+5pFr87wHFAeuDXGTkVM6ucAwSanP7HuxSVvf7SrSrcovKslyqj869pSqn/AB0atiQ4eoq3kWaOqx87NHOV1st9SQW1SYH7SKz4jd9uhrQyDuPb6KJSg1Z2B4sU4187NjPzL4NpzZySgiYk2yXpWKhCLIz6BdZuWX79zgqxLbGxJJnhyy3tOzRWIlMkDOppGJyh8LO0LOqhXzwyrCYzPA+h2xcr7xN5WIW1IGJSZqHdURUtlemcB+yZivuzARNH0LE2MGUfuoNgZ5j1Osn7K88IrkAyKupcIEmG3ktVnPOd1A9RQ9eWbU+C7yKrl6u5ZRZOX0eElVszKfBFy4tu3XHlT7hd/zMFK5NJt8sE89k5m7M8KCGSgJ+Y90ZnUclQvDVtoR5CFkfqsP9fSpA1L+aKYsl2ESq5+fzcqsYRL3YLEhIipBKKrvg6Gy698oNeG+9oCIyuiFexJDq8ycBZ/AWiR+pFQVbNRaFbfKPR9zCW8gHwYOGnENNY9gABuuENqxxXDx9tEYkACd0H9ezLnu9psC6AuR41ACfo6wGKUA1TnpVEHsDbdvJBWDcw60l1hkmHQN2lYFy+eMusEX]]></req_info></xml>";
+
+    WxPayRefundNotifyResult refundNotifyResult = WxPayRefundNotifyResult.fromXML(xmlString, this.wxPayConfig.getMchKey());
+
+    assertNotNull(refundNotifyResult);
+    System.out.println(refundNotifyResult);
+  }
+
+  public void encodeReqInfo() throws Exception {
+    String xml = "<root>\n" +
+      "<out_refund_no><![CDATA[R4001312001201707262674894706_4]]></out_refund_no>\n" +
+      "<out_trade_no><![CDATA[201707260201501501005710775]]></out_trade_no>\n" +
+      "<refund_account><![CDATA[REFUND_SOURCE_UNSETTLED_FUNDS]]></refund_account>\n" +
+      "<refund_fee><![CDATA[15]]></refund_fee>\n" +
+      "<refund_id><![CDATA[50000203702017072601461713166]]></refund_id>\n" +
+      "<refund_recv_accout><![CDATA[用户零钱]]></refund_recv_accout>\n" +
+      "<refund_request_source><![CDATA[API]]></refund_request_source>\n" +
+      "<refund_status><![CDATA[SUCCESS]]></refund_status>\n" +
+      "<settlement_refund_fee><![CDATA[15]]></settlement_refund_fee>\n" +
+      "<settlement_total_fee><![CDATA[100]]></settlement_total_fee>\n" +
+      "<success_time><![CDATA[2017-07-26 02:45:49]]></success_time>\n" +
+      "<total_fee><![CDATA[100]]></total_fee>\n" +
+      "<transaction_id><![CDATA[4001312001201707262674894706]]></transaction_id>\n" +
+      "</root>";
+
+    Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+    final MessageDigest md5 = MessageDigest.getInstance("MD5");
+    md5.update(this.wxPayConfig.getMchKey().getBytes());
+    final String keyMd5String = new BigInteger(1, md5.digest()).toString(16).toLowerCase();
+    SecretKeySpec key = new SecretKeySpec(keyMd5String.getBytes(), "AES");
+    cipher.init(Cipher.ENCRYPT_MODE, key);
+    System.out.println(Base64.encodeBase64String(cipher.doFinal(xml.getBytes())));
+  }
+}
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
index de0fe10e2c..8d419be8ac 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -2,6 +2,7 @@
 
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
 import com.github.binarywang.wxpay.bean.coupon.*;
+import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
@@ -147,6 +148,11 @@ public void testRefundQuery() throws Exception {
     this.logger.info(result.toString());
   }
 
+  @Test
+  public void testParseRefundNotifyResult() throws Exception {
+    // 请参考com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResultTest里的单元测试
+  }
+
   /**
    * Test method for {@link WxPayService#sendRedpack(WxPaySendRedpackRequest)} .
    */

From 8e9c987d98e389ddc81d6749de929d7d329f8873 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 2 Sep 2017 23:48:33 +0800
Subject: [PATCH 82/85] =?UTF-8?q?#320=20=E5=A2=9E=E5=8A=A0=E2=80=9C?=
 =?UTF-8?q?=E6=8B=89=E5=8F=96=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E2=80=9C=E6=8E=A5=E5=8F=A3=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/request/WxPayBaseRequest.java  |  24 +++-
 .../request/WxPayQueryCommentRequest.java     | 112 ++++++++++++++++++
 .../wxpay/constant/WxPayConstants.java        |   8 ++
 .../wxpay/service/WxPayService.java           |  22 +++-
 .../impl/WxPayServiceAbstractImpl.java        |  46 ++++---
 .../binarywang/wxpay/util/SignUtils.java      |  47 ++++++--
 .../impl/WxPayServiceAbstractImplTest.java    |  24 +++-
 .../binarywang/wxpay/util/SignUtilsTest.java  |  40 +++++++
 8 files changed, 292 insertions(+), 31 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java
 create mode 100644 weixin-java-pay/src/test/java/com/github/binarywang/wxpay/util/SignUtilsTest.java

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
index cc0490d22e..41a98d0ae4 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayBaseRequest.java
@@ -95,6 +95,19 @@ public abstract class WxPayBaseRequest {
   @XStreamAlias("sign")
   protected String sign;
 
+  /**
+   * <pre>
+   * 签名类型
+   * sign_type
+   * 否
+   * String(32)
+   * HMAC-SHA256
+   * 签名类型，目前支持HMAC-SHA256和MD5
+   * </pre>
+   */
+  @XStreamAlias("sign_type")
+  private String signType;
+
   /**
    * 将单位为元转换为单位为分
    *
@@ -187,6 +200,14 @@ public void setSubMchId(String subMchId) {
     this.subMchId = subMchId;
   }
 
+  public String getSignType() {
+    return signType;
+  }
+
+  public void setSignType(String signType) {
+    this.signType = signType;
+  }
+
   @Override
   public String toString() {
     return ToStringUtils.toSimpleString(this);
@@ -230,9 +251,8 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {
     if (StringUtils.isBlank(getNonceStr())) {
       this.setNonceStr(String.valueOf(System.currentTimeMillis()));
     }
-
     //设置签名字段的值
-    this.setSign(SignUtils.createSign(this, config.getMchKey()));
+    this.setSign(SignUtils.createSign(this, config.getMchKey(), this.signType));
   }
 
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java
new file mode 100644
index 0000000000..1bdbf9bf4e
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryCommentRequest.java
@@ -0,0 +1,112 @@
+package com.github.binarywang.wxpay.bean.request;
+
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import me.chanjar.weixin.common.annotation.Required;
+
+/**
+ * <pre>
+ *  拉取订单评价数据接口的请求参数封装类
+ *  Created by BinaryWang on 2017/9/2.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@XStreamAlias("xml")
+public class WxPayQueryCommentRequest extends WxPayBaseRequest {
+  /**
+   * <pre>
+   * 字段名：开始时间
+   * 变量名：begin_time
+   * 是否必填：是
+   * 类型：String(19)
+   * 示例值：20170724000000
+   * 描述：按用户评论时间批量拉取的起始时间，格式为yyyyMMddHHmmss
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("begin_time")
+  private String beginTime;
+
+  /**
+   * <pre>
+   * 字段名：结束时间
+   * 变量名：end_time
+   * 是否必填：是
+   * 类型：String(19)
+   * 示例值：20170725000000
+   * 描述：按用户评论时间批量拉取的结束时间，格式为yyyyMMddHHmmss
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("end_time")
+  private String endTime;
+
+  /**
+   * <pre>
+   * 字段名：位移
+   * 变量名：offset
+   * 是否必填：是
+   * 类型：uint(64)
+   * 示例值：0
+   * 描述：指定从某条记录的下一条开始返回记录。接口调用成功时，会返回本次查询最后一条数据的offset。商户需要翻页时，应该把本次调用返回的offset 作为下次调用的入参。注意offset是评论数据在微信支付后台保存的索引，未必是连续的
+   * </pre>
+   */
+  @Required
+  @XStreamAlias("offset")
+  private Integer offset;
+
+  /**
+   * <pre>
+   * 字段名：条数
+   * 变量名：limit
+   * 是否必填：否
+   * 类型：uint(32)
+   * 示例值：100
+   * 描述：一次拉取的条数, 最大值是200，默认是200
+   * </pre>
+   */
+  @XStreamAlias("limit")
+  private Integer limit;
+
+  /**
+   * 检查约束情况
+   */
+  @Override
+  protected void checkConstraints() throws WxPayException {
+
+  }
+
+  public String getBeginTime() {
+    return beginTime;
+  }
+
+  public void setBeginTime(String beginTime) {
+    this.beginTime = beginTime;
+  }
+
+  public String getEndTime() {
+    return endTime;
+  }
+
+  public void setEndTime(String endTime) {
+    this.endTime = endTime;
+  }
+
+  public Integer getOffset() {
+    return offset;
+  }
+
+  public void setOffset(Integer offset) {
+    this.offset = offset;
+  }
+
+  public Integer getLimit() {
+    return limit;
+  }
+
+  public void setLimit(Integer limit) {
+    this.limit = limit;
+  }
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
index 64842b1456..47f636d0fc 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/constant/WxPayConstants.java
@@ -1,5 +1,7 @@
 package com.github.binarywang.wxpay.constant;
 
+import java.text.SimpleDateFormat;
+
 /**
  * <pre>
  * 微信支付常量类
@@ -9,6 +11,12 @@
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public class WxPayConstants {
+
+  /**
+   * 拉取订单评价数据接口的参数中日期格式
+   */
+  public static final SimpleDateFormat QUERY_COMMENT_DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
+
   /**
    * 校验用户姓名选项，企业付款时使用
    */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
index 0605edfc24..ae058e1478 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
@@ -10,6 +10,7 @@
 import com.github.binarywang.wxpay.exception.WxPayException;
 
 import java.io.File;
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -115,8 +116,8 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
     throws WxPayException;
 
   /**
-   * @deprecated  use WxPayService#parseOrderNotifyResult(String) instead
    * @see WxPayService#parseOrderNotifyResult(String)
+   * @deprecated use WxPayService#parseOrderNotifyResult(String) instead
    */
   @Deprecated
   WxPayOrderNotifyResult getOrderNotifyResult(String xmlData) throws WxPayException;
@@ -389,4 +390,23 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
    * 获取微信请求数据，方便接口调用方获取处理
    */
   WxPayApiData getWxApiData();
+
+  /**
+   * <pre>
+   * 拉取订单评价数据
+   * 商户可以通过该接口拉取用户在微信支付交易记录中针对你的支付记录进行的评价内容。商户可结合商户系统逻辑对该内容数据进行存储、分析、展示、客服回访以及其他使用。如商户业务对评价内容有依赖，可主动引导用户进入微信支付交易记录进行评价。
+   * 注意：
+   * 1. 该内容所有权为提供内容的微信用户，商户在使用内容的过程中应遵从用户意愿
+   * 2. 一次最多拉取200条评价数据，可根据时间区间分批次拉取
+   * 3. 接口只能拉取最近三个月以内的评价数据
+   * 接口链接：https://api.mch.weixin.qq.com/billcommentsp/batchquerycomment
+   * 是否需要证书：需要
+   * 文档地址：https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_17&index=10
+   * </pre>
+   * @param beginDate 开始时间
+   * @param endDate   结束时间
+   * @param offset    位移
+   * @param limit     条数
+   */
+  String queryComment(Date beginDate, Date endDate, Integer offset, Integer limit) throws WxPayException;
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
index f0b22d194d..e77d3e1fc8 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImpl.java
@@ -23,10 +23,9 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
+import static com.github.binarywang.wxpay.constant.WxPayConstants.QUERY_COMMENT_DATE_FORMAT;
 
 /**
  * <pre>
@@ -237,7 +236,7 @@ public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException
         configMap.put("appid", appId);
 
         payResult = WxPayAppOrderResult.newBuilder()
-          .sign(SignUtils.createSign(configMap, this.getConfig().getMchKey()))
+          .sign(SignUtils.createSign(configMap, this.getConfig().getMchKey(), null))
           .prepayId(prepayId)
           .partnerId(partnerId)
           .appId(appId)
@@ -256,7 +255,7 @@ public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException
           .signType(SignType.MD5)
           .build();
         ((WxPayMpOrderResult) payResult)
-          .setPaySign(SignUtils.createSign(payResult, this.getConfig().getMchKey()));
+          .setPaySign(SignUtils.createSign(payResult, this.getConfig().getMchKey(), null));
         break;
       }
     }
@@ -303,7 +302,7 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
       configMap.put("noncestr", nonceStr);
       configMap.put("appid", appId);
       // 此map用于客户端与微信服务器交互
-      payInfo.put("sign", SignUtils.createSign(configMap, this.getConfig().getMchKey()));
+      payInfo.put("sign", SignUtils.createSign(configMap, this.getConfig().getMchKey(), null));
       payInfo.put("prepayId", prepayId);
       payInfo.put("partnerId", partnerId);
       payInfo.put("appId", appId);
@@ -317,7 +316,7 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
       payInfo.put("nonceStr", nonceStr);
       payInfo.put("package", "prepay_id=" + prepayId);
       payInfo.put("signType", SignType.MD5);
-      payInfo.put("paySign", SignUtils.createSign(payInfo, this.getConfig().getMchKey()));
+      payInfo.put("paySign", SignUtils.createSign(payInfo, this.getConfig().getMchKey(), null));
     }
 
     return payInfo;
@@ -364,7 +363,7 @@ public String createScanPayQrcodeMode1(String productId) {
     params.put("time_stamp", String.valueOf(System.currentTimeMillis() / 1000));//这里需要秒，10位数字
     params.put("nonce_str", String.valueOf(System.currentTimeMillis()));
 
-    String sign = SignUtils.createSign(params, this.getConfig().getMchKey());
+    String sign = SignUtils.createSign(params, this.getConfig().getMchKey(), null);
     params.put("sign", sign);
 
     for (String key : params.keySet()) {
@@ -411,15 +410,13 @@ public WxPayBillResult downloadBill(String billDate, String billType, String tar
     String url = this.getPayBaseUrl() + "/pay/downloadbill";
     String responseContent = this.post(url, request.toXML(), false);
     if (responseContent.startsWith("<")) {
-      WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
-      result.checkResult(this);
-      return null;
+      throw WxPayException.from(WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class));
     } else {
-      return billInformationDeal(responseContent);
+      return this.handleBillInformation(responseContent);
     }
   }
 
-  private WxPayBillResult billInformationDeal(String responseContent) {
+  private WxPayBillResult handleBillInformation(String responseContent) {
     WxPayBillResult wxPayBillResult = new WxPayBillResult();
 
     String listStr = "";
@@ -597,4 +594,25 @@ public WxPayApiData getWxApiData() {
       wxApiData.remove();
     }
   }
+
+  @Override
+  public String queryComment(Date beginDate, Date endDate, Integer offset, Integer limit) throws WxPayException {
+    WxPayQueryCommentRequest request = new WxPayQueryCommentRequest();
+    request.setBeginTime(QUERY_COMMENT_DATE_FORMAT.format(beginDate));
+    request.setEndTime(QUERY_COMMENT_DATE_FORMAT.format(endDate));
+    request.setOffset(offset);
+    request.setLimit(limit);
+    request.setSignType(SignType.HMAC_SHA256);
+
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/billcommentsp/batchquerycomment";
+
+    String responseContent = this.post(url, request.toXML(), true);
+    if (responseContent.startsWith("<")) {
+      throw WxPayException.from(WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class));
+    }
+
+    return responseContent;
+  }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java
index 33e18c49f3..b13175a724 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/SignUtils.java
@@ -1,9 +1,15 @@
 package com.github.binarywang.wxpay.util;
 
+import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
 import me.chanjar.weixin.common.util.BeanUtils;
+import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -20,22 +26,24 @@ public class SignUtils {
   /**
    * 微信公众号支付签名算法(详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=4_3)
    *
-   * @param xmlBean Bean需要标记有XML注解
-   * @param signKey 签名Key
+   * @param xmlBean  Bean需要标记有XML注解
+   * @param signKey  签名Key
+   * @param signType 签名类型，如果为空，则默认为MD5
    * @return 签名字符串
    */
-  public static String createSign(Object xmlBean, String signKey) {
-    return createSign(BeanUtils.xmlBean2Map(xmlBean), signKey);
+  public static String createSign(Object xmlBean, String signKey, String signType) {
+    return createSign(BeanUtils.xmlBean2Map(xmlBean), signKey, signType);
   }
 
   /**
    * 微信公众号支付签名算法(详见:https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=4_3)
    *
-   * @param params  参数信息
-   * @param signKey 签名Key
+   * @param params   参数信息
+   * @param signKey  签名Key
+   * @param signType 签名类型，如果为空，则默认为md5
    * @return 签名字符串
    */
-  public static String createSign(Map<String, String> params, String signKey) {
+  public static String createSign(Map<String, String> params, String signKey, String signType) {
 //    if (this.getConfig().useSandbox()) {
 //      //使用仿真测试环境
 //      //TODO 目前测试发现，以下两行代码都会出问题，所以暂不建议使用仿真测试环境
@@ -48,13 +56,32 @@ public static String createSign(Map<String, String> params, String signKey) {
     StringBuilder toSign = new StringBuilder();
     for (String key : sortedMap.keySet()) {
       String value = params.get(key);
-      if (StringUtils.isNotEmpty(value) && !"sign".equals(key) && !"key".equals(key)) {
+      if (StringUtils.isNotEmpty(value)
+        && !StringUtils.equalsAny(key, "sign", "key", "sign_type")) {
         toSign.append(key).append("=").append(value).append("&");
       }
     }
 
     toSign.append("key=").append(signKey);
-    return DigestUtils.md5Hex(toSign.toString()).toUpperCase();
+    if (SignType.HMAC_SHA256.equals(signType)) {
+      return createHMACSha256Sign(toSign.toString(), signKey);
+    } else {
+      return DigestUtils.md5Hex(toSign.toString()).toUpperCase();
+    }
+  }
+
+  private static String createHMACSha256Sign(String message, String key) {
+    try {
+      Mac hmacSHA256 = Mac.getInstance("HmacSHA256");
+      SecretKeySpec secretKeySpec = new SecretKeySpec(key.getBytes(), "HmacSHA256");
+      hmacSHA256.init(secretKeySpec);
+      byte[] bytes = hmacSHA256.doFinal(message.getBytes());
+      return Hex.encodeHexString(bytes).toUpperCase();
+    } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+      e.printStackTrace();
+    }
+
+    return null;
   }
 
   /**
@@ -78,7 +105,7 @@ public static boolean checkSign(Object xmlBean, String signKey) {
    * @see #checkSign(Map, String)
    */
   public static boolean checkSign(Map<String, String> params, String signKey) {
-    String sign = createSign(params, signKey);
+    String sign = createSign(params, signKey, null);
     return sign.equals(params.get("sign"));
   }
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
index 8d419be8ac..2fc5354424 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/WxPayServiceAbstractImplTest.java
@@ -2,7 +2,6 @@
 
 import com.github.binarywang.utils.qrcode.QrcodeUtils;
 import com.github.binarywang.wxpay.bean.coupon.*;
-import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
 import com.github.binarywang.wxpay.bean.request.*;
 import com.github.binarywang.wxpay.bean.result.*;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
@@ -16,10 +15,13 @@
 import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.annotations.*;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.Map;
 
 import static org.testng.Assert.*;
@@ -90,7 +92,7 @@ public void testCloseOrder() throws WxPayException {
 
   @Test
   public void testDownloadBill() throws Exception {
-    WxPayBillResult wxPayBillResult = this.payService.downloadBill("20170101", BillType.ALL, "GZIP", "1111111");
+    WxPayBillResult wxPayBillResult = this.payService.downloadBill("20170831", BillType.ALL, null, "1111111");
     //前一天没有账单记录返回null
     assertNotNull(wxPayBillResult);
     //必填字段为空时，抛出异常
@@ -313,10 +315,24 @@ public void testQueryCouponStock() throws Exception {
   @Test
   public void testQueryCouponInfo() throws Exception {
     WxPayCouponInfoQueryResult result = this.payService.queryCouponInfo(WxPayCouponInfoQueryRequest.newBuilder()
-      .openid("onqOjjrXT-776SpHnfexGm1_P7iE")
+      .openid("ojOQA0y9o-Eb6Aep7uVTdbkJqrP4")
       .couponId("11")
       .stockId("1121")
       .build());
     this.logger.info(result.toString());
   }
+
+  /**
+   * 目前调用接口总报“系统繁忙，清稍后再试”，怀疑根本没法使用
+   */
+  @Test
+  public void testQueryComment() throws Exception {
+    Calendar calendar = Calendar.getInstance();
+    calendar.add(Calendar.DAY_OF_MONTH, -2);
+    Date beginDate = calendar.getTime();
+    calendar.add(Calendar.MONTH, -1);
+    Date endDate = calendar.getTime();
+    this.payService.queryComment(beginDate, endDate, 0, null);
+  }
+
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/util/SignUtilsTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/util/SignUtilsTest.java
new file mode 100644
index 0000000000..23d7088b7b
--- /dev/null
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/util/SignUtilsTest.java
@@ -0,0 +1,40 @@
+package com.github.binarywang.wxpay.util;
+
+import com.google.common.base.Splitter;
+import org.testng.annotations.Test;
+
+import static com.github.binarywang.wxpay.constant.WxPayConstants.SignType.HMAC_SHA256;
+import static org.testng.Assert.assertEquals;
+
+/**
+ * <pre>
+ * 测试中使用的测试数据参考的是官方文档，地址：
+ * https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=4_3
+ *  Created by BinaryWang on 2017/9/2.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+public class SignUtilsTest {
+  @Test
+  public void testCreateSign() throws Exception {
+    String signKey = "192006250b4c09247ec02edce69f6a2d";
+    String message = "appid=wxd930ea5d5a258f4f&body=test&device_info=1000&mch_id=10000100&nonce_str=ibuaiVcKdpRxkhJA";
+    assertEquals(SignUtils.createSign((Splitter.on("&").withKeyValueSeparator("=").split(message)), signKey, null),
+      "9A0A8659F005D6984697E2CA0A9CF3B7");
+  }
+
+  @Test
+  public void testCreateSign_HMACSHA256() throws Exception {
+    String signKey = "192006250b4c09247ec02edce69f6a2d";
+    final String message = "appid=wxd930ea5d5a258f4f&body=test&device_info=1000&mch_id=10000100&nonce_str=ibuaiVcKdpRxkhJA";
+    String sign = SignUtils.createSign(Splitter.on("&").withKeyValueSeparator("=").split(message),
+      signKey, HMAC_SHA256);
+    assertEquals(sign, "6A9AE1657590FD6257D693A078E1C3E4BB6BA4DC30B23E0EE2496E54170DACD6");
+  }
+
+  @Test
+  public void testCheckSign() throws Exception {
+  }
+
+}

From 91b54c81a056c6e156babfee420f61ac311cedbf Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 2 Sep 2017 23:57:20 +0800
Subject: [PATCH 83/85] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=BA=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC2.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                     | 2 +-
 weixin-java-common/pom.xml  | 2 +-
 weixin-java-cp/pom.xml      | 2 +-
 weixin-java-miniapp/pom.xml | 2 +-
 weixin-java-mp/pom.xml      | 2 +-
 weixin-java-pay/pom.xml     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index a10e3adc99..f93c5dd5c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>2.7.9.BETA</version>
+  <version>2.8.0</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 1b3be7dac3..68c6130612 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.9.BETA</version>
+    <version>2.8.0</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index f035d15b7a..233a94ecc3 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.9.BETA</version>
+    <version>2.8.0</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 3c4a36751d..3a2614aa59 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.9.BETA</version>
+    <version>2.8.0</version>
   </parent>
   <artifactId>weixin-java-miniapp</artifactId>
   <name>WeiXin Java Tools - MiniApp</name>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 9f658a8fbf..81ec2c01ab 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>weixin-java-parent</artifactId>
-    <version>2.7.9.BETA</version>
+    <version>2.8.0</version>
   </parent>
   <artifactId>weixin-java-mp</artifactId>
   <name>WeiXin Java Tools - MP</name>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index a1f01be6e9..05aa6c5f8f 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>weixin-java-parent</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>2.7.9.BETA</version>
+    <version>2.8.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From f08f9a0585ddcd5c6c5020851927bb4cbf2b34ed Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@users.noreply.github.com>
Date: Sun, 3 Sep 2017 00:01:58 +0800
Subject: [PATCH 84/85] Update readme.md

---
 readme.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/readme.md b/readme.md
index 199399e85c..6af22ea7df 100644
--- a/readme.md
+++ b/readme.md
@@ -18,7 +18,7 @@
 
 ---------------------------------
 ### 其他信息：
-1. 最新更新：**2017-6-25 发布[【2.7.0正式版】](https://github.com/Wechat-Group/weixin-java-tools/releases)**！
+1. 最新更新：**2017-9-3 发布[【2.8.0正式版】](https://github.com/Wechat-Group/weixin-java-tools/releases)**！
 1. 开源中国网站的本项目介绍的首页链接地址：https://www.oschina.net/p/weixin-java-tools-new
 1. 自2.6.0版本开始，微信支付相关功能抽出独立为一个模块，详细使用方式请参考相关demo；
 1. 自2.7.0版本开始，支持微信小程序，具体可以参考相关demo；
@@ -60,7 +60,7 @@
 <dependency>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-miniapp</artifactId>
-  <version>2.7.0</version>
+  <version>2.8.0</version>
 </dependency>
 ```
 
@@ -70,7 +70,7 @@
 <dependency>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-pay</artifactId>
-  <version>2.7.0</version>
+  <version>2.8.0</version>
 </dependency>
 ```
 
@@ -80,7 +80,7 @@
 <dependency>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-mp</artifactId>
-  <version>2.7.0</version>
+  <version>2.8.0</version>
 </dependency>
 ```
 
@@ -90,6 +90,6 @@
 <dependency>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-cp</artifactId>
-  <version>2.7.0</version>
+  <version>2.8.0</version>
 </dependency>
 ```

From 361c696374c2156d4bf3343475cc675482340cee Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@users.noreply.github.com>
Date: Sun, 3 Sep 2017 00:41:52 +0800
Subject: [PATCH 85/85] Update readme.md

---
 readme.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/readme.md b/readme.md
index 6af22ea7df..d390683cae 100644
--- a/readme.md
+++ b/readme.md
@@ -17,11 +17,9 @@
 * https://github.com/wechat-group/weixin-java-tools-springmvc （公众号Demo，内含部分微信支付代码）
 
 ---------------------------------
-### 其他信息：
+### 重要提示信息（部分为新手必读）：
 1. 最新更新：**2017-9-3 发布[【2.8.0正式版】](https://github.com/Wechat-Group/weixin-java-tools/releases)**！
 1. 开源中国网站的本项目介绍的首页链接地址：https://www.oschina.net/p/weixin-java-tools-new
-1. 自2.6.0版本开始，微信支付相关功能抽出独立为一个模块，详细使用方式请参考相关demo；
-1. 自2.7.0版本开始，支持微信小程序，具体可以参考相关demo；
 1. SDK详细开发文档请查阅 [【Wiki】](https://github.com/wechat-group/weixin-java-tools/wiki)，部分文档可能未能及时更新，如有发现，可以及时上报或者自行修改。
 1. 各个模块的Javadoc可以在线查看（有可能是最新的测试版本的，请注意观察版本号）：[weixin-java-miniapp](https://binarywang.github.io/weixin-java-miniapp-javadoc/)、[weixin-java-pay](https://binarywang.github.io/weixin-java-pay-javadoc/)、[weixin-java-mp](https://binarywang.github.io/weixin-java-mp-javadoc/)、[weixin-java-common](https://binarywang.github.io/weixin-java-common-javadoc/)、[weixin-java-cp](https://binarywang.github.io/weixin-java-cp-javadoc/)
 1. 本SDK要求的最低JDK版本是7，还在使用JDK6的用户请参考[【此项目】]( https://github.com/binarywang/weixin-java-tools-for-jdk6) ，而其他更早的JDK版本则需要自己改造实现。
@@ -30,7 +28,7 @@
 1. **捐助渠道已开通，如有意向请点击[【支付宝二维码】](alipay_qrcode.jpg)捐赠，或者直接前往[【托管于码云的项目首页】](http://git.oschina.net/binary/weixin-java-tools)，在评论区上方可以找到“捐助”按钮。非常感谢各位捐助的同学！**
 
 ---------------------------------
-## SDK使用交流方式说明：
+## 使用交流方式说明：
 1. QQ群： [![加入QQ群](https://img.shields.io/badge/QQ群-343954419-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=731dc3e7ea31ebe25376cc1a791445468612c63fd0e9e05399b088ec81fd9e15) 或 [![加入QQ群](https://img.shields.io/badge/QQ群-343954419-blue.svg)](http://jq.qq.com/?_wv=1027&k=40lRskK)，推荐点击按钮入群，当然如果无法成功操作，请自行搜索群号343954419进行添加 ）
 1. 由于群容量有限，即将爆满，故开启付费入群模式以保证只有真实交流需求的人进入，如果确实因为各种原因无法付费入群的，请联系群主说明原因即可入群；并为保证群的活跃度，本群将不定期清理长时间不活跃的同学；
 1. 微信群： 因微信群已达到100人限制，故如有想加入微信群的，请入QQ群后联系管理员，提供微信号以便邀请加入；