From 0a99706b7460ec30a565b360a0e0ff4c7696c5c9 Mon Sep 17 00:00:00 2001
From: S <sshzh90@gmail.com>
Date: Sun, 8 Mar 2020 16:18:09 +0800
Subject: [PATCH 001/114] =?UTF-8?q?:bug:=20#1426=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=9A=E5=85=AC=E4=BC=97=E5=8F=B7=E7=AE=A1=E7=90=86=E7=9A=84?=
 =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、允许动态更新公众号的配置，原有逻辑：更新配置时会报“该公众号标识已存在，请更换其他标识！”；
2、多公众号的消息路由，原有逻辑问题：handler里WxMpConfigStorageHolder不能获取到appid，意味着用的wxmpservice不对，只会走默认的，已测试存在该问题
---
 .../me/chanjar/weixin/mp/api/WxMpMessageRouter.java   | 11 +++++++++++
 .../weixin/mp/api/impl/BaseWxMpServiceImpl.java       |  3 ---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
index 2571ebaa68..98ef7716f9 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
@@ -152,6 +152,13 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String,
     return route(wxMessage, context, null);
   }
 
+  /**
+   * 处理不同appid微信消息
+   */
+  public WxMpXmlOutMessage route(final String appid, final WxMpXmlMessage wxMessage, final Map<String, Object> context) {
+    return route(wxMessage, context, this.wxMpService.switchoverTo(appid));
+  }
+
   /**
    * 处理微信消息.
    */
@@ -228,6 +235,10 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
     return this.route(wxMessage, new HashMap<String, Object>(2));
   }
 
+  public WxMpXmlOutMessage route(String appid, final WxMpXmlMessage wxMessage) {
+    return this.route(appid, wxMessage, new HashMap<String, Object>(2));
+  }
+
   private boolean isMsgDuplicated(WxMpXmlMessage wxMessage) {
     StringBuilder messageId = new StringBuilder();
     if (wxMessage.getMsgId() == null) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
index e57099e9d7..73b548c24f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -399,9 +399,6 @@ public void setMultiConfigStorages(Map<String, WxMpConfigStorage> configStorages
   @Override
   public void addConfigStorage(String mpId, WxMpConfigStorage configStorages) {
     synchronized (this) {
-      if (this.configStorageMap.containsKey(mpId)) {
-        throw new RuntimeException("该公众号标识已存在，请更换其他标识！");
-      }
       this.configStorageMap.put(mpId, configStorages);
     }
   }

From 1b193e30705f0035366b0aee97c616fa17878adb Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 8 Mar 2020 16:26:49 +0800
Subject: [PATCH 002/114] =?UTF-8?q?:bug:=20#1420=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=91=E5=BC=80=E5=8F=91=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java     | 1 +
 .../cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java
index 7e59e6ec6f..2cb72fd07a 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java
@@ -19,6 +19,7 @@ public interface WxMaCloudService {
   String DATABASE_COLLECTION_ADD_URL = "https://api.weixin.qq.com/tcb/databasecollectionadd";
   String GET_QCLOUD_TOKEN_URL = "https://api.weixin.qq.com/tcb/getqcloudtoken";
   String BATCH_DELETE_FILE_URL = "https://api.weixin.qq.com/tcb/batchdeletefile";
+  String BATCH_DOWNLOAD_FILE_URL = "https://api.weixin.qq.com/tcb/batchdownloadfile";
   String UPLOAD_FILE_URL = "https://api.weixin.qq.com/tcb/uploadfile";
   String DATABASE_MIGRATE_QUERY_INFO_URL = "https://api.weixin.qq.com/tcb/databasemigratequeryinfo";
   String DATABASE_MIGRATE_EXPORT_URL = "https://api.weixin.qq.com/tcb/databasemigrateexport";
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
index 984185649c..f83a7bde65 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
@@ -133,7 +133,7 @@ public WxCloudBatchDownloadFileResult batchDownloadFile(String env, String[] fil
       fileList.add(ImmutableMap.of("fileid", fileId, "max_age", (Serializable) maxAges[i++]));
     }
 
-    String response = this.wxMaService.post(GET_QCLOUD_TOKEN_URL, ImmutableMap.of("env", env, "file_list", fileList));
+    String response = this.wxMaService.post(BATCH_DOWNLOAD_FILE_URL, ImmutableMap.of("env", env, "file_list", fileList));
     return WxGsonBuilder.create().fromJson(response, WxCloudBatchDownloadFileResult.class);
   }
 

From 06aaacce65558fe00e427967918b0a987cfe5c65 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 8 Mar 2020 19:54:20 +0800
Subject: [PATCH 003/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E7=82=B9?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/chanjar/weixin/common/util/BeanUtils.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/BeanUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/BeanUtils.java
index 4b7f9be6a7..768f2e5324 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/BeanUtils.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/BeanUtils.java
@@ -50,14 +50,13 @@ public static void checkRequiredFields(Object bean) throws WxErrorException {
           }
         }
         field.setAccessible(isAccessible);
-      } catch (SecurityException | IllegalArgumentException
-        | IllegalAccessException e) {
+      } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) {
         log.error(e.getMessage(), e);
       }
     }
 
     if (!requiredFields.isEmpty()) {
-      String msg = "必填字段 " + requiredFields + " 必须提供值";
+      String msg = String.format("必填字段【%s】必须提供值！", requiredFields);
       log.debug(msg);
       throw new WxErrorException(WxError.builder().errorMsg(msg).build());
     }

From f58ba62acc24990861a86280cf1453b743fcf16c Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 8 Mar 2020 20:15:36 +0800
Subject: [PATCH 004/114] =?UTF-8?q?:art:=20#1428=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=BB=9F=E4=B8=80=E4=B8=8B=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=B8=AD=E7=9A=84attach=E5=92=8Cdetail=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=9C=A8=E7=94=9F=E6=88=90xml=E6=97=B6=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5CDATA=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/request/WxPayUnifiedOrderRequest.java         | 4 ++++
 .../wxpay/service/impl/BaseWxPayServiceImplTest.java         | 5 +++--
 2 files changed, 7 insertions(+), 2 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 fc5949dfdf..3a80c82787 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,9 +4,11 @@
 import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
 import lombok.*;
 import lombok.experimental.Accessors;
 import me.chanjar.weixin.common.annotation.Required;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
@@ -111,6 +113,7 @@ public class WxPayUnifiedOrderRequest extends BaseWxPayRequest {
    * </pre>
    */
   @XStreamAlias("detail")
+  @XStreamConverter(value = XStreamCDataConverter.class)
   private String detail;
 
   /**
@@ -124,6 +127,7 @@ public class WxPayUnifiedOrderRequest extends BaseWxPayRequest {
    * </pre>
    */
   @XStreamAlias("attach")
+  @XStreamConverter(value = XStreamCDataConverter.class)
   private String attach;
 
   /**
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
index ab850d0b5b..de7b1e586e 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -63,12 +63,13 @@ public void testUnifiedOrder() throws WxPayException {
       .notifyUrl("111111")
       .tradeType(TradeType.JSAPI)
       .openid(((XmlWxPayConfig) this.payService.getConfig()).getOpenid())
-      .outTradeNo("1111112")
+      .outTradeNo("111111826")
+      .attach("#*#{\"pn\":\"粤B87965\",\"aid\":\"wx123\"}#*#")
       .build();
     request.setSignType(SignType.HMAC_SHA256);
     WxPayUnifiedOrderResult result = this.payService.unifiedOrder(request);
     log.info(result.toString());
-    log.warn(this.payService.getWxApiData().toString());
+//    log.warn(this.payService.getWxApiData().toString());
   }
 
   /**

From fb4705281a0a0ed5e41358b7517f4e99e1abad9c Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 8 Mar 2020 20:20:10 +0800
Subject: [PATCH 005/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=A2=9E=E5=8A=A0serialVersionUID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/github/binarywang/wxpay/bean/entpay/EntPayResult.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java
index 9863e83bcc..23a3cb7f23 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/entpay/EntPayResult.java
@@ -20,6 +20,8 @@
 @NoArgsConstructor
 @XStreamAlias("xml")
 public class EntPayResult extends BaseWxPayResult {
+  private static final long serialVersionUID = 8523569987269603097L;
+
   /**
    * 商户号.
    */

From 8aa4758e0161909ebaccd2cf1f8c293d8a7c8e06 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 8 Mar 2020 20:37:10 +0800
Subject: [PATCH 006/114] =?UTF-8?q?:bug:=20#1425=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1OA=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=87=A0=E4=B8=AA=E5=8F=82=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=88=96=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/bean/oa/WxCpApprovalComment.java  |  1 -
 .../weixin/cp/bean/oa/WxCpApprovalDetail.java   |  8 ++++----
 .../cp/bean/oa/applydata/ContentValue.java      | 17 ++++-------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalComment.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalComment.java
index 8a70e3e6e9..1bf06ec51b 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalComment.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalComment.java
@@ -13,7 +13,6 @@
  */
 @Data
 public class WxCpApprovalComment implements Serializable {
-
   private static final long serialVersionUID = -5430367411926856292L;
 
   /**
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java
index 5021a57ee6..a22a435844 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/WxCpApprovalDetail.java
@@ -13,7 +13,6 @@
  */
 @Data
 public class WxCpApprovalDetail implements Serializable {
-
   private static final long serialVersionUID = 1353393306564207170L;
 
   /**
@@ -49,19 +48,20 @@ public class WxCpApprovalDetail implements Serializable {
   /**
    * 申请人信息
    */
-  private WxCpApprovalApplyer applyer;
+  @SerializedName("applyer")
+  private WxCpApprovalApplyer applier;
 
   /**
    * 审批流程信息，可能有多个审批节点
    */
   @SerializedName("sp_record")
-  private WxCpApprovalRecord spRecord;
+  private WxCpApprovalRecord[] spRecords;
 
   /**
    * 抄送信息，可能有多个抄送节点
    */
   @SerializedName("notifyer")
-  private WxCpOperator notifyer;
+  private WxCpOperator[] notifiers;
 
   /**
    * 审批申请数据
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
index 7798338aa1..609b8dfb7c 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
@@ -11,16 +11,15 @@
  */
 @Data
 public class ContentValue implements Serializable {
-
   private static final long serialVersionUID = -5607678965965065261L;
 
   private String text;
 
   @SerializedName("new_number")
-  private Integer newNumber;
+  private Double newNumber;
 
   @SerializedName("new_money")
-  private Integer newMoney;
+  private Double newMoney;
 
   private ContentValue.Date date;
 
@@ -36,24 +35,21 @@ public class ContentValue implements Serializable {
 
   @Data
   public static class Date implements Serializable {
-
     private static final long serialVersionUID = -6181554080062231138L;
     private String type;
 
     @SerializedName("s_timestamp")
-    private Long timestamp;
+    private Double timestamp;
   }
 
   @Data
   public static class Selector implements Serializable {
-
     private static final long serialVersionUID = 7305458759126951773L;
     private String type;
     private List<Option> options;
 
     @Data
     public static class Option implements Serializable {
-
       private static final long serialVersionUID = -3471071106328280252L;
       private String key;
 
@@ -74,28 +70,23 @@ public static class Member implements Serializable {
 
   @Data
   public static class Department implements Serializable {
-
     private static final long serialVersionUID = -2513762192924826234L;
 
     @SerializedName("openapi_id")
-
     private String openApiId;
     private String name;
   }
 
   @Data
   public static class File implements Serializable {
-
     private static final long serialVersionUID = 3890971381800855142L;
+
     @SerializedName("file_id")
     private String fileId;
-
-
   }
 
   @Data
   public static class Child implements Serializable {
-
     private static final long serialVersionUID = -3500102073821161558L;
     private List<Content> list;
   }

From c8a23b848fd4548656b3eb0621ed854be8d00c43 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 8 Mar 2020 21:12:16 +0800
Subject: [PATCH 007/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.7.1?=
 =?UTF-8?q?.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93b5df6b87..71083bd5ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.0</version>
+  <version>3.7.1.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index ecf51716dd..69ebc160d4 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index 899b7bb2e0..8a62f39654 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 9053e72ba7..117324d9ae 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 9d77c2c76a..99f153260a 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 870f3e7c77..948aaa8b6a 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index 1f351580e1..9c5f53dfa4 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 0620e6ddfa..15220648fa 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 5892d6a3d6..4a2b18c323 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index ca89968b44..b77cb96d72 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 7ee22b56c2..18a9818dc4 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index 825a1e1a89..2e8b9196ba 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 7d9100c5cb..8e20d7995f 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.0</version>
+    <version>3.7.1.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 9b322713c1760747da5909e70d43151806b559ad Mon Sep 17 00:00:00 2001
From: miemieYaho <ming.sansama@gmail.com>
Date: Wed, 11 Mar 2020 16:03:26 +0800
Subject: [PATCH 008/114] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8Dyml=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89redis=E7=9A=84=E9=85=8D=E7=BD=AE=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../starter/wxjava/mp/properties/WxMpProperties.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java
index 0dbca9e778..4a9bfbbfe6 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 import java.io.Serializable;
 
@@ -42,7 +43,7 @@ public class WxMpProperties {
   /**
    * 存储策略, memory, redis.
    */
-  private ConfigStorage configStorage = new ConfigStorage();
+  private final ConfigStorage configStorage = new ConfigStorage();
 
 
   @Data
@@ -51,8 +52,8 @@ public static class ConfigStorage implements Serializable {
 
     private StorageType type = memory;
 
-    private RedisProperties redis = new RedisProperties();
-
+    @NestedConfigurationProperty
+    private final RedisProperties redis = new RedisProperties();
   }
 
   public enum StorageType {

From 341f176dfa66bab4827481bb07d44ba2c47f3eae Mon Sep 17 00:00:00 2001
From: Jc826 <jicheng_code@163.com>
Date: Thu, 12 Mar 2020 16:54:14 +0800
Subject: [PATCH 009/114] =?UTF-8?q?:bug:=20#1438=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF=E8=A1=8C=E4=B8=9A=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=B1=BB=E6=97=A0=E6=B3=95=E8=A7=A3=E6=9E=90=E7=B1=BB?=
 =?UTF-8?q?=E4=BC=BC"=E4=BA=92=E8=81=94=E7=BD=91|=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E5=95=86=E5=8A=A1"=E5=BD=A2=E5=BC=8F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/bean/template/WxMpTemplateIndustryEnum.java       | 2 +-
 .../weixin/mp/bean/template/WxMpTemplateIndustryTest.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java
index 8a0a91371b..b3bfcba1be 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java
@@ -198,7 +198,7 @@ public enum WxMpTemplateIndustryEnum {
    */
   public static WxMpTemplateIndustryEnum findBySecondary(String industry) {
     for (WxMpTemplateIndustryEnum industryEnum : WxMpTemplateIndustryEnum.values()) {
-      if (industryEnum.secondClass.equals(industry)) {
+      if (industryEnum.secondClass.contains(industry)) {
         return industryEnum;
       }
     }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
index d5affa288b..eddcfd31bc 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
@@ -15,7 +15,7 @@ public class WxMpTemplateIndustryTest {
 
     @Test
     public void testFromJson() {
-      String json="{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"IT软件与服务\"},\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}";
+      String json="{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"互联网|电子商务\"},\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}";
       final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json);
       assertThat(industry).isNotNull();
       System.out.println(industry);

From e761174270be4a5bd3fa553989e18a6b97f87032 Mon Sep 17 00:00:00 2001
From: miemieYaho <ming.sansama@gmail.com>
Date: Thu, 12 Mar 2020 17:10:58 +0800
Subject: [PATCH 010/114] =?UTF-8?q?:art:=20#1437=20=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7spring=20boot=20starter=E6=A8=A1=E5=9D=97=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=B8=8D=E5=BC=BA=E5=88=B6=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?redission?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 不强制依赖redission,直接项目中排除redisson会cnfe,参考方案
---
 .../wx-java-mp-spring-boot-starter/pom.xml    |  1 +
 .../config/WxMpStorageAutoConfiguration.java  | 43 +++++++++++--------
 .../wxjava/mp/properties/RedisProperties.java | 21 +++++++++
 3 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 117324d9ae..9f741a7889 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -28,6 +28,7 @@
       <groupId>org.redisson</groupId>
       <artifactId>redisson</artifactId>
       <scope>compile</scope>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
index 4ddff5a72a..f25caf90ba 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
@@ -6,9 +6,8 @@
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
-import org.redisson.api.RedissonClient;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import redis.clients.jedis.JedisPool;
@@ -22,13 +21,9 @@
 @Configuration
 @RequiredArgsConstructor
 public class WxMpStorageAutoConfiguration {
-  private final WxMpProperties properties;
-
-  @Autowired(required = false)
-  private JedisPool jedisPool;
 
-  @Autowired(required = false)
-  private RedissonClient redissonClient;
+  private final WxMpProperties properties;
+  private final ApplicationContext applicationContext;
 
   @Bean
   @ConditionalOnMissingBean(WxMpConfigStorage.class)
@@ -49,13 +44,21 @@ private WxMpDefaultConfigImpl getWxMpInMemoryConfigStorage() {
   }
 
   private WxMpRedisConfigImpl getWxMpInRedisConfigStorage() {
-    JedisPool poolToUse = jedisPool;
-    if (poolToUse == null) {
-      poolToUse = getJedisPool();
+    RedisProperties.ImplType implType = properties.getConfigStorage().getRedis().getImpl();
+    boolean reuseBean = properties.getConfigStorage().getRedis().isReuseBean();
+    if (implType == RedisProperties.ImplType.jedis) {
+      JedisPool pool = null;
+      if (reuseBean) {
+        pool = getBean(JedisPool.class);
+      }
+      if (pool == null) {
+        pool = getJedisPool();
+      }
+      WxMpRedisConfigImpl config = new WxMpRedisConfigImpl(pool);
+      setWxMpInfo(config);
+      return config;
     }
-    WxMpRedisConfigImpl config = new WxMpRedisConfigImpl(poolToUse);
-    setWxMpInfo(config);
-    return config;
+    throw new UnsupportedOperationException();
   }
 
   private void setWxMpInfo(WxMpDefaultConfigImpl config) {
@@ -85,8 +88,14 @@ private JedisPool getJedisPool() {
     config.setTestOnBorrow(true);
     config.setTestWhileIdle(true);
 
-    JedisPool pool = new JedisPool(config, redis.getHost(), redis.getPort(),
-      redis.getTimeout(), redis.getPassword(), redis.getDatabase());
-    return pool;
+    return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(),
+      redis.getDatabase());
+  }
+
+  private <T> T getBean(Class<T> clazz) {
+    if (this.applicationContext.getBeanNamesForType(clazz, false, false).length > 0) {
+      return this.applicationContext.getBean(clazz);
+    }
+    return null;
   }
 }
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java
index d95e8df984..840cf6e35e 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java
@@ -13,6 +13,16 @@
 public class RedisProperties implements Serializable {
   private static final long serialVersionUID = -5924815351660074401L;
 
+  /**
+   * 操作Redis的实现
+   */
+  private ImplType impl = ImplType.jedis;
+
+  /**
+   * 操作Redis的实现如果在spring容器里是否直接使用
+   */
+  private boolean reuseBean = true;
+
   /**
    * 主机地址.
    */
@@ -42,4 +52,15 @@ public class RedisProperties implements Serializable {
   private Integer maxIdle;
   private Integer maxWaitMillis;
   private Integer minIdle;
+
+  public enum ImplType {
+    /**
+     * jedis.
+     */
+    jedis,
+    /**
+     * redisson.
+     */
+//    redisson
+  }
 }

From 704a389ddb40d8a2eb9aa52d2230d8e29c030c77 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 12 Mar 2020 17:41:31 +0800
Subject: [PATCH 011/114] =?UTF-8?q?:art:=20#1432=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=83=A8=E9=97=A8=E7=B1=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=90=8D=E7=A7=B0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java    | 5 +++--
 .../chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java
index dc71e027e3..f5b9b32592 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpDepart.java
@@ -6,16 +6,17 @@
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 /**
- * 微信部门.
+ * 企业微信的部门.
  *
  * @author Daniel Qian
  */
 @Data
 public class WxCpDepart implements Serializable {
-
   private static final long serialVersionUID = -5028321625140879571L;
+
   private Long id;
   private String name;
+  private String enName;
   private Long parentId;
   private Long order;
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java
index a999d7b2e0..4340855fda 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpDepartGsonAdapter.java
@@ -28,6 +28,7 @@
 public class WxCpDepartGsonAdapter implements JsonSerializer<WxCpDepart>, JsonDeserializer<WxCpDepart> {
   private static final String ID = "id";
   private static final String NAME = "name";
+  private static final String EN_NAME = "name_en";
   private static final String PARENT_ID = "parentid";
   private static final String ORDER = "order";
 
@@ -40,6 +41,9 @@ public JsonElement serialize(WxCpDepart group, Type typeOfSrc, JsonSerialization
     if (group.getName() != null) {
       json.addProperty(NAME, group.getName());
     }
+    if (group.getEnName() != null) {
+      json.addProperty(EN_NAME, group.getEnName());
+    }
     if (group.getParentId() != null) {
       json.addProperty(PARENT_ID, group.getParentId());
     }
@@ -60,6 +64,9 @@ public WxCpDepart deserialize(JsonElement json, Type typeOfT, JsonDeserializatio
     if (departJson.get(NAME) != null && !departJson.get(NAME).isJsonNull()) {
       depart.setName(GsonHelper.getAsString(departJson.get(NAME)));
     }
+    if (departJson.get(EN_NAME) != null && !departJson.get(EN_NAME).isJsonNull()) {
+      depart.setEnName(GsonHelper.getAsString(departJson.get(EN_NAME)));
+    }
     if (departJson.get(ORDER) != null && !departJson.get(ORDER).isJsonNull()) {
       depart.setOrder(GsonHelper.getAsLong(departJson.get(ORDER)));
     }

From 2406dc63ac163640483bec956bc0bc2f14d70c78 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 12 Mar 2020 17:51:00 +0800
Subject: [PATCH 012/114] =?UTF-8?q?:art:=20#1435=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E7=B1=BB?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=A0=E4=B8=AA=E7=BC=BA=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/result/WxPayOrderQueryResult.java    | 76 +++++++++++++++----
 1 file changed, 62 insertions(+), 14 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
index 906a8cf12f..73b5fabbcd 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
@@ -77,7 +77,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
    * <pre>
    * 是否关注公众账号.
    * is_subscribe
-   * 否
+   * 是
    * String(1)
    * Y
    * 用户是否关注公众账号，Y-关注，N-未关注，仅在公众账号类型支付有效
@@ -86,6 +86,32 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
   @XStreamAlias("is_subscribe")
   private String isSubscribe;
 
+  /**
+   * <pre>
+   * 用户子标识	.
+   * sub_openid
+   * 否
+   * String(128)
+   * oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+   * 用户在子商户appid下的唯一标识
+   * </pre>
+   */
+  @XStreamAlias("sub_openid")
+  private String subOpenid;
+
+  /**
+   * <pre>
+   * 是否关注子公众账号.
+   * sub_is_subscribe
+   * 否
+   * String(1)
+   * Y
+   * 用户是否关注子公众账号，Y-关注，N-未关注（机构商户不返回）
+   * </pre>
+   */
+  @XStreamAlias("sub_is_subscribe")
+  private String isSubscribeSub;
+
   /**
    * <pre>
    * 交易类型.
@@ -125,6 +151,25 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
   @XStreamAlias("bank_type")
   private String bankType;
 
+  /**
+   * <pre>
+   * 商品详情.
+   * detail
+   * 否
+   * String(8192)
+   * 商品详细列表，使用Json格式，传输签名前请务必使用CDATA标签将JSON文本串保护起来。如果使用了单品优惠，会有单品优惠信息返回
+   *
+   * discount_detail []：
+   * └ goods_id String 必填 32 商品的编号
+   * └ goods_name String 必填 256 商品名称
+   * └ coupon_batch_id String 必填 代金券批次ID
+   * └ coupon_id String 必填 代金卷ID
+   * └ coupon_fee Int 必填 代金券支付金额，单位为分
+   * </pre>
+   **/
+  @XStreamAlias("detail")
+  private String detail;
+
   /**
    * <pre>
    * 订单金额.
@@ -138,19 +183,6 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
   @XStreamAlias("total_fee")
   private Integer totalFee;
 
-  /**
-   * <pre>
-   * 应结订单金额.
-   * settlement_total_fee
-   * 否
-   * Int
-   * 100
-   * 应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
-   * </pre>
-   */
-  @XStreamAlias("settlement_total_fee")
-  private Integer settlementTotalFee;
-
   /**
    * <pre>
    * 货币种类.
@@ -164,6 +196,19 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
   @XStreamAlias("fee_type")
   private String feeType;
 
+  /**
+   * <pre>
+   * 应结订单金额.
+   * settlement_total_fee
+   * 否
+   * Int
+   * 100
+   * 应结订单金额=订单金额-非充值代金券金额，应结订单金额<=订单金额。
+   * </pre>
+   */
+  @XStreamAlias("settlement_total_fee")
+  private Integer settlementTotalFee;
+
   /**
    * <pre>
    * 现金支付金额.
@@ -240,6 +285,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
    */
   @XStreamAlias("out_trade_no")
   private String outTradeNo;
+
   /**
    * <pre>
    * 附加数据.
@@ -252,6 +298,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
    */
   @XStreamAlias("attach")
   private String attach;
+
   /**
    * <pre>
    * 支付完成时间.
@@ -264,6 +311,7 @@ public class WxPayOrderQueryResult extends BaseWxPayResult {
    */
   @XStreamAlias("time_end")
   private String timeEnd;
+
   /**
    * <pre>
    * 交易状态描述.

From c184ae1e4c57245f738bc8012824eb7387d3500f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 12 Mar 2020 18:46:03 +0800
Subject: [PATCH 013/114] =?UTF-8?q?:art:=20=E6=96=87=E6=A1=A3=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/bean/result/WxPaySendRedpackResult.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java
index adc6a688fc..49390da897 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPaySendRedpackResult.java
@@ -10,7 +10,7 @@
 
 /**
  * 向微信用户个人发现金红包返回结果
- * https://pay.weixin.qq.com/wiki/doc/api/cash_coupon.php?chapter=13_5
+ * https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_4&index=3
  *
  * @author kane
  */

From 07a1d26622baf25e974947f784b74a345cdf0980 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 12 Mar 2020 18:54:52 +0800
Subject: [PATCH 014/114] =?UTF-8?q?:art:=20#1430=20WxMpConfigStorageHolder?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9Bremove=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E4=BD=BF=E7=94=A8=E8=80=85=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/util/WxMpConfigStorageHolder.java       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/WxMpConfigStorageHolder.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/WxMpConfigStorageHolder.java
index af2f9226db..e844c4866b 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/WxMpConfigStorageHolder.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/WxMpConfigStorageHolder.java
@@ -1,13 +1,11 @@
 package me.chanjar.weixin.mp.util;
 
-
 /**
- * @Author: yd
- * @Date: 2019-03-20 22:06
+ * @author yd
+ * @date 2019-03-20 22:06
  */
 public class WxMpConfigStorageHolder {
-
-  private final static ThreadLocal<String> WX_MP_CONFIG_STORAGE_CHOSE = new ThreadLocal<String>() {
+  private final static ThreadLocal<String> THREAD_LOCAL = new ThreadLocal<String>() {
     @Override
     protected String initialValue() {
       return "default";
@@ -15,11 +13,17 @@ protected String initialValue() {
   };
 
   public static String get() {
-    return WX_MP_CONFIG_STORAGE_CHOSE.get();
+    return THREAD_LOCAL.get();
   }
 
   public static void set(String label) {
-    WX_MP_CONFIG_STORAGE_CHOSE.set(label);
+    THREAD_LOCAL.set(label);
   }
 
+  /**
+   * 此方法需要用户根据自己程序代码，在适当位置手动触发调用，本SDK里无法判断调用时机
+   */
+  public static void remove() {
+    THREAD_LOCAL.remove();
+  }
 }

From 61d9fe41633fafd172c3373c802c511c6c7bf78a Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 12 Mar 2020 19:21:08 +0800
Subject: [PATCH 015/114] =?UTF-8?q?:art:=20#1411=20=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=A8=A1=E5=9D=97=E6=B6=88=E6=81=AF=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B6=88=E6=81=AF=E6=8E=92=E9=87=8D=E6=9C=BA?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wx/miniapp/message/WxMaMessageRouter.java | 66 +++++++++----------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java
index bda2e6c81e..e932da641d 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java
@@ -3,6 +3,7 @@
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaMessage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import lombok.Data;
 import me.chanjar.weixin.common.api.WxErrorExceptionHandler;
 import me.chanjar.weixin.common.api.WxMessageDuplicateChecker;
 import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker;
@@ -11,6 +12,7 @@
 import me.chanjar.weixin.common.session.StandardSessionManager;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.common.util.LogExceptionHandler;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,6 +25,7 @@
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
+@Data
 public class WxMaMessageRouter {
   private static final int DEFAULT_THREAD_POOL_SIZE = 100;
   private final Logger log = LoggerFactory.getLogger(WxMaMessageRouter.class);
@@ -36,6 +39,8 @@ public class WxMaMessageRouter {
 
   private WxErrorExceptionHandler exceptionHandler;
 
+  private WxMessageDuplicateChecker messageDuplicateChecker;
+
   public WxMaMessageRouter(WxMaService wxMaService) {
     this.wxMaService = wxMaService;
     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder().setNameFormat("WxMaMessageRouter-pool-%d").build();
@@ -43,40 +48,7 @@ public WxMaMessageRouter(WxMaService wxMaService) {
       0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(), namedThreadFactory);
     this.sessionManager = new StandardSessionManager();
     this.exceptionHandler = new LogExceptionHandler();
-  }
-
-  /**
-   * <pre>
-   * 设置自定义的 {@link ExecutorService}
-   * 如果不调用该方法，默认使用 Executors.newFixedThreadPool(100)
-   * </pre>
-   */
-  public void setExecutorService(ExecutorService executorService) {
-    this.executorService = executorService;
-  }
-
-  /**
-   * <pre>
-   * 设置自定义的{@link me.chanjar.weixin.common.session.WxSessionManager}
-   * 如果不调用该方法，默认使用 {@link me.chanjar.weixin.common.session.StandardSessionManager}
-   * </pre>
-   */
-  public void setSessionManager(WxSessionManager sessionManager) {
-    this.sessionManager = sessionManager;
-  }
-
-  /**
-   * <pre>
-   * 设置自定义的{@link me.chanjar.weixin.common.api.WxErrorExceptionHandler}
-   * 如果不调用该方法，默认使用 {@link me.chanjar.weixin.common.util.LogExceptionHandler}
-   * </pre>
-   */
-  public void setExceptionHandler(WxErrorExceptionHandler exceptionHandler) {
-    this.exceptionHandler = exceptionHandler;
-  }
-
-  List<WxMaMessageRouterRule> getRules() {
-    return this.rules;
+    this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker();
   }
 
   /**
@@ -90,6 +62,11 @@ public WxMaMessageRouterRule rule() {
    * 处理微信消息.
    */
   private WxMaXmlOutMessage route(final WxMaMessage wxMessage, final Map<String, Object> context) {
+    if (isMsgDuplicated(wxMessage)) {
+      // 如果是重复消息，那么就不做处理
+      return null;
+    }
+
     final List<WxMaMessageRouterRule> matchRules = new ArrayList<>();
     // 收集匹配的规则
     for (final WxMaMessageRouterRule rule : this.rules) {
@@ -147,7 +124,26 @@ public void run() {
   }
 
   public WxMaXmlOutMessage route(final WxMaMessage wxMessage) {
-   return this.route(wxMessage, new HashMap<String, Object>(2));
+    return this.route(wxMessage, new HashMap<String, Object>(2));
+  }
+
+  private boolean isMsgDuplicated(WxMaMessage wxMessage) {
+    StringBuilder messageId = new StringBuilder();
+    if (wxMessage.getMsgId() == null) {
+      messageId.append(wxMessage.getCreateTime())
+        .append("-").append(wxMessage.getFromUser())
+        .append("-").append(StringUtils.trimToEmpty(wxMessage.getEvent()));
+    } else {
+      messageId.append(wxMessage.getMsgId())
+        .append("-").append(wxMessage.getCreateTime())
+        .append("-").append(wxMessage.getFromUser());
+    }
+
+    if (StringUtils.isNotEmpty(wxMessage.getToUser())) {
+      messageId.append("-").append(wxMessage.getToUser());
+    }
+
+    return this.messageDuplicateChecker.isDuplicate(messageId.toString());
   }
 
   /**

From ec8cc3ba99b1fcf83717c74e9eae34cdc49b0bcd Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 15 Mar 2020 23:52:42 +0800
Subject: [PATCH 016/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.7.2?=
 =?UTF-8?q?.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 71083bd5ac..18d82e5b8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.1.B</version>
+  <version>3.7.2.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 69ebc160d4..274f6c9aa9 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index 8a62f39654..d3d571450b 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 9f741a7889..2ac23f9e09 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 99f153260a..1d69343753 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 948aaa8b6a..39bb1a7e9a 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index 9c5f53dfa4..25f0f61f9d 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 15220648fa..259a0fb7e3 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 4a2b18c323..0c1a1d1942 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index b77cb96d72..de3a9a751d 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 18a9818dc4..de65ed8fdc 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index 2e8b9196ba..24afbe9f02 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 8e20d7995f..53e62c94bc 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.1.B</version>
+    <version>3.7.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From ea01e55cce38265869ca881ef63322486fc99ffa Mon Sep 17 00:00:00 2001
From: yuanqixun <yuanqixun@163.com>
Date: Mon, 16 Mar 2020 20:37:11 +0800
Subject: [PATCH 017/114] =?UTF-8?q?:new:=20#1396=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E5=A4=96=E9=83=A8=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: 袁启勋 <xun.yuan@infoship.cn>
---
 .../cp/api/WxCpExternalContactService.java    |  79 +++++++++-
 .../impl/WxCpExternalContactServiceImpl.java  | 100 ++++++++++++-
 .../chanjar/weixin/cp/bean/WxCpBaseResp.java  |  28 ++++
 .../me/chanjar/weixin/cp/bean/WxCpTpCorp.java |  86 +++++------
 .../weixin/cp/bean/WxCpTpXmlMessage.java      | 140 +++++++++---------
 .../bean/WxCpUserExternalGroupChatInfo.java   |  75 ++++++++++
 .../bean/WxCpUserExternalGroupChatList.java   |  46 ++++++
 .../WxCpUserExternalGroupChatStatistic.java   |  90 +++++++++++
 .../cp/bean/WxCpUserExternalUnassignList.java |  52 +++++++
 ...WxCpUserExternalUserBehaviorStatistic.java |  78 ++++++++++
 .../weixin/cp/constant/WxCpApiPathConsts.java |   6 +
 11 files changed, 666 insertions(+), 114 deletions(-)
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpBaseResp.java
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatInfo.java
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatList.java
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatStatistic.java
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalUnassignList.java
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalUserBehaviorStatistic.java

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
index df5326f249..0680f3e27c 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
@@ -1,8 +1,10 @@
 package me.chanjar.weixin.cp.api;
 
 import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.cp.bean.WxCpUserExternalContactInfo;
+import me.chanjar.weixin.cp.bean.*;
 
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -85,4 +87,79 @@ public interface WxCpExternalContactService {
    */
   List<String> listFollowUser() throws WxErrorException;
 
+  /**
+   * 企业和第三方可通过此接口，获取所有离职成员的客户列表，并可进一步调用离职成员的外部联系人再分配接口将这些客户重新分配给其他企业成员。
+   * @param page
+   * @param pageSize
+   * @return
+   * @throws WxErrorException
+   */
+  WxCpUserExternalUnassignList listUnassignedList(Integer page, Integer pageSize) throws WxErrorException;
+
+  /**
+   * 企业可通过此接口，将已离职成员的外部联系人分配给另一个成员接替联系。
+   * @param externalUserid
+   * @param handOverUserid
+   * @param takeOverUserid
+   * @return
+   * @throws WxErrorException
+   */
+  WxCpBaseResp transferExternalContact(String externalUserid,String handOverUserid,String takeOverUserid)throws WxErrorException;
+
+   /** <pre>
+    * 该接口用于获取配置过客户群管理的客户群列表。
+    * 企业需要使用“客户联系”secret或配置到“可调用应用”列表中的自建应用secret所获取的accesstoken来调用（accesstoken如何获取？）。
+    * 暂不支持第三方调用。
+    * 微信文档：https://work.weixin.qq.com/api/doc/90000/90135/92119
+    * </pre>
+    */
+  WxCpUserExternalGroupChatList listGroupChat(Integer pageIndex,Integer pageSize,int status,String[] userIds,String[] partyIds) throws WxErrorException;
+
+  /**
+   * <pre>
+   * 通过客户群ID，获取详情。包括群名、群成员列表、群成员入群时间、入群方式。（客户群是由具有客户群使用权限的成员创建的外部群）
+   * 企业需要使用“客户联系”secret或配置到“可调用应用”列表中的自建应用secret所获取的accesstoken来调用（accesstoken如何获取？）。
+   * 暂不支持第三方调用。
+   * 微信文档：https://work.weixin.qq.com/api/doc/90000/90135/92122
+   * </pre>
+   *
+   * @param chatId
+   * @return
+   * @throws WxErrorException
+   */
+  WxCpUserExternalGroupChatInfo getGroupChat(String chatId) throws WxErrorException;
+
+  /**
+   * <pre>
+   * 企业可通过此接口获取成员联系客户的数据，包括发起申请数、新增客户数、聊天数、发送消息数和删除/拉黑成员的客户数等指标。
+   * 企业需要使用“客户联系”secret或配置到“可调用应用”列表中的自建应用secret所获取的accesstoken来调用（accesstoken如何获取？）。
+   * 第三方应用需拥有“企业客户”权限。
+   * 第三方/自建应用调用时传入的userid和partyid要在应用的可见范围内;
+   * </pre>
+   * @param startTime
+   * @param endTime
+   * @param userIds
+   * @param partyIds
+   * @return
+   * @throws WxErrorException
+   */
+  WxCpUserExternalUserBehaviorStatistic getUserBehaviorStatistic(Date startTime, Date endTime, String[] userIds, String[] partyIds) throws WxErrorException;
+
+  /**
+   * <pre>
+   * 获取指定日期全天的统计数据。注意，企业微信仅存储60天的数据。
+   * 企业需要使用“客户联系”secret或配置到“可调用应用”列表中的自建应用secret所获取的accesstoken来调用（accesstoken如何获取？）。
+   * 暂不支持第三方调用。
+   * </pre>
+   * @param startTime
+   * @param orderBy
+   * @param orderAsc
+   * @param pageIndex
+   * @param pageSize
+   * @param userIds
+   * @param partyIds
+   * @return
+   * @throws WxErrorException
+   */
+  WxCpUserExternalGroupChatStatistic getGroupChatStatistic(Date startTime,Integer orderBy,Integer orderAsc,Integer pageIndex,Integer pageSize, String[] userIds, String[] partyIds) throws WxErrorException;
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
index 044b1e5d49..0e26194d25 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
@@ -1,12 +1,14 @@
 package me.chanjar.weixin.cp.api.impl;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.WxCpExternalContactService;
 import me.chanjar.weixin.cp.api.WxCpService;
-import me.chanjar.weixin.cp.bean.WxCpUserExternalContactInfo;
-import me.chanjar.weixin.cp.bean.WxCpUserExternalContactList;
-import me.chanjar.weixin.cp.bean.WxCpUserWithExternalPermission;
+import me.chanjar.weixin.cp.bean.*;
+import org.apache.commons.lang3.ArrayUtils;
 
+import java.util.Date;
 import java.util.List;
 
 import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.ExternalContact.*;
@@ -45,4 +47,96 @@ public List<String> listFollowUser() throws WxErrorException {
     String responseContent = this.mainService.get(url, null);
     return WxCpUserWithExternalPermission.fromJson(responseContent).getFollowUser();
   }
+
+  @Override
+  public WxCpUserExternalUnassignList listUnassignedList(Integer pageIndex, Integer pageSize) throws WxErrorException {
+    JsonObject json = new JsonObject();
+    json.addProperty("page_id",pageIndex == null ? 0 : pageIndex);
+    json.addProperty("page_size",pageSize == null ? 100 : pageSize);
+    final String url = this.mainService.getWxCpConfigStorage().getApiUrl(LIST_UNASSIGNED_CONTACT);
+    final String result = this.mainService.post(url, json.toString());
+    return WxCpUserExternalUnassignList.fromJson(result);
+  }
+
+  @Override
+  public WxCpBaseResp transferExternalContact(String externalUserid, String handOverUserid, String takeOverUserid) throws WxErrorException {
+    JsonObject json = new JsonObject();
+    json.addProperty("external_userid", externalUserid);
+    json.addProperty("handover_userid", handOverUserid);
+    json.addProperty("takeover_userid", takeOverUserid);
+    final String url = this.mainService.getWxCpConfigStorage().getApiUrl(TRANSFER_UNASSIGNED_CONTACT);
+    final String result = this.mainService.post(url, json.toString());
+    return WxCpBaseResp.fromJson(result);
+  }
+
+  @Override
+  public WxCpUserExternalGroupChatList listGroupChat(Integer pageIndex, Integer pageSize, int status, String[] userIds, String[] partyIds) throws WxErrorException {
+    JsonObject json = new JsonObject();
+    json.addProperty("offset",pageIndex == null ? 0 : pageIndex);
+    json.addProperty("limit",pageSize == null ? 100 : pageSize);
+    json.addProperty("status_filter",status);
+    if(ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)){
+      JsonObject ownerFilter = new JsonObject();
+      if(ArrayUtils.isNotEmpty(userIds)){
+        json.add("userid", new Gson().toJsonTree(userIds).getAsJsonArray());
+      }
+      if(ArrayUtils.isNotEmpty(partyIds)){
+        json.add("partyid", new Gson().toJsonTree(partyIds).getAsJsonArray());
+      }
+      json.add("owner_filter",ownerFilter);
+    }
+    final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GROUP_CHAT_LIST);
+    final String result = this.mainService.post(url, json.toString());
+    return WxCpUserExternalGroupChatList.fromJson(result);
+  }
+
+  @Override
+  public WxCpUserExternalGroupChatInfo getGroupChat(String chatId) throws WxErrorException {
+    JsonObject json = new JsonObject();
+    json.addProperty("chat_id", chatId);
+    final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GROUP_CHAT_INFO);
+    final String result = this.mainService.post(url, json.toString());
+    return WxCpUserExternalGroupChatInfo.fromJson(result);
+  }
+
+  @Override
+  public WxCpUserExternalUserBehaviorStatistic getUserBehaviorStatistic(Date startTime, Date endTime, String[] userIds, String[] partyIds) throws WxErrorException {
+    JsonObject json = new JsonObject();
+    json.addProperty("start_time", startTime.getTime()/1000);
+    json.addProperty("end_time", endTime.getTime()/1000);
+    if(ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)){
+      if(ArrayUtils.isNotEmpty(userIds)){
+        json.add("userid", new Gson().toJsonTree(userIds).getAsJsonArray());
+      }
+      if(ArrayUtils.isNotEmpty(partyIds)){
+        json.add("partyid", new Gson().toJsonTree(partyIds).getAsJsonArray());
+      }
+    }
+    final String url = this.mainService.getWxCpConfigStorage().getApiUrl(LIST_USER_BEHAVIOR_DATA);
+    final String result = this.mainService.post(url, json.toString());
+    return WxCpUserExternalUserBehaviorStatistic.fromJson(result);
+  }
+
+  @Override
+  public WxCpUserExternalGroupChatStatistic getGroupChatStatistic(Date startTime, Integer orderBy, Integer orderAsc, Integer pageIndex, Integer pageSize, String[] userIds, String[] partyIds) throws WxErrorException {
+    JsonObject json = new JsonObject();
+    json.addProperty("day_begin_time", startTime.getTime()/1000);
+    json.addProperty("order_by", orderBy == null ? 1 : orderBy);
+    json.addProperty("order_asc",orderAsc == null ? 0 : orderAsc);
+    json.addProperty("offset",pageIndex == null ? 0 : pageIndex);
+    json.addProperty("limit",pageSize == null ? 500 : pageSize);
+    if(ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)){
+      JsonObject ownerFilter = new JsonObject();
+      if(ArrayUtils.isNotEmpty(userIds)){
+        json.add("userid_list", new Gson().toJsonTree(userIds).getAsJsonArray());
+      }
+      if(ArrayUtils.isNotEmpty(partyIds)){
+        json.add("userid_list", new Gson().toJsonTree(partyIds).getAsJsonArray());
+      }
+      json.add("owner_filter",ownerFilter);
+    }
+    final String url = this.mainService.getWxCpConfigStorage().getApiUrl(LIST_GROUP_CHAT_DATA);
+    final String result = this.mainService.post(url, json.toString());
+    return WxCpUserExternalGroupChatStatistic.fromJson(result);
+  }
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpBaseResp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpBaseResp.java
new file mode 100644
index 0000000000..e94110a055
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpBaseResp.java
@@ -0,0 +1,28 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * @author yqx
+ * @date 2020/3/16
+ */
+@Getter
+@Setter
+public class WxCpBaseResp {
+  @SerializedName("errcode")
+  protected Long errcode;
+
+  @SerializedName("errmsg")
+  protected String errmsg;
+
+  public boolean success() {
+    return getErrcode() == 0;
+  }
+
+  public static WxCpBaseResp fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpBaseResp.class);
+  }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpCorp.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpCorp.java
index 9ca59b843d..f77fdb78df 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpCorp.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpCorp.java
@@ -1,42 +1,44 @@
-package me.chanjar.weixin.cp.bean;
-
-import java.io.Serializable;
-
-import com.google.gson.annotations.SerializedName;
-
-import lombok.Data;
-import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
-
-/**
- * 微信部门.
- *
- * @author Daniel Qian
- */
-@Data
-public class WxCpTpCorp implements Serializable {
-
-  private static final long serialVersionUID = -5028321625140879571L;
-  @SerializedName("corpid")
-  private String corpId;
-  @SerializedName("corp_name")
-  private String corpName;
-  @SerializedName("corp_full_name")
-  private String corpFullName;
-  @SerializedName("corp_type")
-  private String corpType;
-  @SerializedName("corp_square_logo_url")
-  private String corpSquareLogoUrl;
-  @SerializedName("corp_user_max")
-  private String corpUserMax;
-  @SerializedName("permanent_code")
-  private String permanentCode;
-  
-  public static WxCpTpCorp fromJson(String json) {
-    return WxCpGsonBuilder.create().fromJson(json, WxCpTpCorp.class);
-  }
-
-  public String toJson() {
-    return WxCpGsonBuilder.create().toJson(this);
-  }
-
-}
+package me.chanjar.weixin.cp.bean;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+import lombok.Data;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 微信部门.
+ *
+ * @author Daniel Qian
+ */
+@Data
+public class WxCpTpCorp implements Serializable {
+
+  private static final long serialVersionUID = -5028321625140879571L;
+  @SerializedName("corpid")
+  private String corpId;
+  @SerializedName("corp_name")
+  private String corpName;
+  @SerializedName("corp_full_name")
+  private String corpFullName;
+  @SerializedName("corp_type")
+  private String corpType;
+  @SerializedName("corp_square_logo_url")
+  private String corpSquareLogoUrl;
+  @SerializedName("corp_user_max")
+  private String corpUserMax;
+  @SerializedName("permanent_code")
+  private String permanentCode;
+  @SerializedName("auth_info")
+  private String authInfo;
+
+  public static WxCpTpCorp fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpTpCorp.class);
+  }
+
+  public String toJson() {
+    return WxCpGsonBuilder.create().toJson(this);
+  }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpXmlMessage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpXmlMessage.java
index 53e068dbfe..f20f74b757 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpXmlMessage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpXmlMessage.java
@@ -1,68 +1,72 @@
-package me.chanjar.weixin.cp.bean;
-
-import java.io.Serializable;
-import java.util.Map;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.util.XmlUtils;
-import me.chanjar.weixin.common.util.crypto.WxCryptUtil;
-import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
-import me.chanjar.weixin.cp.bean.outxmlbuilder.ImageBuilder;
-import me.chanjar.weixin.cp.bean.outxmlbuilder.NewsBuilder;
-import me.chanjar.weixin.cp.bean.outxmlbuilder.TextBuilder;
-import me.chanjar.weixin.cp.bean.outxmlbuilder.VideoBuilder;
-import me.chanjar.weixin.cp.bean.outxmlbuilder.VoiceBuilder;
-import me.chanjar.weixin.cp.config.WxCpConfigStorage;
-import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
-import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
-import me.chanjar.weixin.cp.util.xml.XStreamTransformer;
-
-/**
- * 回调推送的message
- * https://work.weixin.qq.com/api/doc#90001/90143/90612
- *
- * @author zhenjun cai
- */
-@XStreamAlias("xml")
-@Slf4j
-@Data
-public class WxCpTpXmlMessage implements Serializable {
-
-  private static final long serialVersionUID = 6031833682211475786L;
-  /**
-   * 使用dom4j解析的存放所有xml属性和值的map.
-   */
-  private Map<String, Object> allFieldsMap;
-  
-  @XStreamAlias("SuiteId")
-  @XStreamConverter(value = XStreamCDataConverter.class)
-  protected String suiteId;
-
-  @XStreamAlias("InfoType")
-  @XStreamConverter(value = XStreamCDataConverter.class)
-  protected String infoType;
-
-  @XStreamAlias("TimeStamp")
-  @XStreamConverter(value = XStreamCDataConverter.class)
-  protected String timeStamp;
-  
-  @XStreamAlias("SuiteTicket")
-  @XStreamConverter(value = XStreamCDataConverter.class)
-  protected String suiteTicket;
-  
-  @XStreamAlias("AuthCode")
-  @XStreamConverter(value = XStreamCDataConverter.class)
-  protected String authCode;
-
-  public static WxCpTpXmlMessage fromXml(String xml) {
-    //修改微信变态的消息内容格式，方便解析
-    //xml = xml.replace("</PicList><PicList>", "");
-    final WxCpTpXmlMessage xmlPackage = XStreamTransformer.fromXml(WxCpTpXmlMessage.class, xml);
-    xmlPackage.setAllFieldsMap(XmlUtils.xml2Map(xml));
-    return xmlPackage;
-  }
-
-}
+package me.chanjar.weixin.cp.bean;
+
+import java.io.Serializable;
+import java.util.Map;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamConverter;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.util.XmlUtils;
+import me.chanjar.weixin.common.util.crypto.WxCryptUtil;
+import me.chanjar.weixin.common.util.xml.XStreamCDataConverter;
+import me.chanjar.weixin.cp.bean.outxmlbuilder.ImageBuilder;
+import me.chanjar.weixin.cp.bean.outxmlbuilder.NewsBuilder;
+import me.chanjar.weixin.cp.bean.outxmlbuilder.TextBuilder;
+import me.chanjar.weixin.cp.bean.outxmlbuilder.VideoBuilder;
+import me.chanjar.weixin.cp.bean.outxmlbuilder.VoiceBuilder;
+import me.chanjar.weixin.cp.config.WxCpConfigStorage;
+import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
+import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
+import me.chanjar.weixin.cp.util.xml.XStreamTransformer;
+
+/**
+ * 回调推送的message
+ * https://work.weixin.qq.com/api/doc#90001/90143/90612
+ *
+ * @author zhenjun cai
+ */
+@XStreamAlias("xml")
+@Slf4j
+@Data
+public class WxCpTpXmlMessage implements Serializable {
+
+  private static final long serialVersionUID = 6031833682211475786L;
+  /**
+   * 使用dom4j解析的存放所有xml属性和值的map.
+   */
+  private Map<String, Object> allFieldsMap;
+
+  @XStreamAlias("SuiteId")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  protected String suiteId;
+
+  @XStreamAlias("InfoType")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  protected String infoType;
+
+  @XStreamAlias("TimeStamp")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  protected String timeStamp;
+
+  @XStreamAlias("SuiteTicket")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  protected String suiteTicket;
+
+  @XStreamAlias("AuthCode")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  protected String authCode;
+
+  @XStreamAlias("AuthCorpId")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  protected String authCorpId;
+
+  public static WxCpTpXmlMessage fromXml(String xml) {
+    //修改微信变态的消息内容格式，方便解析
+    //xml = xml.replace("</PicList><PicList>", "");
+    final WxCpTpXmlMessage xmlPackage = XStreamTransformer.fromXml(WxCpTpXmlMessage.class, xml);
+    xmlPackage.setAllFieldsMap(XmlUtils.xml2Map(xml));
+    return xmlPackage;
+  }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatInfo.java
new file mode 100644
index 0000000000..e5d8db7262
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatInfo.java
@@ -0,0 +1,75 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * @author yqx
+ * @date 2020/3/116
+ */
+@Getter
+@Setter
+public class WxCpUserExternalGroupChatInfo extends WxCpBaseResp{
+
+  @SerializedName("group_chat")
+  private GroupChat groupChat;
+
+  @Getter
+  @Setter
+  public static class GroupChat {
+    @SerializedName("chat_id")
+    private String chatId;
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("owner")
+    private String owner;
+
+    @SerializedName("create_time")
+    private Long createTime;
+
+    @SerializedName("notice")
+    private String notice;
+
+    @SerializedName("member_list")
+    private List<GroupMember> memberList;
+
+  }
+
+  @Getter
+  @Setter
+  public static class GroupMember {
+    @SerializedName("userid")
+    private String userId;
+
+    /**
+     * 成员类型。
+     * 1 - 企业成员
+     * 2 - 外部联系人
+     */
+    @SerializedName("type")
+    private int type;
+
+    @SerializedName("join_time")
+    private Long joinTime;
+
+    /**
+     * 入群方式。
+     * 1 - 由成员邀请入群（直接邀请入群）
+     * 2 - 由成员邀请入群（通过邀请链接入群）
+     * 3 - 通过扫描群二维码入群
+     */
+    @SerializedName("join_scene")
+    private int joinScene;
+
+  }
+
+  public static WxCpUserExternalGroupChatInfo fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpUserExternalGroupChatInfo.class);
+  }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatList.java
new file mode 100644
index 0000000000..0a0e970efc
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatList.java
@@ -0,0 +1,46 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * @author yqx
+ * @date 2020/3/116
+ */
+@Getter
+@Setter
+public class WxCpUserExternalGroupChatList extends WxCpBaseResp {
+
+  @SerializedName("group_chat_list")
+  private List<ChatStatus> groupChatList;
+
+  @Getter
+  @Setter
+  public static class ChatStatus {
+
+    /**
+     * 客户群ID
+     */
+    @SerializedName("chat_id")
+    private String chatId;
+
+    /**
+     * 客户群状态
+     * 0 - 正常
+     * 1 - 跟进人离职
+     * 2 - 离职继承中
+     * 3 - 离职继承完成
+     */
+    @SerializedName("status")
+    private int status;
+
+  }
+
+  public static WxCpUserExternalGroupChatList fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpUserExternalGroupChatList.class);
+  }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatStatistic.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatStatistic.java
new file mode 100644
index 0000000000..242ceb4f8b
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalGroupChatStatistic.java
@@ -0,0 +1,90 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * 联系客户群统计数据
+ *
+ * @author yqx
+ * @date 2020/3/16
+ */
+@Getter
+@Setter
+public class WxCpUserExternalGroupChatStatistic extends WxCpBaseResp{
+
+  @SerializedName("total")
+  int total;
+
+  @SerializedName("next_offset")
+  int nextOffset;
+
+  @SerializedName("items")
+  List<StatisticItem> itemList;
+
+  @Getter
+  @Setter
+  public static class StatisticItem {
+
+    @SerializedName("owner")
+    String owner;
+
+    @SerializedName("data")
+    ItemData itemData;
+  }
+
+  @Getter
+  @Setter
+  public static class ItemData {
+
+    /**
+     * 新增客户群数量
+     */
+    @SerializedName("new_chat_cnt")
+    int newChatCnt;
+
+    /**
+     * 截至当天客户群总数量
+     */
+    @SerializedName("chat_total")
+    int chatTotal;
+
+    /**
+     * 截至当天有发过消息的客户群数量
+     */
+    @SerializedName("chat_has_msg")
+    int chatHasMsg;
+
+    /**
+     * 客户群新增群人数。
+     */
+    @SerializedName("new_member_cnt")
+    int newMemberCnt;
+
+    /**
+     * 截至当天客户群总人数
+     */
+    @SerializedName("member_total")
+    int memberTotal;
+
+    /**
+     * 截至当天有发过消息的群成员数
+     */
+    @SerializedName("member_has_msg")
+    int memberHasMsg;
+
+    /**
+     * 截至当天客户群消息总数
+     */
+    @SerializedName("msg_total")
+    int msgTotal;
+  }
+
+  public static WxCpUserExternalGroupChatStatistic fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpUserExternalGroupChatStatistic.class);
+  }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalUnassignList.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalUnassignList.java
new file mode 100644
index 0000000000..ec86dea767
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalUnassignList.java
@@ -0,0 +1,52 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * 离职员工外部联系人列表
+ * @author yqx
+ * @date 2020/3/15
+ */
+@Getter
+@Setter
+public class WxCpUserExternalUnassignList extends WxCpBaseResp{
+
+  @SerializedName("info")
+  private List<UnassignInfo> unassignInfos;
+
+  @SerializedName("is_last")
+  private boolean isLast;
+
+  @Getter
+  @Setter
+  public static class UnassignInfo {
+
+    /**
+     * 离职成员userid
+     */
+    @SerializedName("handover_userid")
+    private String handoverUserid;
+
+    /**
+     * 外部联系人userid
+     */
+    @SerializedName("external_userid")
+    private String externalUserid;
+
+    /**
+     * 成员离职时间
+     */
+    @SerializedName("dimission_time")
+    private Long dimissionTime;
+  }
+
+  public static WxCpUserExternalUnassignList fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpUserExternalUnassignList.class);
+  }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalUserBehaviorStatistic.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalUserBehaviorStatistic.java
new file mode 100644
index 0000000000..bc1aa0ca53
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserExternalUserBehaviorStatistic.java
@@ -0,0 +1,78 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * 联系客户统计数据
+ * @author yqx
+ * @date 2020/3/16
+ */
+@Getter
+@Setter
+public class WxCpUserExternalUserBehaviorStatistic extends WxCpBaseResp {
+
+  @SerializedName("behavior_data")
+  private List<Behavior> behaviorList;
+
+  @Getter
+  @Setter
+  public static class Behavior {
+
+    /**
+     * 数据日期，为当日0点的时间戳
+     */
+    @SerializedName("stat_time")
+    private Long statTime;
+
+    /**
+     * 聊天总数， 成员有主动发送过消息的聊天数，包括单聊和群聊。
+     */
+    @SerializedName("chat_cnt")
+    private int chatCnt;
+
+    /**
+     * 发送消息数，成员在单聊和群聊中发送的消息总数。
+     */
+    @SerializedName("message_cnt")
+    private int messageCnt;
+
+    /**
+     * 已回复聊天占比，客户主动发起聊天后，成员在一个自然日内有回复过消息的聊天数/客户主动发起的聊天数比例，不包括群聊，仅在确有回复时返回。
+     */
+    @SerializedName("reply_percentage")
+    private double replyPercentage;
+
+    /**
+     * 平均首次回复时长，单位为分钟，即客户主动发起聊天后，成员在一个自然日内首次回复的时长间隔为首次回复时长，所有聊天的首次回复总时长/已回复的聊天总数即为平均首次回复时长，不包括群聊，仅在确有回复时返回。
+     */
+    @SerializedName("avg_reply_time")
+    private int avgReplyTime;
+
+    /**
+     * 删除/拉黑成员的客户数，即将成员删除或加入黑名单的客户数。
+     */
+    @SerializedName("negative_fee_back_cnt")
+    private int negativeFeeBackCnt;
+
+    /**
+     * 发起申请数，成员通过「搜索手机号」、「扫一扫」、「从微信好友中添加」、「从群聊中添加」、「添加共享、分配给我的客户」、「添加单向、双向删除好友关系的好友」、「从新的联系人推荐中添加」等渠道主动向客户发起的好友申请数量。
+     */
+    @SerializedName("new_apply_cnt")
+    private int newApplyCnt;
+
+    /**
+     * 新增客户数，成员新添加的客户数量。
+     */
+    @SerializedName("new_contact_cnt")
+    private int newContactCnt;
+  }
+
+  public static WxCpUserExternalUserBehaviorStatistic fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpUserExternalUserBehaviorStatistic.class);
+  }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index d5287136e2..0bee3f42ac 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -118,5 +118,11 @@ public static class ExternalContact {
     public static final String GET_FOLLOW_USER_LIST = "/cgi-bin/externalcontact/get_follow_user_list";
     public static final String GET_CONTACT_DETAIL = "/cgi-bin/externalcontact/get?external_userid=";
     public static final String LIST_EXTERNAL_CONTACT = "/cgi-bin/externalcontact/list?userid=";
+    public static final String LIST_UNASSIGNED_CONTACT = "/cgi-bin/externalcontact/get_unassigned_list";
+    public static final String TRANSFER_UNASSIGNED_CONTACT = "/cgi-bin/externalcontact/transfer";
+    public static final String GROUP_CHAT_LIST = "/cgi-bin/externalcontact/groupchat/list";
+    public static final String GROUP_CHAT_INFO = "/cgi-bin/externalcontact/groupchat/get";
+    public static final String LIST_USER_BEHAVIOR_DATA = "/cgi-bin/externalcontact/get_user_behavior_data";
+    public static final String LIST_GROUP_CHAT_DATA = "/cgi-bin/externalcontact/groupchat/statistic";
   }
 }

From 868545cfc3458fb3834d865e33fc07c071a858b1 Mon Sep 17 00:00:00 2001
From: S <sshzh90@gmail.com>
Date: Thu, 19 Mar 2020 09:20:48 +0800
Subject: [PATCH 018/114] =?UTF-8?q?:art:=20#1449=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=8D=A1=E5=88=B8=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/mp/bean/card/BaseInfo.java     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
index 2c3bf3b84e..ed3354947f 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
@@ -228,6 +228,18 @@ public class BaseInfo implements Serializable {
   @SerializedName("promotion_app_brand_pass")
   private String promotionAppBrandPass;
 
+
+  /**
+   *
+   * https://developers.weixin.qq.com/doc/offiaccount/Cards_and_Offer/Managing_Coupons_Vouchers_and_Cards.html#2
+   * “CARD_STATUS_NOT_VERIFY”,待审核 ；
+   * “CARD_STATUS_VERIFY_FAIL”,审核失败；
+   * “CARD_STATUS_VERIFY_OK”，通过审核；
+   * “CARD_STATUS_DELETE”，卡券被商户删除；
+   * “CARD_STATUS_DISPATCH”，在公众平台投放过的卡券 ；
+   */
+  private String status;
+
   @Override
   public String toString() {
     return WxMpGsonBuilder.create().toJson(this);

From 6f7bc7c02c1f84da5a4b333cb86808254aa37850 Mon Sep 17 00:00:00 2001
From: yuanqixun <yuanqixun@163.com>
Date: Thu, 19 Mar 2020 09:24:08 +0800
Subject: [PATCH 019/114] =?UTF-8?q?:art:=20#1450=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E6=8E=88=E6=9D=83=E7=A0=81=E7=9A=84=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 重新实现企业微信三方授权，获取永久授权码返回信息

* 1、增加获取服务商三方预授权URL
2、修复授权后应用图标字段为空的bug

Co-authored-by: 袁启勋 <xun.yuan@infoship.cn>
---
 .../chanjar/weixin/cp/api/WxCpTpService.java  |  29 +++
 .../cp/api/impl/BaseWxCpTpServiceImpl.java    |  25 ++
 .../cp/bean/WxCpTpPermanentCodeInfo.java      | 220 ++++++++++++++++++
 .../weixin/cp/bean/WxCpTpPreauthCode.java     |  26 +++
 .../weixin/cp/constant/WxCpApiPathConsts.java |   1 +
 .../api/impl/BaseWxCpTpServiceImplTest.java   |  66 ++++++
 6 files changed, 367 insertions(+)
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPreauthCode.java

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTpService.java
index edc2f552ce..0c9a0a0a41 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTpService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTpService.java
@@ -7,6 +7,7 @@
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.cp.bean.WxCpMaJsCode2SessionResult;
 import me.chanjar.weixin.cp.bean.WxCpTpCorp;
+import me.chanjar.weixin.cp.bean.WxCpTpPermanentCodeInfo;
 import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
 
 /**
@@ -88,8 +89,36 @@ public interface WxCpTpService {
    * @param authCode .
    * @return .
    */
+  @Deprecated
   WxCpTpCorp getPermanentCode(String authCode) throws WxErrorException;
 
+  /**
+   * 获取企业永久授权码信息
+   * <pre>
+   *   原来的方法实现不全
+   * </pre>
+   *
+   * @param authCode
+   * @return
+   *
+   * @author yuan
+   * @since 2020-03-18
+   *
+   * @throws WxErrorException
+   */
+  WxCpTpPermanentCodeInfo getPermanentCodeInfo(String authCode) throws WxErrorException;
+
+  /**
+   * <pre>
+   *   获取预授权链接
+   * </pre>
+   * @param redirectUri 授权完成后的回调网址
+   * @param state a-zA-Z0-9的参数值（不超过128个字节），用于第三方自行校验session，防止跨域攻击
+   * @return
+   * @throws WxErrorException
+   */
+  String getPreAuthUrl(String redirectUri,String state) throws WxErrorException;
+
   /**
    * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求.
    *
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImpl.java
index dea5428c1b..bbc8e3c18c 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImpl.java
@@ -3,6 +3,7 @@
 import com.google.common.base.Joiner;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.bean.WxAccessToken;
@@ -17,10 +18,14 @@
 import me.chanjar.weixin.cp.api.WxCpTpService;
 import me.chanjar.weixin.cp.bean.WxCpMaJsCode2SessionResult;
 import me.chanjar.weixin.cp.bean.WxCpTpCorp;
+import me.chanjar.weixin.cp.bean.WxCpTpPermanentCodeInfo;
+import me.chanjar.weixin.cp.bean.WxCpTpPreauthCode;
 import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -123,6 +128,26 @@ public WxCpTpCorp getPermanentCode(String authCode) throws WxErrorException {
     return wxCpTpCorp;
   }
 
+  @Override
+  public WxCpTpPermanentCodeInfo getPermanentCodeInfo(String authCode) throws WxErrorException{
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("auth_code", authCode);
+    String result = post(configStorage.getApiUrl(GET_PERMANENT_CODE), jsonObject.toString());
+    return WxCpTpPermanentCodeInfo.fromJson(result);
+  }
+
+  @Override
+  @SneakyThrows
+  public String getPreAuthUrl(String redirectUri,String state) throws WxErrorException{
+    String result = get(configStorage.getApiUrl(GET_PREAUTH_CODE),null);
+    WxCpTpPreauthCode preauthCode = WxCpTpPreauthCode.fromJson(result);
+    String preAuthUrl = "https://open.work.weixin.qq.com/3rdapp/install?suite_id="+configStorage.getSuiteId()+
+      "&pre_auth_code="+preauthCode.getPreAuthCode()+"&redirect_uri="+ URLEncoder.encode(redirectUri,"utf-8");
+    if(StringUtils.isNotBlank(state))
+      preAuthUrl += "&state="+state;
+    return preAuthUrl;
+  }
+
   @Override
   public String get(String url, String queryParam) throws WxErrorException {
     return execute(SimpleGetRequestExecutor.create(this), url, queryParam);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
new file mode 100644
index 0000000000..c703c28a69
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
@@ -0,0 +1,220 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * 微信部门.
+ *
+ * @author Daniel Qian
+ */
+@Getter
+@Setter
+public class WxCpTpPermanentCodeInfo extends WxCpBaseResp {
+
+  private static final long serialVersionUID = -5028321625140879571L;
+
+  @SerializedName("access_token")
+  private String accessToken;
+
+  @SerializedName("expires_in")
+  private Long ExpiresIn;
+
+  @SerializedName("permanent_code")
+  private String permanentCode;
+
+  /**
+   * 授权企业信息
+   */
+  @SerializedName("auth_corp_info")
+  private AuthCorpInfo authCorpInfo;
+
+  /**
+   * 授权信息。如果是通讯录应用，且没开启实体应用，是没有该项的。通讯录应用拥有企业通讯录的全部信息读写权限
+   */
+  @SerializedName("auth_info")
+  private AuthInfo authInfo;
+
+  /**
+   * 授权用户信息
+   */
+  @SerializedName("auth_user_info")
+  private AuthUserInfo authUserInfo;
+
+
+  @Getter
+  @Setter
+  public static class AuthCorpInfo {
+    @SerializedName("corpid")
+    private String corpId;
+
+    @SerializedName("corp_name")
+    private String corpName;
+
+    @SerializedName("corp_type")
+    private String corpType;
+
+    @SerializedName("corp_square_logo_url")
+    private String corpSquareLogoUrl;
+
+    @SerializedName("corp_round_logo_url")
+    private String corpRoundLogoUrl;
+
+    @SerializedName("corp_user_max")
+    private String corpUserMax;
+
+    @SerializedName("corp_agent_max")
+    private String corpAgentMax;
+
+    /**
+     * 所绑定的企业微信主体名称(仅认证过的企业有)
+     */
+    @SerializedName("corp_full_name")
+    private String corpFullName;
+
+    /**
+     * 认证到期时间
+     */
+    @SerializedName("verified_end_time")
+    private Long verifiedEndTime;
+
+    /**
+     * 企业类型，1. 企业; 2. 政府以及事业单位; 3. 其他组织, 4.团队号
+     */
+    @SerializedName("subject_type")
+    private Integer subjectType;
+
+    /**
+     * 授权企业在微工作台（原企业号）的二维码，可用于关注微工作台
+     */
+    @SerializedName("corp_wxqrcode")
+    private String corpWxqrcode;
+
+    @SerializedName("corp_scale")
+    private String corpScale;
+
+    @SerializedName("corp_industry")
+    private String corpIndustry;
+
+    @SerializedName("corp_sub_industry")
+    private String corpSubIndustry;
+
+    @SerializedName("location")
+    private String location;
+
+  }
+
+  /**
+   * 授权信息
+   */
+  @Getter
+  @Setter
+  public static class AuthInfo {
+
+    /**
+     * 授权的应用信息，注意是一个数组，但仅旧的多应用套件授权时会返回多个agent，对新的单应用授权，永远只返回一个agent
+     */
+    @SerializedName("agent")
+    private List<Agent> agent;
+
+  }
+
+  @Getter
+  @Setter
+  public static class Agent {
+    @SerializedName("agentid")
+    private Integer agentid;
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("round_logo_url")
+    private String roundLogoUrl;
+
+    @SerializedName("square_logo_url")
+    private String squareLogoUrl;
+
+    /**
+     * 旧的多应用套件中的对应应用id，新开发者请忽略
+     */
+    @SerializedName("appid")
+    @Deprecated
+    private String appid;
+
+    /**
+     * 应用权限
+     */
+    @SerializedName("privilege")
+    private Privilege privilege;
+
+  }
+
+  /**
+   * 授权人员信息
+   */
+  @Getter
+  @Setter
+  public static class AuthUserInfo {
+    @SerializedName("userid")
+    private String userid;
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("avatar")
+    private String avatar;
+  }
+
+  /**
+   * 应用对应的权限
+   */
+  @Getter
+  @Setter
+  public static class Privilege {
+
+    /**
+     * 权限等级。
+     * 1:通讯录基本信息只读
+     * 2:通讯录全部信息只读
+     * 3:通讯录全部信息读写
+     * 4:单个基本信息只读
+     * 5:通讯录全部信息只写
+     */
+    @SerializedName("level")
+    private Integer level;
+
+    @SerializedName("allow_party")
+    private List<Integer> allowParty;
+
+    @SerializedName("allow_user")
+    private List<String> allowUser;
+
+    @SerializedName("allow_tag")
+    private List<Integer> allowTag;
+
+    @SerializedName("extra_party")
+    private List<Integer> extraParty;
+
+    @SerializedName("extra_user")
+    private List<String> extraUser;
+
+    @SerializedName("extra_tag")
+    private List<Integer> extraTag;
+
+
+  }
+
+
+  public static WxCpTpPermanentCodeInfo fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpTpPermanentCodeInfo.class);
+  }
+
+  public String toJson() {
+    return WxCpGsonBuilder.create().toJson(this);
+  }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPreauthCode.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPreauthCode.java
new file mode 100644
index 0000000000..8c102ae4a2
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPreauthCode.java
@@ -0,0 +1,26 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+/**
+ * 预授权码返回
+ * @author yqx
+ * @date 2020/3/19
+ */
+@Getter
+@Setter
+public class WxCpTpPreauthCode extends WxCpBaseResp {
+
+  @SerializedName("pre_auth_code")
+  String preAuthCode;
+
+  @SerializedName("expires_in")
+  Long expiresIn;
+
+  public static WxCpTpPreauthCode fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpTpPreauthCode.class);
+  }
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index 0bee3f42ac..da3774ca8d 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -93,6 +93,7 @@ public static class Tp {
     public static final String GET_PERMANENT_CODE = "/cgi-bin/service/get_permanent_code";
     public static final String GET_SUITE_TOKEN = "/cgi-bin/service/get_suite_token";
     public static final String GET_PROVIDER_TOKEN = "/cgi-bin/service/get_provider_token";
+    public static final String GET_PREAUTH_CODE = "/cgi-bin/service/get_pre_auth_code";
   }
 
   public static class User {
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
index 5de54f545c..e8e813b04b 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.api.WxCpTpService;
 import me.chanjar.weixin.cp.bean.WxCpTpCorp;
+import me.chanjar.weixin.cp.bean.WxCpTpPermanentCodeInfo;
 import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
 import me.chanjar.weixin.cp.config.impl.WxCpTpDefaultConfigImpl;
 import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
@@ -128,6 +129,71 @@ public void testGetPermanentCode() throws WxErrorException {
 
     final WxCpTpCorp tpCorp = tpService.getPermanentCode(authCode);
     assertThat(tpCorp.getPermanentCode()).isEqualTo("xxxx");
+
+    final WxCpTpPermanentCodeInfo tpPermanentCodeInfo = tpService.getPermanentCodeInfo(authCode);
+    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getAgentid()).isEqualTo(1);
+
+  }
+
+  @Test
+  public void testGetPermanentCodeInfo() throws WxErrorException{
+    String returnJson = "{\n" +
+      "  \"access_token\": \"u6SoEWyrEmworJ1uNzddbiXh42mCLNU_mdd6b01Afo2LKmyi-WdaaYqhEGFZjB1RGZ-rhjLcAJ86ger7b7Q0gowSw9iIDR8dm49aVH_MztzmQttP3XFG7np1Dxs_VQkVwhhRmfRpEonAmK1_JWIFqayJXXiPUS3LsFd3tWpE7rxmsRa7Ev2ml2htbRp_qGUjtFTErKoDsnNGSka6_RqFPA\", \n" +
+      "  \"expires_in\": 7200, \n" +
+      "  \"permanent_code\": \"lMLlxss77ntxzuEl1i1_AQ3-6-cvqMLYs209YNWVruk\", \n" +
+      "  \"auth_corp_info\": {\n" +
+      "    \"corpid\": \"xxxcorpid\", \n" +
+      "    \"corp_name\": \"xxxx有限公司\", \n" +
+      "    \"corp_type\": \"unverified\", \n" +
+      "    \"corp_round_logo_url\": \"http://p.qpic.cn/pic_wework/3777001839/4046834be7a5f2711feaaa3cc4e691e1bcb1e526cb4544b5/0\", \n" +
+      "    \"corp_square_logo_url\": \"https://p.qlogo.cn/bizmail/EsvsszIt9hJrjrx8QKXuIs0iczdnV4icaPibLIViaukn1iazCay8L1UXtibA/0\", \n" +
+      "    \"corp_user_max\": 200, \n" +
+      "    \"corp_agent_max\": 300, \n" +
+      "    \"corp_wxqrcode\": \"http://p.qpic.cn/pic_wework/211781738/a9af41a60af7519775dd7ac846a4942979dc4a14b8bb2c72/0\", \n" +
+      "    \"corp_full_name\": \"xxxx有限公司\", \n" +
+      "    \"subject_type\": 1, \n" +
+      "    \"corp_scale\": \"1-50人\", \n" +
+      "    \"corp_industry\": \"生活服务\", \n" +
+      "    \"corp_sub_industry\": \"租赁和商务服务\", \n" +
+      "    \"location\": \"北京市\"\n" +
+      "  }, \n" +
+      "  \"auth_info\": {\n" +
+      "    \"agent\": [\n" +
+      "      {\n" +
+      "        \"agentid\": 1000012, \n" +
+      "        \"name\": \"xxxxx\", \n" +
+      "        \"square_logo_url\": \"http://wx.qlogo.cn/mmhead/Q3auHgzwzM4ZCtdxicN8ghMOtTv7M7rLPKmeZ3amic00btdwbNmicaW3Q/0\", \n" +
+      "        \"privilege\": {\n" +
+      "          \"level\": 1, \n" +
+      "          \"allow_party\": [ ], \n" +
+      "          \"allow_user\": [\n" +
+      "            \"yuanqixun\"\n" +
+      "          ], \n" +
+      "          \"allow_tag\": [ ], \n" +
+      "          \"extra_party\": [ ], \n" +
+      "          \"extra_user\": [ ], \n" +
+      "          \"extra_tag\": [ ]\n" +
+      "        }\n" +
+      "      }\n" +
+      "    ]\n" +
+      "  }, \n" +
+      "  \"auth_user_info\": {\n" +
+      "    \"userid\": \"yuanqixun\", \n" +
+      "    \"name\": \"袁启勋\", \n" +
+      "    \"avatar\": \"http://wework.qpic.cn/bizmail/ZYqy8EswiaFyPnk7gy7eiafoicz3TL35f4bAvCf2eSe6RVYSK7aPDFxcw/0\"\n" +
+      "  }\n" +
+      "}";
+
+    final WxCpTpConfigStorage configStorage = new WxCpTpDefaultConfigImpl();
+    tpService.setWxCpTpConfigStorage(configStorage);
+    JsonObject jsonObject = new JsonObject();
+    String authCode = "";
+    jsonObject.addProperty("auth_code", authCode);
+    doReturn(returnJson).when(tpService).post(configStorage.getApiUrl(GET_PERMANENT_CODE), jsonObject.toString());
+    final WxCpTpPermanentCodeInfo tpPermanentCodeInfo = tpService.getPermanentCodeInfo(authCode);
+    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getAgentid()).isEqualTo(1000012);
+    assertNotNull(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getSquareLogoUrl());
+    assertNotNull(tpPermanentCodeInfo.getAuthCorpInfo().getCorpSquareLogoUrl());
   }
 
   @Test

From d3b58e3174cb5db681044af7eb09a8961bb09b15 Mon Sep 17 00:00:00 2001
From: JoeWoo <xjoewoo@gmail.com>
Date: Sun, 22 Mar 2020 11:13:36 +0800
Subject: [PATCH 020/114] =?UTF-8?q?:art:=20#1458=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98createOrder=E6=96=B9=E6=B3=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=87=8D=E8=BD=BD=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调用 WxPayService 的 <T> T createOrder(WxPayUnifiedOrderRequest request) 时，经常找源码来看返回什么样的实体类，再强制转换。

通常在业务中使用此方法时，可以明确交易类型，所以添加一个交易类型的类，设置交易类型的同时，顺便作为确定 createOrder 返回类型的参数传入。
---
 .../wxpay/constant/WxPayConstants.java        | 54 +++++++++++++++++++
 .../wxpay/service/WxPayService.java           | 12 +++++
 .../service/impl/BaseWxPayServiceImpl.java    |  9 ++++
 .../impl/BaseWxPayServiceImplTest.java        | 18 +++++++
 4 files changed, 93 insertions(+)

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 4f8480b6a2..fbc499fedd 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,10 @@
 package com.github.binarywang.wxpay.constant;
 
+import com.github.binarywang.wxpay.bean.order.WxPayAppOrderResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
+import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
+import com.github.binarywang.wxpay.bean.result.WxPayMicropayResult;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.time.FastDateFormat;
 
@@ -103,6 +108,55 @@ public static class TradeType {
      * 刷卡支付有单独的支付接口，不调用统一下单接口
      */
     public static final String MICROPAY = "MICROPAY";
+
+    @SuppressWarnings("unused")
+    public abstract static class Specific<R> {
+
+      public abstract String getType();
+
+      private Specific() {
+      }
+
+      public static Specific<WxPayNativeOrderResult> NATIVE =
+        new Specific<WxPayNativeOrderResult>() {
+          @Override
+          public String getType() {
+            return TradeType.NATIVE;
+          }
+        };
+
+      public static Specific<WxPayAppOrderResult> APP =
+        new Specific<WxPayAppOrderResult>() {
+          @Override
+          public String getType() {
+            return TradeType.APP;
+          }
+        };
+
+      public static Specific<WxPayMpOrderResult> JSAPI =
+        new Specific<WxPayMpOrderResult>() {
+          @Override
+          public String getType() {
+            return TradeType.JSAPI;
+          }
+        };
+
+      public static Specific<WxPayMwebOrderResult> MWEB =
+        new Specific<WxPayMwebOrderResult>() {
+          @Override
+          public String getType() {
+            return TradeType.MWEB;
+          }
+        };
+
+      public static Specific<WxPayMicropayResult> MICROPAY =
+        new Specific<WxPayMicropayResult>() {
+          @Override
+          public String getType() {
+            return TradeType.MICROPAY;
+          }
+        };
+    }
   }
 
   /**
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 52f99af6c4..109ce34b98 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
@@ -8,6 +8,7 @@
 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;
 import com.github.binarywang.wxpay.exception.WxPayException;
 
 import java.io.File;
@@ -166,6 +167,17 @@ public interface WxPayService {
    */
   <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException;
 
+  /**
+   * 调用统一下单接口，并组装生成支付所需参数对象.
+   *
+   * @see WxPayService#createOrder(WxPayUnifiedOrderRequest)
+   * @param specificTradeType 将使用的交易方式，不能为 null
+   * @param request 统一下单请求参数，设定的 tradeType 及配置里的 tradeType 将被忽略，转而使用 specificTradeType
+   * @return 返回 {@link WxPayConstants.TradeType.Specific} 指定的类
+   * @throws WxPayException the wx pay exception
+   */
+  <T> T createOrder(WxPayConstants.TradeType.Specific<T> specificTradeType, WxPayUnifiedOrderRequest request) throws WxPayException;
+
   /**
    * 统一下单(详见https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=9_1)
    * 在发起微信支付前，需要调用统一下单接口，获取"预支付交易会话标识"
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index 61dcee09ba..abf9a41e0e 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -351,6 +351,15 @@ public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException
 
   }
 
+  @Override
+  public <T> T createOrder(TradeType.Specific<T> specificTradeType, WxPayUnifiedOrderRequest request) throws WxPayException {
+    if (specificTradeType == null) {
+      throw new IllegalArgumentException("specificTradeType 不能为 null");
+    }
+    request.setTradeType(specificTradeType.getType());
+    return createOrder(request);
+  }
+
   @Override
   public WxPayUnifiedOrderResult unifiedOrder(WxPayUnifiedOrderRequest request) throws WxPayException {
     request.checkAndSign(this.getConfig());
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
index de7b1e586e..dfb4ffb8c0 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -144,6 +144,24 @@ public void testCreateOrder_native() throws Exception {
     log.warn(this.payService.getWxApiData().toString());
   }
 
+  @Test
+  public void testCreateOrderSpecific() throws Exception {
+    // Won't compile
+    // WxPayMpOrderResult result = payService.createOrder(TradeType.Specific.APP, new WxPayUnifiedOrderRequest());
+    payService.createOrder(
+      TradeType.Specific.JSAPI,
+      WxPayUnifiedOrderRequest.newBuilder()
+        .body("我去")
+        .totalFee(1)
+        .productId("aaa")
+        .spbillCreateIp("11.1.11.1")
+        .notifyUrl("111111")
+        .outTradeNo("111111290")
+        .build()
+    )
+      .getAppId();
+  }
+
   /**
    * Test get pay info.
    *

From 5b934c0e0dbb13ca177707eda74677ea1feeb4a8 Mon Sep 17 00:00:00 2001
From: Ray <hrwhat214@163.com>
Date: Sun, 22 Mar 2020 11:15:38 +0800
Subject: [PATCH 021/114] =?UTF-8?q?:art:=20#1457=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1OA=E5=AE=A1=E6=89=B9=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E7=B1=BB=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=E7=9A=84@Data=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 增加@Data注解
* 增加control类型为Attendance的数据结构
---
 .../cp/bean/oa/applydata/ContentValue.java    | 25 +++++++++++++++++++
 .../bean/oa/templatedata/TemplateOptions.java |  3 +++
 .../oa/templatedata/TemplateProperty.java     |  6 ++---
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
index 609b8dfb7c..92b47f56da 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/applydata/ContentValue.java
@@ -33,6 +33,8 @@ public class ContentValue implements Serializable {
 
   private List<ContentValue.Child> children;
 
+  private Attendance attendance;
+
   @Data
   public static class Date implements Serializable {
     private static final long serialVersionUID = -6181554080062231138L;
@@ -91,4 +93,27 @@ public static class Child implements Serializable {
     private List<Content> list;
   }
 
+
+  @Data
+  public static class Attendance implements Serializable {
+    private static final long serialVersionUID = -6627566040706594166L;
+    @SerializedName("date_range")
+    private DataRange dateRange;
+    private Integer type;
+
+    @Data
+    public static class DataRange implements Serializable {
+      private static final long serialVersionUID = -3411836592583718255L;
+      private String type;
+      @SerializedName("new_begin")
+      private Long begin;
+      @SerializedName("new_end")
+      private Long end;
+      @SerializedName("new_duration")
+      private Long duration;
+    }
+  }
+
+
+
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java
index 7dc0b41a80..42c7d811cb 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateOptions.java
@@ -1,11 +1,14 @@
 package me.chanjar.weixin.cp.bean.oa.templatedata;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.List;
 
 /**
  * @author gyv123@163.com
  */
+@Data
 public class TemplateOptions implements Serializable {
 
   private static final long serialVersionUID = -7883792668568772078L;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java
index cf33f47175..143e4ce8fb 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/TemplateProperty.java
@@ -1,17 +1,15 @@
 package me.chanjar.weixin.cp.bean.oa.templatedata;
 
-import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
-import me.chanjar.weixin.cp.bean.oa.WxCpTemplateResult;
-import me.chanjar.weixin.cp.bean.oa.templatedata.control.TemplateContact;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author gyv12345@163.com
  */
+@Data
 public class TemplateProperty implements Serializable {
 
   private static final long serialVersionUID = -3429251158540167453L;

From 83d1b933e6db8384a51ddf585191cafa8fa984ca Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 22 Mar 2020 11:25:47 +0800
Subject: [PATCH 022/114] =?UTF-8?q?:bug:=20#1445=20=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E7=A0=81=E6=94=AF=E4=BB=98=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84receipt=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/bean/request/WxPayMicropayRequest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java
index cdded3110d..b9452a4b3a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java
@@ -21,6 +21,8 @@
 @AllArgsConstructor
 @XStreamAlias("xml")
 public class WxPayMicropayRequest extends BaseWxPayRequest {
+  private static final long serialVersionUID = 100577773033376092L;
+
   /**
    * <pre>
    * 字段名：设备号.
@@ -205,7 +207,6 @@ public class WxPayMicropayRequest extends BaseWxPayRequest {
    * 描述：Y，传入Y时，支付成功消息和支付详情页将出现开票入口。需要在微信支付商户平台或微信公众平台开通电子发票功能，传此字段才可生效
    * </pre>
    **/
-  @Required
   @XStreamAlias("receipt")
   private String receipt;
 

From 8d6978d757d029b25f3e2dc79992d9e872fee58e Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 22 Mar 2020 14:13:36 +0800
Subject: [PATCH 023/114] =?UTF-8?q?:art:=20#1456=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=80=9A=E8=AE=AF=E5=BD=95=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=80=E6=96=B0=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=90=8C=E6=AD=A5=E5=AE=8C=E5=96=84=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E5=A2=9E=E5=8A=A0=E5=87=A0=E4=B8=AA=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/cp/bean/WxCpUser.java   | 21 ++++-
 .../cp/util/json/WxCpUserGsonAdapter.java     | 85 +++++++++++++------
 .../cp/util/json/WxCpUserGsonAdapterTest.java | 54 +++++++++---
 3 files changed, 120 insertions(+), 40 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java
index 90354154a6..07ecb4aa85 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUser.java
@@ -4,6 +4,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 import java.io.Serializable;
@@ -16,8 +17,10 @@
  * @author Daniel Qian
  */
 @Data
+@Accessors(chain = true)
 public class WxCpUser implements Serializable {
   private static final long serialVersionUID = -5696099236344075582L;
+
   private String userId;
   private String name;
   private Long[] departIds;
@@ -56,13 +59,19 @@ public class WxCpUser implements Serializable {
    * 成员对外信息.
    */
   private List<ExternalAttribute> externalAttrs = new ArrayList<>();
+  private String externalPosition;
+  private String externalCorpName;
 
   public void addExternalAttr(ExternalAttribute externalAttr) {
     this.externalAttrs.add(externalAttr);
   }
 
   public void addExtAttr(String name, String value) {
-    this.extAttrs.add(new Attr(name, value));
+    this.extAttrs.add(new Attr().setType(0).setName(name).setTextValue(value));
+  }
+
+  public void addExtAttr(Attr attr) {
+    this.extAttrs.add(attr);
   }
 
   public static WxCpUser fromJson(String json) {
@@ -74,10 +83,16 @@ public String toJson() {
   }
 
   @Data
-  @AllArgsConstructor
+  @Accessors(chain = true)
   public static class Attr {
+    /**
+     * 属性类型: 0-文本 1-网页
+     */
+    private int type;
     private String name;
-    private String value;
+    private String textValue;
+    private String webUrl;
+    private String webTitle;
   }
 
   @Data
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
index 5128405a47..e8bfd14b23 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapter.java
@@ -9,21 +9,13 @@
 
 package me.chanjar.weixin.cp.util.json;
 
-import java.lang.reflect.Type;
-
-import com.google.gson.JsonArray;
-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 com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
+import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.cp.bean.Gender;
 import me.chanjar.weixin.cp.bean.WxCpUser;
 
+import java.lang.reflect.Type;
+
 /**
  * cp user gson adapter.
  *
@@ -32,15 +24,18 @@
 public class WxCpUserGsonAdapter implements JsonDeserializer<WxCpUser>, JsonSerializer<WxCpUser> {
   private static final String EXTERNAL_PROFILE = "external_profile";
   private static final String EXTERNAL_ATTR = "external_attr";
-  private static final String EXTATTR = "extattr";
+  private static final String EXTRA_ATTR = "extattr";
+  private static final String EXTERNAL_POSITION = "external_position";
+  private static final String DEPARTMENT = "department";
+  private static final String EXTERNAL_CORP_NAME = "external_corp_name";
 
   @Override
   public WxCpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
     JsonObject o = json.getAsJsonObject();
     WxCpUser user = new WxCpUser();
 
-    if (o.get("department") != null) {
-      JsonArray departJsonArray = o.get("department").getAsJsonArray();
+    if (o.get(DEPARTMENT) != null) {
+      JsonArray departJsonArray = o.get(DEPARTMENT).getAsJsonArray();
       Long[] departIds = new Long[departJsonArray.size()];
       int i = 0;
       for (JsonElement jsonElement : departJsonArray) {
@@ -80,25 +75,41 @@ public WxCpUser deserialize(JsonElement json, Type typeOfT, JsonDeserializationC
     user.setQrCode(GsonHelper.getString(o, "qr_code"));
     user.setToInvite(GsonHelper.getBoolean(o, "to_invite"));
 
-    if (GsonHelper.isNotNull(o.get(EXTATTR))) {
+    if (GsonHelper.isNotNull(o.get(EXTRA_ATTR))) {
       this.buildExtraAttrs(o, user);
     }
 
     if (GsonHelper.isNotNull(o.get(EXTERNAL_PROFILE))) {
+      user.setExternalCorpName(GsonHelper.getString(o.getAsJsonObject().get(EXTERNAL_PROFILE).getAsJsonObject(), EXTERNAL_CORP_NAME));
       this.buildExternalAttrs(o, user);
     }
 
+    user.setExternalPosition(GsonHelper.getString(o, EXTERNAL_POSITION));
+
     return user;
   }
 
   private void buildExtraAttrs(JsonObject o, WxCpUser user) {
-    JsonArray attrJsonElements = o.get(EXTATTR).getAsJsonObject().get("attrs").getAsJsonArray();
+    JsonArray attrJsonElements = o.get(EXTRA_ATTR).getAsJsonObject().get("attrs").getAsJsonArray();
     for (JsonElement attrJsonElement : attrJsonElements) {
-      WxCpUser.Attr attr = new WxCpUser.Attr(
-        GsonHelper.getString(attrJsonElement.getAsJsonObject(), "name"),
-        GsonHelper.getString(attrJsonElement.getAsJsonObject(), "value")
-      );
+      final Integer type = GsonHelper.getInteger(attrJsonElement.getAsJsonObject(), "type");
+      final WxCpUser.Attr attr = new WxCpUser.Attr().setType(type)
+        .setName(GsonHelper.getString(attrJsonElement.getAsJsonObject(), "name"));
       user.getExtAttrs().add(attr);
+
+      switch (type) {
+        case 0: {
+          attr.setTextValue(GsonHelper.getString(attrJsonElement.getAsJsonObject().get("text").getAsJsonObject(), "value"));
+          break;
+        }
+        case 1: {
+          final JsonObject web = attrJsonElement.getAsJsonObject().get("web").getAsJsonObject();
+          attr.setWebTitle(GsonHelper.getString(web, "title"))
+            .setWebUrl(GsonHelper.getString(web, "url"));
+          break;
+        }
+        default://ignored
+      }
     }
   }
 
@@ -237,13 +248,39 @@ public JsonElement serialize(WxCpUser user, Type typeOfSrc, JsonSerializationCon
       JsonArray attrsJsonArray = new JsonArray();
       for (WxCpUser.Attr attr : user.getExtAttrs()) {
         JsonObject attrJson = new JsonObject();
-        attrJson.addProperty("name", attr.getName());
-        attrJson.addProperty("value", attr.getValue());
+
+        switch (attr.getType()) {
+          case 0: {
+            JsonObject text = new JsonObject();
+            text.addProperty("value", attr.getTextValue());
+            attrJson.add("text", text);
+            break;
+          }
+          case 1: {
+            JsonObject web = new JsonObject();
+            web.addProperty("url", attr.getWebUrl());
+            web.addProperty("title", attr.getWebTitle());
+            attrJson.add("web", web);
+            break;
+          }
+          default: //ignored
+        }
         attrsJsonArray.add(attrJson);
       }
       JsonObject attrsJson = new JsonObject();
       attrsJson.add("attrs", attrsJsonArray);
-      o.add(EXTATTR, attrsJson);
+      o.add(EXTRA_ATTR, attrsJson);
+    }
+
+    if (user.getExternalPosition() != null) {
+      o.addProperty(EXTERNAL_POSITION, user.getExternalPosition());
+    }
+
+    JsonObject attrsJson = new JsonObject();
+    o.add(EXTERNAL_PROFILE, attrsJson);
+
+    if (user.getExternalCorpName() != null) {
+      attrsJson.addProperty(EXTERNAL_CORP_NAME, user.getExternalCorpName());
     }
 
     if (user.getExternalAttrs().size() > 0) {
@@ -279,9 +316,7 @@ public JsonElement serialize(WxCpUser user, Type typeOfSrc, JsonSerializationCon
         attrsJsonArray.add(attrJson);
       }
 
-      JsonObject attrsJson = new JsonObject();
       attrsJson.add(EXTERNAL_ATTR, attrsJsonArray);
-      o.add(EXTERNAL_PROFILE, attrsJson);
     }
 
     return o;
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapterTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapterTest.java
index abfb8a4617..d78175c1b8 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapterTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/util/json/WxCpUserGsonAdapterTest.java
@@ -35,18 +35,31 @@ public void testDeserialize() {
       "    \"enable\": 1,\n" +
       "    \"alias\": \"jackzhang\",\n" +
       "    \"extattr\": {\n" +
-      "        \"attrs\": [{\n" +
-      "            \"name\": \"爱好\",\n" +
-      "            \"value\": \"旅游\"\n" +
-      "        }, {\n" +
-      "            \"name\": \"卡号\",\n" +
-      "            \"value\": \"1234567234\"\n" +
-      "        }]\n" +
-      "    },\n" +
+      "        \"attrs\": [\n" +
+      "            {\n" +
+      "                \"type\": 0,\n" +
+      "                \"name\": \"文本名称\",\n" +
+      "                \"text\": {\n" +
+      "                    \"value\": \"文本\"\n" +
+      "                }\n" +
+      "            },\n" +
+      "            {\n" +
+      "                \"type\": 1,\n" +
+      "                \"name\": \"网页名称\",\n" +
+      "                \"web\": {\n" +
+      "                    \"url\": \"http://www.test.com\",\n" +
+      "                    \"title\": \"标题\"\n" +
+      "                }\n" +
+      "            }\n" +
+      "        ]\n" +
+      "    }," +
       "    \"status\": 1,\n" +
       "    \"qr_code\": \"https://open.work.weixin.qq.com/wwopen/userQRCode?vcode=xxx\",\n" +
+      "    \"external_position\": \"高级产品经理\",\n" +
       "    \"external_profile\": {\n" +
-      "        \"external_attr\": [{\n" +
+      "        \"external_corp_name\": \"企业简称\",\n" +
+      "        \"external_attr\": [\n" +
+      "            {\n" +
       "                \"type\": 0,\n" +
       "                \"name\": \"文本名称\",\n" +
       "                \"text\": {\n" +
@@ -65,13 +78,13 @@ public void testDeserialize() {
       "                \"type\": 2,\n" +
       "                \"name\": \"测试app\",\n" +
       "                \"miniprogram\": {\n" +
-      "                    \"appid\": \"wx8bd80126147df384\",\n" +
+      "                    \"appid\": \"wx8bd8012614784fake\",\n" +
       "                    \"pagepath\": \"/index\",\n" +
       "                    \"title\": \"my miniprogram\"\n" +
       "                }\n" +
       "            }\n" +
       "        ]\n" +
-      "    }\n" +
+      "    }" +
       "}";
 
     final WxCpUser user = WxCpUser.fromJson(userJson);
@@ -84,6 +97,23 @@ public void testDeserialize() {
 
     assertThat(user.getAddress()).isEqualTo("广州市海珠区新港中路");
     assertThat(user.getAlias()).isEqualTo("jackzhang");
+
+    assertThat(user.getExtAttrs()).isNotEmpty();
+
+    final WxCpUser.Attr extraAttr1 = user.getExtAttrs().get(0);
+    assertThat(extraAttr1.getType()).isEqualTo(0);
+    assertThat(extraAttr1.getName()).isEqualTo("文本名称");
+    assertThat(extraAttr1.getTextValue()).isEqualTo("文本");
+
+    final WxCpUser.Attr extraAttr2 = user.getExtAttrs().get(1);
+    assertThat(extraAttr2.getType()).isEqualTo(1);
+    assertThat(extraAttr2.getName()).isEqualTo("网页名称");
+    assertThat(extraAttr2.getWebTitle()).isEqualTo("标题");
+    assertThat(extraAttr2.getWebUrl()).isEqualTo("http://www.test.com");
+
+    assertThat(user.getExternalPosition()).isEqualTo("高级产品经理");
+    assertThat(user.getExternalCorpName()).isEqualTo("企业简称");
+
     assertThat(user.getExternalAttrs()).isNotEmpty();
 
     final WxCpUser.ExternalAttribute externalAttr1 = user.getExternalAttrs().get(0);
@@ -100,7 +130,7 @@ public void testDeserialize() {
     final WxCpUser.ExternalAttribute externalAttr3 = user.getExternalAttrs().get(2);
     assertThat(externalAttr3.getType()).isEqualTo(2);
     assertThat(externalAttr3.getName()).isEqualTo("测试app");
-    assertThat(externalAttr3.getAppid()).isEqualTo("wx8bd80126147df384");
+    assertThat(externalAttr3.getAppid()).isEqualTo("wx8bd8012614784fake");
     assertThat(externalAttr3.getPagePath()).isEqualTo("/index");
     assertThat(externalAttr3.getTitle()).isEqualTo("my miniprogram");
 

From 38959f821a29ff63c3dd84394d346c4340b695ea Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 22 Mar 2020 14:37:32 +0800
Subject: [PATCH 024/114] =?UTF-8?q?:bug:=20#1455=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=88=86=E8=B4=A6=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E6=8E=A5=E6=94=B6=E4=BA=BA=E8=A7=A3=E6=9E=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=B9=B6=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85=E7=9B=B8=E5=85=B3=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProfitSharingQueryResult.java             | 20 +++++--
 .../impl/ProfitSharingServiceImpl.java        |  1 +
 .../ProfitSharingQueryResultTest.java         | 59 +++++++++++++++++++
 3 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResultTest.java

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java
index 49fdf74552..e52cde9465 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java
@@ -4,12 +4,15 @@
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.w3c.dom.Document;
 
+import java.util.List;
+
 /**
  * @author Wang GuangXin 2019/10/22 15:51
  * @version 1.0
@@ -49,7 +52,11 @@ public class ProfitSharingQueryResult extends BaseWxPayResult {
    * 分账接收方列表
    */
   @XStreamAlias("receivers")
-  private String receivers;
+  private String receiversJson;
+  /**
+   * 分账接收方列表json转换后的对象
+   */
+  private List<Receiver> receivers;
   /**
    * 分账金额
    */
@@ -61,11 +68,14 @@ public class ProfitSharingQueryResult extends BaseWxPayResult {
   @XStreamAlias("description")
   private String description;
 
-  public ProfitSharingQueryResult.Receivers formatReceivers() {
+  public List<Receiver> formatReceivers() {
     GsonBuilder gsonBuilder = new GsonBuilder();
     gsonBuilder.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
     Gson gson = gsonBuilder.create();
-    return gson.fromJson(receivers, Receivers.class);
+    final List<Receiver> receivers = gson.fromJson(receiversJson, new TypeToken<List<Receiver>>() {
+    }.getType());
+    this.receivers = receivers;
+    return receivers;
   }
 
   @Override
@@ -75,13 +85,13 @@ protected void loadXML(Document d) {
     orderId = readXMLString(d, "orderId");
     status = readXMLString(d, "status");
     closeReason = readXMLString(d, "close_reason");
-    receivers = readXMLString(d, "receivers");
+    receiversJson = readXMLString(d, "receivers");
     amount = readXMLInteger(d, "amount");
     description = readXMLString(d, "description");
   }
 
   @Data
-  public class Receivers {
+  public class Receiver {
     /**
      * 分账接收方类型
      */
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/ProfitSharingServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/ProfitSharingServiceImpl.java
index 09e305d19a..1055320997 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/ProfitSharingServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/ProfitSharingServiceImpl.java
@@ -81,6 +81,7 @@ public ProfitSharingQueryResult profitSharingQuery(ProfitSharingQueryRequest req
 
     String responseContent = this.payService.post(url, request.toXML(), true);
     ProfitSharingQueryResult result = BaseWxPayResult.fromXML(responseContent, ProfitSharingQueryResult.class);
+    result.formatReceivers();
     result.checkResult(this.payService, request.getSignType(), true);
     return result;
   }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResultTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResultTest.java
new file mode 100644
index 0000000000..386101fed0
--- /dev/null
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResultTest.java
@@ -0,0 +1,59 @@
+package com.github.binarywang.wxpay.bean.profitsharing;
+
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * 测试.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2020-03-22
+ */
+@Test
+public class ProfitSharingQueryResultTest {
+
+  @Test
+  public void testFormatReceivers() {
+    ProfitSharingQueryResult result = new ProfitSharingQueryResult();
+    result.setReceiversJson("[\n" +
+      "{\n" +
+      "\"type\": \"MERCHANT_ID\",\n" +
+      "\"account\":\"190001001\",\n" +
+      "\"amount\":100,\n" +
+      "\"description\": \"分到商户\",\n" +
+      "\"result\": \"SUCCESS\",\n" +
+      "\"finish_time\": \"20180608170132\"\n" +
+      "},\n" +
+      "{\n" +
+      "\"type\": \"PERSONAL_WECHATID\",\n" +
+      "\"account\":\"86693952\",\n" +
+      "\"amount\":888,\n" +
+      "\"description\": \"分到个人\",\n" +
+      "\"result\": \"SUCCESS\",\n" +
+      "\"finish_time\": \"20180608170132\"\n" +
+      "}\n" +
+      "]");
+
+    List<ProfitSharingQueryResult.Receiver> receivers = result.formatReceivers();
+    assertThat(receivers).isNotEmpty();
+
+    assertThat(receivers.get(0)).isNotNull();
+    assertThat(receivers.get(0).getType()).isEqualTo("MERCHANT_ID");
+    assertThat(receivers.get(0).getAccount()).isEqualTo("190001001");
+    assertThat(receivers.get(0).getAmount()).isEqualTo(100);
+    assertThat(receivers.get(0).getDescription()).isEqualTo("分到商户");
+    assertThat(receivers.get(0).getResult()).isEqualTo("SUCCESS");
+    assertThat(receivers.get(0).getFinishTime()).isEqualTo("20180608170132");
+
+    assertThat(receivers.get(1)).isNotNull();
+    assertThat(receivers.get(1).getType()).isEqualTo("PERSONAL_WECHATID");
+    assertThat(receivers.get(1).getAccount()).isEqualTo("86693952");
+    assertThat(receivers.get(1).getAmount()).isEqualTo(888);
+    assertThat(receivers.get(1).getDescription()).isEqualTo("分到个人");
+    assertThat(receivers.get(1).getResult()).isEqualTo("SUCCESS");
+    assertThat(receivers.get(1).getFinishTime()).isEqualTo("20180608170132");
+  }
+}

From b9f60cd7c0e91da6545042d60bf2a1e15cd2f79b Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 22 Mar 2020 14:43:43 +0800
Subject: [PATCH 025/114] =?UTF-8?q?:art:=20#1452=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BB=98=E6=AC=BE=E7=A0=81=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=B1=BB=E7=9A=84storeMap=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=9D=E5=AD=98=E5=88=86=E8=B4=A6=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/bean/request/WxPayMicropayRequest.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java
index b9452a4b3a..779dbdce79 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayMicropayRequest.java
@@ -274,6 +274,7 @@ protected void storeMap(Map<String, String> map) {
     map.put("time_expire", timeExpire);
     map.put("auth_code", authCode);
     map.put("scene_info", sceneInfo);
+    map.put("profit_sharing",profitSharing);
   }
 
 }

From ffb25e9555579440da00dc99cd35f1377ce0b5b5 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 22 Mar 2020 14:48:50 +0800
Subject: [PATCH 026/114] =?UTF-8?q?:art:=20#1443=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98createOrder=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AF=B9=E8=B1=A1=E7=9A=84=E5=87=A0=E4=B8=AA=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E5=AE=9E=E7=8E=B0=E7=B1=BB=E5=A2=9E=E5=8A=A0=E6=97=A0?=
 =?UTF-8?q?=E5=8F=82=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

---
 .../github/binarywang/wxpay/bean/order/WxPayAppOrderResult.java | 2 ++
 .../github/binarywang/wxpay/bean/order/WxPayMpOrderResult.java  | 2 ++
 .../binarywang/wxpay/bean/order/WxPayMwebOrderResult.java       | 2 ++
 .../binarywang/wxpay/bean/order/WxPayNativeOrderResult.java     | 2 ++
 4 files changed, 8 insertions(+)

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
index c37efadbb1..5f1d468e4d 100644
--- 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
@@ -2,6 +2,7 @@
 
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -16,6 +17,7 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
 public class WxPayAppOrderResult implements Serializable {
   private static final long serialVersionUID = 5408678833978707228L;
 
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
index 7fe7234f1c..f3266668b8 100644
--- 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
@@ -3,6 +3,7 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -17,6 +18,7 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
 public class WxPayMpOrderResult implements Serializable {
   private static final long serialVersionUID = -7966682379048446567L;
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMwebOrderResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMwebOrderResult.java
index 78487f9966..046885e624 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMwebOrderResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/order/WxPayMwebOrderResult.java
@@ -3,6 +3,7 @@
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -16,6 +17,7 @@
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class WxPayMwebOrderResult implements Serializable {
   private static final long serialVersionUID = 8866329695767762066L;
 
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
index 134f5cf883..a94615d159 100644
--- 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
@@ -2,6 +2,7 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -15,6 +16,7 @@
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class WxPayNativeOrderResult implements Serializable {
   private static final long serialVersionUID = 887792717425241444L;
 

From 71d6d7fdaa17f3262f62461304107af2dccabb70 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 22 Mar 2020 14:53:26 +0800
Subject: [PATCH 027/114] =?UTF-8?q?:art:=20#1441=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B7=E8=84=B8=E6=94=AF=E4=BB=98=E8=8E=B7=E5=8F=96AuthInfo?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/bean/request/BaseWxPayRequest.java     | 4 +---
 .../wxpay/bean/request/WxPayFaceAuthInfoRequest.java        | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
index d60e56893b..4619e52d4f 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
@@ -221,8 +221,6 @@ public String toXML() {
 
   /**
    * 使用快速算法组装xml
-   *
-   * @return
    */
   private String toFastXml() {
     try {
@@ -297,7 +295,7 @@ protected String[] getIgnoredParamsForSign() {
    * 注意：不含sign属性
    */
   public Map<String, String> getSignParams() {
-    Map<String, String> map = new HashMap<>();
+    Map<String, String> map = new HashMap<>(8);
     map.put("appid", appid);
     map.put("mch_id", mchId);
     map.put("sub_appid", subAppId);
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayFaceAuthInfoRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayFaceAuthInfoRequest.java
index cef831a3d6..e5bb4f5257 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayFaceAuthInfoRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayFaceAuthInfoRequest.java
@@ -127,13 +127,13 @@ protected void checkConstraints() {
 
   @Override
   protected void storeMap(Map<String, String> map) {
+    map.put("now", now);
+    map.put("version", version);
+    map.put("rawdata", rawdata);
     map.put("store_id", storeId);
     map.put("store_name", storeName);
     map.put("device_id", deviceId);
     map.put("attach", attach);
-    map.put("rawdata", rawdata);
-    map.put("now", now);
-    map.put("version", version);
   }
 
 }

From 2cda0e45e1ad4db884641ad8445c1e0edd932d4b Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 22 Mar 2020 15:16:27 +0800
Subject: [PATCH 028/114] =?UTF-8?q?:art:=20=E5=A2=9E=E5=8A=A0=E6=9E=84?=
 =?UTF-8?q?=E9=80=A0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../github/binarywang/wxpay/bean/order/WxPayAppOrderResult.java | 2 ++
 .../github/binarywang/wxpay/bean/order/WxPayMpOrderResult.java  | 2 ++
 2 files changed, 4 insertions(+)

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
index 5f1d468e4d..17037b303a 100644
--- 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
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.order;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -18,6 +19,7 @@
 @Data
 @Builder
 @NoArgsConstructor
+@AllArgsConstructor
 public class WxPayAppOrderResult implements Serializable {
   private static final long serialVersionUID = 5408678833978707228L;
 
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
index f3266668b8..3ec6a7e09b 100644
--- 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
@@ -1,6 +1,7 @@
 package com.github.binarywang.wxpay.bean.order;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,6 +20,7 @@
 @Data
 @Builder
 @NoArgsConstructor
+@AllArgsConstructor
 public class WxPayMpOrderResult implements Serializable {
   private static final long serialVersionUID = -7966682379048446567L;
 

From c15384ff8d0e5e5bcb7c555e48be201d23e41945 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 22 Mar 2020 16:37:29 +0800
Subject: [PATCH 029/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.7.3?=
 =?UTF-8?q?.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 18d82e5b8a..777f6f9134 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.2.B</version>
+  <version>3.7.3.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 274f6c9aa9..e9e621fd2d 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index d3d571450b..be6d7a6c88 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 2ac23f9e09..5262fdb93d 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 1d69343753..7fd51a0af0 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 39bb1a7e9a..9b506ef005 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index 25f0f61f9d..b5c09da2d1 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 259a0fb7e3..0ff706d726 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 0c1a1d1942..6fb0f93bfc 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index de3a9a751d..de4d37fa88 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index de65ed8fdc..b7bc1bdb11 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index 24afbe9f02..140a772d5e 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 53e62c94bc..a06b8b35bb 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.2.B</version>
+    <version>3.7.3.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From bb12cce0b8ae867db61d7c47e24112ff5c6ca645 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 23 Mar 2020 17:08:56 +0800
Subject: [PATCH 030/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/WxPayFaceAuthInfoRequest.java     |  3 ++
 .../impl/BaseWxPayServiceImplTest.java        | 54 +++++++++++++++++--
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayFaceAuthInfoRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayFaceAuthInfoRequest.java
index e5bb4f5257..1e81b0ad41 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayFaceAuthInfoRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayFaceAuthInfoRequest.java
@@ -2,6 +2,7 @@
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.*;
+import lombok.experimental.Accessors;
 import me.chanjar.weixin.common.annotation.Required;
 
 import java.util.Map;
@@ -16,12 +17,14 @@
  * @author <a href="https://github.com/jmdhappy/xxpay-master">XxPay</a>
  */
 @Data
+@Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 @Builder(builderMethodName = "newBuilder")
 @NoArgsConstructor
 @AllArgsConstructor
 @XStreamAlias("xml")
 public class WxPayFaceAuthInfoRequest extends BaseWxPayRequest {
+  private static final long serialVersionUID = -2909189635374300870L;
 
   /**
    * <pre>
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
index dfb4ffb8c0..6350828f6b 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -20,8 +20,6 @@
 import com.github.binarywang.wxpay.util.XmlConfig;
 import com.google.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
@@ -619,10 +617,60 @@ public void testTestDownloadRawBill() {
   }
 
   @Test
-  public void testGetWxPayFaceAuthInfo() {
+  public void testGetWxPayFaceAuthInfo() throws WxPayException {
+    XmlConfig.fastMode = true;
+    final WxPayFaceAuthInfoRequest request = new WxPayFaceAuthInfoRequest()
+      .setStoreId("1").setRawdata("111").setNow("111").setVersion("111").setStoreName("2222").setDeviceId("111");
+    request.setSignType("MD5");
+    this.payService.getWxPayFaceAuthInfo(request);
   }
 
   @Test
   public void testFacepay() {
   }
+
+  @Test
+  public void testGetEntPayService() {
+    // no need to test
+  }
+
+  @Test
+  public void testGetProfitSharingService() {
+    // no need to test
+  }
+
+  @Test
+  public void testGetRedpackService() {
+    // no need to test
+  }
+
+  @Test
+  public void testSetEntPayService() {
+    // no need to test
+  }
+
+  @Test
+  public void testGetPayBaseUrl() {
+    // no need to test
+  }
+
+  @Test
+  public void testParseScanPayNotifyResult() {
+  }
+
+  @Test
+  public void testSendMiniProgramRedpack() {
+  }
+
+  @Test
+  public void testSendRedpack() {
+  }
+
+  @Test
+  public void testQueryRedpack() {
+  }
+
+  @Test
+  public void testTestQueryRedpack() {
+  }
 }

From 60c37d83da145c926a1317ac4e1529f1ae6c7333 Mon Sep 17 00:00:00 2001
From: 1ibo <422423229@qq.com>
Date: Thu, 26 Mar 2020 23:05:39 +0800
Subject: [PATCH 031/114] =?UTF-8?q?:art:=20#1472=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E6=A8=A1=E5=9D=97=E9=83=A8?=
 =?UTF-8?q?=E5=88=86Result=E7=B1=BB=E5=9C=A8XML=E5=BF=AB=E9=80=9F=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E8=BD=AC=E6=8D=A2=E4=B8=8B=E7=BC=BA=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/result/WxPayOrderQueryResult.java      | 17 +++++++++--------
 .../bean/result/WxPayRedpackQueryResult.java    |  9 +++++----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
index 73b5fabbcd..2737dc2a6b 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayOrderQueryResult.java
@@ -1,17 +1,13 @@
 package com.github.binarywang.wxpay.bean.result;
 
-import java.io.Serializable;
-import java.util.List;
-
 import com.google.common.collect.Lists;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.w3c.dom.Document;
 
+import java.io.Serializable;
+import java.util.List;
+
 /**
  * <pre>
  *  查询订单 返回结果对象
@@ -360,6 +356,11 @@ protected void loadXML(Document d) {
     cashFeeType = readXMLString(d, "cash_fee_type");
     couponFee = readXMLInteger(d, "coupon_fee");
     couponCount = readXMLInteger(d, "coupon_count");
+    this.transactionId = readXMLString(d, "transaction_id");
+    this.outTradeNo = readXMLString(d, "out_trade_no");
+    this.attach = readXMLString(d, "attach");
+    this.timeEnd = readXMLString(d, "time_end");
+    this.tradeStateDesc = readXMLString(d, "trade_state_desc");
   }
 
   /**
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java
index 91c6eb7f22..669e01f7fb 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayRedpackQueryResult.java
@@ -1,9 +1,5 @@
 package com.github.binarywang.wxpay.bean.result;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -12,6 +8,10 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <pre>
  * Created by Binary Wang on 2016-11-28.
@@ -241,6 +241,7 @@ protected void loadXML(Document d) {
     hbType = readXMLString(d, "hb_type");
     totalNum = readXMLInteger(d, "total_num");
     totalAmount = readXMLInteger(d, "total_amount");
+    reason = readXMLString(d, "reason");
     sendTime = readXMLString(d, "send_time");
     refundTime = readXMLString(d, "refund_time");
     refundAmount = readXMLInteger(d, "refund_amount");

From f65833f699044d584c7ea09f0db35d14d37da6c0 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 26 Mar 2020 23:15:35 +0800
Subject: [PATCH 032/114] =?UTF-8?q?:art:=20=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97WxMaPhoneNumberInfo=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E9=83=A8=E7=B1=BBWatermark=E5=AE=9E=E7=8E=B0=E5=BA=8F?=
 =?UTF-8?q?=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

---
 .../binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java
index 6b39a3d718..398838eb80 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPhoneNumberInfo.java
@@ -1,12 +1,13 @@
 package cn.binarywang.wx.miniapp.bean;
 
-import java.io.Serializable;
-
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 微信用户绑定的手机号相关信息
+ *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 @Data
@@ -23,7 +24,9 @@ public static WxMaPhoneNumberInfo fromJson(String json) {
   }
 
   @Data
-  public static class Watermark {
+  public static class Watermark implements Serializable {
+    private static final long serialVersionUID = 2375642809946928650L;
+    
     private String timestamp;
     private String appid;
   }

From faf07b3d27b7e503e670818043e59710b8d806be Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 26 Mar 2020 23:17:06 +0800
Subject: [PATCH 033/114] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E5=88=86=E8=B4=A6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E7=B1=BB?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=88=86=E5=B8=90=E5=8D=95=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/profitsharing/ProfitSharingQueryResult.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java
index e52cde9465..03dd6b212a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryResult.java
@@ -36,7 +36,7 @@ public class ProfitSharingQueryResult extends BaseWxPayResult {
   /**
    * 微信分账单号
    */
-  @XStreamAlias("orderId")
+  @XStreamAlias("order_id")
   private String orderId;
   /**
    * 分账单状态
@@ -82,7 +82,7 @@ public List<Receiver> formatReceivers() {
   protected void loadXML(Document d) {
     transactionId = readXMLString(d, "transaction_id");
     outOrderNo = readXMLString(d, "out_order_no");
-    orderId = readXMLString(d, "orderId");
+    orderId = readXMLString(d, "order_id");
     status = readXMLString(d, "status");
     closeReason = readXMLString(d, "close_reason");
     receiversJson = readXMLString(d, "receivers");

From 9bad0ff28043b2e33eedd9c73840ef486c8574a6 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 26 Mar 2020 23:19:47 +0800
Subject: [PATCH 034/114] =?UTF-8?q?:bug:=20#1473=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?redis=E9=87=8C=E7=9A=84access=5Ftoken=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/impl/WxMaRedisConfigImpl.java      | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConfigImpl.java
index dfff1ceefc..a66ad1fa8b 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConfigImpl.java
@@ -14,6 +14,10 @@ public class WxMaRedisConfigImpl extends AbstractWxMaRedisConfig {
 
   private JedisPool jedisPool;
 
+  private static final String ACCESS_TOKEN_KEY = "wa:access_token:";
+
+  private String accessTokenKey;
+
   /**
    * JedisPool 在此配置类是必须项，使用 WxMaRedisConfigImpl(JedisPool) 构造方法来构造实例
    */
@@ -37,4 +41,41 @@ public void setJedisPool(JedisPool jedisPool) {
   protected Jedis getJedis() {
     return jedisPool.getResource();
   }
+
+  /**
+   * 每个公众号生成独有的存储key.
+   */
+  @Override
+  public void setAppid(String appId) {
+    super.setAppid(appId);
+    this.accessTokenKey = ACCESS_TOKEN_KEY.concat(appId);
+  }
+
+  @Override
+  public String getAccessToken() {
+    try (Jedis jedis = this.jedisPool.getResource()) {
+      return jedis.get(this.accessTokenKey);
+    }
+  }
+
+  @Override
+  public boolean isAccessTokenExpired() {
+    try (Jedis jedis = this.jedisPool.getResource()) {
+      return jedis.ttl(accessTokenKey) < 2;
+    }
+  }
+
+  @Override
+  public synchronized void updateAccessToken(String accessToken, int expiresInSeconds) {
+    try (Jedis jedis = this.jedisPool.getResource()) {
+      jedis.setex(this.accessTokenKey, expiresInSeconds - 200, accessToken);
+    }
+  }
+
+  @Override
+  public void expireAccessToken() {
+    try (Jedis jedis = this.jedisPool.getResource()) {
+      jedis.expire(this.accessTokenKey, 0);
+    }
+  }
 }

From 7a1863b6a14c2f1384156e37112520528c5b8a82 Mon Sep 17 00:00:00 2001
From: skywsp <wangshaopeng@sunnybs.com>
Date: Sat, 28 Mar 2020 17:47:26 +0800
Subject: [PATCH 035/114] =?UTF-8?q?:art:=20#1476=20=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E4=BA=91=E5=BC=80=E5=8F=91=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93CRUD=E6=93=8D=E4=BD=9C=E7=9A=84=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=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

---
 .../wx/miniapp/api/WxMaCloudService.java      |  92 ++++++-
 .../api/impl/WxMaCloudServiceImpl.java        | 251 ++++++++++++++++-
 .../wx/miniapp/config/WxMaConfig.java         |   4 +
 .../config/impl/WxMaDefaultConfigImpl.java    |  54 ++--
 .../wx/miniapp/util/JoinerUtils.java          | 253 ++++++++++++++++++
 .../api/impl/WxMaCloudServiceImplTest.java    | 213 +++++++++++++--
 .../src/test/resources/test-config-sample.xml |   1 +
 .../src/test/resources/wx-ma-jssecacerts      | Bin 0 -> 116059 bytes
 .../src/test/resources/wx-mp-jssecacerts      | Bin 0 -> 116080 bytes
 .../api/impl/WxOpenInMemoryConfigStorage.java |  33 ++-
 10 files changed, 845 insertions(+), 56 deletions(-)
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/JoinerUtils.java
 create mode 100644 weixin-java-miniapp/src/test/resources/wx-ma-jssecacerts
 create mode 100644 weixin-java-miniapp/src/test/resources/wx-mp-jssecacerts

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java
index 2cb72fd07a..8f48bef834 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaCloudService.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.common.error.WxErrorException;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 云开发相关接口.
@@ -32,6 +33,8 @@ public interface WxMaCloudService {
   String DATABASE_DELETE_URL = "https://api.weixin.qq.com/tcb/databasedelete";
   String DATABASE_ADD_URL = "https://api.weixin.qq.com/tcb/databaseadd";
 
+  String invokeCloudFunction(String name, String body) throws WxErrorException;
+
   /**
    * <pre>
    * 触发云函数。注意：HTTP API 途径触发云函数不包含用户信息。
@@ -50,6 +53,12 @@ public interface WxMaCloudService {
    */
   String invokeCloudFunction(String env, String name, String body) throws WxErrorException;
 
+  List<String> add(String collection, List list) throws WxErrorException;
+
+  String add(String collection, Object obj) throws WxErrorException;
+
+  JsonArray databaseAdd(String query) throws WxErrorException;
+
   /**
    * <pre>
    * 数据库插入记录
@@ -65,6 +74,10 @@ public interface WxMaCloudService {
    */
   JsonArray databaseAdd(String env, String query) throws WxErrorException;
 
+  Integer delete(String collection, String whereJson) throws WxErrorException;
+
+  int databaseDelete(String query) throws WxErrorException;
+
   /**
    * <pre>
    * 数据库删除记录
@@ -80,6 +93,10 @@ public interface WxMaCloudService {
    */
   int databaseDelete(String env, String query) throws WxErrorException;
 
+  WxCloudDatabaseUpdateResult update(String collection, String whereJson, String updateJson) throws WxErrorException;
+
+  WxCloudDatabaseUpdateResult databaseUpdate(String query) throws WxErrorException;
+
   /**
    * <pre>
    * 数据库更新记录
@@ -95,6 +112,29 @@ public interface WxMaCloudService {
    */
   WxCloudDatabaseUpdateResult databaseUpdate(String env, String query) throws WxErrorException;
 
+  /**
+   * db.collection('geo')
+   *   .where({
+   *     price: _.gt(10)
+   *   })
+   *   .orderBy('_id', 'asc')
+   *   .orderBy('price', 'desc')
+   *   .skip(1)
+   *   .limit(10)
+   *   .get()
+   * @param collection
+   * @param whereJson
+   * @param orderBy
+   * @param skip
+   * @param limit
+   * @return
+   * @throws WxErrorException
+   */
+  WxCloudDatabaseQueryResult query(String collection, String whereJson, Map<String, String> orderBy,
+                                   Integer skip, Integer limit) throws WxErrorException;
+
+  WxCloudDatabaseQueryResult databaseQuery(String query) throws WxErrorException;
+
   /**
    * <pre>
    * 数据库查询记录
@@ -110,6 +150,8 @@ public interface WxMaCloudService {
    */
   WxCloudDatabaseQueryResult databaseQuery(String env, String query) throws WxErrorException;
 
+  JsonArray databaseAggregate(String query) throws WxErrorException;
+
   /**
    * <pre>
    * 数据库聚合记录
@@ -125,6 +167,10 @@ public interface WxMaCloudService {
    */
   JsonArray databaseAggregate(String env, String query) throws WxErrorException;
 
+  Long count(String collection, String whereJson) throws WxErrorException;
+
+  Long databaseCount(String query) throws WxErrorException;
+
   /**
    * <pre>
    * 统计集合记录数或统计查询语句对应的结果记录数
@@ -140,6 +186,9 @@ public interface WxMaCloudService {
    */
   Long databaseCount(String env, String query) throws WxErrorException;
 
+  void updateIndex(String collectionName, List<WxCloudDatabaseCreateIndexRequest> createIndexes,
+                   List<String> dropIndexNames) throws WxErrorException;
+
   /**
    * <pre>
    * 变更数据库索引
@@ -157,11 +206,15 @@ public interface WxMaCloudService {
   void updateIndex(String env, String collectionName, List<WxCloudDatabaseCreateIndexRequest> createIndexes,
                    List<String> dropIndexNames) throws WxErrorException;
 
+  Long databaseMigrateImport(String collectionName, String filePath, int fileType,
+                             boolean stopOnError, int conflictMode) throws WxErrorException;
+
   /**
    * <pre>
    * 数据库导入
    *
-   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateImport.html
+   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateImport
+   * .html
    * 请求地址： POST https://api.weixin.qq.com/tcb/databasemigrateimport?access_token=ACCESS_TOKEN
    * </pre>
    *
@@ -177,11 +230,14 @@ void updateIndex(String env, String collectionName, List<WxCloudDatabaseCreateIn
   Long databaseMigrateImport(String env, String collectionName, String filePath, int fileType, boolean stopOnError,
                              int conflictMode) throws WxErrorException;
 
+  Long databaseMigrateExport(String filePath, int fileType, String query) throws WxErrorException;
+
   /**
    * <pre>
    * 数据库导出
    *
-   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateExport.html
+   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateExport
+   * .html
    * 请求地址： POST https://api.weixin.qq.com/tcb/databasemigrateexport?access_token=ACCESS_TOKEN
    * </pre>
    *
@@ -194,11 +250,14 @@ Long databaseMigrateImport(String env, String collectionName, String filePath, i
    */
   Long databaseMigrateExport(String env, String filePath, int fileType, String query) throws WxErrorException;
 
+  WxCloudCloudDatabaseMigrateQueryInfoResult databaseMigrateQueryInfo(Long jobId) throws WxErrorException;
+
   /**
    * <pre>
    *   数据库迁移状态查询
    *
-   *  文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateQueryInfo.html
+   *  文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database
+   *  /databaseMigrateQueryInfo.html
    *  请求地址：POST https://api.weixin.qq.com/tcb/databasemigratequeryinfo?access_token=ACCESS_TOKEN
    * </pre>
    *
@@ -209,6 +268,8 @@ Long databaseMigrateImport(String env, String collectionName, String filePath, i
    */
   WxCloudCloudDatabaseMigrateQueryInfoResult databaseMigrateQueryInfo(String env, Long jobId) throws WxErrorException;
 
+  WxCloudUploadFileResult uploadFile(String path) throws WxErrorException;
+
   /**
    * <pre>
    * 获取文件上传链接
@@ -225,6 +286,8 @@ Long databaseMigrateImport(String env, String collectionName, String filePath, i
    */
   WxCloudUploadFileResult uploadFile(String env, String path) throws WxErrorException;
 
+  WxCloudBatchDownloadFileResult batchDownloadFile(String[] fileIds, long[] maxAges) throws WxErrorException;
+
   /**
    * <pre>
    * 获取文件下载链接
@@ -242,6 +305,8 @@ Long databaseMigrateImport(String env, String collectionName, String filePath, i
    */
   WxCloudBatchDownloadFileResult batchDownloadFile(String env, String[] fileIds, long[] maxAges) throws WxErrorException;
 
+  WxCloudBatchDeleteFileResult batchDeleteFile(String[] fileIds) throws WxErrorException;
+
   /**
    * <pre>
    * 删除文件
@@ -272,11 +337,14 @@ Long databaseMigrateImport(String env, String collectionName, String filePath, i
    */
   WxCloudGetQcloudTokenResult getQcloudToken(long lifeSpan) throws WxErrorException;
 
+  void databaseCollectionAdd(String collectionName) throws WxErrorException;
+
   /**
    * <pre>
    * 新增集合
    *
-   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionAdd.html
+   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionAdd
+   * .html
    * 请求地址：POST https://api.weixin.qq.com/tcb/databasecollectionadd?access_token=ACCESS_TOKEN
    * </pre>
    *
@@ -286,11 +354,14 @@ Long databaseMigrateImport(String env, String collectionName, String filePath, i
    */
   void databaseCollectionAdd(String env, String collectionName) throws WxErrorException;
 
+  void databaseCollectionDelete(String collectionName) throws WxErrorException;
+
   /**
    * <pre>
    * 删除集合
    *
-   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionDelete.html
+   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database
+   * /databaseCollectionDelete.html
    * 请求地址：POST https://api.weixin.qq.com/tcb/databasecollectionadd?access_token=ACCESS_TOKEN
    * </pre>
    *
@@ -300,17 +371,20 @@ Long databaseMigrateImport(String env, String collectionName, String filePath, i
    */
   void databaseCollectionDelete(String env, String collectionName) throws WxErrorException;
 
+  WxCloudDatabaseCollectionGetResult databaseCollectionGet(Long limit, Long offset) throws WxErrorException;
+
   /**
    * <pre>
    * 获取特定云环境下集合信息
    *
-   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionGet.html
+   * 文档地址：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionGet
+   * .html
    * 请求地址：POST https://api.weixin.qq.com/tcb/databasecollectionget?access_token=ACCESS_TOKEN
    * </pre>
    *
-   * @param env            云环境ID
-   * @param limit          获取数量限制，默认值：10
-   * @param offset         偏移量,默认值：0
+   * @param env    云环境ID
+   * @param limit  获取数量限制，默认值：10
+   * @param offset 偏移量,默认值：0
    * @return .
    * @throws WxErrorException .
    */
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
index f83a7bde65..f01a87a1d9 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
@@ -3,20 +3,24 @@
 import cn.binarywang.wx.miniapp.api.WxMaCloudService;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.cloud.*;
+import cn.binarywang.wx.miniapp.constant.WxMaConstants;
+import cn.binarywang.wx.miniapp.util.JoinerUtils;
+import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 云开发相关接口实现类.
@@ -30,48 +34,225 @@ public class WxMaCloudServiceImpl implements WxMaCloudService {
   private static final JsonParser JSON_PARSER = new JsonParser();
   private final WxMaService wxMaService;
 
+  @Override
+  public String invokeCloudFunction(String name, String body) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return invokeCloudFunction(cloudEnv, name, body);
+  }
+
   @Override
   public String invokeCloudFunction(String env, String name, String body) throws WxErrorException {
-    final String response = this.wxMaService.post(String.format(INVOKE_CLOUD_FUNCTION_URL, env, name), body);
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    final String response = this.wxMaService.post(String.format(INVOKE_CLOUD_FUNCTION_URL, cloudEnv, name), body);
     return JSON_PARSER.parse(response).getAsJsonObject().get("resp_data").getAsString();
   }
 
+  @Override
+  public List<String> add(String collection, List list) throws WxErrorException {
+
+    String jsonData = WxMaGsonBuilder.create().toJson(list);
+    String query = JoinerUtils.blankJoiner.join(
+      "db.collection('", collection, "')",
+      ".add({data: ", jsonData, "})");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("env", this.wxMaService.getWxMaConfig().getCloudEnv());
+    params.addProperty("query", query);
+
+    String responseContent = wxMaService.post(DATABASE_ADD_URL, params.toString());
+    JsonElement tmpJsonElement = JSON_PARSER.parse(responseContent);
+    JsonObject jsonObject = tmpJsonElement.getAsJsonObject();
+    if (jsonObject.get(WxMaConstants.ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(responseContent));
+    }
+    JsonArray idArray = jsonObject.getAsJsonArray("id_list");
+    List<String> idList = new ArrayList<>();
+    Iterator<JsonElement> idIterator = idArray.iterator();
+    while (idIterator.hasNext()) {
+      JsonElement id = idIterator.next();
+      idList.add(id.getAsString());
+    }
+    return idList;
+  }
+
+  @Override
+  public String add(String collection, Object obj) throws WxErrorException {
+    String jsonData = WxMaGsonBuilder.create().toJson(obj);
+    String query = JoinerUtils.blankJoiner.join(
+      "db.collection('", collection, "')",
+      ".add({data: ", jsonData, "})");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("env", this.wxMaService.getWxMaConfig().getCloudEnv());
+    params.addProperty("query", query);
+
+    String responseContent = wxMaService.post(DATABASE_ADD_URL, params.toString());
+    JsonElement tmpJsonElement = JSON_PARSER.parse(responseContent);
+    JsonObject jsonObject = tmpJsonElement.getAsJsonObject();
+    if (jsonObject.get(WxMaConstants.ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(responseContent));
+    }
+    JsonArray idArray = jsonObject.getAsJsonArray("id_list");
+    return idArray.getAsString();
+  }
+
+  @Override
+  public JsonArray databaseAdd(String query) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseAdd(cloudEnv, query);
+  }
+
   @Override
   public JsonArray databaseAdd(String env, String query) throws WxErrorException {
     String response = this.wxMaService.post(DATABASE_ADD_URL, ImmutableMap.of("env", env, "query", query));
     return JSON_PARSER.parse(response).getAsJsonObject().get("id_list").getAsJsonArray();
   }
 
+  @Override
+  public Integer delete(String collection, String whereJson) throws WxErrorException {
+    String query = JoinerUtils.blankJoiner.join(
+      "db.collection('", collection, "')",
+      ".where(", whereJson, ").remove()");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("env", this.wxMaService.getWxMaConfig().getCloudEnv());
+    params.addProperty("query", query);
+
+    String responseContent = wxMaService.post(DATABASE_DELETE_URL, params.toString());
+    JsonElement tmpJsonElement = JSON_PARSER.parse(responseContent);
+    JsonObject jsonObject = tmpJsonElement.getAsJsonObject();
+    if (jsonObject.get(WxMaConstants.ERRCODE).getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(responseContent));
+    }
+    Integer deletedNum = jsonObject.get("deleted").getAsInt();
+    return deletedNum;
+  }
+
+  @Override
+  public int databaseDelete(String query) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseDelete(cloudEnv, query);
+  }
+
   @Override
   public int databaseDelete(String env, String query) throws WxErrorException {
     String response = this.wxMaService.post(DATABASE_DELETE_URL, ImmutableMap.of("env", env, "query", query));
     return JSON_PARSER.parse(response).getAsJsonObject().get("deleted").getAsInt();
   }
 
+  @Override
+  public WxCloudDatabaseUpdateResult update(String collection, String whereJson, String updateJson) throws WxErrorException {
+    String query = JoinerUtils.blankJoiner.join(
+      "db.collection('", collection, "')",
+      ".where(", whereJson, ").update({data:", updateJson, " })");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("env", this.wxMaService.getWxMaConfig().getCloudEnv());
+    params.addProperty("query", query);
+
+    String responseContent = wxMaService.post(DATABASE_UPDATE_URL, params.toString());
+    return WxGsonBuilder.create().fromJson(responseContent, WxCloudDatabaseUpdateResult.class);
+  }
+
+  @Override
+  public WxCloudDatabaseUpdateResult databaseUpdate(String query) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseUpdate(cloudEnv, query);
+  }
+
   @Override
   public WxCloudDatabaseUpdateResult databaseUpdate(String env, String query) throws WxErrorException {
     String response = this.wxMaService.post(DATABASE_UPDATE_URL, ImmutableMap.of("env", env, "query", query));
     return WxGsonBuilder.create().fromJson(response, WxCloudDatabaseUpdateResult.class);
   }
 
+  @Override
+  public WxCloudDatabaseQueryResult query(String collection, String whereJson, Map<String, String> orderBy,
+                                          Integer skip, Integer limit) throws WxErrorException {
+    if (StringUtils.isBlank(whereJson)) {
+      whereJson = "{}";
+    }
+    StringBuilder orderBySb = new StringBuilder();
+    if (null != orderBy && !orderBy.isEmpty()) {
+      orderBy.entrySet().forEach(
+        e -> orderBySb.append(".orderBy('").append(e.getKey()).append("', '").append(e.getValue()).append("')")
+      );
+    }
+    if (null == limit) {
+      limit = 100;
+    }
+    if (null == skip) {
+      skip = 0;
+    }
+    String query = JoinerUtils.blankJoiner.join(
+      "db.collection('", collection, "')",
+      ".where(", whereJson, ")", orderBySb.toString(), ".skip(", skip, ").limit(", limit, ").get()");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("env", this.wxMaService.getWxMaConfig().getCloudEnv());
+    params.addProperty("query", query);
+
+    String responseContent = wxMaService.post(DATABASE_QUERY_URL, params.toString());
+    return WxGsonBuilder.create().fromJson(responseContent, WxCloudDatabaseQueryResult.class);
+  }
+
+  @Override
+  public WxCloudDatabaseQueryResult databaseQuery(String query) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseQuery(cloudEnv, query);
+  }
+
   @Override
   public WxCloudDatabaseQueryResult databaseQuery(String env, String query) throws WxErrorException {
     String response = this.wxMaService.post(DATABASE_QUERY_URL, ImmutableMap.of("env", env, "query", query));
     return WxGsonBuilder.create().fromJson(response, WxCloudDatabaseQueryResult.class);
   }
 
+  @Override
+  public JsonArray databaseAggregate(String query) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseAggregate(cloudEnv, query);
+  }
+
   @Override
   public JsonArray databaseAggregate(String env, String query) throws WxErrorException {
     String response = this.wxMaService.post(DATABASE_AGGREGATE_URL, ImmutableMap.of("env", env, "query", query));
     return JSON_PARSER.parse(response).getAsJsonObject().get("data").getAsJsonArray();
   }
 
+  @Override
+  public Long count(String collection, String whereJson) throws WxErrorException {
+    String query = JoinerUtils.blankJoiner.join(
+      "db.collection('", collection, "')",
+      ".where(", whereJson, ").count()");
+
+    JsonObject params = new JsonObject();
+    params.addProperty("env", this.wxMaService.getWxMaConfig().getCloudEnv());
+    params.addProperty("query", query);
+
+    String responseContent = wxMaService.post(DATABASE_COUNT_URL, params.toString());
+    return JSON_PARSER.parse(responseContent).getAsJsonObject().get("count").getAsLong();
+  }
+
+  @Override
+  public Long databaseCount(String query) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseCount(cloudEnv, query);
+  }
+
   @Override
   public Long databaseCount(String env, String query) throws WxErrorException {
     String response = this.wxMaService.post(DATABASE_COUNT_URL, ImmutableMap.of("env", env, "query", query));
     return JSON_PARSER.parse(response).getAsJsonObject().get("count").getAsLong();
   }
 
+  @Override
+  public void updateIndex(String collectionName, List<WxCloudDatabaseCreateIndexRequest> createIndexes,
+                          List<String> dropIndexNames) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    updateIndex(cloudEnv, collectionName, createIndexes, dropIndexNames);
+  }
+
   @Override
   public void updateIndex(String env, String collectionName, List<WxCloudDatabaseCreateIndexRequest> createIndexes,
                           List<String> dropIndexNames) throws WxErrorException {
@@ -86,6 +267,13 @@ public void updateIndex(String env, String collectionName, List<WxCloudDatabaseC
       "collection_name", collectionName, "create_indexes", createIndexes, "drop_indexes", dropIndexes));
   }
 
+  @Override
+  public Long databaseMigrateImport(String collectionName, String filePath, int fileType,
+                                    boolean stopOnError, int conflictMode) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseMigrateImport(cloudEnv, collectionName, filePath, fileType, stopOnError, conflictMode);
+  }
+
   @Override
   public Long databaseMigrateImport(String env, String collectionName, String filePath, int fileType,
                                     boolean stopOnError, int conflictMode) throws WxErrorException {
@@ -101,6 +289,12 @@ public Long databaseMigrateImport(String env, String collectionName, String file
     return JSON_PARSER.parse(response).getAsJsonObject().get("job_id").getAsLong();
   }
 
+  @Override
+  public Long databaseMigrateExport(String filePath, int fileType, String query) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseMigrateExport(cloudEnv, filePath, fileType, query);
+  }
+
   @Override
   public Long databaseMigrateExport(String env, String filePath, int fileType, String query) throws WxErrorException {
     JsonObject params = new JsonObject();
@@ -113,18 +307,37 @@ public Long databaseMigrateExport(String env, String filePath, int fileType, Str
     return JSON_PARSER.parse(response).getAsJsonObject().get("job_id").getAsLong();
   }
 
+  @Override
+  public WxCloudCloudDatabaseMigrateQueryInfoResult databaseMigrateQueryInfo(Long jobId) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseMigrateQueryInfo(cloudEnv, jobId);
+  }
+
   @Override
   public WxCloudCloudDatabaseMigrateQueryInfoResult databaseMigrateQueryInfo(String env, Long jobId) throws WxErrorException {
-    String response = this.wxMaService.post(DATABASE_MIGRATE_QUERY_INFO_URL, ImmutableMap.of("env", env, "job_id", jobId));
+    String response = this.wxMaService.post(DATABASE_MIGRATE_QUERY_INFO_URL, ImmutableMap.of("env", env, "job_id",
+      jobId));
     return WxGsonBuilder.create().fromJson(response, WxCloudCloudDatabaseMigrateQueryInfoResult.class);
   }
 
+  @Override
+  public WxCloudUploadFileResult uploadFile(String path) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return uploadFile(cloudEnv, path);
+  }
+
   @Override
   public WxCloudUploadFileResult uploadFile(String env, String path) throws WxErrorException {
     String response = this.wxMaService.post(UPLOAD_FILE_URL, ImmutableMap.of("env", env, "path", path));
     return WxGsonBuilder.create().fromJson(response, WxCloudUploadFileResult.class);
   }
 
+  @Override
+  public WxCloudBatchDownloadFileResult batchDownloadFile(String[] fileIds, long[] maxAges) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return batchDownloadFile(cloudEnv, fileIds, maxAges);
+  }
+
   @Override
   public WxCloudBatchDownloadFileResult batchDownloadFile(String env, String[] fileIds, long[] maxAges) throws WxErrorException {
     List<Map<String, Serializable>> fileList = Lists.newArrayList();
@@ -137,6 +350,12 @@ public WxCloudBatchDownloadFileResult batchDownloadFile(String env, String[] fil
     return WxGsonBuilder.create().fromJson(response, WxCloudBatchDownloadFileResult.class);
   }
 
+  @Override
+  public WxCloudBatchDeleteFileResult batchDeleteFile(String[] fileIds) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return batchDeleteFile(cloudEnv, fileIds);
+  }
+
   @Override
   public WxCloudBatchDeleteFileResult batchDeleteFile(String env, String[] fileIds) throws WxErrorException {
     String response = this.wxMaService.post(BATCH_DELETE_FILE_URL, ImmutableMap.of("env", env, "fileid_list", fileIds));
@@ -149,14 +368,33 @@ public WxCloudGetQcloudTokenResult getQcloudToken(long lifeSpan) throws WxErrorE
     return WxGsonBuilder.create().fromJson(response, WxCloudGetQcloudTokenResult.class);
   }
 
+  @Override
+  public void databaseCollectionAdd(String collectionName) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    databaseCollectionAdd(cloudEnv, collectionName);
+  }
+
   @Override
   public void databaseCollectionAdd(String env, String collectionName) throws WxErrorException {
     this.wxMaService.post(DATABASE_COLLECTION_ADD_URL, ImmutableMap.of("env", env, "collection_name", collectionName));
   }
 
+  @Override
+  public void databaseCollectionDelete(String collectionName) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    databaseCollectionDelete(cloudEnv, collectionName);
+  }
+
   @Override
   public void databaseCollectionDelete(String env, String collectionName) throws WxErrorException {
-    this.wxMaService.post(DATABASE_COLLECTION_DELETE_URL, ImmutableMap.of("env", env, "collection_name", collectionName));
+    this.wxMaService.post(DATABASE_COLLECTION_DELETE_URL, ImmutableMap.of("env", env, "collection_name",
+      collectionName));
+  }
+
+  @Override
+  public WxCloudDatabaseCollectionGetResult databaseCollectionGet(Long limit, Long offset) throws WxErrorException {
+    String cloudEnv = this.wxMaService.getWxMaConfig().getCloudEnv();
+    return databaseCollectionGet(cloudEnv, limit, offset);
   }
 
   @Override
@@ -174,5 +412,4 @@ public WxCloudDatabaseCollectionGetResult databaseCollectionGet(String env, Long
     String response = this.wxMaService.post(DATABASE_COLLECTION_GET_URL, params);
     return WxGsonBuilder.create().fromJson(response, WxCloudDatabaseCollectionGetResult.class);
   }
-
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/WxMaConfig.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/WxMaConfig.java
index 49a80cc423..bc381f43af 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/WxMaConfig.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/WxMaConfig.java
@@ -87,6 +87,10 @@ public interface WxMaConfig {
 
   String getAesKey();
 
+  String getOriginalId();
+
+  String getCloudEnv();
+
   String getMsgDataFormat();
 
   long getExpiresTime();
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java
index 98929be166..b75fa711ff 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java
@@ -1,51 +1,53 @@
 package cn.binarywang.wx.miniapp.config.impl;
 
-import java.io.File;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 
+import java.io.File;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化
  *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public class WxMaDefaultConfigImpl implements WxMaConfig {
-  private volatile String msgDataFormat;
   protected volatile String appid;
-  private volatile String secret;
   protected volatile String token;
+  /**
+   * 小程序原始ID
+   */
+  protected volatile String originalId;
+  protected Lock accessTokenLock = new ReentrantLock();
+  /**
+   * 临时文件目录.
+   */
+  protected volatile File tmpDirFile;
+  private volatile String msgDataFormat;
+  private volatile String secret;
   private volatile String accessToken;
   private volatile String aesKey;
   private volatile long expiresTime;
-
+  /**
+   * 云环境ID
+   */
+  private volatile String cloudEnv;
   private volatile String httpProxyHost;
   private volatile int httpProxyPort;
   private volatile String httpProxyUsername;
   private volatile String httpProxyPassword;
-
   private volatile String jsapiTicket;
   private volatile long jsapiTicketExpiresTime;
-
   /**
    * 微信卡券的ticket单独缓存.
    */
   private volatile String cardApiTicket;
   private volatile long cardApiTicketExpiresTime;
-
-  protected Lock accessTokenLock = new ReentrantLock();
   private Lock jsapiTicketLock = new ReentrantLock();
   private Lock cardApiTicketLock = new ReentrantLock();
-
-  /**
-   * 临时文件目录.
-   */
-  protected volatile File tmpDirFile;
-
   private volatile ApacheHttpClientBuilder apacheHttpClientBuilder;
 
   /**
@@ -190,6 +192,24 @@ public void setAesKey(String aesKey) {
     this.aesKey = aesKey;
   }
 
+  @Override
+  public String getOriginalId() {
+    return originalId;
+  }
+
+  public void setOriginalId(String originalId) {
+    this.originalId = originalId;
+  }
+
+  @Override
+  public String getCloudEnv() {
+    return this.cloudEnv;
+  }
+
+  public void setCloudEnv(String cloudEnv) {
+    this.cloudEnv = cloudEnv;
+  }
+
   @Override
   public String getMsgDataFormat() {
     return this.msgDataFormat;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/JoinerUtils.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/JoinerUtils.java
new file mode 100644
index 0000000000..3ef3eb915d
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/JoinerUtils.java
@@ -0,0 +1,253 @@
+/**
+ * Copyright (c) 2019,sunnybs.
+ * All Rights Reserved.
+ * <p>
+ * Project Name:yigou
+ */
+package cn.binarywang.wx.miniapp.util;
+
+import com.google.common.base.Joiner;
+
+/**
+ * ClassName: JoinerUtils <br/>
+ * Description: 字符串连接器 <br/>
+ * Date: 2019年10月18日 下午1:42:59 <br/>
+ *
+ * @author <a href="https://gitee.com/esunego_hunan/weixin-java-tools">wsp</a>
+ */
+
+public class JoinerUtils {
+    private static final String NULL = "null";
+
+    /**
+     * <p>
+     * 空白连接器，忽略null
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.blankJoiner.join("a", "b", "c");
+     * <b>result : </b>abc
+     * 
+     * JoinerUtils.blankJoiner.join("a", null, "c");
+     * <b>result : </b>ac
+     * </pre>
+     */
+    public static final Joiner blankJoiner = Joiner.on("").skipNulls();
+    /**
+     * <p>
+     * 空白连接器
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.blankJoinerWithNull.join("a", "b", "c");
+     * <b>result : </b>abc
+     * 
+     * JoinerUtils.blankJoinerWithNull.join("a", null, "c");
+     * <b>result : </b>anullc
+     * </pre>
+     */
+    public static final Joiner blankJoinerWithNull = Joiner.on("").useForNull(NULL);
+
+    /**
+     * <p>
+     * 空格连接器，忽略null
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.spaceJoiner.join("a", "b", "c");
+     * <b>result : </b>a b c
+     * 
+     * JoinerUtils.spaceJoiner.join("a", null, "c");
+     * <b>result : </b>a c
+     * </pre>
+     */
+    public static final Joiner spaceJoiner = Joiner.on(" ").skipNulls();
+    /**
+     * <p>
+     * 空格连接器
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.spaceJoinerWithNull.join("a", "b", "c");
+     * <b>result : </b>a b c
+     * 
+     * JoinerUtils.spaceJoinerWithNull.join("a", null, "c");
+     * <b>result : </b>a null c
+     * </pre>
+     */
+    public static final Joiner spaceJoinerWithNull = Joiner.on(" ").useForNull(NULL);
+
+  /**
+   * <p>
+   * 逗号分隔符连接器，忽略null
+   * </p>
+   *
+   * <pre>
+   * JoinerUtils.commaJoiner.join("a", "b", "c");
+   * <b>result : </b>a,b,c
+   *
+   * JoinerUtils.commaJoiner.join("a", null, "c");
+   * <b>result : </b>a,c
+   * </pre>
+   */
+  public static final Joiner commaJoiner = Joiner.on(",").skipNulls();
+  /**
+   * <p>
+   * 逗号分隔符连接器
+   * </p>
+   *
+   * <pre>
+   * JoinerUtils.commaJoinerWithNull.join("a", "b", "c");
+   * <b>result : </b>a,b,c
+   *
+   * JoinerUtils.commaJoinerWithNull.join("a", null, "c");
+   * <b>result : </b>a,null,c
+   * </pre>
+   */
+  public static final Joiner commaJoinerWithNull = Joiner.on(",").useForNull(NULL);
+
+  /**
+   * <p>
+   * 等号分隔符连接器，忽略null
+   * </p>
+   *
+   * <pre>
+   * JoinerUtils.equalJoiner.join("a", "b", "c");
+   * <b>result : </b>a=b=c
+   *
+   * JoinerUtils.equalJoiner.join("a", null, "c");
+   * <b>result : </b>a=c
+   * </pre>
+   */
+  public static final Joiner equalJoiner = Joiner.on("=").skipNulls();
+  /**
+   * <p>
+   * 等号分隔符连接器
+   * </p>
+   *
+   * <pre>
+   * JoinerUtils.equalJoinerWithNull.join("a", "b", "c");
+   * <b>result : </b>a=b=c
+   *
+   * JoinerUtils.equalJoinerWithNull.join("a", null, "c");
+   * <b>result : </b>a=null=c
+   * </pre>
+   */
+  public static final Joiner equalJoinerWithNull = Joiner.on("=").useForNull(NULL);
+
+    /**
+     * <p>
+     * 竖线分隔符连接器，忽略null
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.vLineJoiner.join("a", "b", "c");
+     * <b>result : </b>a|b|c
+     * 
+     * JoinerUtils.vLineJoiner.join("a", null, "c");
+     * <b>result : </b>a|c
+     * </pre>
+     */
+    public static final Joiner vLineJoiner = Joiner.on("|").skipNulls();
+    /**
+     * <p>
+     * 竖线分隔符连接器
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.vLineJoinerWithNull.join("a", "b", "c");
+     * <b>result : </b>a|b|c
+     * 
+     * JoinerUtils.vLineJoinerWithNull.join("a", null, "c");
+     * <b>result : </b>a|null|c
+     * </pre>
+     */
+    public static final Joiner vLineJoinerWithNull = Joiner.on("|").useForNull(NULL);
+
+    /**
+     * <p>
+     * 中横线分隔符连接器，忽略null
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.hLineJoiner.join("a", "b", "c");
+     * <b>result : </b>a-b-c
+     * 
+     * JoinerUtils.hLineJoiner.join("a", null, "c");
+     * <b>result : </b>a-c
+     * </pre>
+     */
+    public static final Joiner hLineJoiner = Joiner.on("-").skipNulls();
+    /**
+     * <p>
+     * 中横线分隔符连接器
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.hLineJoinerWithNull.join("a", "b", "c");
+     * <b>result : </b>a-b-c
+     * 
+     * JoinerUtils.hLineJoinerWithNull.join("a", null, "c");
+     * <b>result : </b>a-null-c
+     * </pre>
+     */
+    public static final Joiner hLineJoinerWithNull = Joiner.on("-").useForNull(NULL);
+
+    /**
+     * <p>
+     * 下划线分隔符连接器，忽略null
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.underlineJoiner.join("a", "b", "c");
+     * <b>result : </b>a_b_c
+     * 
+     * JoinerUtils.underlineJoiner.join("a", null, "c");
+     * <b>result : </b>a_c
+     * </pre>
+     */
+    public static final Joiner underlineJoiner = Joiner.on("_").skipNulls();
+    /**
+     * <p>
+     * 下划线分隔符连接器
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.underlineJoinerWithNull.join("a", "b", "c");
+     * <b>result : </b>a_b_c
+     * 
+     * JoinerUtils.underlineJoinerWithNull.join("a", null, "c");
+     * <b>result : </b>a_null_c
+     * </pre>
+     */
+    public static final Joiner underlineJoinerWithNull = Joiner.on("_").useForNull(NULL);
+
+    /**
+     * <p>
+     * 斜线分隔符连接器，忽略null
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.pathJoiner.join("a", "b", "c");
+     * <b>result : </b>a/b/c
+     * 
+     * JoinerUtils.pathJoiner.join("a", null, "c");
+     * <b>result : </b>a/c
+     * </pre>
+     */
+    public static final Joiner pathJoiner = Joiner.on("/").skipNulls();
+    /**
+     * <p>
+     * 斜线分隔符连接器
+     * </p>
+     *
+     * <pre>
+     * JoinerUtils.pathJoinerWithNull.join("a", "b", "c");
+     * <b>result : </b>a/b/c
+     * 
+     * JoinerUtils.pathJoinerWithNull.join("a", null, "c");
+     * <b>result : </b>a/null/c
+     * </pre>
+     */
+    public static final Joiner pathJoinerWithNull = Joiner.on("/").useForNull(NULL);
+}
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImplTest.java
index c3e008fe8d..69d6cc990e 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImplTest.java
@@ -3,13 +3,19 @@
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.cloud.*;
 import cn.binarywang.wx.miniapp.test.ApiTestModule;
+import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Ordering;
 import com.google.gson.JsonArray;
 import com.google.inject.Inject;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
+import java.math.BigDecimal;
+import java.util.*;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -20,18 +26,89 @@
  */
 @Guice(modules = ApiTestModule.class)
 public class WxMaCloudServiceImplTest {
+
+  private static final String COLLECTION = "geo";
   @Inject
   private WxMaService wxMaService;
 
+  @BeforeTest
+  public void before() {
+    /**
+     * 用以解决：javax.net.ssl.SSLHandshakeException: PKIX path building failed
+     * 参考：https://www.cnblogs.com/cloudapps/p/5022544.html
+     */
+    String mpCert = ClassLoader.getSystemResource("wx-mp-jssecacerts").getPath();
+    String maCert = ClassLoader.getSystemResource("wx-ma-jssecacerts").getPath();
+    System.setProperty("javax.net.ssl.trustStore", mpCert + "," + maCert);
+    String property = System.getProperty("javax.net.ssl.trustStore");
+    System.out.println("javax.net.ssl.trustStore=" + property);
+  }
+
+
   @Test
   public void testInvokeCloudFunction() throws WxErrorException {
-    final String result = this.wxMaService.getCloudService().invokeCloudFunction("rcn", "login", "{}");
+    final String result = this.wxMaService.getCloudService().invokeCloudFunction("login", "{}");
     assertThat(result).isNotNull();
   }
 
+  @Test
+  public void testAddList() throws WxErrorException {
+    List<Map> stuList = new ArrayList<>();
+
+    Map<String, Object> product1 = new HashMap<>();
+    product1.put("description", "item1");
+    product1.put("price", BigDecimal.valueOf(1.2));
+    product1.put("due", new Date());
+
+    /**
+     * 等价于new db.Geo.Point(113, 23)
+     * 参见：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-sdk-api/database/geo/Geo.Point.html
+     */
+    Map<String, Object> point = new HashMap<>();
+    point.put("type", "Point");
+    point.put("coordinates", new Integer[]{113, 23});
+
+    Map<String, Object> product2 = new HashMap<>();
+    product2.put("tags", new String[]{"cloud", "database"});
+    product2.put("location", point);
+    product2.put("done", false);
+
+    stuList.add(product1);
+    stuList.add(product2);
+    List<String> idList = this.wxMaService.getCloudService().add(COLLECTION, stuList);
+
+    System.out.println(idList.size());
+    assertThat(idList).isNotEmpty();
+  }
+
+  @Test
+  public void testAddObject() throws WxErrorException {
+    /**
+     * 等价于new db.Geo.Point(113, 23)
+     * 参见：https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-sdk-api/database/geo/Geo.Point.html
+     */
+    Map<String, Object> point = new HashMap<>();
+    point.put("type", "Point");
+    point.put("coordinates", new Integer[]{113, 23});
+
+    Map<String, Object> product = new HashMap<>();
+    product.put("description", "item1");
+    product.put("price", BigDecimal.valueOf(1.2));
+    product.put("due", new Date());
+    product.put("tags", new String[]{"cloud", "database"});
+    product.put("location", point);
+    product.put("done", false);
+
+    String id = this.wxMaService.getCloudService().add(COLLECTION, product);
+
+    System.out.println(id);
+    assertThat(id).isNotBlank();
+  }
+
+
   @Test
   public void testDatabaseAdd() throws WxErrorException {
-    JsonArray array = this.wxMaService.getCloudService().databaseAdd("rcn", "db.collection(\"geo\").add({\n" +
+    JsonArray array = this.wxMaService.getCloudService().databaseAdd("db.collection(\"geo\").add({\n" +
       "      data: [{\n" +
       "      description: \"item1\",\n" +
       "      due:\n" +
@@ -63,16 +140,59 @@ public void testDatabaseAdd() throws WxErrorException {
     assertThat(array).isNotEmpty();
   }
 
+  @Test
+  public void testDelete() throws WxErrorException {
+    StringBuilder whereParamSb = new StringBuilder();
+    whereParamSb.append("{")
+      // 等于
+      .append("_id: _.eq('79a2c43f5e7e9e8e001a120e494d51b8'),")
+      // in
+      .append("age: _.in([0, 1, 2, 3]),")
+      // 小于
+      .append("due: _.lt('Mar 29, 2020 8:47:07 AM'),")
+      // 存在属性
+      .append("price: _.exists(true)")
+      .append("}");
+
+    final int result = this.wxMaService.getCloudService().delete(
+      COLLECTION, whereParamSb.toString());
+    assertThat(result).isEqualTo(0);
+  }
+
   @Test
   public void testDatabaseDelete() throws WxErrorException {
-    final int result = this.wxMaService.getCloudService().databaseDelete("rcn",
+    final int result = this.wxMaService.getCloudService().databaseDelete(
       "db.collection(\"geo\").doc(\"056120a7-c89e-4616-95bf-dfc9a11daa3b\").remove()");
     assertThat(result).isEqualTo(0);
   }
 
+  @Test
+  public void testUpdate() throws WxErrorException {
+    StringBuilder whereParamSb = new StringBuilder();
+    whereParamSb.append("{")
+      // in
+      .append("age: _.in([0, 1, 2, 3]),")
+      // 小于
+      .append("due: _.lt('Mar 29, 2020 8:47:07 AM'),")
+      // 存在属性
+      .append("price: _.exists(true)")
+      .append("}");
+
+    StringBuilder updateSb = new StringBuilder();
+    updateSb.append("{age: _.inc(1)}");
+
+    final WxCloudDatabaseUpdateResult result = this.wxMaService.getCloudService().update(COLLECTION,
+      whereParamSb.toString(), updateSb.toString());
+
+    assertThat(result).isNotNull();
+    assertThat(result.getMatched()).isGreaterThan(0);
+    assertThat(result.getId()).isEmpty();
+    assertThat(result.getModified()).isGreaterThan(0);
+  }
+
   @Test
   public void testDatabaseUpdate() throws WxErrorException {
-    final WxCloudDatabaseUpdateResult result = this.wxMaService.getCloudService().databaseUpdate("rcn",
+    final WxCloudDatabaseUpdateResult result = this.wxMaService.getCloudService().databaseUpdate(
       "db.collection(\"geo\").where({description:\"item1\"}).update({data:{age: _.inc(1)}})");
     assertThat(result).isNotNull();
     assertThat(result.getMatched()).isGreaterThan(0);
@@ -80,9 +200,43 @@ public void testDatabaseUpdate() throws WxErrorException {
     assertThat(result.getModified()).isGreaterThan(0);
   }
 
+  @Test
+  public void testQuery() throws WxErrorException {
+    StringBuilder whereParamSb = new StringBuilder();
+    whereParamSb.append("{")
+      // in
+      .append("age: _.in([0, 1, 2, 3]),")
+      // 小于
+      .append("due: _.lt('Mar 29, 2020 8:47:07 AM'),")
+      // 存在属性
+      .append("price: _.exists(true)")
+      .append("}");
+
+//    // Hutool创建有序map,返回LinkedHashMap
+//    Map<String, Integer> map2 = MapUtil.newHashMap(true);
+//    map2.put("_id", "asc");
+//    map2.put("price", "desc");
+
+    // 有序map
+    ImmutableSortedMap<String, String> orderBy = new ImmutableSortedMap
+      .Builder<String, String>(Ordering.natural())
+      .put("_id", "asc")
+      .put("price", "desc")
+      .build();
+
+    final WxCloudDatabaseQueryResult result = this.wxMaService.getCloudService().query(COLLECTION,
+      whereParamSb.toString(), orderBy, 20, 20);
+    assertThat(result).isNotNull();
+    assertThat(result.getPager()).isNotNull();
+    assertThat(result.getPager().getLimit()).isEqualTo(10);
+    assertThat(result.getPager().getOffset()).isEqualTo(1);
+    assertThat(result.getPager().getTotal()).isGreaterThan(0);
+    assertThat(result.getData().length).isGreaterThan(0);
+  }
+
   @Test
   public void testDatabaseQuery() throws WxErrorException {
-    final WxCloudDatabaseQueryResult result = this.wxMaService.getCloudService().databaseQuery("rcn",
+    final WxCloudDatabaseQueryResult result = this.wxMaService.getCloudService().databaseQuery(
       "db.collection(\"geo\").where({done:false}).limit(10).skip(1).get()");
     assertThat(result).isNotNull();
     assertThat(result.getPager()).isNotNull();
@@ -94,21 +248,36 @@ public void testDatabaseQuery() throws WxErrorException {
 
   @Test
   public void testDatabaseAggregate() throws WxErrorException {
-    final JsonArray result = this.wxMaService.getCloudService().databaseAggregate("rcn",
+    final JsonArray result = this.wxMaService.getCloudService().databaseAggregate(
       "db.collection(\"geo\").aggregate().match({tags:\"cloud\"}).limit(10).end()");
     assertThat(result).isNotNull();
   }
 
+  @Test
+  public void testCount() throws WxErrorException {
+    StringBuilder whereParamSb = new StringBuilder();
+    whereParamSb.append("{")
+      // in
+      .append("age: _.in([0, 1, 2, 3]),")
+      // 小于
+      .append("due: _.lt('Mar 29, 2020 8:47:07 AM'),")
+      // 存在属性
+      .append("price: _.exists(true)")
+      .append("}");
+    final Long result = this.wxMaService.getCloudService().count(COLLECTION, whereParamSb.toString());
+    assertThat(result).isGreaterThan(0);
+  }
+
   @Test
   public void testDatabaseCount() throws WxErrorException {
-    final Long result = this.wxMaService.getCloudService().databaseCount("rcn",
+    final Long result = this.wxMaService.getCloudService().databaseCount(
       "db.collection(\"geo\").where({done:false}).count()");
     assertThat(result).isGreaterThan(0);
   }
 
   @Test
   public void testUpdateIndex() throws WxErrorException {
-    this.wxMaService.getCloudService().updateIndex("rcn", "geo",
+    this.wxMaService.getCloudService().updateIndex(COLLECTION,
       Lists.newArrayList(new WxCloudDatabaseCreateIndexRequest()
         .setName("drop_index")
         .setUnique(true)
@@ -119,15 +288,16 @@ public void testUpdateIndex() throws WxErrorException {
 
   @Test
   public void testDatabaseMigrateImport() throws WxErrorException {
-    final Long result = this.wxMaService.getCloudService().databaseMigrateImport("rcn", "geo", "test.json",
+    final Long result = this.wxMaService.getCloudService().databaseMigrateImport(COLLECTION, "test.json",
       1, true, 1);
     assertThat(result).isGreaterThan(0);
   }
 
   @Test
   public void testDatabaseMigrateExport() throws WxErrorException {
-    final Long result = this.wxMaService.getCloudService().databaseMigrateExport("rcn", "test.json", 1,
-      "const Point = db.Geo.Point;db.collection('geo').where({age: _.gt(1)}).limit(10).skip(1).orderBy('age','asc').orderBy('name', 'desc')" +
+    final Long result = this.wxMaService.getCloudService().databaseMigrateExport("test.json", 1,
+      "const Point = db.Geo.Point;db.collection('geo').where({age: _.gt(1)}).limit(10).skip(1).orderBy('age','asc')" +
+        ".orderBy('name', 'desc')" +
         ".field({ name: true }).get()");
     assertThat(result).isGreaterThan(0);
   }
@@ -135,14 +305,15 @@ public void testDatabaseMigrateExport() throws WxErrorException {
   @Test
   public void testDatabaseMigrateQueryInfo() throws WxErrorException {
     final WxCloudCloudDatabaseMigrateQueryInfoResult result = this.wxMaService.getCloudService()
-      .databaseMigrateQueryInfo("rcn", 476629L);
+      .databaseMigrateQueryInfo(476629L);
     assertThat(result).isNotNull();
     System.out.println(result.getFileUrl());
   }
 
   @Test
   public void testUploadFile() throws WxErrorException {
-    final WxCloudUploadFileResult result = this.wxMaService.getCloudService().uploadFile("rcn", "E:\\MyDocs\\Desktop\\test.json");
+    final WxCloudUploadFileResult result = this.wxMaService.getCloudService().uploadFile("E:\\MyDocs\\Desktop" +
+      "\\test.json");
 
     assertThat(result).isNotNull();
     assertThat(result.getAuthorization()).isNotNull();
@@ -155,8 +326,9 @@ public void testUploadFile() throws WxErrorException {
 
   @Test
   public void testBatchDownloadFile() throws WxErrorException {
-    final WxCloudBatchDownloadFileResult result = this.wxMaService.getCloudService().batchDownloadFile("rcn",
-      new String[]{"cloud://rcn.7263-rcn-1258788140/Snipaste_2019-11-13_00-21-27.png", "cloud://rcn.7263-rcn-1258788140/avatar.jpg"},
+    final WxCloudBatchDownloadFileResult result = this.wxMaService.getCloudService().batchDownloadFile(
+      new String[]{"cloud://rcn.7263-rcn-1258788140/Snipaste_2019-11-13_00-21-27.png", "cloud://rcn" +
+        ".7263-rcn-1258788140/avatar.jpg"},
       new long[]{7200, 6800});
 
     assertThat(result).isNotNull();
@@ -171,7 +343,7 @@ public void testBatchDownloadFile() throws WxErrorException {
 
   @Test
   public void testBatchDeleteFile() throws WxErrorException {
-    final WxCloudBatchDeleteFileResult result = this.wxMaService.getCloudService().batchDeleteFile("rcn",
+    final WxCloudBatchDeleteFileResult result = this.wxMaService.getCloudService().batchDeleteFile(
       new String[]{"cloud://rcn.7263-rcn-1258788140/test.json"});
 
     assertThat(result).isNotNull();
@@ -195,18 +367,19 @@ public void testGetQcloudToken() throws WxErrorException {
 
   @Test
   public void testDatabaseCollectionAdd() throws WxErrorException {
-    this.wxMaService.getCloudService().databaseCollectionAdd("rcn","test_add_collection");
+    this.wxMaService.getCloudService().databaseCollectionAdd("test_add_collection");
   }
 
   @Test
   public void testDatabaseCollectionDelete() throws WxErrorException {
-    this.wxMaService.getCloudService().databaseCollectionAdd("rcn","test_delete_collection");
-    this.wxMaService.getCloudService().databaseCollectionDelete("rcn","test_delete_collection");
+    this.wxMaService.getCloudService().databaseCollectionAdd("test_delete_collection");
+    this.wxMaService.getCloudService().databaseCollectionDelete("test_delete_collection");
   }
 
   @Test
   public void testDatabaseCollectionGet() throws WxErrorException {
-    final WxCloudDatabaseCollectionGetResult result = this.wxMaService.getCloudService().databaseCollectionGet("rcn", null, null);
+    final WxCloudDatabaseCollectionGetResult result = this.wxMaService.getCloudService().databaseCollectionGet(
+      null, null);
 
     assertThat(result).isNotNull();
     assertThat(result.getPager()).isNotNull();
diff --git a/weixin-java-miniapp/src/test/resources/test-config-sample.xml b/weixin-java-miniapp/src/test/resources/test-config-sample.xml
index 1f6cc38887..7812fc7469 100644
--- a/weixin-java-miniapp/src/test/resources/test-config-sample.xml
+++ b/weixin-java-miniapp/src/test/resources/test-config-sample.xml
@@ -4,6 +4,7 @@
   <secret>secret</secret>
   <token>Token</token>
   <aesKey>EncodingAESKey</aesKey>
+  <cloudEnv>云环境</cloudEnv>
   <accessToken>可以不填写</accessToken>
   <expiresTime>可以不填写</expiresTime>
   <openid>某个用户的openId</openid>
diff --git a/weixin-java-miniapp/src/test/resources/wx-ma-jssecacerts b/weixin-java-miniapp/src/test/resources/wx-ma-jssecacerts
new file mode 100644
index 0000000000000000000000000000000000000000..7a7995ea0d7795485a9ede072db7399d4359175c
GIT binary patch
literal 116059
zcmdqK1z1(>)-FtUcb5{1z*;m&HwXgKAl=<5NJ>bTlr%_pODc_Yhjgg4gn<J8T%d@)
z@80j(*Z-aUpZ|EtCG%M`p1J0@?=i;xj4?giIopAPf`S2lEH3^faxr!=cQiM(F|^Wm
zbYwMUHPollvM{pLhJu1teJ$M?00pnk%mLzof`UZ^`N6`1{9vqLu%Q}Q^!kI-Gd(1b
z>$U8xo|b{o5s+^ON(FvKhlYlShXVP&0;7VE5nxr|5O85sl)!`_e8>h0E`};_Jtg3J
zcc`Ro44J`vAYRA^sJLvRkO@$+QYknaSeYAADL9y0>pQqpi5fdNnVXm!>N}a++E58Q
zJDJ%!m^-;sF;Pjff_XvQmq&vc3~y0^d3d;~em_63n}n?cmHy>n9>zvg&W^@Zwl-Go
zU`i1A<*@`m51~?aaCUT}x^L{{YU^MLq98=);RbPlxj`3yGzrmJxk20@Fe@7e4+oFt
z{}uP>n|}StLBm7A`i28fF9gQd7b-6pn%e2kI}+Ia#N`A&OlqW$&*u_8B!7PmJku84
z2R;21cW_ki)I*!!=})38DSuY#4tIdd^XgIJOQbvRUkBjcDK!6peAHb4lOyu_hP=%5
zK1S9zuvPDdZ4y1=@y3y?TblKjMBqt7V6XB)Wk=b#1es<pKIk0X>X-?`deGYy1{N9$
z`ug+$!-56o<-q*ad*q}2w~n+=ojQt7g%az{zNC=(Pp_mlpYLRDm~65jAN5Ub<}${A
zx~Uf^C&uib+rgAER_bPM>o99oinMPS!?n@a0U|7M?U&{#9GZ?CX{jT6Ch2IQOv7%(
zR7;Sep;fJ@!CQrjcZ9QOnsHRZYNS&k;XogT^Qcp-y7U4!#75?(=7xZ60!HiXU~FV=
zWXg68I8uw;SHOXh0YD=G@`E18fQ5mEfx$w})I1?y%&3tTD;v0(VYLlHK|lh)Gsq7I
z;LG@T;NXLBFM)$523!yV1_*Az#2~^;<Hd4yb!GlJ7iL3SYw%4F4df$OT+*u}gfHhv
zB`rqvz}D7@N|Fs?++a3{HG^3p)(sdp8)Spy$L4=)8ZIC#1jLJbhk-_bXY_@GqJcGl
zf+K#{R4it^Gf*$6{w=&htw4+k9{*qu^&HD7y~f~yuE}G{^|z$r?x_7;N+_w}+AuQ(
z8VfL*pW<(0gmcS0mF{Zlg5^fkRhfN^Y_sC6Gb~Ppso{b(nQ?QUX@T>=>K0G72uKKo
z34BfDxX{q&aPS~l;2#hMWB?N~00%s%zzcpL$ABY%!+SH_T(F!7ub3&vmF4d~7*2kB
zE#Uf7gEfT$8Nq;Pb9}{NEOG8RJIVLlShYKFc3AKX*&m8_&`;CBiqTMQ@bAWY$NfQ_
zj?-&mjXjVD2IR@9v=3T0Fyu{Ism;Ed!hS+Aixp$96OEfUpJNl#&pLTbZPLxM`OMJ5
zSUe^ky86QQ$bWLSvyD0MtE0Y^1MpOTCvGpBEBk|M2Km7?0OXzd!~TRwI*h2RaH(N2
z8rN`0I?1nN3>8A&&A;2=za;N}qR>D18L+hffS<WRoR@aYa>dUoKkxU_jQ@pefY>%*
z+3cVT%f7U2F2JsT5%>Sk@6QjK=K3Rpu(lsGCKSLhC@_A|&`{m_Tsjrd>~jWF_$lY=
znqfC?OzK5MPempAdu*r^bBA?)S~q%9on`-Rr@3KvKn|+9hsiOw+uS~$l83KS4DtDU
zj1xJT4(i2Q`jM<O`hJ~3lr~|Wx&%~;Vk36)YMZNMtNre~>eCpntHfj5?z~GTWPAk0
z<sr=Gw#>G2h(+QZbf@Lh@n?~h_0}MR5M8Kyi=Fdp&SI>>ycG5}=5J7)C6Gq?Mj7LW
zhrTrkSsI0@$$iJgb`RLmQU1i9js$&(MT<ZvGy9R;!^ARC&m?DNZ<N{Z<NhA<rdTh&
z#R{wq+gNeB3RL$eB#XEP-M33@9|QEhYSCj?e<wI-RJHJ-4Zm<4*}jz^-?D!KIReNU
z0f`X-h*=P!(ctt!x|!M;S|AOO8c2lz83;g3jaf|1O+eHjN)RHzPZ+Q;Byf0<>tiH=
z#o-Z_?L$5m<5EO-9uYHxXbEnZIXT(!vand$n%Xk|geZiPSzH`1#vo^c#2lBLQtNtR
zE+v_+gfsDa6Oq*gaU=ne`1)f7kO(|hXegO4U&>)O?wCGWi*q&Xw~_tog@OLIr-7rv
zPTuh3=82Vmm}Kf*!^7mSF0Ap<6|POi$t@LYVCpX4cvVe|ir3>6FEolj8osHQCD(|O
z*^44zpwukI`sS;^jb_#Vk-z=eaJ6ccy7wl}hf{nLi6c_%VL8WaFNv@GJNdc>;~xdT
zEIFw$5~cc9cQDMxCFI&|6_d9hV((AP&98^;Pq3EzZ>X(Awzgyzw(^tLjB{^Jl|ST_
zw-AhMGqEx({4kS4aO67@kB8wk5YIj{8foX~`{?=O=0yEz@u0-0&aFUD7f0*<dAmxm
z|Gho<7zF!+`o!3}?EydikK7yb35mBg!!Ib0^rwq+f`n+sMi9a?WxwWdrR8U?2oF9E
z<Od%G5T4r)!h=sCRZEMYW?kVyY|e9aet7+BMgs`X;CH_J&wVanAD3K3bmem|Vo4z0
zymYwi|LAc48*}i3`73e2K!^hdAPyL4sMd`rN3(^-HEkI_5DmzjZToc|Epsn5|H0E~
zjn~V!^7z$@T#^S$ACU&2cYr7lNprXfwp6<ktjUWi-4FV(N7r;G;rSk5KA`MM!_R%(
zl3t)jprPVWW)^Gry7HxSl7%B{+z6H!7W1OtA!5LW(_L%(6(%&&U8;#*DssbHOoQ7x
z_j_W$Q0u3#Z^3uzY-^D;ZS@Wf6tfHIR(P1~y7oxro2aR!E2~GKG1kfFfo4>9`yOep
zmh{T&taH2rznP8Ic^eVwGg}*-C=})1?$%vf(NSYT#0`rTK0VHr!wl~geC#KH6>V3f
z;wQ{HH3#Q-+a?;?lUjDXsgxAfS=-HIh8HZB%qG-|G^Ht>^LnEo!*o7}zA00lrv_V{
z@bk@w5|KuqUzrEHB)afxXp6W6g(R4JNbN6W;gFgnJM}Hxqj-m5Sh_L37Zbyq#{U*-
zO`JBQHd&0A@o`&R^{Bq}7TZkc;ypO1elN24_Q=oFm6h0ajot?nVRm<f^$IHtiNxYb
zTnrw6@+trJ-slC}NC@I`bKQn$4pIFJSLkKTI5cYVO66O$Ay(@c4-_SxTIh;vg`F2X
zigm*Udz;3Dv2nE4u@ttzoqY}jG{}pdvd)5r+tj)pREn0i6-9xe@~<bwbyKOnXHs;w
zMP^kzMxjeOUNdJ&BxgFFDX1i0C%q)j|1dV%o?7)AwbwS1U1T;DeD^Z3lnhh;4}if!
zjH^+9#;d@pg|H)<v^_HmDty(*3{!Q;wbbtGX|haGL$BLIG&J3{4ZK^bsGQQ;Vunj4
z&z}*QklsM&cmH5*IjQ_*l<$?OP${{>@q_PCcN-Iv%q_cL<>i~@(7#RnN?!_k((uVt
zj#nU3gNH^*Y^z5bwr@wl!^?mg#iz&7WF!M#PxpOpbzWKiXKRk<o|;c5v$&HE-9nG#
zMyXI2;C91OBz+yw+wfTTKpM=YOZEq<YZeK%F$&ht!p%IAD>?Bz5DsoOAY&^`Ayw3e
zcm&+g7rC{bJ&;8uJT>y%Xl9cxGZb%1mbg+u*q&cd&hADan#^0@(SFvr0CXhe1Ty)y
zT}vt_(C88mJJu6wd}yTiDy$3k(lZQ%3UV7QawE>g!+qa`>qT=5$J*h=<nM5%temWf
z*WXaGLa;Se@s_BO6|`Z{bf+85$u~$CrC8aK32h=hm6SnWG&Ol#sU<vockSrz5uD+N
zz1PZ6iWyID_YS)CPizLk5mgPANe7o5#w68NZRlf;K7o3tK(a;}pGutB@Vp|W0*Yd9
z7*k%vsu!hcSM-F}KDS4XE|=ppM7!yU0Xgev2BY#$vf8V;6RaWPx=<O?Na$Mnc%}EX
zA=X+=X5%;Bhbm^Ne%*iJlQBtA)r5(u<b11e6W4WZA<UP$1QAOTyCjGoam2Z4=+NZx
z1&{wOH-Jsqevewec3zP<90d@yk^m$Q1IP`bTF$Bg%1=<ChRV351}k!|+t-EM(Dyro
z|4&7%fTF<jzpf~VgG4XA0N+)_dMRpv{{vCuA~oaT0fRum-=C=&Cx{Eod8Ir2-*mJ8
z6wA&Bj5kz&&6_@ib9=tP|JDkZV8&zqrlLt(H=PE0F#^)-xDhtWeSZ#08`7SILL2=1
z%Jh33)+F1gs~G!YxoX`)>J-_Ml=j<tpRD70h<J9+M2J)u*JP!!-0nlWa2Von&YLtr
z!*OP-m`!AHA{Q4?(<vjA2=?JE759}OkjJllN&UE_cmCSjnNhZX_ADrgdh_L(fb!I+
zhT9yU%}@p|6iGdO=30yCv%ZYZs^{~)&S_hqWZmq6nNl}m!5beQ&fRJ*QRyL74m14p
z{>5fD7tX`%TNE%ebCh?hr!Z9|eevOB%KYg^I@N<;&3`J)%O;vNE40Q|Ty8bCOn>Gw
z!vD7-2qY{lG6|omdfA;^yP+}+|1ljLu30!!C_#s5zmr>{q-p>yd0XtmnV=IYZc4+E
z9BJi<Ze{Ig@WZO~fj8rMGkWm>ykA~%k?Z%pEAL#7o>hKP4E8NeSQtPmu5U~5@wRcu
zd1sCrZ%o+{%XjJ?2{$evzxg?BaKO}4-WcXQ`iZh*_c`b1K&I_s9r<(YbO(gVdXkT_
z=yb*_Vm=hz>8tbaQD(PuseH`MGUXpHTMi)#pZG^KanF}CV^>&Kiu5NpeU+kdmm$Wi
zBom-=nz3kaIbd+ZRdtuQR@fvhuTiVuGEu*A_!e^!C8%RB5PpIiPcJF^-U7li`#T47
zwUjw~g1Z-VLTGMeY;zG3+FhuIzp;tbd*LfKfwurcLKA>Z?*9l0QJ_V90Etul#*l<3
z<W$!g1(E~H{Z1%2fKG9tUm{BbSG<Vrz_&pRmvE=P8vBWJC1XP;Kz6){{X~VSz!%XU
zJD{&{g1I=@*jOQQ%k|Cw>C637pjS&1_dQ3d?7gHV$~StKwFAMYcRgh8fNzI|mlw2y
zE%RMn0_bXseMQibwp7#`J-##<dmUt0hvrLuFmR#3-bKP2sT3nP+8jQiV9}X-<0xF(
z1XV7>C{$UzeD~gKrqs2}lx-4TihZQ2;kBC_i0RL(dmmWOA@)VqXzlwS%6Bv6_LRJd
zr^*2{sHtnNg_9;1rJ<u8ps?}K@Sr3xA1b*vh>4#Dyy2ws)nH1twU(07?~`3r8Yz3w
zB$i&pV(IU&=j=0!z(%UwGi%r-H&AQ>9vE2=2*ToAZpiW2(^IH?)AvGkiL0!L9hZmp
zJ&(y+qDLW4;&Tm?K!K8v<$VGOn2+|c?{Q^_SwDJ{A7+0vQ4`JCzmMO=xS&W_kszzU
zUlFh23Gc;3Jpt7UZJMR?=*7c>&om#S&|~Kc#S~5Yy<A|oEb?!26DPQ!TRzqQ+VpAH
z<<yRG{ubXC6bda7vQSkP6;iTH=9+GTjW30KF%jmq(64F&Q$sLOx#N`IZ@x|Ar)^TA
z+nFfhDeM%IRW7Qmo|*YF<uFIqWZi76yBExH+k|EJQ<d>PTexSUu(<@LD4F?5O3kpo
z#X#S^8QCa_B7BWZN#$G2{tUWgud|9A2%!)n#J59N*!aC?iN)3o9NHIYx(-yw=XK*9
zcC2+jOTlWLcHYkT<ai?hixm3ZuR!m2%?shL`SP!Xb=7_;Z8}e6X3jp^GA?$jJ$nQ%
z`w!S$1bUJu^C;!m(cC3++Mm}k5|oMkq=J;g3XPJcHP3>fJJoZODsCv>sIwraQd@^M
z5GEW$o^yU<qa5XYMw0G}@_K&iGxD&O1O6HXvIRfeA$9Tw{^JtG33RL-FOjy$-L_<;
z3E|0y7}VxAKKdB=ZS_N)(l`(LTX_4&nYrN?I8G^T>wU};`Q<YDgp5ZWJ&!|YP~rur
z1#eiBjNHCSJoBWAaL>)AKz-!KSU2vD1Fg4qg`?fDH$nn(z%3tr@)MnN$Ks6Dka{wE
z{H_JCH_qE->y)y0@6(;#WQ!#3CJ(m46KTug^ARKyE5IdJCfgc^KG5Y;hhv~^Gtmb>
zZdh_|Aj$WgbRewigavb8ySZg8eE@}d`z)$2^1Y;gw&KHXy_z^?L|-iRn8Ed77p*?+
zmnUe(CmpOTxry*=Ur<d62)g|0S&6@XZE$}}Ij~h$gfUM#C%)$K4rV1@`@8wRlDU4o
zvpcGe$_6)CT!98#T93VxySHLUZI4AgsK<i4-6n0Bi(nJpKvoM!awo64N?o;E`p_H4
z3>j>{Z~f)I<hRKuyPfJn#5v@7U+;->y*1O6AKH3t<g`$YKXat4Ou|Aom0+(N6){7V
zs>JAB6uGhqYEt0Z`zTrC<#`8g+bp$OS`6#R;U1aMyYCy8QS;_r=BH4qxpl?0C3SrQ
z(0k7>n3=@c$p%<zaWFA=aCEXYumA}0H*%I{PP`&#IDnktu9LG^3tFfG)Xi$_F;1qX
zDqYg+R(28Y#sALEKbD%1fTbqopG!@MxEM<MR!&s1`j*C2qQHs~m;yw0$>I3QX2w)1
zO5zWcAE+oP|6K0@|48CdafyBiIS^?bat{{{=0aO12a#S<KAwv5eJ02$Bp~<4B!6*(
z5SHiR0dawNz}#$r;0Ulh_{SzYh>a6iG5SAr-v1PY4Ho(eW@qcW6@sBu;<3}{F)7Iw
zc~kt%Ky5Pm<R4iuPFmbQ=ib;;QG6CKFt^%ZBLJR8p)&10nrV&Ol7th08N8jP9R!E`
z36x6oG@-JP?7Q%2Cg+=P{LwGp&De3Ati6kBPsvUh<2%Mla;>OCUNYMtt3Ql047RX1
zLv`tGIiguJZ73qqaeeg!aUR{Obr+%A)j~Ke4|D3<ZX99V_a`kmMIB_|`Kj8Gwf((C
zg2>7Tu~V7jA(@EGt;^6jA`~Rc)A8(cM(zyfFPX7lufNxdk@_Zy`r2x?gw<d8Fn3+p
z?$kKS`s75h<7@LXMq;=-W7c_Z_q}cXjaMv+f&!g?2#RGO-(nCdU;yNp7b^r^|BfwZ
zcZ{6yp5yTq%_kK!Yca@$^7T%GL?8!K!rcV{W|6^>!4?SqVQPjBR==AX%ikFoGq4-z
z7UUeXa5NyQpUNdH?A32b2q=J>2?y=Rg#rur2W&3XL?p@w6<lI&bEkt1v+>Uo3ssDK
zYBYuBsdGDD9qQhZ?UB?p-+aH%!ErQ9d)V_LCrGB5w89aodAz-^mZMQ4&=ow8=Yv;@
zyZ609>Z>I!Et6vH9c%Gdi9JtMwFP!X?+aMcM-21cdxEMvwqud!{ANTmh=s=)SJR;!
z#y7oXA2UFi3RvA8UzY1aPZEVj$9Wd!mfEV2RUuYrF+}JwWQ#fe<)(`6K0AT5iGYGc
zuc19R*r48^;ZUi>s)jKOr;u14c~<9LY*z#x(%C-9hbSZPiCmA@R4DA3&BW(ag5sDv
z88_CSM?av9TO^EgY_EFt${wBy%B>mq0eQZ_02F1<1vwF$8rxog`f35?cWxqeyW%Ez
zD<E(*0|G~d%fJ!(&lO3K`0rdq0K$V%1PU&?q_OQqpm@2^{eyjAaq+Lle=TQ-3STT*
z04xD4TX6iy`dE3cZT?SP=AR<N7x*d}*<DMNVX4##Q?FVWwQ6$GGG`pro1sW$TlIVK
z$i@ANy2yPd`M0p1^OjlP{L*9(orZAisY~$+L#59@Sp!r`{01ZyzeB?nek7CZU?NZw
z-?l^mwS+~<2*#L-Qyvpx%U~y`5O<lE?<3;ceuD2ojP!k?`}zJs0W(%X%m%+Ye*u9R
zAB!_JkvD^D?y^2%-HQ)jD3azJZH`c~sI7Kq3!lW8lzsBB^qYN2gT#S3B=V8t#A5d`
zBW*t~_L_B>W2Fmu$#A8cDM=0wnIfvGs{bjsHu~WFek0>E%7sU)4^GJ&YY;LksdaKE
z<ITMHlhWRbBMH14MMmd{oA<e|lrU9;EJkHSKnM#XtAuX0Fj43r7i;Z@G55TAsQU1s
zwz7vg^0Ub~>{sE=`PD-_J%fBrH$68D`j(r$@|x9*QP<9BcWTYC-ZGF#G((dQC)6w_
z-fiPDn&gk$MO{8-C`DCmwGX{<OE@C1^WK9;)AmJ_Pw`*e_1BzIhgR&86`t{)7B+Rr
zVp!DkFG%Zo^j*o(LE|{qgU|(I@bmh^8B`VatU|3C3*~pXeQMhY)<-%BEaIW+<2MLm
z)(C7E3^hQD3ee9DLrBu+2;=<hxY}=~B}-0f_TA4n4{@N3wwimKMq1KM={SE!p4j-*
zJ5~sbd31k=FO8W&z?_b)^U)>M8G`ixEw?o?7nY;d2h%A!J+y`$YnzVrn7mNH$#1|B
zfe3u?X8&%7-$Tv7zpxXa5rW+|x@#8e<Ai$cJMuZUCCFbtIb=`|EJytwQOOf2rcz`S
z@X)+qIGLO8WSx>@U2N6IJ<cqru_K*-nSB5x5vt4>pS$;2Fe%`aV`B*1_12;_Z|Vlp
za-vSVCX!3Ri!xW1I=yBw35&gibI15s5$|Kaor3GO)v&R}Q$Qa{f_Yxa^W{NJbbl|h
z_Mx%MMO)H_y9M*@O-A&H=Vbe1g^5)47GdtK24_C}nUr1`e~q?TrBk*>PNI}2nE3O%
zOvNs-4KvW;Qds%lj=2Lr&Y^TQ2V~z6UYK;XeKP)pOkt^1@#)KO0hg7AKKcXQ^gSC5
zbcAU}!kkf0%SK&15~)ZM*>_cvWD&CBj8wZ)i|^)<BZ%^6g~DU#u$A;3wYQqzb;#Y~
z(%&lPVKQYVm^_B^f0Ehn?b6}3R(H>24^~{yycX@jvzP##7uhvA0*o{L)1;Dx2V%4G
zUt!<x<Gm3)^j{c$rMz1A9)(LTlu82@M4Wl2rx}}av9wpF^N`-eB(T^l`g~?Xi3~IJ
zp}8>%T@M9&ySCz^se<PSnVj<zA#qJJYfNZ5$W}-Rp4t4KvFC!BczHuL+FNsTWF0Px
z!41vg@bRRj-z6+$%cNEZOEE_uZ*5pTm-n^sFe+{on0WWbg}F0N>ea(2%r`xPCmXEG
z;iR@X8xhlAZ%I8JbUeFr89M%4>oK*mHMm^c{;jq`8q@KLo?%3R#S1}T<+JnWQjdyi
z(}7M72S<Aj=0uUW!}V2qkpAyf{hzP%P=P2Q<PM8Vc(u+Wc`?cV<+_Uh!W8~RO~riP
zOykpf)NiQX)T8??Eslq5+9XZvn+shjO~dh@_WOrXU+QZqN<2<uO5cqzL?hfrv^yRO
zU>5R!{$5bn`fkZs4xR?5TPm#RE*7qp!$N6rUZ!P@=%DG_8|ScO*((D7X-!4doK()&
z%+BdjPT_uRLvw>$P4~L4KP^}@D3CD>7^<Y{z)BEDW`v2S9R)eT@hF%xESSD=BRE{)
zNuJ@?G}Z-^Sj><8708kERz)Y4-Wf0;9uuwCM&b2o3UBi#q_cLq-;PLo6GGSb1V-Ku
z3uequE_m8G0@eIQc_n#W%d?7}@WSfIjEtR~91YEkos6xFEp4qYODb5eFEP@mT-hCL
zHV_h|1GX3RBP^i%gU&$q*KAEp983lxxeN<%#eQ6eO8N3aRKk+iYSEOLAj5!u^rIL}
z6wtSf9l$q0)R%@w@|VMZicGB6(hpWJARb?(9}wXf*!=%uO8=Bu6rpBwEQQ{}tH66w
z#)q}WW6Pl}Q#!w?A097#WNVa70<8ZR2+;)0jOVVq#bTI2mo&&d<Q*KV&leF|9Lj#_
zr(qF8T1=Kai^NDv|JD44<j1A0J02;=xG=+y**#yU@j+=69nYd2v+^+(E6h%|FZjpx
z<)bCBVjxMWYFT`nT~=3zmezF;=EFyTj?gYCtdFf8NZZPLZ^86{eU5kUp|j%b+#&eu
zu6-hFhcdnx+Se47osvZ&q>Svqr_#Gh@R7u_6AS9@DWeu-B1N4Oc|&HH&(@ap6J7Ls
zqCF=CpjM(4f|gTJHcApk$-8*H-Zag^vQI>4K_6Qn))Ca&$awz}Vt(l?;C6S?m&Zy|
zgi9eFOoUb_Rg9@@KfEy<5(ojPPlADl|D#w5;Sck>i1p))G)j1k-rd^5J=1It#Z~Kp
zySeY=+NQT^`t3u=3;)(<ex5et?fiRbJ~oZFsuMjb?kaEb5K2BKi9r2M3Dy9^RSps!
z-sv{rR9T^!4pFI2lqxhjnIz+!7IV|oyuquMaO?q+FHN_Qy~h}l0lO-&R4_jJXtXMS
z#euIR?c7IWEk(Tg)7|m`9^ypS^-XI1D4;AMg1zE13x~`Ttl4)@xu{z-43`d`1cQ~v
zmGPd~xgRkjxY9ebP}V>Fde-@Jnsd#6`<-!JtD)whM44|K*SK)l<c&#+p<^>rF~cm)
zmw6l-nd^4&DHu1@lHyRTU-B3-1jZZ^1x$Y%8G=_eQoF!4!4HA>63@nl;OmIi|8|9F
zm{S1FUx6Q=OGKkXy$E%`1)Ks(VL1Bhbz%bfwqC<FP~7?}<QKmbqkq)4GJxnHphd-{
zR5CWEf~W~U=E7`a?8IVaY^ra?1c2Mx5uy@Y?g@g_u|i6fsD3*YP{wNVFUnZiK;TPe
zxc%dZe_I;`oJd^sQjTT?vx2$79IPCGG6BfZK!p@!lLNB(f59F83nv(W+dKTyTKLh5
z)$o>zt_cju%_FT4bIH~E*IpkFU^>$?K50#aA`l14D`8n9-lWgW_%b0$tS{@;7fZkC
zgtlk<4EfA(+fJLa#MHI4H`P-`j5o_rk@9%eV7x#QQJ|md!U_H!=>A(xwa)Mz$$a<+
zq!%jwIZGA_!p7Jl(${V6M`5A9`}Deq<RV$AQW9aUEt%JHD|XxnY_RiMcu3AuSBV8{
z{XLlDZ#9ekXZO#~3O4d!Kw3#tPq+|j9wD7>(TB>!eO*4ui=ab#?-^re?Ko{qS4<64
zpHxRDtVOF=IxI!9i*SJzJV#@oT*=Y!5-YzU#TESuDX=<#@6!a3BJ#ucLH$8KAcbrA
zkWl~wDFMVpQE)Mp#6{)hE<GCr17La(?WNsQ03OfzqOM!i*4i3K%YW2+L!6ta@P)ww
z$uJKa2*l0`V&?%2mi7AP|As66ljo|cI`ba0uGk~+RLe!Pc6rKjuhr<A?C#V3!&{!m
z=exI;K74qoWki#lY<q{7&Rh{biSF$LnT35<vKK|_yr)%Hn5n6Zz!&>+V)_DPv={NM
z_rlOlR1)t_zo*H(XV2|koDgGP74mqK+6*BP?^)2OK4+6Py=t1;Zd;q`DeF+qOvLLO
zQ{nlC)3n72Yj)g6wY=4-cN6GDvoo8dH5_DbfP$daKizL3GgCDw8xYp+sgk>`B2h#+
zOR*xvKR4jj5aaWlYaZ>HQR-Wo&qkq(`V07R5AZX*9`xSJr|#{l*m=_)uQ!6ZUu5@X
z@r~T$?a7m(nPzY0gWM19Co_{SHyIo+J(nPe|5`~~hNE<n+1n>t#;Yj|ENbb^Y)yz#
z*9Eh`fx_>70~c<~OsF8gaZO&^y$ZgDuu2bit1Cu(X=Kde>|0BUb!#`gwFXrO*?!$@
zfI5ufi4?(}d@kx|nZyG@AhDISG#o^d+<GAB_Pk84^vi_&P;%mJEMcAp9rH6O7<;kM
zrIpNmW+FF5tjeo+1qMFMN_F7B`S2AHGe$xB={z_=xAy~A;av^mggDmTs&oNf1NBbn
z5(5nTT-HLCt`HYdAzWNj{w!r$tT!Kd4`xp0q*WVVoaG5~v@Zqg_Xc+_a$?aWYHXIv
zd{ZTGv?-SROp_^JLhivNPQMO%rE@Tg`-WCTF<ufj%!<0-Nn}UqoGmmGQw^GcW$49j
zuN@6u^J$9}D(oc`FOwfgXNJQcJsCdPzo6IxK=CC2#jHyxqQXHO7Bprc-3I!fpp*sw
z$X-x!2``ftNE^o08YL6e16D9D2>TMLD8KgjIS7k;ZSX>_;sjg<2T*AX{DA-xC?&tz
z1pUum?VrH-V(2DD3$rallDJ4mkpQ)F3hJ15fZYjB)tlBJ-7fFIu}aXx$<vaLkKV3-
z(R+p*gLOQtwD9fGW5?j)2f>eIUi3-7(8<pW)5LD_@Y`w$`%qQ<j21CLCh0aJOEraS
z>r>1c7*En?^_>m8cbX<~8n!gNR)!G*b#<gIYIt;l*|(eA(2x=Xtnvr$RcCmixy$X>
zGrghio3PUITF$r?kok2iPWsJFgJ`OzdDMxS{;!+#D2$HLU8$tSJ#XGGWgM|Yh01*^
z=Oq0^?D1sD`amBy_+k1|EQ(^nQ_aD$qKVIi$c1{%Z)bED9SZbtb)cYoWljWhHW6W|
zVIutcU|*+1{t&32gM5?z5*Yra%>7rSnX-bYW=clUW`VGvQJu`R_?9@3`J(C?(5P8J
zOd!ULTN(6$wAVE1Usib$!$2GblLPC8E)A)G{Hg!^?TP;e>PfyzL1bnLfzjJbGWBAp
zMZU%K@{_OX$wb|%(2~Dz-r=*+CzZQ*>o^^robFZq2Y)C7@!A5U*oFeOdql~vzXS!}
zpPRR5CwZkjD<QZvcDu-0ndX?+V1UZ@<*ksZ`RLuThgkxdTEfSR>qeqXA0~K;Mza>{
zLWkRYh{?p;n8MzFVajn*mF|SEk;h-K5p&}S%75H==uQ;fcx0RUYCnu4OdI-JyLH2!
zn6<kE_%X^^f#0k1y&@Z`4uxLbRJjzwFtl~(-V9+2N2QZog=!mG%x|(pN2d>FBFrn^
zV`DA^Pk$qq{#>{aKSbsBS`TNARw&Hk`(qJqAtRj6X}-&`%$HEVDq=8lbaMNxi)8%K
zFR0%KpbqIIVZDSpmRMQ2&tx|J%McJxAoCX?%Rlih__GrP<+2mRN#BYJf_Qx=pkL)@
zc4^D}bG-}}7efqK41+jaDxhRR{h|&DKsMlWFOYrVbHR{JFr;#ULlgA>`U3xi>cz4T
z2?|L5YSsM)#-F16w!6pfSc3YrwrASCx`kd5;e{@}XLFIhy(&m89b0@Kqf9{Rjq&dH
zF=|ZX(c3eukzwnfUCVJE)x@`jWEZ^Lab)&DLtypKdi)d*G=QD4e4D$$9R+-<(ClNp
zSf^;{-?I{|zj;sJcl&{5L)OYY5{7iC>@>7l<Ol&mW{P>LMXj#ePm7qF?MgaPNob>-
z96BFa6tPc&LeAICa33k7_Dq&;Yd(*m;5VuY>soB>6}H<ZaG0Rm=2qbm9sYhw^ib$y
z!q!A`N;vt;S=xrK>BU$0FuX;xHXj9;j~^mE=bQ95U&BfvzFm7uZFQYLC4C=8`&V-K
z7YzRyV*bK(M_xtFqdWE|bIbRloX<P(^`3-a{b3pxUN)QLP6{E^!vcz31`{scR{w6n
zd+o>>@l@KYGa6!}0_XzGPw!<oQ4V7HJ$E7@f1F4%{|5J76_wap^oRcMUb%A?>t`FM
zOZVsNpm=NSq{|N0w_rYwz=RUNiR0Cg>L8*}C)TBa(cDM-SW!~&RwFRf=0o&xVBblD
z30t9t*5FDWfurOb#{Q&oE~%ka)qBT7m}m~HL0$V|jY<yIqQ`Vn$q!8H)QiqcUF_ZF
z(6dzWaCvTmpJe63Xo4h{=M@l}V34Drwu}t*QV5!YdvP{Ky`n?E^0S5;SAX!VP;=Sr
ztYzS7#WyDF`Q-Y{0wvrPbvhaqE&_4xRxQeIsvidj)&=yifpFK>$ky1<(C~WOqYNV7
z74Bfd0nCK}KbSvoM=4oWXaHrWpezfWmSUK6`+B$z@_lkG^pz9=lY)pL4iyO(N7BJq
zA4vA7<n(O-kqM|_cK~Bua5WqvE+Vi}4di!5U=k3~rT@hS;$(R-c?c3^&8^LWigz&M
z#mXO`J<|O6Ok7m-Uv)=bxMyx4V&;T6=L`3I(cZ;<RYUlH$UOf=ng%QRh{d_r5C6$G
z=e1~p@gjqyV}S>#2!p~<-U-VnH~Gk+;dc2)!;urvmYmm4zPUcVeGIF2k293u20;n3
z{gKQOgF^LLFqw^@6$=ZphE}c?DqGS@JAcSmi#vOjV+bEE(zIWgakkGRmLhISP2Cih
zT#W0Ga!nd@|7SmXt!wY6R=EeO<xyPchT>2cym($CfrpH8lCj~1)I}21OqB1~OxLG}
zmO7Y}KJ*Y1wA_LR-h=_+9mVoV=dpQ2Nk~>1df}$rud^lM@=-dQr&{7j<{asUZrFG`
ze|S!QhnGNYCWdG7!feR^S=`Co+SUO`*NluIF`~JR>2DS+&0Be8!LWsZ=Xe2FFd))E
z`VZlN?%&owC;?=8&2FW|!N2O=M1EfCXB>!%iz4c7VC-;N1P6o(5Q~MyrMudZ>et6q
zqQLwvybdtI3*T~KnINF6mJ8xWE(1pn$mUOx^1n8bfAT&(_Q^yz5gv12lfMg>O&=T~
zN0bPjnR4;X_R=X-R0zCzf8P=6pz`fur^GkpJ)&oWc}vd&w5c#WG733EPZ(<5n5(wm
zOCG}QN8PC2EL&HqhyN_8%^3JGFQ@A+N9`#31L3Ko80Y0I6b03wmITyCY)`Nn7>IV+
zHl?tqw4x<lXvTMkwBP05Crf=6J^#Gf2|3?Ezp$K|_apxuSXJcFS8v;Ex|O+#Ht4b{
zCF~vhu!DD--Wh!!#wKwT((IAGgITv1<!$Bz$Bjygd3XFcqw00UGJCa8l69KPc+4%K
ziuh5k98(<cC4<INj?N@bKe74^HzGED`&cce@N~C$zb)%a@1qG)zvw^(Dh|*fOn2EU
z1@x)@LQjt{`$K$uxOJg}k)mYVn=u|iBAOr^NHloST=`S7g#8Pm{w5%N;8YlYk0z{}
z|5?tN_6bW()7C!f2UTwJ5o`3!CbQ7}PM_SH?579Mh_C}QIgh#CDGN;)QMT*aiC8l6
zbf-OlAAD!wFdFV4D5>CI)E!RSTfUm7L=gYNLTQsIHPWrX)s^IHb%LZuFg-&}-!k)*
z07e#iJ&hRb>WE>vFmL8@4%25B3OMB?H&&r3Mo+nyFP@jX+aR`tZSPKTn`^y7Q#DIJ
z+ZtK!3I2L8;N9}1TFewmLEwlE)@ak!>%EQu8JA?w<YvwxCtt#A9tZe1V%qj8E@8}9
zltE8V3tK)^7^$tz#bgdGOTWKM8I7yi9yvp+F6|?U*#%o#yxLmVR(SgY-nc(xLO|)@
z{vFkm6j!K*V+M+*ZUe~1`GIO~!-X$@qT06_jCb)U0PzL&hdy{Aya<5=Ah1Qn<N8yU
z6je~tg<P1*+{Vz>!H${Az@5s$*o2vi!3yGt9I33#^$nPBfoVZEF3x~U_M`Ql=ci-|
zxxkgz`iney@#(+l+@xZFT=~}JLI#+Xl^v*-1-Jo{TmlLyu*nW-PzL15|9{@rKQT^;
z+`R&vz{<^RDnxt&quY%4Mp{v2<RW%_Tyjn8+=SX3MS9HI=9C!cb?RLbIbuUeQay2b
zF(|d_D2CQ=;!#xi7KD4%_gmhB{Ro5hwkTKVCX}~RTxKfLt*T(u;~>{mm4UVP$5R$Y
zMNjYo<Fyi46>Rx?UYek-es8Xqe&rG(O?=vx-yD){%F>nIWKXPD&-CF=Z<LG4qqvna
zw@G6qZNACpl|#2+zp~^gRE|px!n3M8J*_m7#aK&3be{8GY(P@cdjh)k^^sJLdEhFC
zAVr|IhX;Q19#jNAjWQur6kTi+hO}99>lewf)Oe9s7;=lYbVKb#)CMM^c9Rorh|9m?
z-9N+Izr?@4*hgi}cLdv~Wjdq*DI5GX^CmJugWVr6xQKV}rbMcyfZi!3d3w0#$t6q?
z$47lbpzLGwlrW5ZW^(gHh?JVXZ^OayK>iGzblQU^Yo^rY<A<AgQd=^s&Hr)G<`X`4
zoFCe*V0;;N5#|)j0wrvu+8v7C#$*z)_$?y&7nB2DYFI2OaLAegH8#`ayvvhmBUbJ@
z?qqnKtHZLfca8aW7WrFVtjCkI*ATZi>u5Ee-`F!FeuEQB{}7hR7BoyzOH#a``FW%;
zpZ>*}yKjek5}VpfobrMt5v$lf)rB+b092&V$Kjh(iPT+(@A%wVbe@mM;)gG9({S}C
zi=rmH^@$3vGEK3SLc&)aYW>LQsgvyTK_jZu)1L#|Sn+~ci1dw&E()KF-GBhpM&Igp
zdTFHlMK8Pny>J5bLUBnif3176y%sSjiC^OxVI!l<x+h@~FdgXTB}<TBjf(%cG?lWl
z!d2}hq?+v_j3EB&en1Qi$x44l4gjM7B*DfFVFe(NxY`8$*C+H(c&__Q!nSb$1;@m*
zbYE+SvdIc_pyuR8?chQRHd{i@Em^PF^k$i+*d17s)yScBYX!~8gj;c%KIPILbIkFl
z^?j{e+)NY#(ZVHms@?nYg6~<=ocemAls|OoV!EX!3-MtT>lf<aMWzL1S}44oO1@tP
zU-iO1?zw%Hf*wjYZYnooAWZ&;d~-UYs3O^N`5Q&N@&VI}gXzoWwvAIFQ<h?D-6gx$
z!nzKc_DEb+?#4M98F5^np;*vg$2iOmb34r8<%@S{-}b7jp6u8y9>5i=>t&o5g`z#t
zZ!ot|zkyws#}=vTtZ_VWYf7RHh0(ZnOvDzyvi{Mxy${+-6YQGwKUAr=Am5p5;X+As
zq6d35-RF}II^{js=B1l&lu7<UB=$`Lj04b?e4|0W5k7c-cZN*I9Q*&e1ps|Ge@8Xt
zDN9diUr*jx!F+}glPa9}d?vu%cZNa>5Ag=4ab)?lYh$snm871(V)<8A{&(L$(cyOc
z5ahOMeh(UQa}S|TUXeva3FK%xSWxU3eOCAO@%>%9Q!<_{G#EuZrif;OrB{m*&hKuP
zY#)hKKZ&)&GJTnfz#&64#^}+nD3a-6II_{0*~$2tvjrD@quKDW`=dN$bfF@P`N*g3
zpFV|=h`=k3iyx=w8Bm+yQ;G5=z4L6oIb9G<=ol=hN($yCs<y{W9_YbHi(n>Q4omcZ
zLka#UCffz)DD9$$+5M%N(8rSbL%%GBX0kgb6$<l2njsy9N=)3eAED->;im4$`+*P*
z8U~8=msAL(*ASu5P~YKt$F|gGr7O09UI$8emVuui<rLVrxpT;#p};MOR5IkEzGqK_
zxt3+afE0d8Td26Czl3UFWmEJ@zXIfJ_MaIG%5~-X=ip!DY(TvR1FuB+EnfyIFo86M
zOY?uj6*Yjc`s&Rmm#=?;g+_!Gfr6{=avzJdqQyvO<{>77%_&V@=Rrg!=rgQn2>kL?
z?UmY~$cba-XJe6bidRsTHjWtQ-PG$uIfXO!g8AbOgJI<V=^CVR`J)o?`V}GXZzwk3
zTG)E|vI8crf8DTBP#|#_YN)p{nHjh*hG5G#I;az(PVm&2V7GVq#%%iXtz4S278+rw
z=<}b@bEK$tWgke6*4dE4KoJ(2zQB)OIEmYSg!&~t;KDF)_3g}=U5(A%%x#$M?IC6L
zOkiNm!X8UH|Lv7Qz-<EVX9I9QgO~0H8)~<BPddA~O=T|=qp)|a<ls8+APrl$uel@f
z`#*&jSTvk#2J%DPgm@CbbpXQV)zfALd<vjyUJL;7W!ANmiC&!yqT)E~+n5^J0?Dj`
zgRKh?A{&FTFKROY6$eSl%-F^Q`1$$T6BJzV&mo}L2iVsJkXCK2?VKSxkdix~0a-g<
z4CvdqUj@vNEDI8uqrpC)6Z`p|A6Q&0YrEgSG|<0$b<;~jnbpI&s%09&o9}yOYPdEk
zF^D{ggv0{q-O#y&Cvs(7VFk5f?W<ajKGDBkA?kM@&q|8P#{O8zJTB`8J`(35Q6p25
zrROg0kudv&T(VNeL7d|zzfZCi`f{+15RQPm>4_YcHa2B-yq~~Y%Xz@iwpgK|B|Fv$
zLG@4)P09Qv^ZUVI0jdKU0P8sje`CY>L5~6(gMQdRQ-urg_9RzhLo<CRhza;%IT!)=
z2ierOv%46<y}Dxq2jJ~W#utM)wsyugzkd;a1lHy@=BE1A#(#`s>i;qDm+#OI=Wh-p
zGBS2CwgRr>;P~h9`hSk#0JhBf$6nZfv2Q;teaOvSvv@y3$c3$e))a?7KEQSKV7|KX
zANcUY0|x(kRy;?uzZu0hvt<68FNx3!FxtQS02kQ*uNMRc|9U}uU>bitH3$vza4%AQ
z7!cH@qo;*~)WrN03!txl`?JmRA~G*BdG4M!miZ=$=x89acdE9JsdTL2Lo%!8;9JZX
zro2z9P<1xTJ_2QZ6T4OTjt5WYOlmraxX4;HA0vbK+FgxetteoS57&7!yhKT3Jax7L
z_4GfX>TVM|8Z`48Vtd%c;2peZHR<J+ZMo;6Bfw8=mfKl;K78*xnITns=qH@C-kYzU
zTeV3xpXZws)hi%v-vu*)A3EG~jk?KWSyl6R7Ph0QTfo{mp^mO^dYPBk#(@bV?dzko
z*@IUwGmVR&#BdFB`1jAg@92!a-^0RSmNf6@Z!DjEDl_Q)yuGR8A$zBv4p<W^xrzJ`
zG<>?podZ|@y`tYB;53knqHF{~0sev&@va(;fcH859+iJGzoJF>6`&ho0ieaMOIpN&
zKD7pY&+b#qCv7sq;DBYi&WeyXoA?G_V=|yr>Bj;u5-!SpV^=B}z{ZW;e}?XexTu!{
z|7-11%%D3EqJqVxy=bMncy-<bCE<T3NdtNxP}_7xx_?O0|L08gpPD3maEu8#G1}*V
z{?=kObeEk0`Z3uO1%LgOLMl0ACL`pxgCXht`~};ehF-n>I94(Fh>HQ6QF4~2tBIGm
zTK7e>S8BGQNUh63!Cl7aFDtgg+XPfm$O0?xoqCC?qsI-5=Df2JJ_Zw6MA7gyo#E~W
z;XV4aMj0`_rr3pTDuJZ<CJ;|qu!-&LvDNc)f>fer#R!fUc_uv$rgPLL72_#xux$#w
z@B8=PHl@j)mBBybpj6YWJ0JYYUw5bWlk$AeI~-oQQrV|<50k6wsQCN5Y1m62-!(IV
z7JCPMUqUH`P49DDixO9qqv#=PyVBlV;hEEY^KQ#9z1W40ZnVW^*3$miyNYh{rlGt1
zs%L1!=9r|IhqQE-Y}TJ`Bu^Yg*B@i#npE8KWDPJ>3F$z86{`#)#w{N6;>z37=C$H@
zI43-XGg}~yx;X9g6gk!)qQ+#1Hh3VQzCtjE2Xh7{Z3{;>-t*8BzCee-zrWse<vng{
zzn0&aY}Jm|`NFzm@r}DoP^}y)PRP>J(&{AMF`OHUF&Kw*USx8FO}*Qqbi=K}x<UnF
zVn<2u)Pm9!DAknn1x}p|St=BakvG&um_<ostM_RoHBR6tV#nzuWE6ZW7h2rvzMJAN
z_o@X@U>Z(-FnBqstHQkbu!{i+j+Un$gR$U1Hh~OL5dFdN&K`>&<}ab*mky!i-l|#1
zC^Mw&vpk*BmU>VLYx3qVisxT+jB64o0N0E5*@xqv=tG~Oy@ZpD(HuJ;q`&zxl!V|-
zIxC8wo(7|$_6+ai13vnoIEEccUTCf?m+wjnZ2>7=miJ$VQOjpVs2D^an&VG51+R7#
zqMq*Mf4HY|8-dDN#qAdHt}f`|y_?u7=QopWbZ#^5qRORve}?9c!;2S1ME<5%uuE2i
z6PA&zlb2|rVI3-n^sQ$^yo?CnC<+JDk%75$<>vkG>f8HA;%78fTPzWyGvfO2uM%wY
zT^u4q!#K-Y(cuT}!#7^oQd+&RH|U%m_IE)0Xo?+z_8eE%fqk)Q!hW&Petx;ZDvS?D
z+jzEF4X0Mr@_c<k&IDU=D5-Rtu=c%ubl8IQ**u4R7CwC(*^vG!U88NbDJ`}3#ymMH
zvl;1Kzp`zA(<kGJicS>`Nj@Rx-fqMX-DUKcV}wd&xo+R-?KbGa(EiM+)we`T3tc@=
zg81AON^tn?#5Vu<Nuyx@lSy0e0;a_Vn9s)v$u%6a?WW~HG6f82HzLj-(pxT<%O4`{
zLNSkP1ig769KU%aIkjsftl}B20TVxOkovk|SChdhAUCBhsv8Y)@i>IjiFK0URe3q;
z(sS8%vdQnO<~5QMzARaOMPr6yb{*m8Ol&VpA|KV*1(ymC4+$|$fA5KE)J~!~ez2k5
zNf`_l-3=z6>WbhKwII(UTJYj0_-OF8FDn1^!X1$R?18v?z2s#Eb**?+s?+$&FTgee
zKA{c>w$gw21+;fd>x9!1XOZiA-%0m@cEf9i2I-*vZ@gvlM^hUokXBt%{>57+fvu~}
z|JF4ANvJ8oz#m)_^?6tkbXceN)gC9e^etUnaN*J5F%=Jkx*pmWpV<QZcvgMBnhJ)1
zr%&IeqoDZ{dPGJQKYiz}^bj0y`x9m&E2m5U!aQGo)}F;T>VpURi|JHTlq(f8XGBJ$
zI9j@2)rmNoBnL7%zgl{amvaleB5e<2o0(=II%B}B%JZLWw-Ia8=XgeNrtv(~#d_*v
z);)B_b5w`fG`-=7D2^^Sl_082KqErwk@f^9vRTo52pVS9%zBCIhrPo?n3}}vkhyV^
zGc!R5b}oJ5MN=vWEfM&M!M&$qc1?}2<1raVd3DSS)vD&ogq^~?{kqP4!FYn<^UP;k
zNV-I>@|S!DY5MwIcn$n_O<>|%S!G8tZ~VYailKRV)TxKoJ(#~Wf&J|czuVzO{FjB%
zw79afzv|%VVHDT;*}-I*bxp+CpfqUfU}9!LwJN=T5Rah&Jwfjwj;#9H7{9-?xOxJI
zIZ3|crfQda5ze%!Z@{8AGGE+AJ>4CuX8tOMkk7j3G%E=Klpl=uf|eFvnMzk_Z&f1S
z-lE%aYw;3fJglSRu+|NMu9enGhlWon;-`JpU+ew)qitZ<iILfsFH_u>NZm;o#k|4C
z76sEftLDRxl$L0mhy>nTo&{Rg9v^We^!%sj;actuCbYDh-ZsNt^m&KIX3~m_j%Rb|
zO=*ZlaS~2SYi$*oTc;0QF`7-6iDjQ!veN#wJxQ^S5fN#Sc|)Nx?*v7hC2RlS0`Me1
z0e>l*K+tabTk{Ey<uA0y0BDZ@(C+dB?XbKbH}bFxG8!3-D#(#f)~}--k{kbTZ#uf@
zJ^8oqll?DD;h#|6$Th(J_K{_8rCC&ojPtp~OKKFP@MB`--fzKkhouL+A<=vu8$}2t
zmP5r%?{$!GioG;Qemt3-|9DB+nF_vGq3*dMi52MWEG2Qp6ve{n)Y6+cf3DJPO40lC
zkM4{%Gv~6b71WpTjwj{R(tb#>gwl)AJC~=HCi-j|RiuybJo4b>hw2Y8td=#0YVWm4
z2g1mU;^E?@4>_2gtx8+ZyRLqdzE@qWf>;n4UsZjhQPx^~|5HI_JgE9qRwayHMh(x?
zFLl5%W{f}v0WC~nB$5KTg)no2y6@C~9jnPd7p23L;gcgC9>0W3dk|g-HM?9Hra0OQ
z>CBgn&pRvF{BJ$^6}9{&4EYoGzrvdPG|E&&@f)i)8<;024LCapgpt2F6TrMKK&)rV
z5NC@aWw-^N-!vtf2=U_U43+Wz&@#tJxLB_1=z5zKm&eysB;dw@xGBeWaO;=Ia(y)R
zoKh;;fUdbO9Lp{<i!VePyTy<Ky*Zt3YR+1r<7sd-A4t#FQubD%OWx*BVrhKXSTjzw
zoTRHHfj?)KvVRDg5CE@)2c)e&ot=Fqz=4~qyZ_Zr!A?>bTaEaBTVyFhM?5Ye3n^{7
z^Fc*KQl>3#g|Piu@a-OXEGm_$Lp<^IC9$K;pm^3;j58&PlRK&Bp)?KmW{|~m7INy7
z)#pjQ9;8QThz9%Sq|r^-mdvAfae3{)#*nVN>bmUmg?DJHYGuus*i><Ft+Uo%fS6j}
z5U8><cZ9rd91wec6tVxsb4yF~Twxi$70Boy-aGpe%SdV{*a;#XtNnjs*z#H;C#?*|
zxJbL<5Ygb}%&qioem01qppgh)&Vfpa*^XJ5nFYkg#=*_O3gY49`dMxdi$?KtC&>HM
zf6er#dI}N9058qM3aR{K1zo(Z2&e?S+64VqC-YC)SYB60?ya0Vd+S7<<qFxhig(jd
zG<#o5aihE@%OLWOt_f-o5}YSDqeSwbV4?`l_!6laX`KWU6Gbqgi)0ltwOrgp^}1ro
zU-7BA9Mm&STb4Gl$JrQb(F5wcZ@+a@h)d4XHy}Z$zn~^R7G`3RJ!L3adRjtLt!f+*
zs2mw9dTW74!Yvzg<K@7<7p_{H_Nc$5lx#;)x{sz7Z*y-Rji3)bn-)ghQ#5TvE~GbB
zqaKnpVjP|Q{mc>bw|DBiOwe`p6=_sRS0z?g`G+|SlIP0sdbBe8Lr9lFbl)>lD1GxJ
zDdD!Vd14UKlg3)dHsuwb6Q4Z`qTn<BludNgKM?DkvOqqs%T0M->dsY6m@lz$l2nan
z;}~OR4f7oy0e-7W%I@=X&qogsQ<!U;1a_WS@6lo(B#?;cf0jvjA6kKhcw+2ZnZ+~o
zneUwFTh~X;P>mIs;zu#V_wnR4#6O|wFzA-Q7Ze{FDoe5b7BJ?j8E;!07m&8w)Fu-t
z6Z=JsdIc=5uW%o0dX>XdmbiKWzBL;my{BeijdF?*0o^0sNd?`E<U1Crfl;dUQhY{x
z9HJUJ-bOS0xBB#r#n6?mcaNWaQtI?!S71=z$5F5+1ijpFGi*AlEJ<OkJX_`o(|L(X
z6}Rxnzy5qxHM|b{!`-lhidWjHIjFLXGnGWgHR<<$MK8Z->%nv|Z%?|L$xg`OBW}C6
zUKkk8;lBnm*GrcF_K4qk@wX<s3*rM>)=?ih1hwhCkd_Tr-yjeEjAtbEVp<&qLmro7
zk%N4E2LasUD_}7(f0u-HH;Ny7l=&#4-H`c)Nx5l@ZEYJak6vLGJ8i7<gN3}*5{#gb
z2lf^Oe8lAbUy^Sbw;Ty3&+H#+22tDl$h}$OP7!Q8Spvxo1&$eG5fhChz*I0gh?o^;
zG~d^pC2F-y^c_A;ZqdP)8o<VHXuI{W`hD<c0nXAogHsBF1v@t^GAXUurX22<raLME
zI%<pKutKuFIivE1dB`Hjc;BH4Ui&!8Gq(xNU_X-D^nhs_+hTyGQ+ImR=15~58-L2<
z)p&dLli%u{1l{|T(Qzkdce1BlNb2P(x#d$%$ffk$=~fO;fzJH*c9GH^lk3eW7;{XA
z;jLS%IbLtN<L%$iW_xzN{^Aq^M;ch1L!%^ATYM(#GW0EuwT&a)MbKtF$|mClT~_^_
zmJ!A$r+H>QFQFMLtenW}9pm5a)^*eFL&-u_KCVR#B|B_WNTY37LR#Q7Ip@k9X;e14
z(@S4-FXplF`54o3!~G`j9AWAxVb>Qtl$&X*>BA<r@Y{thk6SGXGPY{EzsD%EFk;iw
za=FPWT9hC5t83$Zw2;C-e~nmM5sn%0P(h-KzZE)BzEVS3Qh@!Do3&~zv*V@-gWCW(
zUTa1q3v)el!~x#Z{tq>t->g#6a+jZ75dYu&ZvfYWH>q`=E5e6O2FU&y5WGG95xk+s
zlJQRRm~NWhXl*Y`KDzfO@&7kcHOYSt;QmX~_@^Ll<{bme13^v)>EKxQ!!H&TU}c~5
z5@q2U$;D^+<7GZf4Jbp-ry;psH&0e+&={NI2~pWviRFY5qM(}5<gm^VYu=IB(5Qfo
z6Pm{eM=1;r=Qgbr!UO}*o(<K#fnDme&cu@?4VmA8Du3Wv7Hw6*jXUxI2dNFJoQx5B
z*42(PrF76e=&hgK2C|c#ig{VKS$gYyt$Wo$s@*M>qoVV8{li`%Tk?^X*v7Ho+l{HM
z4w|a=cLm1}M^Mff_Of?plFDGmBK7JHVlpe5LqaG)1MM%E4cJNvU|hvC-}$2O<%u!7
z*9*cmJ<JGNCM{Ep7}&mZ^5x8WpVzZ6bj>s#{Nvr`|KTfo2is*Dl2i`r=k!_&9yhDj
zByi?U{$XYpL0n(1O4w?Tu#Gu=o-_6yUm&OLXlj=mH@W$<tQd1<ZmSe8xbcwO3NY8x
zUh4iLtAS9m<jGd4QC5>zPumVzc=y^?$D;#B6jov999?Z?c$9V)=(=mX${0mPoDEiG
z7-6~<?k$<GJhQ?OGr<yzEP>zpf4F-Ku&UN|ZJ6%v?v$Ezry!vqDUEb@cejF+(jh4!
zjWkF|3rLrAhcp7B{sRz2*WP=b?|l3G=bUe?OE1Tq(>cbA@AJI(Q}=!9R+LM)&drgk
z)U8*LsaPUoixb?+*HwmT%QZ3Z=?H;iRP(`C*p$q=NpO3uL)n&(C}l**?FLP+kFdUk
zZD)$2Jm~9E6&bXKEO?I;8J3u6xhDWB;hD2($ZDb|qb+p&j!EG<8?UHB5>TZ~2KlM@
z?ZZd2+<k361yHp0!!9-Y)3}}~bQG8lmIE}$;q+@)wv6lGV&>p**;H#{V`=!OAkI+d
zPfLadhOeN3;VZ}=!&mTN^&&)fk98iF-u~HMW?Lj~VYj<dtiO0ClrC>|HHP(z1OO5f
z=hw@Uz$08XfnTcKTs6ROv4YrunJab>J15Wp!+!hn-*ub6!&@cGpS+(?p<r0&%QNAK
z^T)(!_0(tw#)x6wX)sdt7ZFmWdN2Qk`cAdY#ct-{TT%!r8O#^YC^1**)WEVNJ7Mwy
zDH-Yknk^rdz9%iJq$v7Es2>F%g*!|Ydt24{5qXO}CF7jDD;szoIIYNdh(havXwi($
zV(*&HJR!7-$E|V4{%lG=D&~0)Y05^007LH~IA*iPKuZ;ZZsW(QL_?*Tj29I)i!?6L
zPv`Z~AksNdvqxjt6=s_v>H^($1<a?@8MbF<!G*15SLB0xD@%67Mc(yjJe?Y1@O<?N
zXwO0@K*^bdR;*U(q|jzFkB>LNobH}><MIgNlX<5Yc1E?9>XPsOU4<ye&Wzy$1l2(W
z&4|Sml*&pALZ=moJL=AI8Wy__4z9{O&8l9Gu$cW+nrAOzM>@(~<)@L55Iqr}ijLQA
ze0&=EIZL*jt#1N%>V0*;aq7rdo$rnDLiA2+-g)|JCDa@_qMd>b$nrgqkf?APq|Y5(
z^_xrVvCL3%Rv=MaBWdWw_Fxh9$<R!A@15sE_CfKu8}E_@R6Uh>6d4V65vk=r8=BF!
zXlm^hu`BS==t#RrVVBCcxZqK|&Dm?ODLvr?7lEAUH$+cqri?P-ty&h9muh<+Jn((y
z;-Q;FGWX^{iUg%jPT4A9ej$?}(?x!u-5_RL5<hio)uO-U8gBtqXny&B<ct2neCIDn
zrb+GbBHKv8yN37ht*f!lI^Wvfr{D5L|L_C%E{ls~P?vM2{4nskL5|?+;1EFD&1LoJ
zM|}|j9Ea@3h?>2Tt&M}3qm8{A^G_?jtQ)iZVUbsfcG|k7IM4m!x3jpbD-)x~%B2BE
z_3w3{Jszez8J7sGKk~k?cjbYcWY8xBt3BP&ec#uw5Z)=zYP}%ijmKi9{zlNyk6|ew
zaFrq?(rf+`M50~|$x#hMC<aboD{Cyz3)b9PekI{Hs@O-GW-;6ETIzYgmbP*8Yi2q<
z!2{CSB<mC@IEdNY;UDFBQgh`C-k*BwZ-Y>e(G_x^7X6HbsWVnMZTc~dh2kW0_&!#L
zcm#HSb#vovF2Sc_rY}-1xZmoxOYn~GDD3eD#y_{TCTwG9chq&GE=8c7o6{NM9gy%6
zyFXXKNb;^jyGMmDBgHJ~+0<@%sX%&&B?g0$Ew&;n0o8yFE2TW?(}&L}+Z;s=h*Vx-
zeH5BkkRRA51U*8DDfJJU2<W9SY+$OP9#zh)f!TZ=lTDS;5?m#NX)ZayjQHrea&Ldq
zw0UK2`LrlpFs;jH^9(UdM4tX}CwaD*);R_ch1B4vC=a!E_J($PN1W53#8*)K-DgpS
z2%W(Wx-w==vpKHgFjMAf_k~>e$S^6u2b)dP40J6xWf86FUJAaAo%f-vP<d@nEqCv1
z2xqs{umwDAqbI{W0cBu9_kcyZW?5{3hZE<h%lhGGzenqJSxuBB#b0e8=OOq(&gX<y
zq66S%8#Ud=N7FQieA$i%(o~w=rGu(1=R)oa@!eP69vg^$FH4u#LHh40H!$0uz8*>p
z=tmI(d_B!IYJ-wddP;YDQ(dOn{F-k0`Tr7L2++?a>uZXMf58g@w6a{6XXz!bSNJ2i
z2k0#SnVj0y0RuEz17zdeY@D1Nmj?_$MR9ov@Ir6^eKG&r7x;JRvM%tA{d5|V#bV+H
z2t3bulda~tC_(p>o}8Nfz_$~Bw`K=D7=#?!iHgU=5^_ZLV{&W<_Ti|X1MmmUeSN_s
zNJ=}`lA1A8X^FB-Sr9@R%`H%Lj1GxhMn{4oY{@Gt*w&t8jsmhzWi>;R{mb3b?fiMO
zUzEL6oA%bNTiwd}5LFiC6L8otwOCvqwY0`n9B3@lCZ$u2cWe(PQ~NLVwYE#Vdm8T!
zV{r#PJs-hZir;2>1RY=O^E24yW2MI_LPxlat7b)VY!CEZHmlcH>Ny(lpA@GktW|qg
zDV4EPtXK`$3J{zxCY!toIEu(A(SIO2uU2HpfdP5?CL+#&D%<W?itx|K_b(~KUyj|}
zp2mHUWY=qr-%Me|G9o<+!?^Gd)3`#HZt27?I^MVmQ$&Oehd@H<np-3>tA{zD7v24E
zjQKr+m*MR}<3ro0`7E2b?TE^0BZMy!*acp_*3SfUE>t(Oh9UNDuN99-D8U%fn?}ID
zCwaK_*`P%PS|n$v`lu?2t2sZ^ITT6-iXkP$hk#qan<<B2VkAtbr?E)Ta>A-)^w1gg
zJ%1<<MXF_NQoCTYKcSIuE~<9H#Y#DLPu1&=2EoC=^-UQ2QdwR$*JdH~6vXV*B=W<(
zWJHkbbjwW0-ER#BNj>jciMl%@zVl<K!L7a#+;(S_`x5Y?A4$M0MA;$Rp*8lq0$LHa
zGWf&=bXnL-AIE?s>G2skk8mlQClV*u=+e%~##ztM%;DPMu>H<#HWT^N<3Jk%=u#K(
zI8xUh2TNR)gG$pcESdA5zlMQdGmmD^=`S8g>Xri%lfCI4L%>8+aI$%HdDow9X20kt
zf4-&oWAvBpMjsC7)c~3zc{q8m2+INDjbE3bf8U+{4sO0IrY;A^n^6rFzPEK&vbaTQ
zx0v)n&zSsiK?$wGiZvn52$Pq5sgg^hE1&M7Aw;rgaPk;I<m>OG*gm7rNicd>u>zr5
z=C~?w(!-a!rxQ5(C)jc6?p@?{?+sOs%EH@ApB;oO<xhFN^s*@Dqt3Td6fZh$vi>rY
z>ku8KmkWtScCZ$b75e&h#?$Y)h}4SIYdGMey)~SENLl=Q3kw$-+Wo$ER;SX1Li}|#
z<G$cua<()p-s$MxVa+JvUMJ&Af5pa#)CW&IoEE9w@F3ySI|5UWZKd1|EY7UC_rB>!
zQeTLU_M2sD&PSix$#jyw{wA7K5ukk#_-Hpr^=?1?>!*b(&Fx<_!9P-xzf=Q@Y#TJk
z+`(MJVDOzWS$$sqo`k~s&Z+3gK@S#eM7Rn@huLvWuqlg@PU%nqc}v17XvsvSGugTb
z|CLIv1k4~M-}IJ|_8oNeJ^qJ1R!1D|cFW(vG)}aNDRqM!_LtGhsEbEq>M>i8=6R<o
zc~z?lIScH``2zrPojG@M>l!vVFJiW6Y#Dv~fhCuh4WsCU&fq3+^P-4tTiDj8+4z&0
zg(Zu$ijNo|!Wprs&YHy_nrXT^p3PhHcquWh>?Bk?H!$@%<2;%ReW%MA^VZXhNDnAO
zZp|W=2tlDq7^%tglt>+@zri^WK#qdwuw@2+Er31#%P0NC2mR@!e)*)GH5+G*X5DRR
z&5j(GdV3tZ<aWWo_#_~E7d_`Id>7u^uJ!X)Md-5yh4KbLr!zY3u7<>95AA}Lo&|)@
z>*d4gA5B=j>%a>-%|-d6M&Pu{b<Lypy80pY&z|gjvA#0{BP&3U8io_D_CN}CJy35`
zz&_VyS*$oT>#mxccX3aS5^}zvZ6g`JUbZFA#a*_A7Rm3Y+xzGgY%fw;Pc+S5c#t98
z6;0ASQO6IRRSD%*Ky=kYAjuN@+L;=P`u4yTf=W5IBrGJfTgI1obI@8ykD05U6NUE0
zS7Q!-J$r|J94$#0Woa;XHH=b(-Jq{!HSA92u|ycFx;i$*KHa30y@7h^B>v)Ok6-Jn
zP$elQ>?o|g^p59SWg$hMQu1XCN-N|<o2Gbd{!S-e>3|Ia9+aiFhYUVy-%;ji=FxV{
zCDEs6t@9x6olfyOiq4bf&+q4VUZN1Pe^SQ#hT6329cXcP$u?nH+o>E`9X1G?l6P!>
zE}sT<OscaYm*SY6TjRN8x<?%zw$1l3EW-flAp{fhX;e-FT{?=TvgZNsgK|HzpstxH
zTGz7#c^=C+ti2O@+enT9EqqZ8DGj07MZLPH%yaA(@|0MqTrS81hNqJeP(-tjpk8rN
zJc1;W%9Vc{N(Qn%@V{Fq7$3N%^o6|TAu2^uaE<z%6G=h*P^R^ug|zJ;IP)?~j&9;@
zDF%Mm9pm;$H?x3QpQl$onesMQxq+n_012-uI97UQzYoYrEpq?#&rrZbEmS7ppTmFT
z@otfpQ&XFChuz+8SES{|x12M84*!26E$0GpTq8lI-#Ml4Uaj;>QukH~NYC1kOyY9o
zmuT<@n>jZd59cpBK~`>dE>0c*4gPOi(BGlIa^9fq1Fu3+e*Jsg#qV2mof>$J&SVHA
zGi&>#`pgqXWjXO{v&B~Wr5D3lNIZvFVLRn20}NA{=|?jS+k+Z|6gb_o<xHbIh}^Sd
zUf~`jU?0Txb!W3ZuSa?aYD~yLd;*+SnfK0J8!~MQ)pc@M270Ef3Rt#^URIbFR5P1!
zK5<(hF$-N>z4tyNXR`^h-<i)HC3*8=idIw5fs|rZO0VO=p;_50X2LfktYnN0{^60?
zC^_R{cQ0@>N{H>o(bcEwLXb<&4;NbZvfr6J9UD{Tn?=a3gLJ7d>iSAD?5JOW*JBz>
z@-oQ#SkkEXR92PFafstP=*_1SeGt}D#;qTLeJ#lE&Fz7lj=vU8emUAOe-p3vR2o~b
z`<3!ip0k3*P}W``wacKL6iNZ~5G0#%KSMfL@)m{6&qmj)!2BO=$={2Tz=piqk5?o!
zS2zB>yBOjo5Acr(&&#azv~vl3JPT!(K^ICk)KnckJBzGZ3@D#I>8aR22@UYhz9W>5
zTizmjP`R2W&ul*#aa@p9Av5)eNH^Yh#y|75Ok+6EiUVKSF-`_0vHac_ysnPHy1!sN
z=G$_~))5Uc&K)01&~t7Uc8nsQkDVXTpDHAj4`xLVzCKA$3y38l7OS~eVqv_O?6bK9
z39$m9&{8nUnQAWr8CJ(i{0_}jF>Nk0=$#f^uIsAO!?N}2VXU;++&06dB5%9*4e1+@
zgneH&idb7pJh2@i65Glpb6eT;#yf4Ks1#^lj)tflcsxrG#7X<)^yYLh^5C$em`*cq
z?~n`kq78bu2U14)%EMs-#BKoV%T=UnaGU8uYU=4vj|SNQc(WRyGLiAaqap1@YQf>;
zycYA>+oHu&AN<p!-Nt}`L;FE5g@B2BMdoI7Jp_0c7$UZ@zf$kMMK$x=C$7oQfj%)H
z(&S}lWxX2h;|1heSy_1jI&^?)=HGXxzw-fw*?ud}-yfe~MYcZd8Ci6Fu9hOYfSf2o
zh07bwZoJX75KyA8753qRN>i_59vxkjh}e3srv7v`&#x|5sw17au_-cNRH!Cyhn`?0
zatM+ba@Pvkgh+K9=5<fk@i&wbV`?d=7l_(fbvSKs4?o;H#nL+H(g9Dj`Wo67{Hn!<
zRm@UR$h7wmpJT2*1n-eAP5a=?TbsGrjMiwJ3`6w$;teDxYv%^D#zoHAc3In8ai;Dr
z*=1`eEPn2bRrbNVnHEp>P^X90h3o7a#Hmu294bDSsIrLBq~<%;fhiu`f3M^ziO3a%
zVw?{bkHewbV*J^6X~$N%Gj^Vt4qH8>uKtG)NCo*N0Ru|#Kg0yEAfRAKpup~eiQaY$
z|FS(yjO`81In>v0+V|btzJ7inLacGO<mw;-90R~C1p=6*GN^-ZG*d724{q(zE7zc;
zd{^|!=+S;Y2R8VnGV`B&gICcdXy>8Kf*PNqy=GNzmJwcVy#l|>M(XBpy4Jjekq2^*
z=Ax~9c^ouWv2<sIC@h9UoHr6B`PT+CA6+yJ`{M+ZqU~CrkM1_w!$e2lL!r&Y@}cdz
zs*7mWnJb@~f47^dDVs}d@FZ7eSXRrdSEVmb%g@56K}}?aE8YESHjqdFAF-5|&d|-p
z;Xzg5`rtWkHVh5P8$(5|$GRqyDes^i5!Xy8hu|(kH;SM5EP#%<y}x#_O);g3gFu#_
zU}uLoE{48~oZLS$z6Yb6d%%WZKm)Q!{xI`IvTmVvRDUot<H!WsmEM5B25RiI<3UzZ
z8FyvG3f+C;G{)8%(}o?0PrwKjFmy*?0F0GfYOYx60i!fl0859%Z{{w&a`e;OVU<As
zun&PCll$7-;lZ+|#Jsc1il_dx^WP472^H46Akj-e0gK5et7izz=8(}j0Q{zagRuv2
z1Q{@5Y;WY?K&Iz-MS1$`iLU-pf4ob7!!QDk2`|dS#?8Ub#>0Ixw1t3)Aqr62{9Fpq
z$|B0lN)MvFhB0J!e=Lp6#`to43Rtm$(RFr<3E)lz2<ZUi0{ng@ZqCMgg<OD918%^b
zuw7mLj$HmXEa>lI<Pxx6TW$tl4H-U5*Ep{%9|F=7&e6u{USx55A)4|i#X19iIyIY|
z3ahx>!;gkYDkmpv2NV>(It%(8Z|E2NEDxGjyx7c@GuZIezmYx}7t{?7qOw^+uW%6}
zd%;O=Q2{q;%WU{LFh*$%r8Fu$d?_RXX1Fm5Wijz3VKB;65<)$qo;-}=ewvT-b}#B6
z3GzT9NRX&q0!^)GY<PWqW%C_4tjn0fDx^=iRF15vQ|(4WnjF5}G28tVD_wlVFMX*_
zGtD&bpT)ZJx;f}jqx5KPxnRKd8j4EV#}>-BZNWPmat!fSJEOxRJ4>|Z7Ymw~RCyV(
z#HpceYk8J<FTTN>988weke<soM(h*laP`bfAztc_RBD2r)kU>fA($3kS|IPHZ`t31
zO;IES7grGQpdN2uQB>BZhV8*2t9iXF`pF&cTcS-sZZt%xC6|i%n%D7*)gHgG`2Dzm
zjh)gm3k)-oqA%L{?-DjDHPzgk1T)3?4Ae&usb>ivHm-oDy&s|<O~=JYuxUn$8is#7
zxfIUX=cXZx&mB|U-txNS$c-wg92~K%MC-+&FWVO_!G!$`VVT*ck~ro`l_Xqi-Bbh1
z8iVd)KP^1Y`KbCPfrs1_wcc9;X)ffsf;@g-q^4K}8J5D12df&r=jGcm!YU|}&{%_}
zi*0s!*zugvuf4WEI3QL6Zu$?nSCDSaU!PGGp_W&jy1hNu4JB-!l!Zvc#RvH<T|zcs
z!g?CyH{px*k3RF#uQJ=O?0=o@_}}ttf94AWFBeS)&>R3-@i0)pAAvDaK-BM7U5V%i
zZnd?sG&68x{@s`T;U=$YN>Lak6r8PDynD>E8&w;wo>EQ1UJ@}n8&hTY7dQgxm72zB
z=4)-W+M(;HuLmemXQ}yg`X1)AR52A%4XMG-W)7GI>awq+A!FuK4hF46dgP`F+GE<Y
z9~XFa7?8ppeFOKQ8em{lhM!$zu!`y6eTcIu;O%~IM8f>ut1T!0M|p)Ao~D@WC#j%4
z8(Ll}$~#eCqv$ygV&^z=IzFH7K1J1+@hl!bRz8h*lk_MA$DfbAP=f;Qvwz(t^SoqI
zWtBu0H2>rbvxEr$=8Vre|JH|XnhDNq&^x{&)wBxd95RnH5*cWH@LW14-S`+}Yav<g
zyT~!vDR>m`6%sS(2?QR8v$1P}I>T5b6Hv1tJ5KhC=GgWo{Roy*8c%$&_C7Gy1|3gi
zm38HiuMlCze?n=TqtD;vP|_S;HpdKvdBX<Lu2@VlG*eD4MldC^N8i1TfTXoJSl1^t
z%#F~8fe`LiDhTOgcK?Wj%&UT9GxEOSvC!8FN)v2ksG2>d7I+1La!c&J9Ln(k$K@5~
z?r#aSVjYDYX{CdjJUPkov)*_KRTBIsZk6kw2|Qo|z6?H@s_$&XD}=KV@U;*T#>cNS
z3SVs+)f(m+-xX1$(&aIMV%>gr=-)A0t8&QC8m%!?1&96GnHmAvgE?doDHo=J2F;2)
zb^D|1Q%~P_dy_6wgIA|8?v1>Vtvw(iZ}0Z|5zLzO^9Y9Y1rWC<fVd5RAa1;(D)X;q
zZ?O3cEK8=&+h6{%#XxE|SpyhA>g+c0_)kqCX=?*!07$c3AC+`JUzfjrlz%my2Lcc{
z8~3m2yx&A;|LgAjcZj^H2HWHNh^Lpy>i|QKE-@vhxsyORGQBZyb@LQ)^paiYug|^v
z^+5IR0goXX!Hs)9VMo}!1f?{-3`&dRJA4!h#yT+Z$@~Sx<PPN1FHTl#n>8vp&^Sp)
z^EzdrZw-UAuw_F#tLx^SHeN#urgnx&&DYa)K`ww|4RsXXs@qa<s)mN|KSu}{Z(wx*
z=h)f3XE$#F@ru*lB0kx8zL&`D@dN>sDTyS+YO3xcS3LM!KWEHblS!wQi#q?a)Uhb+
zxCSu}v=-j8GFl<;v2dq%<s~nMGiQ^R6PmmhHvC?{vAGyWnVRP)MJ8}rTY^j2RXa}!
ztmZ0dohuqTLW8lj<NQzMKN&~mMdPub>^<Ys)0FvQF`3xS9`na$x<btwwmys>t2rJX
z2P@>$G~KT$*tbKT(d*3E<REc(L51R6r+sD_)f|mObx%k}uAc#C6j71*g484vLW1>S
z|KT}go?EJt`Q(%V->L8TaN<JFLeq$fT>>XxQ|xB(Yq9buoB0cJSxy7?FzK;mxt`87
zIe4(oQ=Pks`iU-Yo>S<AXA~aQxF+=Q;3sz5r@6krUsQsh;ef$((JET!7d?fe!CHM*
zY3GX}m1ysvp{~?opvb<H*FD4wVS7GbCT2`ukgTu+Ql`LqJXuKGvK+T}dd%>7v&Z$`
zSWWcTTx13UEN~&;J+X}EusT-n`|f8;L=<AISIlaxWO%NlQV?rws9)JD{!ao{pjF@!
zO_~8zshZ}77TN$W!J}5`-L#(;`)5@K?Wc}xmw46Xm)-s$U)F?Wez(|Pym~)1V}EvK
zW0L%Q?FQCfKFCd3=C+6|4}fIZFUzynBC^+)|JHl`9pcQB$Db8W6dYl{w{N4M=U<-x
z@R>=NcHpGaM<lw*@xAZG&+pnNo>ggkhPQ|<u*y4r@I&@|pG;nOcd_WTPO$YMd^o8F
zTVv){+}XMo!uI!sp%S}_N~LtUklmPu#_fk}pwRocI;!nTttSxi5tI51%~YiN5p!)d
z^!KG*1!8qWDJ~MHxVl<1M;MjCOgOC_njzHovOlhrX41I#%yZ@7;~amj-YpguIkwV(
z`r6OYLp9?_NvO?^iJ{#NPJIIU2%()mKPuT+xkdQ0URru0T@&Ike3>e0S^wd~mXaqZ
zj<~Nr*oT_CgG={S-gE1~Et^UpfmJ_uA`de981<<COJR;~YJ2LLV(F8{kh5nDln9j0
z{GZtuy1@?3&hBT<%Qbk%@&>|w7Ps~O2CK1BR`da{?|^efS{knBQMce1R6MUI{4JQR
zvd_97qHu4JzC<yf(`WAGgi&x~?4ss5I=`P6rj;_Zgv=W(<LEi69?~i-hoq%=B=}j;
ze}6Np=&Ljb0o|c!C?Dph_1W)<#E<KG*GUd)<#pe(4m+&uHf8LvBRV#bk+qvx?!iI2
ztN8ldlY5bOL?X0sG6BE9ZpdIT&Zd)o_SOT{)h50nHt8${Bg)m?Hw1g!-Z4eR(Y35@
z!P*w8?qNoqX`9D));$M7!MHnRh@vPN-(*9LEZo>DZ&hXf1XX{j()>ym?ug^R9o~a^
z@+sS+No<Wqxhs;(`45A+LQ%-YQEVr<_dUg(@%2b(>E7!o?@~7`!9|_Xj~AQ5EyRJT
z?J_faD=9vGqXoMeT9^1lK5pFKcTNu;EcP|fT;AVuz#ZpW`Z%Q`)1l@WbS%&N2%*xN
zFK-9R4z`(?2>Z4Rk}3*x{Rx@)+X4ku!(Wi3IMob;-s{2zL=8tO@5>s$)pmpw$@&!J
z-Ad|`0<+$dho`Ohe5d;(b(+<A{!SJj$Dq2$)Q<ciXY<Y$mMm+h?$OkKNXnwrV#hn~
zFED85PU^<2lJrx~Nkkj|#k)zh3ZFwMlgys$3#_R4a*ZoPeBZCt?jNDFnUDyS(KOl(
zL;8r7N7jp%LtTk{2ELa$bOhGr82R#!RHV@~X8R&FuGdymh$b$XvO=tk5+vfbb`SfG
z{#S`k7R?#83}4>W^YL$(Sh+ibaWZ0#BW*6~4)34cYf|CaJztMz+l*I(qL}4r>ua#;
zX6G|UFcZ$`+O&W6)F7C$(MsS&+Vgqo2L+k6cL-Cs{9Je1*6%ISsEa$1Oge=ryhjU6
z)zj_OK8vT2jZ9cw@;TA0FMi)6<7c6Rc&M=8$gtr}n>U##Eq9vZJ57yBWS}43&2C~L
zfELj4diK?OoXChhSZ=%YgTf2Z<CZ7eVBFg9D{{WO=Ve+vFgb)W3o|@S0yBlAQ3Rth
zDW5*rTK0W9Qa#113$zZo^2&scrg|=pMn5prkN%w7?AX%eK0p2PpKOR|y5RBE_wqI?
zE0f0VvwV*F^2av&J&XaM)UTe*>)ZZC!sU0$LZxd069+PJGiNggGaGAGo-5*XK<tI(
zTEYdyLw5U{fKHuz|3txs3Pf>@)_$xQpq9CUjXym<(ENGL#?5mXsQdzGfMg5Mo&$(G
zaq|AP8uLGXL4Sw)%A08!zf4bPesuL9Omi{z>lJG7EI!PoP2$KhWwqmB*Iz!gGj=P>
zH_FO+GWtxHNm#6}z=G{9WiO-X$K|;Ty_7|Va*F5Zckv##zadq%M1WSK=;C_7=b7_i
zAh;wnPaFc%(ar%uOdaBs5X(Yr&gOBQg@0zM=9)|+3Ap|AeaCfvA0IDLs7jjT`AUr<
zNkNsG@lqN^I&fAI<B3VC#*;e}+vL(($tUg`J}R8vFDxQrV`+P1>Nkr--ln&n`VMFx
zY0UIH2ImS{A}aMX#`NRE*smgK@tAc&jWt;IYo2^IO_`y_mI{5jk$;+yGJiPAN~ecz
zY4Re1H?g->f{OP)h5KGx7R2eM>@0sj7ea7kFo690M*TOc-<xqg0+EU5Mn&*3VI90j
zXe;?B#!A|*v*%RN^=sk^a~(Jw2)pLu3Y!eD;gIfaTfzv8iZ~ezcWbGmgl+TLsjVak
z==f;|3fkz!2<P}8yk+Om6b)^*U@$77+butCD=_Z&c=V~dtJkEZJB0wRroBxXa$grk
z{{6johc0fP-(b)4On0)-WgrQ=&^S&~V@$D55s=K#i$+rjnB~<&9K6w@g$z4_*-T!x
z_g{Jm-?9OQKP)t2Yf)#HTcB2aRKH>QW;diSx&Axv>La~jguHgG2f7~6E;R1V6R?Vm
z`k!qLCV3ldh+5rdoasyY-!U3O>4b7wvyO-m=yPxhbAlHa8Dv~}7;JqfH(Ox9-oO(0
zjosjOT}1lMFReFdZ6Hai4n%6A*HIeyUqGJREs!VokoAX3Gy)Qq*!2y_M3tC$0ZC{s
zc6K)In>q<367J30cP}4+jQz&oFY}kI08a`V7l;R_yk3?=F1eC_UV{GJ_xn4rmotU%
z97lfX`GHQVGb;?6d-6V-a}8Khl_J-BD#_AxJi~^hlk-uxi75RC6fCnmf@AZqHi#If
zUC}opO%<^1I}h1ImNT>wwdPe}?|_cqw{yGD$>K$?HjgTPwPUgsTI*;JU)rNXJaSHW
z`6NW8oDcJ&T8NfAl49xA!#lgW^@7#BZ7AT9iP{(sr|+JtzT7!WZ9<o%(ZozB)W!)f
z<t9>1mG~a|f~&c{2iC(T#9(}o&3sJT5^2A}ns?EHm6;ce7HgL0?KZw~FvfbSJr1U!
zVrM=#(N}-aP9PrfQL)x{TTHO6vSW7l`(rAn&=L2|N{=h(xU{g^6&z$O5cfG?r*V15
zXXrdEj?)jBTOQ)xK|Ad0S>O6<QOKN>&g5?mHKGU}%On_l;e9c;D@L4av0F>l@wqW0
z@A=of)iA1wzNZ|Pi<B&r7zE_CD$zEG(Qf!iuSG%;Z5Q2#P$o>J>isc!(bP63?!b0n
zOsh=~@vERoLSvigd*d18-V=sLQD)O=M%H(y-Su6cp1cpE!L30(2#4V^VgoN9FW5!g
zHuqEl^r&Olu+aGMt<H;-w)WjNPm3pfZax*#1A>cT=^3E=LA5DyRBq3_Eb=8xQ5gpJ
zr-*vZYI>ygt-1yc^grsNsuetY*#MnmoH;<~Tpnmx_JCLMEvRnq>3xXOH`V{b75xHt
zk~QzYuh@J#E#GF5Lph@^jTEqG`%8cLt?~bx0Xi@;N>NUzs8$hu-Q7jb2jjv;iyTok
zFKwL9ad5JwxEVL1S`P$H5z;68R_ZmUs2Q{KRP3nOPPz~e8q7~)i^^eJAE!_Eb%hr+
zncFN#qxG?l`_|WYO=O}Ns%~Z;x8}2A50RN~Ur>P44FuQtlH~WH=Lj6&R7j>?4Ed6`
z_YO+hioWa#z=vbBI?#4W3CF@5;UbFJTY=%8$z6>~=6R-NL3l6tuGnKCa9AZ}Z6mMG
z;SMj8lr>1{?_$xm2BB7kdJyo(RTJyxRi&)ao2hCf$GYDI5kijZcZuW{To^9Pj7KYh
zzak5@PI)X|+pFuxv28Q#H6`_Ut1_yADW3?jh-fs^l*|`u?4s-$OT7#$vP>}1)*=@@
z&GFPk`+<|*fOoO8fsDI|QEbR5iSN_kmEf^wC>KhMy6ZT41erp2J>K)`Dw`i4gwcST
z21sSHuXjU5m!or_3vCYG#V3V~jY9gaAgFpIYQ4~#(X`cV@ZPF#`IM``G<By@JKk0t
z`3(x^%mR{jeTG6@uQ$#XI!jiJMArkm$%gJkMb&#O@&k>WW=De9{V+L<s6r=xb#e7=
z_02}EL&0v}rTGa0koIO>x4RBx9}vv?)1S6zOznJHrPW!N7)&Kncx75BzBKs6eCd?G
zenxiO@IawywV+UAgY^?kgF`c>K0<nDZTyuh#&kBa2XK^$wd0@cS1G<fK^{aUkSZ$$
ze&PQ}mzi`etS>bYHC{yXN9Iz7NZ$r|S1mVBZaHQR(HoElhl!+mrNCef6q#&|Zt-7<
zJK5{&Sv#9qS{kvU0^bHyxezd6l&^s3jax^=#JYar_gvbIh9@w-^W$x0Gb`XOdRDfV
z-1paHD7@T&AOA&w1+WeR|NlgA|D&GvU(pMWF{rufNdzlxa(F1D?3AuD<Dq<;fBcGe
zxUzfRQ(X=R#X(uO#pfiQd4n&A3R_@W63U=0tv!xFWA1_b;pAOn0W^0v>glL&dkSly
zF;TFu>2z~$O>y<9Z?KjqgU0hk=O1Ldl`;@KIXLAH7m_Hlivg>Q5>5E>c;~#DIs7z~
z``RC2g086-ues--L6Cql<{vu%($5d<{zd_=AM_VM>m~i2=+PtP!j0CI_(;5O(cMTw
zG=|+TAJ7`+HG;>g*jeK~<eed$k>*6>rTpHL+%;e<JoA8H#1BSHk#vEk3<tMv)z+R>
zd|fU=b9wk|aOoMfA?w<mQ@l_v0>yX8qMU?g)ilSreJ%Jp_dT^11AL>;S-vDy<6P};
zyqo=fjWtX-en%T>dp|chWGH|%0)bx$KQ=jw?>EY)C={qtCKz<lAw?Cps5v1)em%E#
zI1t9*g0QbQEy^Rnpe`rNegrb4R}~;2Ji)nn<A(&0oROo8jlIPUXC)#g>yP+_o9yP3
zKW7d8Sp*{ix_ceL2;BS?vKvSv@1zfuPJV_ozeiD*jXpM4s((O;!*Nx%<pz@1oWDYx
z%Np)4(USj{7W+?>Px2nQdn!&DCZjNEP3RQG2z~=!#g`Gpg1mpOOG`Ex5N39++>wN*
zqjJY^7Um>EhW|C1fRSKSC{)-yNUx$;8$8cr*0a2+$4Cz>xOnQB$6(lNSz`4h(Xs|f
z-<dT1wzDk1a*$uiUpu<~%;H$xRKdWJp!7hGUutJ)g498(AQc>VAUHKKVlgo@29bkE
zL9j5;3@DHg1W;JdR)z_Jiy|T|+6H{hN2Kr=J@A=9)HpXS9+oyHHq6dH-27E9fV0EZ
zYnR{j3r1AnM1TF1YrR~>Ed4CR)z5c(rL5}qmcN!-0U47c;nC=7@OV5Do6o!83RH+D
zV|13iE7(pPNI6(E=E(`u|K6-I3VGU6N{kq#KnxI)P7##irQ}s3z{XHFPum?;FDF)H
zOtgF7Nk2z;N6*9V!|dVP6=Xh{0;ar);5#3guN8s_e@U%eik|$ngGyTD%`e;a0PNNU
zIG`S1+wP^(O6?ym38Zn$V*gK+R(?^W|3jsf%QW$o1zn1(0A2eWfb<U#H~_<<z~zm&
z%75j(|1O@-f~uz|Ob}FEr?F3}avPyvTv&hZTUNTH8OcDOWH|Ryd#4m0+G?7PxnDn1
z|666~6vh_M7J2GhQ3h~Dk5HFkqGz3TwV_q!@M{k1=puO^`g-&um{y)4=E@Jfl5eBi
zJT9aT2~T=Kly6caj5PZBOc9f%m2lM7cJJ9+j2@WYq=m^Ic6XPt)9u=QQ*kjV%%Qif
z*~L1#-`?axUsQgCRfiZ+$4f9c&M}yeLh{lshjBj)+T0p}EY=AWdi))G$E@Lum&@L1
zz(rB^use#eR&b@8Qc0MUDuG-JHj%!ugKvAyI+)KQ-qC=)(G-t$&o#oi`2y(qzZ0A%
z8#O~q@FSiFT;;9JzLE;Wm6B?GMdxtJT)`fERZy~f|Db&TACgW9Leh?0woxz@gU<L^
z|B#kC5VG;J;a8?{&{8%U?$#7NJurIXe1eZjS%Zdfrj|XTXWIy+XO0n$JBrZwt^wpZ
zwt++)5iIg>yD!U|r-K{);m$`>*2o7#72uAanw)fCr3id%zvE~HzI6+#f&S{#WQ3lD
z`WB+{RFRt(YBZnK9j`g#&Jjl9=PU{TB>|n|)U>LuG*9NP>@+zztov49ZLKT_3>pnr
zNvr$!4$_(H39Ap}LmgsT7ng7%lGq>$Bk?|NprL>A<}8dV5dy`z53&p98KE9uM5gHv
zNQyIpYu6K3u?<NM@h}g5^P6EaC#m`*FnY1(M~vS_CAMk6n}2oA5}G&~8T>TVYc8$d
zk6K5_pXLgo1DL7?&@#~m0Rf(K+fJc?%8k=4I|WYGUm~`W$`U|*=2utaFA>|TcYbOk
zktx|&IynNlL5Ck_@GlYfKR$R(QGFHuUz#v4(7SZWL=K3aTy<SvUEY}Rf74_AD>(QZ
zHRH{me9F3eXXyKnxG2n}af5_{C?|1m!{a((x}xH{Y77b7y)6Zl7P#pgbbZR>m0;7A
z&aBkphDsu=LQQ;Ecgmj+*t7QJ5ZTvhL97{yt)1mFj`1NEMTiwpf%C4W2!jWyBCCZ+
zoDK&S#G26r*-H5eV_<i>Rgyxp@ardD!NEWN`7V*4)fOTAhR&qIv<Zb?_8kE!m!%BP
z+*yZAEXW|iFNG+ecL6x;ewc7+9vpIWB3+K-wO%tv&MIEX2FiFFdz*(^Ws^_DNNV3c
zm#aG;UGzLQ)oYI2hK_%%SvsB-#L-Tbhm86>cDFZfB8@avE6A#|p!gvvMb-P~uj}&q
z&I%FTeXe#Sfu)n{)v57|*zNZX*-H9zLqeJY=LazN1@Yke{D45LxxK8*dZPHPUHL%e
zmh|`oC)ewSTL)%6=9^dr5)<p^>wj!A0B5nYa)Wp|S%C=+;GDR9`ER<*-<=5MK6xU0
z6g@~MTV?ybD9=?zoJul;h5EM(*i={X%S`SjXjphw)SSDf6yye$>k|5k_8Yt>#f3}E
zKHe3==zLJBnxy3_;(8$wF%@kx!>3Sd<*-`K8|lmkY>Q(vm9y9Z*HD?Jg5+@zNzHpu
z5Bza*IZrMe=f)~aCKjt`(H+$@Ta6h_5f&0cLj}U2ov@Z_iVxuelg(R%S@B9}bM7Z+
ze|2M>O%O!U>j_C{ISmJ;oC~p!=Cnh?E_{CBhzCZ?L;HcDpkP5%;)%^Zb?Z!K{PRvR
zEOu?TKuYs9qqnLV6WaL(;A^GJPu5T08Pu#;Iz|b0x?C{Sxou>3V7TUezYb$`K{`Ju
zw4r{)Fn?mP+cZVE*g;|NEL0&j!o-Bj2QS<Lq%iw$9Vq|s?LU();NV~ydqjgH@&lsY
zt2L=!ZMK6tT;HuD-C1U(&__9#1*#=lm8tU<T1dD9-ozEZk&uGieBQK`VqVFuMan#E
z;qP}>6G0eV#h~ci6ApqqLx2~G{aZX+m*UDKwQOm}CsR_}0*8K8$QdsLWcGt0jX4BM
z{yubtc!F&5%pgvPabJp|!1B|#1*XlTTLo>1g)coBJ|FXkEGVmPLsRX#iOC&4F->2#
z?)6XX?z=Oi)Jkd_P)LsYs8Z_t94tk}(=*~+s5vG`uG)__-&jM9zgt>~bCkfj2+<7L
zAJt1fiWNvOSYWSDq>QNwa9bx%H+ii;7B+TrK|9Mv+Z#CL5=8zIgZ#=g{|w6h&{;Mg
z`DK_efMG%ahG_wT<~8{ZcHk9BHJY2rm%K2Jj@uS`m2_yiWupHoBohGfT}DlanC$=O
z!4lga@fs^HFVBBGUi-UX@W&y<2^6)i{=4)KSN*g<Qx*RYtnpu+Xni^#(6zP91`CI4
z%^xI^swaRVae~P1SxE|y1d#<USXG>6?;!2tqVk{Rol%ds3<Me+cp403N*;7*vPT+<
zK$*7q)*2E?xO7ffA3vuTkYDE*cO`vQXLUFF`7;Ss9q)Hvda|LmHsiUKK{oZ^l5Fhn
zXH=67&Gb%_iHX7<YMK1yL<2U~<%y;s`@Tu5HvvBdyBwU?m01?m#MU;k15G0?TS->g
zilGEqTjYu1@c5_MM|v@jbK8m0^tgr@X$98l;cL+i9s8;r(ut(<8}z_GE#l@PEs4PK
zqpWR-JKRayH;dV|!)oI#vdfExw^_D>si;#|rEvp0IYrK72hoibsAZ(4nnho86I1+Z
zgZ$ZK{-X=~_mfR}=%)cewE)v{jers5T%T-z>EQ?Y+_D;=CHn`cLck>XqZJ$=n3ujs
z_N!<72dF~CB>2&*c`0aj^ISmwgW1O3g!NbK^iO-ouVN?mD}7@wR(6i7?i%2D1PBl=
zF9Gs{|Mmy;2PeDjYrwCVH<7^r{0ax*5BT(IE|rxWZ9LHYRG4z~MOUZdDU1B%ZW%Cd
zCFw<|S?Bcb;$<k+Im=EDoD8pWyMlYwl<p>vfM0p<e*I)LrLYvZty4bqo!6vxhuzA8
z#4zR}LKR3spR@?wTJ_s&xFR{V!I3DTBsmL`b>%XQ1$$`_Qbb-JX(u$>73P4M-q{Io
zN6o~l8lkB0Efql0P%vXs!+W-qn6_WM_<Z$5^3@m;YN?vqbel1ET5_~9JNHl=k-1cN
z_d(874ie>ON|Y2f6&<^jKxl;|rmw4VcQ`a=dqlWRkd(<)T&56^`r?ayXX3bIj)eNT
zFiDh_i{$vAx2KEkQ+S>X^74lv2)TT7f&hoi@&^|OejXzKAcjH$2>{*}7(U?ygkM-Q
zSTdM`8E#Fb{jp<MZmuu;4t`CZp+Mn4VJ*cSm&tBSzogexeIn}&<Gk=8GyE@w4s?L5
zCRhqQ_*4uW910j(0fW67UjRf<fH5gQqT63Da&z%xw_bk`<3I4ht2sNe>p43Z#H(2y
zzYt~wNN|u4u-ad3%%Gcv+B*Dc8Y~934!<wf)X~cF_CC9GJ(t@HNi@EdAowkXXZn|@
zLxK;GWxJSX<d30Jrn++?Xf0oaL^p{>f!oKfk$62m3G2|#6M+{jl9rH|VU7Tqmc!S5
zX=CZDL!1+K@wn&3hd~wj;+X(6g3VAI9kCVCTjo%T(TM?K%+5Wj@p0(9flkRZegTdy
z--jbu^%uzUpU*3{#UAH>wCXx?8t`bbrzry`(qjDTE>{Wu4qCN#O`rgJGIRs>o@oEB
zs9&+#TtH@V&$tWe8kj(;P2@5gJh7}RhbxCbTr$nhL%R-q_eL@bDUEOUy&$XC)S5cj
z<Qz#%KfW^6tPuL7?=|VWj^N~8{i)I@i9Bk)U@)P9r^-R#$?41$WWaK;u{N^TyUODJ
z0T*5<{`7W`RDh==1K<MO4{t~O#}5?5d&}G1lfG4JP`dj58|DT;_viYB>wGHPk1_&K
zHQ)fGow?b7@wjX3{_FDp=Bxh>ut(v_aHjU`A;0JpKgZ#|kZNr7@nz!VU$A*)lHUwT
zB>U8cO>$J!G#eADg%c?$@a}~c@%ONbbzHpn(T~4`Ep0Z-X?qgV3_H2)tOhQruDqsi
zKjNcX%kc>0GOPHi<J_3VlsFtEM@i>}XRxo#Pm}7b8824;y?9S<`y=mjxd0fSHEEHq
zci`p98pgze7iSv+2x)#bwtL`DmMN7zyNXYvNWfm$k0=l5Q8sLTNria+;Z3a_pBbDm
zYUP4hXXvqT!mGSGqIo;JT{Trdd3P-f$9pINkO^&(udEN8*{o>;S{)8&@YXA1H=V>S
zpmfRXR6|k^n=+y(1;eQprpTw;t^qsXKK`0NMZa_|C{PGca55PMYJtN#0=FmSeq#>3
zF({4xkTV>6Y}Nb3lgVqDG@$KRlesabA&!#IJURV^IJJc=o}9f!gQ%4c7%qHwEuKa{
z=5qc#T|tPyc~p-6RnJbmnXZD5xVhr)dV2E=E1X?vYQz|aBwJL65!L4m8BZvOXS_DJ
zPwlH3?{~SMdIYr5$)&(=nh2MhKoPcKO`WbuQ$-IFo1g3P?pmyoJHfzCU{sQm*^1fu
zO$j7%HRWm|n_DK4Mthu{?TXdO$))unMa0caN~Gv)i^&@lA8EIjVa)XKzhX|s(tviV
z-X1qttmAwG1sA<Om6~#5T!mMJkgH6?!9GOTGU7wP7l~NFW<7oJkUD*mt@DM3ZPDC=
zD}y4|Grk;GyNZwj-Pp@g#GhK$Qd{D`EK44+tOtN)aa>y#oaaL*UZRo2--K^2QTXjR
z835roD!539qF4933YCAB?2vG7y?Ucb2|UInCIG5+tZcl13LFpH4IvURNOpbsZ@SCh
znO$XIA3H9yMVzIDo?^yU)__~wgOxbn#9kFcaieD@hKn#uTHMknEXjd^BuodosUW$&
zz@SCO0g|+DT!ri|oZ=IlF9-y=*4<GiMkQaGn?0GlsOKwo(-=J(v#U>vqO?e=4s{Gc
zB6(b!#&lk&#4uCuEEM|y4(=&QCMD5``D=>0L~v#+quwSeV->3VBI0F);|r}pZ)eej
z1$SyL_V+23W}1!SZ6?n|>>|7xpO5r6W$4gS&VJ1uq(K3r-x9dDC#c&jEI%|uBdU;w
z#VrPvWvlv%Fl2}6+~d<zgr$7rF#KN8vyb9jdIO6t_qx1Jj$-_{zD{%O+j}1(;WSoa
zUz^<}=jE?50W9gzTFO+bb*4yVsk=OyykmP;<6o`v&q(@KBz$9qVXEag?yp+Ej!h;f
zbF`*ZvSG>QWzTIl<u#q&osQ=2uViDES0Uh(bG~awwj1jrhi%Io($+$3HPc%~JHq(r
zgQ60j_>e<aJ0Y}@hJH-SC(#Jj={1f`b@EYg_i@7-L*Dn@J0&~!A*J#%62X0EjIy|j
zjnt(c`rq#|+E*oBQD;UFww(BIyaHcosSJiNk1ZSGWL2&9LgS;=5Lm`hvQ$$WcXl1u
zyk|&IJOOs*EOVx2V+r0_l>B>J^;23C$==QkSU#^0jM|p?e8yE?U!!gO%bMU~r?DjW
zGr2n@(gZqPN(^7c&YhSA`0E}>i*f8|fGGzN;c&$uX`Sc3Zl1ofLNZ53BTFM-0QXjs
z>K`;kJ@^IaAv*y>Yy%9j@W&DNn-b<_rpnL%))^-*!3vE0UWU5}NEFIUH{y2yHJOn;
z(BbI-h{WG?R7zUuOWjx|A`;H84_~LZ?gBHWM)o)I(~w9+%1p|@vjYR=WY-z4>wfv`
zj;bqA&vR+QK>HLgCl_#7va?@V^i9{~|AdG9JNs{Rirv$vu%RlRcXuxGYMi7Rt*O3v
zzb7`o<r?}(Cpk%(SQaV#WO%^#NU>@n7Ha8Uu$`z3!`>Z6705BEws~HjodYcaVey7o
zLA^q`_sC6qWVC81;yzFWAvxnOu(+ZIr9ECceIc-LC_C-Xhi5!c8g0W8uL;gMdBVUu
zmBp?+d2UbenF5<AG}^+)c%{wUx0LE|E?6S;E546Y2q|e9A%X*yX06dYqjHz-uraRi
zLZ33bLo@_mu8)T^Zzk!BH$25vU9pbDX|<Irx~VLWKFn|FXg<KOMY0qpD@30-!ao^G
zQRH4bf78m!FEfIb__~weSo`rgY>g)}=~w_s#V`B+OK<s~2L8)IR6%}r=GXH#$0)#4
z+JYpHYyQ^Xa~p--bV5E7+>IM;oN_2vYbuU<oj@D^4ZN&W5v)dbnULI((EIHt9kV;s
zC0b*|Q$uduhw=3D!6CCy>ZtqbBZfiu6HBO}NV@Ok$Itqg6WXSyoRrwHe)NFOVH~dQ
zkv!=+I9YpLD<#~3Q{7^9v<Y9beOR>yot8@yuB0#)>(}QPdr~`<OAYPlrr|9j<bR(A
z9b~;AEZQjv#yNUC{8?GZPjE`wJgH(AO>lL~=0g{SWN+U9IBU!#-V#L<JPCo2M)|S@
zlCrzkUAdaD9FOr#!56`O2Q(Z^<}s;B1cRVOZ8@mY$4|(-U0MX6`+vBX#4q4lWAkzl
z*)Y?UgkCPTEn68&^UD4)UG0HBm22ZS_^l68=ljpI7m5Rj;X#1e<6WCPntYt)Hs0oF
zitK3ouG6!O*SCMXmuK*A9soFme{hZ=Vq#y$=vTMAn)x?#1V$@utZqbI5ikkW6oJP9
zTmmpt4!rrxHvrRZtN?kyr5}OBq`LmpkG%Fj=`6VN033k%v$Apnr}otm&Ux8&11LuW
zY!g7=^lcCD-}R7x=K&I^NE)##>*hM2=Fq<3K{PvjBln7tnVeWle2!e(o6_-{j(4R@
zb?$4@;&~XH#bnJ%6Gsbe-)Hox!Gx13$O%@?Xmo1JMx{P732y20ZLHqD3{_9xitwWc
z5B6pTbLnP}g8Z!}tp`ytpxEOdKh)FMTRw{}TqEXhSRXjDVB+vxl+q)LJk%5Kv&oRj
zk1Lg(TFd8fx952!+9wc)?zPpG`?NZ^w}+j7Qjq(}7k8mx#x;j=1l1zLWc;loR4BOc
zB1l|(!y^r9iU<zI@)J{H46EUA60E8AXSs`%L8I=-jpp+k+uOMHVuU6I)H@OZ<QFa7
zo}>Cg=LheYhQE#&U3&l^W9OIhf5%GE@i0>m#vl+rrC)y;swhIMYU2&zRpUO87+?Vb
zTPp+Lr3j|JiI)LZioa}A7B$I#!b|bn5qN_yqOo})!3j;i$Pk?&=xV;4l8x6tqf(+B
z_cxS_Vs4WrWJsF1c;#xsxlg=@-dHWQgm!{FCp^^sra&cIst#g$R-GAJlRp*5OLClh
z^RcWm23I}l_)9;idt_ORR{3e*-oo_#V6k&wyJH-}!VJ^a7?z2m8HZ~7z4~of6Nguu
zhDf6J;IZ7aC<|qWrpQTU6Wvl5258gKl8Hi*OT!ICS!+-%qo}fzwd|hN)q4{WPMiCp
zk~eHj=T?gxl|RWZTiyjciJ)2Hr&n}Y3j!5;<>)B`o+7Is*Y0{{PViObM;ve@wvV7K
zz<h-dMC1R|{@`ev)>Ew2(bGR1zPl2Vy5Y*d;QwVJ_IKXHKK)-_21v6*eglBT>JKl2
zU1S}HU+#8a^n^CQ4G)#{wwJlW840&=24KLK%A;3(d&obBU$2H@0b<k3*AX#6KL<2^
z`@p}L(D=om_49As%xL@*w*!3He`IFkf9|9IokyBk)X`TXW>@89V?W>O4SAY3BJ&X@
zbki`BH6e#5iX>rx*??j1UW0gf*vq$cNYb|C&(jUx=Eh<`7|{fG<b>^=j|XPhmOLbg
z7lsiZ?cTCS^IB%5`$D9*N(U?M5JO>>2N`OaYS5)Pl|Z`&_rO-DvKyo2ok@T;`ynLy
zw)vpa;)gme-8kQRAQhvD>pdqDM^cE~N=|1R`hASX(oz?ST295=YqvR0YPOpAqiqEA
z<ItSsgVs-*A4Ej0^m&LM!MuZ%R3O8@@IXUE(JyvZX@2a|BqR;4B$z-A=}e_TTsa-K
z>9+Ewf?v4q0iCE1Op$qH%isw#vDd0t@KVmG<bMj2w7d00zLbL`CYrIBX4Q-n5(fGF
z7P#JE5~g>U1CM+?++7>fiy0HwcBkgzbl}bM)~rpRHrh8y=A*=8)X3}`4)e}YbBwgS
zm-E|0g=(j&;CRuITL79f)pHm>iwp|eMbUXqCv%7P8CoQ>XK*`2+7yzD5sEl+%-63K
zI9%uG$iz=kV8hJmAAPnz`iPz4!fC8ph^aIY*&_0891};wzO&j4yxqMl0Nm6oLiA-E
zUJJF>#oo67h!9U?<N;<lEg2DHp>03CRjTQpc@!qta-l~v5yzrIuu{oLh`rLnUfb1Q
zdm~K32nu)VNwUD;;BfEwYq4tI3ui(NPIjD>_%b3==3ZdR6kMK2vCzWMnR0sg_?17#
z7Ct)DmCqplYncH^kp7NN<_doL4Om%#&PE!T)L^~#8}MM=?}s-=y(s%{JB%w>Qgq8<
z{I{{c{3vihVv^hdm>;Y*z#^{)LH<f+b16oD8N&P^v$?ti`Tg%&&fm?Nyq$YAyv&#E
zEK!L${k`Q4{u6FdyyuFNTezw8p^==HFl@|{`iIg`&0gYMWp;gy8t@LIlR@I&qgAQr
zbhsjIKWN$AC7ztx)f)Oj*vMDa`#P&nJP)~;99y{7T{FgMA{&Dz3_rZucW9B#=21%Y
zSST7|g`;7Nqwe9!0Nz90a>~I@{(imtiO*V*21UvfW{_XWWz`}S>t?)`P&BABZZw@g
zYa)2%S5G49>NMQ)4NRppM0uSyij(*O`|J3Nc;<w_X2$NU<_`(zSUU!%Jqe*|xQROw
zkn!FE!6czin+~D_pBZsXfIaZ4X2sQ@cSpdZ0%dVmx#xp>(Tts;M5^z9C1kIn=f~w2
zeMA0n<gH*%dOGP{`R@7#OZWJMPw$_Seo0X%eq!55n{M~kqR1=Cczs-(54m)-HDa_Y
zHMPZRaIjfndFix`hpTuj&uO(J@UC`j43atQEI)Aq#aK}b=X6#E^>_O!XX06_4Mt-|
z#lS&{n0}&_6?WnoV7?)%z@I;fn`P!>hT+EQ$Hw9d!ysaTyl$A;!0#6876bzCGAqQs
zJb@Q_45!$s-#!9u*W7NneEKqAT?ixj70C#fEQ{Sq1l>tMKIV{KOLV=|TaIU<PwzjN
zHpBQXAD2QFpzg5a`SM`@>&MU1!*|s(9vSoq3a)TIQr|%7A?stfA4~s3Th|}l9H`?M
z|HC@YuNbcuz9)rbdf1ZBqIgGnUo#ellUWDkw*VaTmsB>BAiptRtbg>Gmwx5hKoji$
zF3SOkY<_yQKf_+Z%O(F?iEMmBeQalA=q91#?tPC^&EIF4BS5w|_e3F*rgEd5xL069
zudWzsi?R7p@HkmX*=9jE^A&vU_LjP52j~6_-p0PkN=co>Jp62rIBF{{ic7SFJNx6u
zFBnaqv`9WnNEUp%-FrOh9}~#=p^1y<kv*%XBvS!ywt>PH0{Cm6ZKt%}m!$hX7-hA~
zhCU`^ly{D5c(oJO$@3N(1;q#)lWa>&E#<YP2flwn(OzYg9QWf>2di?hFd#c&m4M?#
zIkNQ@vDFYBv=Ga86r^K;uyV404j&<9(9uDu8WXF-*%EPv@R>1HpXlVZ=f_-Dk~d|Y
z-a$0y+2&PK2A~hSvE1dxEMCx`*Q)O)#Bsiz<fCs%Eth8}mdV%1?S|alIa+&V9bTy#
zxRotD_^F^EMAKkBcG2S1NR7R#1>p|wvUYEBLCEMsIk0b&=IH{gsB{qEUJ2`YrJ06l
zZl_WQ*!g{{UE*89u89X8c0vOC33>1EFoaj@>Da|KBoI8U4uaiS-udHu!H0R4D?5i4
z&$b-)Em%*pj>Q%yX6#a%J0yf@@-btEk~F`KiQ^z#qOE>HVk7o_ZG$^mo|q}~4B}I-
zni`*7gXvO1O9>GjY32;2k+9!papLd<XaE!WA$E6QL!K1VDTvZ#;@*8XtCOcYd_KD9
zu16cm#iPn^9eqC_ilw()9l`%_1pBtIl{8hz&jT3ZDFE7m;ROifAHbdSf<|jH@L{(g
zji73B@&Cu&TL5I4ZfnDIqafYg_0rvv(nv~oNrQBEBP9*eA<`w?B@NOkNC^UB5&jQg
zpfj^)@AJ($|M@;=5T7@=AK+ebuXU~KdZl_3#SQWexDkYbto<*>mH#kR&G}DGRbNZ$
z{L7Jp{~fpa7sCQir_%h~6VeZrT!JscFk7KFmvbQGkzsql6dREslo&{JMYy{zqIde+
zTP9_{X1ZmpRd}R4D+q#j2p)TrvhJ2wY<=2TW!q*N@|1lN;1oQ6)^Wi6rLf`n6s{+B
z?35-U=iktog1J$YPniJ&fxWTx4#eIMuN@9U`h>dr;^uE1(i{wA0wD1hKdq=qJSf;i
z=xjdm2}@!}#tY@UAM}WNAp5=RQq3k;`8#9V2yck{9j#wyvIS;GfVXr-#-A-Hk1wRV
zU=m@lk|`^#Ycgx650o{d(cDF*dQkYrEbY!mbwNgZ2(_H(Y;?w}{YznN=VWf8?{ZaT
zGQKWv85=k`m|Ft`g@*dfH%VTw9e(cQOL;axV;B7NdM867v19$7MBYTw1KSrLgnN0o
zL_k9myI%6Tcx6m{b@cpMvij}WZ>gWL$hUg}`nwEQJTCz8G6w+3WV?i4U3Pduz$MGK
z%U>o4{^_;<6)LLn4OR?<aRr+SpHzq9)N;WXXY|+`Uk70&z0~w<EJ~MWy%k%O@hmk<
ztdTrS^G7LenhsBLw6;&f9PqT>bhi3fy)1e^P1pAEb8@la(+UZQ+mo*qdG7F8g=yXo
zu$^!3jv28R8!Xgld&!zEn3K30$V!4QKq#PR?VM&B*xlEue|_dM0U7-w8`M&m<!G;9
zdAF{gZ05A^Yn7U%nbnOw`KM3+p^p3~aE;%3MF9FLt%@~A(14@|`;*l}RPsH~f@CCE
z&$l5Mps|+-vzxH&;&IZ`VpR3i?K6_4WE2k7*tm$;VP)B&Mh}r!O~0(nzC|UoEKEeZ
zZ4-^a@>)wPmF)TB_i+#wO`AbeRaNJGFFY)D=z2x1;Z7hdKaXcLGL+!K6>v8r7^n{|
zR}*)GKfBt~zk(J4{fJ*rL@g#iwlNd|P_M-Sswv<QDEhX8QW3gO#Ax1>=g%rUaQl5b
z|98!i0k}l&e;=3lmvdw+#Q**r*%eg=H}_?i=LdR`^%pL)|EIp$zbn){M?mhFqMtWy
zVAzPKTFh%%DVL3|(pTl1_UL^7QXpvXX~^2@Os;u%&01@FzJ!8~ICuC|Vq=XBdMnB>
z6<P+gL@Kiz+6>X`1O#XJGkS@4QNAz*$RMQMk9@a@2^Q?d_wyk79(4Arn#*)!x5v68
zPN9LNHXU?I3W)0w2hvW()V>VQ8e&<jI~P)^RKQm)8;X1++e<84!0dcr_Bbqt5YAV%
z@|k&#(&!+57a2cM@`cP6reRbMT+|2V5941poEK~GALmHDd<p*2>}8R8W6mxCa#}8N
zetTB;n79nq!|_rR!NiD_fJu(8q#E6yQS}OSp*)XpKTwG1-|mvG7YMy_8ozD#D?Ae$
zB?ezxq^zhELGw1r<5wnWbxYm#qp!7fok`m$KL_yee2%C&-P1eV8ip$GTP%Q#1|2_H
z&fUyqUY@{56ko6>7A)I`=F4RjMC2~Db#b_tOt%c`xL;n#tCD?zN&Ql!+0oi(p6YJF
z@LlamyqG7*gd*`3VDwO<jyVv}q=tqs{cBF!9~xMiJDqFW3OAgzdMvlJvpA5Fgsc0y
zW5l{Ot{X{~d!KSp%q5H-lA~iSV*6N%lX2fai86qPB8ZR4Pu-+g6A>$}k9pPt7hQxX
zf*n6%&%Ih9x<Wlt_eRqS%~GoB>pHeaXgI5ODeJ3(&vQH~{pu*6iw`twNABHQroHke
z=s(!ljSUTd^(5OkKRgLU91swrfe(ytshw7Ma<^uD_qd(v(#uevA<COU9^@PHYib9~
z>0ZW0I5Y$~<445O04K4r>vuo~EE?kV1H__0qvv~v2muY_zL_zxin5r}eI*s;``;lM
z%$KTfz?XtVqqutRQn-s)OcdY>{&Q8UZ}<&>CFiFn_;sT6f6uM{MT&=8dSA2Xvl-bN
zw<&TP<sQwMdnG+nwPTwOc4doc(@6T~^I4&g_0Z^hYQy{5f@>sI!yhNZTvu}Zy%>^4
z^}7y}7bs#4OT0lj)wXNB*{o^Dt&CdA6}nZPEZ$*k>#nX>Dc;W$HP0%1(BueCN20T%
zl=H$0dyk=E${(<ee~6w4FmSX%lEeH^kdWWTGdWDNG2s?oCxHnQ$hE8*f{*YPi=Y~1
zrN?tapt@?g6MQjh*vAy9Y7Ogv@7jA^Aq!-9+qC);5lYhc<gjf&Oy8ZhKJjmSsNPII
zt17v3(DhW@H^hQRe5@!{wqJj4Ok2$Y`)dCZ8Unw0TPvq;94@xs*rI;j$woUrb~0o#
z5Dyc8o$PtNlTpE1wdQM&@U7cqcikX(IksGXa}^+g8=F~NiTQfu97y!wF8AE!%HMN8
zNHnx>IDUnn<IY#q_E#zzfQZ`VE(DS}=1Yk+j_*+V|I@GkcmBVG^Xsl&s<4asiIjTz
z5|N#GKHYkmLQhds+%|E`>n=1u)q{7UEbs%VPLR<a@~bQI&KZc$jNH(9Qqo(QFcFRM
zi}ur+)^Uvo<pXyft2&uXs|X#O4o!0jmf#<VMB;>gs7nayC?MGWNOMR#YwUVPcM>&#
z`^YO}tMs!;tJvulTDoqn!-l7O)ae~ZZ6X+*K)ie%?7Lu%O%v8*O1EI1?e5o9x4&rG
z<+?3N8ry3#UT@Fa=-n1+Ro5ipKtdb%wRD>LDb7@q1y4iiL$SS0+0OYw?QU(qC#BMw
z#hY|+NGOg?1|N8&piE{I@hS6XoHEl|%k&iawVIyFyN8;-RK89ceIr4>Vc+mUP;ej^
zfGPk29N|}p-cKtCT3z+EYqhv@h;Rh{y6;qI*vuysaALn9dci?lfHMLbhXCCwh#?DT
z9R^W-YaCu-(7)}Et5IiBB^jnG&?u|I6`J_B<nj_<OHsT^D%6qd!&moIJ2{fbO@y7x
z1PgV!`S}?J>JuE+O=yvT`-S&*%hTsM=P;FoP#w)$xBDwm0_q6vg1J)RpQyuNVY9H;
zf|3k-^11Q)_QkObx*6Xf<fMdw3>}Km^JEbU?c?4_p`yfiV0#u4Lw9w!u{YvtBCIgF
z^o3N6sDbbCufd?PwG}RW@$rG)hjwmGr|U~su(9kGQV2NLCfJNgLz&3!X`seks`-Rq
zTRgm^zz^v&KNHd|3G*7#VG(nfV|pWX=h0kcVvTVDlr~w}$GA$JFhwKXxseEd;Rj2f
zbGB(cBv6Pxu<&`=ZZBs~F(Oysid8q=c}tD8O$dxi0|fRsKV&-{%&mZ7@!#ZkCC7Y!
zm@+glQUHBpqySDHZ<6W$3#MNLv@h%Z5;rXPuhn;fS@!GDg8fr{SNZB5fJ513JMUNh
zT^6=0FcHT$Io`|5e{P|_tC4pd276DqFn{Fg|J0c*+SL28iSvz|UE{szJO=_T>nCN9
zYGquUqD)x)M18|%DD5s~IFNKGU+7)^KWsIaHK-gx-7Vn$d<GRxc=%M7>a)IkW8KD6
zwAx*Lfl;fm&C@SBZwab1ve+MFKOTH1_4pzX0a{>l7I97f#X<t-S?o3oJLwn^j~rEC
zdO1cs%bY&4gsh%O*<*<<e@zAT?Xd6$?d*lcWN9J}(-)Gj{cAaQC3&9THjT!D-GUl8
zuwV|JY^(hoZ|81mR9_n_E#hv>2(myriP=xsJbLN3H=8ZJ_o4FMhFIX{Lzg%x#x%c&
z97SEsMnpmWh_vt75nTFJMuf{Hwn3T6E&7Ep0S(k{x?Hn(MO@|n-VW`Zypptjw@Fg#
zhYHy{1MvK-1X^+v%)xm=!Catb``;(yl&E?=2oK`Mh|NWzhiCE8tBPx*t;I%6_llG{
zLXr0VJSEPA^EfBDfU@*O1mEVZCJERD2gO5MBPO`d)e;0CtGhcioPm$cOq%?;F5I~p
zCluZho$Bb-7Uh4T5<X1Dwm&)vaFp&h?YdtkX|x<MW?fFO3L6ban4D&}Ei;q%QQ{7f
z<CtPb&~e98G9g5V`Fr_q9AF~av$oqcO2xlyGJP7cOA~+C(1j7n<q9b#dC;Z(3T{7`
zn>45r`L?>~N4p|P#`B$NqHjL!KULtx%6i%UTDX?y0q>w#dNY2<lP^K)zZ|9i^aX#W
zzza~V{1Xbi4n4jrRO1Y{R}w&LDZ<_g^t!qR`b9w&=GaJ%Qq$T2JHkrXHtNq5REaHm
znyJmzV;5pk*^77xnsD><GG>Up#bV88y<WK3x5M0~9gYsP)i2F@iCE7~qZ+^>7xaR^
zi+1)Ek^TOKVm7I8g&l+;u3x!9iH_PGqUFIwr>r(@*O&;r6@|?u=8Grpwz_#SGtWLj
z)Y?qwEehQu?dE^R<CckwD-r9;+UU2yVh)*TO?2;_-Nm}8eO5)QR`}~L$)vpj4S11c
zNrG=FRz{3poajRxED}~~3X^JPXKK@LJ?MW}goNZ$tk<I&4X%k~)?|+3+C}7*1l`)b
zO|GajIdxC@?JSul2c&UMJLEHA(6KmPV9aylnyHG{m=9c>2$I|$Y825%yDxPHhoU4)
zIk@!kH!HF`(oP+End8yE;BBU;PtoMJ*N-s?-bb32okVp+w75WoJj+p03%!sYEPH?j
z-FFm8#;nXW&R`+v*ANM3@li+E(Yh1W3$~O-FIJFiKn(@C8N}3^w<(-8R|XxNl9g+0
zB?FHX+E_o)&=wa4`VzU3Vu=ARXIeaGpehgmXENT!;aMPnau%{O>9YaWTzo7CljCOb
z*}#4sUVb<A7C6~q<_nL71uN7fipryEL-cVNTGI&sli?lMnG_4cz1IjYXk~Wc^|*%z
z3}zUuuUtN^{!awBt-bL>bEk*Drf)~*KYhM5;Pb_S6pryaeS>=#fi7N=kFb9;YeNEj
zzVHp750uFM9RB^SXa|Xeb`$=saD5LqvERUK^rg24Ncb)_iP)|#|A{63*3aKrF4Daa
zUR*o@v@1W9uJXC0G|jy8cFSU=U5F%pP{v^MCT^C)*1~KgN--z!fhklL3b~CowO@OZ
z+KeO(TJ35}tn6|ik}`G*A^B7J=yy*85eMJXc#r3*?^DY57Z<vx%zoiox~qn<@hPHj
zR&os)lZt?_&p(i&uCZ7}cnFg89z$$o_-5#HliuyGblZHTbK_N=t7d7TpWMJym)@%+
zSe-T+EgFO`BR*o;H5j5yNqtdl;4f1R;|A)ZX?+VLo78~c#Y{J)+oXI4D=k@##^jMc
z2{SAsg;YBB(f%==T|`YIH>}j7vjfJ*G0>3=Opn|TL|fTkq|AJFD4;(YRokbQqtuO#
zF@tBS|Fi(J&6pyfSTIJ~g;2mHX;t<4t7l1&+Ir)3pv$91(H%+e4>K)f4+&exIIPsQ
z4)=3$?&F?7jyrFzMl|zPO-SBb>-*&WxX@WVO~hCrm#`fcQd69vKIyn_s#1mIpm9M4
zEa?<Ifr_<tOH@L994;ACk2l3@eDf{W&K@`+pQNf3e6I{ASVqXLHiuOklWltmkO0aC
zB4mGx2$)rOyqA7g*s`}DE}}-42Fs(WCOvai?(=FGclv1~j@f3(w*f?6d8E;_^&;>6
z>L!(AT;v#V&wXv~zTyRUOcYrGTVu4`>E5?5ebIWcQ(X9I;X|csSnc%~=x-;q^fuFc
zB+^;R6S0zfV<l9o8L?8s{|NXFn8y{#a+R7aih&%@>(ZTi{O2rWeN|GLifPW&k*>vR
z;#gBBN+0U(Zo%Dc#SR!p^m*BR=NwE0T0dBLp@uwzuWP37)HZ|3CDEUlW69&TIa)}b
z6UP&{{GR2~;dS-tI)SCe<6SnPnWw%dE`m%`d1tdvCv~81VFBW%?=~v!zufg>71?4?
z|EL;aAlN8Uo`$65#b`{ar7RCt>Ee}*oXikePZ0IAtNdJV6qFm)2W3#y^_G3fE$Qto
zE}h3rakhCyX*LC(Xart8aFP`|rn`!86x*8=mP$0SY2(}uaB54*Fx3yzQD9a(zzXZ}
zr6CZ|N85!5P9xY!JpH(iitfkau*bzewBYHk9DNZQ6t|Vyf19Vktv>smi};r_PNt2p
zfaB#0sM&0@EGF_b_ym}#gn?D^#9faManLW`I&3qHIdQ*wLq0zvrz;wrF^bOJs$wgd
ztj1iOwlDnzG7&_i2eXeycHyf>hAUwZm^XyO=3`S;io2fq&Rz1^6!@%ZZION44ueTe
zW&LY@zRClch@D;7))Mv<m7pf<{F*|YYJV$BbD@dMg~LvB%ZAm5@b3?c6`T>=Jl(Le
zRT4##nc)}pP$Qv1UYk+kW9jH~y;!fI6C=9FYw$+UVJn3`<zxs4H9?J9Cic<#u${La
zz~n5dcL(wdL|<gktkl-So8jPNi(Wb3JJ(H-OXj^_oo?vv52p+13OHOR;LNOj?Q{{L
zfVYByW8Bm1jKAr3FLQ0R8-7<r?E4rSAV7TG>9`~$Ber&CaL{K)xhg9Fa6H&+z`pQz
z^(RQQJ2zhZ?a51T4A7!*UrG>P)^aX;B0wdF1z^6vy8Q23`0viwbGJ5=BZqU=<-@#A
z55xT_EO#V{4r$995>TO<-x-drnVO8?FOJ|z((OlvMx{Kb@i8vh?q#?$Sb{HO3!BZ4
z0D6fLDgSA4GC~0Z|3G2Ci}B;xw$f3o=gPw=c2Ja#sKb%)_LRkXWhjp-H<t|zUx@hw
zTG{S``}J0#L#dzn1~$$^PwwzNc1fIGaI}uQt3MXmD_-ezD`*QRZ0e!alnZ9U)9pS4
zuH7SYG<k>nacF@&cuj<CHQ~?^4UfVr=81@7OW>8QV}{*19UE*VVo4PZF<r|l%7iK5
z`f%vR#ET`Tjc8x_vwfwfZMVV^m4*#`GvV=p#Oz?_NGa1hE@tF97rks0{tim`Lz(F3
z0b9@A1Xm0>X&_XA$rI`&TjAHU^WTqcS2fychc_Pb&ZCj7dyP+9*t)4%YCO)Y(&*`$
z;WLz5Ep>`fC2Kd}a;gUS^<^i-;j08Xv(^n&@QxY}o^h{=HgM%^GKEp{9%Lz~e(pgy
z=X%+NXsZ~X^aN_TQ#XDJqaR&3txMa<2m|@63TQ7V`YZAQeS@L+hvKv4Ci8Q~JCa5z
zD+%xN4``ynD==!12=Xq>>CMSq2&)S4?F{w@`jSeqw8J_+Nd#HbcBwKajGBf9(tWnd
z*A`DlD)xJwthi`fH?PXC|Jq_zYx=_l|B~<!Y?+}_tFrQYy6xWc+K+y^f#bs1^S)J3
z_}xUgJ~kM{{Yyw82n5q6Dr;ww{WO&3D}bFrfMFP2O~+lA4-EBx>A$o6l%{~<1lm2U
zfT`kLn<*r`|M5-pyu`}N-Y`#KB<Fk69SP|!!}WB{)$q-CXc`hB@bFdr_2x{?<#Cwh
zQfH0(3R}+&VC&gIT&(O@JjKAI+|SE@dbz(d#feJk5jTkgr&O{pJWSIHVxjCjJ(lwq
z^I&F$E0CxJoC<K6veIVp>{ZHR@rDJ&s?V1cUG`}Ck0m7)1Q3?RRl=zrcB054$0~`=
z1g~hzanz6u=yD4|=|1op%ITpi5+a=C2$+^UeoV+FPE6jOs~9DXd!Qg_u8rd@*4Yal
zt=LbtWnWg^qzdnSXAr;QIZX^gzsk_<iE7-p66~7NZ_^y0NJfjBk<e<u1}Lq%ERo_h
z6XNF-QVzf7(U~yk_H$(|6A;zIGaeUgnJSee5Uq#{%;a_sXm&IEY)PhM#+zT@EY3K1
z_zom4MZK+Jfi@0c+uS@?L#feqZe=P*LGHdbML%#{pmmM;$DH7&`JK<9cV&W>NSX;n
zxX(%q$)r{e1O8yXz7yBgE#E<qZy(6lC(A3#BgoClNZ*!+iOI;^-q_I5#@?0Dh~a8?
zG6KV!Ormo9-*yZI3+Qss0H3aEqQGa?%YO?4f3aMC0K11?{_@3_C4At4%Y8>L%70f(
z@Uoz5Zenhz4@`L(JKF%C0R}BAa|cI|XqIr6U=aU}65GwS0R>5>Z`Zo^z|y)`_M*$G
zYpAcwqI<dE?}fMTXj|{3c~IYSZki{Fn~&`<`W^ES^aQ=T;H8z@Ao)~<4wD(LNKlO}
z^Y)r~@3HMXF-FiR^1GH&aHoJ_uT0t2Iz8UB;{k#-9kZF7^rQ_Ty>Skbi_z+OtU1RV
z@5$xzClIAJmX`Ds<o4Od`xKfRn=EgRmP@3*9LJcG%|p$;(NaG%o=j>PI%7l_qM&7m
z`lJ_&;lwZem5d0d&uZ6C87lv^45@5nMC0%ShdrbF3J=H9R8Gx1IXWYn_yY4S5h#&Y
z;-2W0dG(Mdh3V_YMwvW@59W9op2{HbL2*)HQiHnL|7eKXT{-CC3}uMztDV@F0u2Lg
zG1i(rI*!J#v@UYiuAI!xIozKrIEKH>0=Y5$%n5#<!+rD!hKjPN!sB<3^M5dhEBZr>
z=jK@q!~wdhynQ>1U0wd4%;DZx<?sB<2RwOGSh{SC6ByD#BJj#}2QiqtQuHsRDA1>e
zJL^j5<$Hu#;?=&~DR^*eEt-fh2&bU9hM_?hIjrM(AiFCI!wY-^&ZCM4()<H2?R2+A
zTH?3*mOhh88ue_H^w2$g2L0~K6yiwA#yf@Fa9)W#vIlN%pI8O!50aDCiQA{CLr3CI
z8^qqO3t^#7I=(|>UZbP5NR?45D<u|a6mx?<Zca7FDD#vfHtb?|=7ELi=REI~*xx#I
zCUC$wO3JP2b90>)DW>z*x)`RE&oS|3e}1>|J|RAc#W;PFFHT26&TXA%(s~H@^z%4p
z898l<8YC$-vXql|9rc`3Yt;I}Em!8Bq5h{UNssGM4%ZoYE|^Jpdm}laiTp!+^dDW%
z@2SC!^7nTuR4;uGb?apt@>hiO$wo|Fnr3&iWOb?WY64DKZz@l57;Vv>AVvX)N=i@p
zxT4xF+LRKKB=m}<h>4O=j2TPv$wSPtnOv<&Z^fv$*x(g$hRsc%^nFq?DuzXD*NQx0
zC_JgMFKqUz2+8Nx@2TK|@v>L*&c4zHo%^DN9(BOby*2HM>KColvcw35XfimHJE~zV
zuC$pzc&f1efp?4XZpXX{R}rhK<l#d+)=1<CK|Rj&iGhb+Y+lHj_RisWnfB*O?80IY
ziA?yFDGpL36;cvn64eJ5Y^eRRDMK1{(-0Y&a>h0BWq8Xp<(P-9U>UGHSVlEaHDn~o
z2noDN9tT%eh-GE$=wNJZXzyz4XzpNd>hcq!q(vBdN8^Y6LE8X@5KAD~D}V1}`Js%I
zj|;79+%;TzVdxkBi$?Bc=$F3{`hkkbH#JoRGytIlcv`@F{~Whd0w#g=?G4R{CG2gS
zY`<p-kZ4F!%1RQ~*mU)4H7a(%{4R&<*jO(`3RrJm{__j|UA5%d7P-TFbk5_{3_3Mx
z{NR>_x@E4I2y4DgwJev9P90A#PAsfHfXP$OFPQ~d-HofQFg!=UW7$eHzQdeK;x)#~
z*C=_i=(=20|MkuxNy@$Uupm2gX%iExXfHn7)@L-NFvqXkHhs$0?nT!nd&NU$PDmtq
zBukPhZ*i5$BiQ&ej!CIS_&C<iF^zIXx<lHM;5i+E_`XD!EzTL1>|)AyM4{gE8bRFp
zTJwnUeWknfip(7fB-=<xnygi2@;$WKeVkU5D(MKp&>VfmrP5&7`1gi(dyH!~51#n0
zhHA07S~(x^#u&J6&gZ5uQFf1_tlnChMTx>Zt@~K`v3COk_DM7cT*8|*&O~Gmr;O8E
z_7w!FO^~0Zpl5s+p{r@9g||z=of8ml&n!<h-yvdWqQ<fsf6`tEZ}iAog0peBR71xs
z-P?XTv>Qg4MnFSgk@AGRAGJU;M@EQ9JUh9jfJf0fh&RL2zTghDi^f|4MHdW2$mqyX
zCg@55cWL~44$ybbdUjS6&^$!r9IFN#-$W6C!;OL_AJ}nJ!#1{qKw6S@e!NfeJ@vw#
z=Fs>JH8%T0;XU<-6waQ8KE&&&eOKra#4BDXNgJ}@oZ{R{WRb^@6TQoIY_!xzhm1h|
z_2c{+hR7u8D3$iA>jm~3+mL5+o3r6OJ&RO|)?b^9PFO|df4ZmN-Oax^iMUp4Y`WKO
zyasphfeY!wRsXP^YW-UbyQ-F`5UCe6RTe6YB2~=bniEsez?JGdX@yyT^4l<Hn);x6
zuc6)nMPq^_$?J`b-D%~x-ZSn(#2qXW)xblATN=B=D;nF4{TK&9>Cpi`A6{?A#w=i^
z8sLe&Gf5ctu<6+0Js=txoGzm}EGq9SJNNWT`9cb{`*qfPCzg)10_#@vQ5f3;^_es9
z{`(E}ltW=5tf4Xt0epVT`-y7Mjr1=*cGdOD@%pte_mMg{JRa-t$>ruoVI}jE;mZuF
zRCz+sLK750nwqg@$*acWXDhn^-y1rJ04r;?r5)9OFkI66qJ~aRY+8Dha%jVT0L~&W
zVI3p;WA592dfmL!ucg!wj4iL+U##1?$6!vt>WC|QaKeg2OmrotO(oaRt|Z|4NS4WP
z!wwHg<SHf5HP)X#8)sGa+#ryBIF((|D`K-LM8&R^LtO_O`6iMz<_%fqsY05omH1RO
zMpdG<S1M8>PrVX@;PivlQ@D<R3-ZF8(795JRczXdLQ(w(6GRKVk<Ld9Taix7Sgcn3
z%BSvw!n$7<o{s8sttQr&YKL>aa++doOGYhA7jCzA3TS~47SS~&my91vrD}l{Y^ay_
zbyQq+t9zSHw$`#TMGb|<#|)XV=w=n&1B>0`y(AGONSy%%Gm>|o?NReyXzDhW=<<Vk
z-HRwfwWlwI(!C5w=a#UkuH5qvJoHtS+5uoJ0K@`srbv>5KT)KRJb-)V0Lmtr*De}`
z;|^(J_c~V|arU^b%q#f&H@Df<T+;9j7yZ|21>YnDVbS0(#S4h<+dQ)VPWOrMQ<?x^
zoprKuyi^`AG-Rd*QC{{o5z&Z#1<L&3T==14^|K55O~l|^HT-G>+t?mB`(1r8cmVDZ
z^br{x9vl<rTg{%~`o|&UcqNu_+4R1u*#HtYH_$h~2_F2v_6`3l@a#AThei0Sjt3cY
zzQP94T>DZ`D$}C}_;?AJ5(n6l>^w^E=`3KPd6{-p*PjPPW?+5Hs5W+jkUbcLe@db_
zlR9cT+KBuZ2HjyYZZL@!EKN%esp$)b(%I2n>p4_uYq(4%hV{?IJV6e%;>zlMq0r6#
zsPztl#jug@MP%OyrQ`o+nhC}+r6IRfXE#A?la#%q3WtxEEGM}`;7NP(4gDcMCO?{~
z+`z8aHawnmIJHVkb~(J~;)z4vNe2<|sflzpjPzC3ncZG&F!5piUIid|SIV!{$9=2g
zT^qFgw4YN%v+g+H<Du{LKez8(pzz9-jl#-X3HDx1(OlJAFe2j<VU)eHHgo{CZS&CB
z`SLXP8(91N1|yI!U}m0xnHgW3*&mq&^=_Dzw8D4h5Ck-QWie5C*>5rk-x*0n<r(Q^
z?%!o(z7&GKvKf*eGz6DN1t;svqbYDCB^Fb?N`(N6xT=EykRISa7NA4Ka+wO<yafIC
z-@)G<U7Ec2)KbY;F47uBT#G`&zWA)1z|x5BL?N(oMB;xbsNr_`n&kA6>2<LsRKVSV
z{57+va}@=H+qrhPhGDrFL;@9_@g>@XPd&XgvLqGCKW)UwwLxfAqZXENAbIPhn>l9i
z-I|!!FzIF4P)X{p2gK5TmJy__dqlUl1MJ=&-g;e+jW(ppp*@yDsA$P;t>+xVhIm{x
zR-Qhfzh*?xE)H97xJbxqTonbcqQqa*{1tZhnZ61(eUbSS>0+U7R&--Wu+One&mkqd
zh3+rh4u~-$?tYxOz_<Y+R@|n0|I@=AsS$0fd(RJ2I#jiK*i}U=K)M|zAJ+H<tNKx+
znPpyOO8v|YejZ)erB7s^3%>H>DlM@y#&U{CSBcyFLlxu?sl$z<3*fY`s+5Jn+k2mc
zOtm}PO?rjyC7lJM#b|aNWDV$s*A>(qPS+UKg;mw#4b7dFnuG`sZ=JoKCk)AdOQnDZ
z0U{T7y?_d~O%ie#Yin1-Niol(N-jw^2>77bPTx<4F+*KfLV;Ezz8VDal`^6$<S~Kj
z1&-;F%4?q-%e0b5tBQ8W#PcXA^Ucn#u#b|dpQY%`Rmk6^XOGHD>^=8?r{3c_{lud%
z@*+q87W46{`x}BiR%b5}M(M!Mv7u%GkiL1TDJ|=q-S<mWd9fLUbCEuY%qM59*xS6&
zUd5DGMlkv;_r6u`ezS{J$WCh-8hMAU`BU%PeSFX0`pcgP<<Pzf@qha$+VRR-f5oLU
z{|4NVhCKOkc7eP>rYqCCQ~X50ZXyol6F*OA?C%=IAm9Hg(Jb?SfEfS3l}z`4(f9bT
zB46=nV+$rjz5nFE`0XZV=7IPbg187(h^AQ^TpJ}0YbR9%m5F81U=md0Ft6xlk|j$P
zLA(IA1n6{O_T9(3iHpS=g5b&zljYxTtkG)5v^R9+V~q5P?dEGor3t(<B6rSvS%Pa*
zJL9gXZ=LTQ+_zS@!L}eAvI8&F;_#T?@{QA#?f;f+U6Sb*$#)|6nzqmn&KAC8aC+l~
zk-=-f>$R)J03SSU`B2YeqpUlI3`t9R^m&E$ac?cc{0c@K@*-qYuX9+<qI_p6no~V^
z+h+d*%e?x~h0@$b`?qr0ALW~1CU*La9Njw-gwu>2)DL4)_$(@(^mhd}jfg!ITeBt=
zylA@3thIGCdu2ALK!~$3veDPq|0R)>Dnk2VFHk@d3B>|LIoxj%?suLMko%1YCn55^
zkp_o!N5bCtvW`kDt8Z;+b|rcBz3&E#1gorXWnyD*#Ec8VzKnDTNT@)71McOrz%OI|
z(A?43i1~Xyh=eUH3^4Ehtj+%5<hcrdm-2)^G1iw|Iac8RYhlv=UvKX3;$n+X`g`lu
z9p_+tS+ToOE#iItFzM~I7uZBmuOYr1muM@5VKO78z>Id=lD?E;xNkUAYi%ZusJt^M
zL*CY8FSm1uQTG0R${mDGw@OyMwYgB0V^a0wrG=3L|DdN4@$#8wM^9qJ1E_kPTi1u!
z>BDtkjg0-;B+Cn9KkH{Y6Dt(P_L|h}x)?yJz6--e+hNWj%t}7z`tX5@McoGW#IpVr
zo$h&E@zAuPu0zBebaEkA;UJa^hhph=#(Ni@$dTK#B5O~ON|-WlfiE3oCQBVMESEaU
z;ytO6=-!|i`y7MaYmnCB-%IH(5Ju74wwS)jZiYgf9zC-(-WiaFth2?`e;pTn+d#g}
zH)f`?P!Y%k5)Wbb)}GTG_~m&6UHIz1kBsiu{Q^gjJ%}rdBa1DF<pzz;^)@%uze2+T
zd+Ekj`hE(zs?P)O%VG)oL0AhA@La$1s=x3r-uEYA8BX;K;$7<2*W54D?mc&XhUL4u
zKY*zZ<<~Z$OPN7AZ*A^t??K$wn~qe#mZy{hU*9ax+iz`hyf55(es-t6S6=gds2;Sp
zULCab@rT2X)~*J}pjrk`%c1dO@kOSd6^qVJHb{EU#6``HTLlQo?a<*RNKD6CJR??|
zD)7Ne%0gD^2WPb<#@0|D@D})1G%<QIW)C$aK_teIR(snd4tuGP*(;pSvM{itzcfM&
z7tj}>pwUlmz)_ZvCh2{O(Q%x7nxfo%RAjdD)Vkx9RYlJ2jMiPVH>yWvN9%N4Jn+6X
zmVvKY7~Trv)>Rs=ofy#jO<I5nD;#qBXC`cOBtE%DSN#d|&Mytbk*7cW3`8Z6MVA2|
z?B5Qoe3kDd5x~|icFB2l^aMIBf1UF9uX5LL68|94xg3uC$7y%|jiKKEy|?}sQy>@>
zTj!7%q8p{V!JMcD2jl)6N}ghBh|-bn_j!4&bul2?6!J$Xm^=q0>w6Up@o7omJW@Dj
z5HH3kyManAHN~;Ec20e5UiIU*R`i*>i=v@V`R+-^5-99ZE>G(*Hk16PgT5HL>}rZC
zrxcaXAkELfbH22os!ZM79gwDAAR`EnQKClv7W`6p;}^}4kat9}6XJzO(lQW+r&hXL
z^NhlAMYlH77nt!YvkI{BT~~WKAV55-&r=+&KAifmuuj0~W~X&L$P}Nh9gKxBd<yf1
zwN#+c_s-~G<LG0=+Kj|vsM}%J2gRQt7W?1EAs;UN*xrzaKnT?ZwztIf_WlNAAyHR`
zdwMfFxGa{-d>83OM8o<c7zNm}O03M^#+ne&5PrVm`-6}-AH0f?+<@B3B@rd?=MuYe
z^YR~F?e9X~5QTG$D~t;%=1H4>ZNLC^#yPYzYWK4c`!jI}(ca3ibSPc&LB@NldVb=o
zN+n3X61G;0Mq|4t^f|Zv_>t(!l3vxK2cfvW;6?L!6alv?HEv<RM5Oa2(QG-CDuF8#
z=9NJIAf*Pf!%}(QHsvjUjGluB;p0$x15)|aAIy0_4E9mSZls6lt8tb(qAxhE@a)?&
zF{Yi4zGyw+2U~?<-SVR=Q_knXbck3KzD3N_R$Y+2T`3>K$fCEcHrN35*vxE$i&D?2
zGV{^bSoDK3VyUxdLKu=`5X|~GI`v5h&mPqorMR`~wxb=S8k{0qt=u=qEP|Y~-u92P
zbM7$@^uzjj6#Ng$#L@5Wc^5K@k(bFTd@)Q3Us_wlYx-@|Tpb1P3C*`D6kqfq9ehl@
zFDCUO5e#0qv<fXKh#Ho4z;e^Ep%ILsEEi$o<nZuzSgV7nw14kicbApt)>bx<G*PVF
zVx3X18`P|d&+a7dDfckECbw#cH#}WXHZxTf@UI_XC+X}ryBMD9P%a*d3EO_BEgq4u
z=%!AM%S5pB5{y$g`t99^uav2iypBzw2r*uTC00)?$x!9W;5j%rzsE}MAac94&H(oe
z0iXUWUx~`C+p%68yPaxMEvt+S9(v)O!is2Q>BApcEaSloli$#@67ld-j0Xt~^U?>o
z^y@RBH}21?*enO^L&M89Q_t8BPZ%f|6Yf4v@@Jl{su_?_7u3D7N1W>#;I~<<>+;Rb
zQTs^PA4UlUFr`BQOzDu{n9@<$<fhb!r{3;Ky=NNcoTqzu^M`y@BrUp;>jHhO?+_L=
zr0Ye$Np1c670*8~OmO_W3=`i}Q~<%(>!p88eO)3SfF%0L?m3tN;>jzszqI?`=8*p{
z`d<FdtCVKFJN40+OzX`ZNzc}BfJYHSLZ-JiJG6QrX(pw?d4|Y})A7iA2!$bm4S#c2
z7QO&~yuLq)1EMZ;l3W+2ZRl=%d?bW{&93GmY9w`vRzM62zzXST!eqgfwKjGC?k)jr
zCTye4{`R>XBF%|FKo<C6TFEDTuh87B>=`>_<Qzr!{ibnJJ>-T5>C260iVqN<KdIbi
z+=kjR2wtM=dnMN{V??+(60F`REk9reOMss)-801$JLF+!kKf&9y2}C(C~C#e1-7NO
zDtpqwzmG_dB}%eT8eD?s$bB^99;|S8O2C@N{FGaYk`O-6$6bhFcZ({p|3d%VYtti%
zU@HBmSNTK5=yx~svjXM*Ky2js@Sxi{^J83#+GFuuHA#ivHvE-WaYb#rR~1`(_HNsB
z64_d;MP(~)d>B&j?Holpf!ZJ;k8_sHo`Un1kv&pw(P4e~^mK5*3ziLG)V4>nReI^W
zcvEB6ckdSEgYT&r5Im~aijtJ_NaIyQEq&&|8O7wH6=NnbtEabl2Fp)MjMeoKbGvKC
z{&Sy$$1)}pMv=g|1yybKu4dyCqN#ORBZPFcKK;fMZv5cJ`et`h?++KHLarO7C^r1j
zc&^UjU7S@U*Z~_HV7rFI$qm~VtWYn6``RHs-!&x8@EsPJm=>gWo-j<)Sd7kJy_Ll%
z{E;z1Vx;Mu_4os#zL!@lov%a(6==TzMVm8Pi<|B>)I0Y`)d;gIuYzIcWaF%F1hmDk
z>cOlxJqnEZ503(q4f2CY2fRw)b(n{M{)0l3*bNsVB6|a*s_0~+dbz@n<1Zcv=kjO_
zKvI7^_0716uV@B9fO)g9F$17CmMg&+z}PP@K^&KYG5^pqf7kXNQWL?vpSJmAVnTNR
z;%#rHD7Un6)fQ$5+dQ&HtmDYzdMKf15cil%nj&M(W{7X$g0JDa%VBA+h1Cfr<G$S0
zFX=GOC#tJ!u8Tf9w~a>3GHn5Wsxe}>d7H-hYlW(-7#&fD+x@K^8g{c>aQWN0jGPB}
zt?SV!h4v-tYH#ib_4OY=n4_Q5j<V*<5tuvm+gLo(s)S~>3F8<ZMU(s5DviV@lix|w
ztN^95Tk#_ORE*FFV@U-(0>ZgwFk4W>yossVOcYZ!l$KLJ_B_8#u5A$AIG*#~W0(V|
z(Y~~hc|>>L=N0_4UB)~vwfhS`72^}hX*~OunwC|ObyLG>9W8nHm@q3c%y?mJ$~-ea
zE$t1_6g<hH5M??z)TLYvk^Q7&{c0B78i&=qfHxpCu1i@3EnCq==u>_F(|z|wB@zD&
z^taGTni{GFNoVPT2sASb^0BwjnwAoBm&21=N>f=w4r+X#<Mog#_kHNyPeL#6_Ha?^
zdpB(TNG~9No7S25tvWasC~g}!e8s_V*5Yxzlw9>Q>A<cWQqURvTQgFJ{17A+67}v?
zo=n=sfz_CmS%(rUpZYCCqqwZJ2%N7~<4Ak4l)+(DPgiZD=@B+wJ~UI@ofCxi4rkd!
z)3UtK6<Q<htFAVZpKkP&6eu)Ddi5g6uHT_vkT;#;-rQHA-D}U|2M$a%gU9|6dUH*O
zMtn_&1_D5R@K-u9E$U!^dUQ9)H|~c{3<StG2-nwN*xHpCU<DwyF#!T0U<)@+>coaX
zThY<n(aF)+fmq+r(Ad@yC@g(@sWI^%ZRD3XE7$-^(5}QxHy*s~qbLA!DvsvBS5bBZ
zYE=&bdUr+;!;hN+$0WG{`1|ext`q*NS^}V7^H*cMM{Q^;exd@W`%I=RiR@bQ^@9+j
zAnVI21sRkn$k+${&t8x%l`HWNnXca-ea{t^K>k@4z08-kBb$#VDkWrW`)_FGIv>=Q
z`_GP!u92J`>lN^7>nT$`P5l5zO8cfY%YGw`+=96x#*Jz|05y~<|B)uwtJcz>vwdy<
zCYYYFN0zrAk~7_Nvnqg199R#?d=?T;P=Xoxzyxa+^L@C__~NHZ=gu=Ov|^+s5pz20
zW4>J<s`-=ryU3ZEDjJAW$V!skWtm4zKHWPk3hZ~17~5CB9+HJ9a%CQws5-y7t(cUj
zgd{7an83l``t%+W3PDh^O!2WjYTWCc52<s7+6A(884zU-V109BkXxU3a2yT5;s;5I
zTjC2eYWyr(l3m@3j-<(zK02N^%54@BKv-8G``m3Wn;_%VeG%wE_n2|ZD=&O8d9{_w
zhC#d7J@^7)@!na~3FT{RTM=v4J?0Gexc1lm=D7TAmU5&I_e<1edq#!Z>2~Dr1ncaI
z%~+j0ftbjeQ3-=d#(A3cXbhB5I^?wPe^PG1Jz}M{CNmz3c*}_zFQxSySM+e;(J61V
ze!V$0rU;adEiFFDO!R6q*#ibgp~tg^ILHo*=1m3?O)HLcmAjrT!gw`p;@#P#gSv9<
z)Q^|28>eWgU!aC##XU*Zi`OC>(WFY!L4<~h<0RxY=h!XE&?ksynTtZ2b`)@jC!Yg<
zB+<qDk}V?nWMGv-pS4m0Z_WA@r&=v?(Ve-gaE9gJsBdp#Zfs?A1yub_Oh~llM?ix@
z1A^IY;N1H0Tlx1FXxC*<Y<44_0Vy#Bi0rDK3p6;tFF}0Y*wD<{29Vn}H~y|h3qWEo
zUxtWA^Ydj_U|j&+{nO?zE%b*>`?p#z2Y~YCWaVbQ!eIi+Lq9J62k+!>#n4##F1GFR
zp#q;Fp&Bg@%O3PWVh0Ommz?tDXTIyqo|~Mprc;hNCC?QIc$cxIySG7g_k=oM(0yrz
z_Fdm|Wu}Y)Xz)0~XcK(y0@*K`wGL1eCcBTk-)QtmCsUx`-=*w5_Qsh4*+xGv7pMLD
zY?tQktIT4k;GD_Np?Pe&^P;hS9J3~T74;2%=V?3wD1E#KFvccssW{mDU+on6K#aOA
z{Er+ewPCC}$y8J50x2Kk7eG|K7DRpy=jvC_!M~F>!Cuv5K5#OWzIARCiRHs;ts||S
z+)o%>osQc!WsSy8rn8)?%YQKa(Ya$s;Drk^zKE$M)Xb;pIh*jKyIJ5Rmtts_?!Dti
zS+`ZUZftmwDCqqImC}V*C>^(oLf(LUA748}fF8j&*a!X3UXyK=Yw<t#tMvmq_(+%c
zg!Wwz^-pTM(CLC9>0|x4D%qvx$Hy9Tso=r5@@hrduJE+;ADJo%hkA7^X8eP*lMbZV
z1s=f&s~faNsn;Wz3hq@cl9&+n-~VDi#4jT><NN$khQHg3r@bd^SW&a6LhsM$X=O3I
z3k<XwDJH-WiE#<cK4aCtZw`M;t+6PJ8II-OS83eK08r;O0f_2FwcLSE#KMSX@7|v}
zwy0{mxt@F`2wZ1KXgRTq5gm#oN&!O%rrA~@RR<&6S-&Gn^FRV_F+$kF7^ZN8q*%B*
zfh3{9bBwJ7ZTeZ$!WuvK%Vq&5+iYwN$bQo5=(H&v+E;nClL!w#)d``Brx3Z`GHAV>
zw70@Ugcbjr3%N{*f9tqP#jyWyA&{%U340N6A>DuGLM{tlzR|z>kZ;pjaA>f?_U3Lj
z*81NoTd-&d%7!+Mjt)lpR>uFKtAV`fYOeF>8x5r&Ugjs+0{7*>*U!T<=gqd#|Gqo^
zyCZV*+jhva57B236*dntC1=xJ*Phlv>Z@XRO4Pm@;AdwH75$iPp1Kr<dyYn&RxS02
zg+}$fVJ~8l^o#uhm44Fx2hD&zYn+Bq`h|c8Q;w&Wy4|69C`zH?D(~x^@Hf3*-!HrO
zNyT0b0_PK!oyIO9HLPQIx@3!0_50lNV<S%2$8CG!I^L@fm1PW`za&C5e8H1`dgcoD
zMBj0Q(oe|nxYFJN2RV6Q@|M#O=V^FoyT+k`w{DfLG3Zl4ovgDap|cKK+g74#a#+<n
z@7$No3oOhYu_G(GsGls0rL@M9<Hw$^8$N({u2D5uz2``fI7vAP2c<Fk<kqdtrL)dG
zqL{<~(h=DMiG`?O7UbRKX_jM9m_1wq`+(}^5&1iO9982Bg*>E9d@^qekzXM9q%(B9
z&MI}>Lj!I2j;zATawo1sHjDJvnPEYciktLfJq*?f#L|z!_v*t;-I>=+86y%PDH%o6
zrI|n6szG{Dx5nvB+6b0&%U$Wz@&#|#gsY<5%b543usD5u;%>;`p55wi9&QGLuu{mo
zP*$Kmt{iz!79)HWA>e!)zhR_thxifK1d9NduT!GK7qjS!!C|8Ay)S8ABVHAUune_l
ztpmBOqe;-xO*`1s5HZd7UEoRVCdNDoW--f)^!Y~-z(~(}-3Q@~#1MIfd_Q`6u$(*@
zP>=GY-H*|5F#62ls6&x`Vgk+R&5cn+d#Vr~6=?qc${}C^ctrE7S<XKZZz6R6;SV5$
z0AIidoEP#SQ21h*2Z=t6;@wKAAHCapr{(4k_cFQA{nasGfiSL<i(9I|T9@;j-zsjL
zAolBYg7G?uVEs1%7?(K(HwQ4y0f^mS{<*A<Uuq4reD5Fsx8K0O!Y=e{X=EJXg@L12
zqbx%S&9AFHw-6JG4nRU2W1XEv9odIaC!+XBTX+|`cn^}u#XBReAqA|M%yYUl@Ts9#
zuRYb!dzl_5yK(LVd69Qc%Lp+&QN%V+ZhtBz)3v4H$n6h$Q;|YEsGJx0hQGx#<$_#{
zb-@|q?d_*_Ml!~XzGh+tS2pw8ujCTDfMTyy1dWcv0w?^g+Y({O>oy6_%h#q0x<z=K
z16vO1q%%*f9U%2%yFJRqgsktTN0wJ4I_fhZ7m1DMKBk>caZ0ilR6Z9=)*~pSlliPu
z06*gddNppW$8S0<sp4cV7<(d#C}B=&?w8oo-^Uds?MCl_BWW&Y>0#V@`^<JYB<5<n
z-JBWvh64Qqi(KB%IbsMv*#jI<_5lA@nSpamq6q61bi04EbM(v6>o1ub01eg4%?62t
z^(V{?myB?iy9$ULSIT|BxY?!b&v*8QtIL0CnZM}QA%k@AFw!AMvt8Nic=#T>4PfBE
zG&oM9)Pm*Txc?<*dg#v1dvx8cD4Y@|M#;@mY*CleQO?fh%9r$;5^K1dhV}f6OfFsW
z^Y3rxn#rixTP6_5VT&ZV3~}<suB95&(fq~<0E`v8wV|@JQ!0YMIxQ}Qrpl)I{#Xh4
zy$*Skwe7lJhXsEe9HOB4ysu59RYLc~$|7i`i^}mem+~uUZ#=g39;T`Rcs|bbS8wXY
z56`pL>>xlQ8o{EIipz}?@GP3cAzo_yX}ThoC$J1P@BHFEYuJ<-eNo>CCtNpdsquYj
z0}<i+CvJ+_@Fs#<iof<x-ISm?p>Nu|6zOA!uMLt<UoZY<6aQs5_3vV+{@dKtzkLJ$
z%1v$Hv_8yH)n`bSwEJMX)DXE_ml5QH5PRzj7sYe&5WfwF!mLzsZDgV$V{4@HQPlwK
z;1rltlx&CPYISZ)>-G;AQ-y_s#dlyLnM=LP*<MAnnTEi>L`Pkd6H_%Oa)I!fTabvQ
zdBM?dsMWpliXqrNyN;#Y9n?t6#9X|eV>&ngS8hrjgNB>$QO=we1*C`GmwotTJ}MO3
zJ|y_fs^AfXHS9!ogQ3<`D%Vim{x10U!!-oUw9OmyL1|_b8z7I`P>c)Hv1h9arF<R+
z_o5pEUfsdKBO1`Y-L4c*i<&&=K7z!7HpRYxf}^n$-wxL56g~Up+!<=#;6;oD<g7UR
z>?e<FaWhO)W1FiP)$6L!uiGt7<i~b{R0p!;`<IdNI!lIxU{n2ln~D4y4gX4O=x5#d
z2iD=bN&LMn!~$Z!N$-5~67)~3@prlC+z_@Q==?nv87@GGwajP5_1dn^C3dnYdq(C{
zp=d4Swk!!OT*#a{lL<FXGqg*1I@cC-orRZO?q-)>e))mV>rm?385GlR{g0pJ$M!zy
z7r|ynPk;7A{4t~az+tdxJ7$6!gTg^5gO8iqv!i`o%W<&C2J}zp80@oc;yLd2eX*_m
zDs(SLlLXQzjfR$o{c-FD<TfX#+>3Btsx0;Gjq7kJZ)nL!FkC2*ah#cK4o2m2<ABvA
zKyU-)oC_|-F#_n653&L_w_ypM(-TJPaj$*hP)6gP)S;xC=PyKWX4%Dtq*j8m+bCh>
zU*&oM%MoCZ=DLFkdav6?w`FJf`tx-zsti*6qnrHMo@sM?Vip;CS^{l^gz8!BX<R=r
zB=-wn)}OxMPfn}s>ogV{OxpLOXcXczlX1~sN4wA(#6P7n%@`fQ)sfh4ugo1;6vl;?
zOTD)*ZKI-8MV`%xuxsQ@%SeBG&g&G@`o(Uhm!EUI20Fo@A%7{9pTnK&kz`V7K5;Z-
zem_!2WwIDp?=Y$&Dd|eyPA!HcywQ%1yyHh`f!;7Bq<M_$=7*^pJr(!Oiq_3zYE$xV
z*Ea|fdzMMp)Tg~Bs4dxy&uj1Xe>Q(Y6?_ZIYU=A^miF6Vr8+tch%)Yc3&-ubt~X7x
zY=lKxvaGs~;h92Av>zq)5;&t3O>G=v!lSZJmClpf+0s8zMV!T|9$QzW({b9G8eNcQ
zd)onR;*&kN$$I7WiGCqtH~w=PcF9*EKkN}A7_dcuAYa(~*2&RW|J@vwe>KN{&B9Iz
zBEL!+&<K8GVgC>5*Z*4<{a4<7m<gu|tM1WKT#>FOGL}3WF4B|tq_Y~6U1s9%s@b~(
zA&GmQi{+6hiV5#xs&lZ|tSJ~6eLh!AD<+?PpYBf^j6gDRhl|ZB63kjNYgS|*mn7k{
zl8lOG_iZkD@h=ZQF|tn+c<ipdD|hngD?%%62|3`gF43jsGJq(*<9-pH4|#1Yzw@q3
zyRays&TC+D=q$IRa|l^Tc*tbmC^r4+(|_oV{()2z_P1a0WwMK3fcMlCdS&8Eyl`3k
zeSh`xN~`MH=fiph&PU+r5D^_BYhZ%hbu$x&OfMKn^J3CFbvkxBL`nxu=igQE#?(tv
z$PFG6D3nYwu#EV<I^kF}UwtkbnI3qQx9Q|ky3&Tu!#Tf=mR3zfTS3PoF8=w2;RAWe
zPEjok9qkb;exx_oKst;oW=a5zc-?;d1w@Br`(x8W17#NISs;+KUvF9z!VKyy$)k;f
zP7i59O>EQJo8RAM<;Cd67B)0v{>d+UMMDX!_r1u1h=zaH+|=Ar-|9wr_NQ*{choP?
ztNi}X>rvfHx{j-Km>H<l0=m_#T+CN0n3tFAAkM4H|Dn71yH;j`h+IIr;^qYWmc1sK
z`Mis56y_maG&1CH+z=xeoO=mt#QSZbO)Qy`jCu)lmPag$)JRL%_jH{zKXLP($%W2%
zbekTOj5o09TJjtlaSV5qkD!?i^bPLTtno9FEbq`yu6(vll=*6*{-h4;HJ;Lj7c3Zo
z?%bw80#u!O2zR!y9)<qB1a30}{0c<q&^8V~bP~a``Rwy18+^T>TIG1D20HO>c`&-x
z>=%QAE4^y?YFpFhpW4Zl(nC}hJAxS<$wtx7X(cpY<fos<za9(A(+x6o4jg>`Rf_t|
z=dFzE_>0$V2jKe(!f@<lwsb|9)e+W#+qI}8%!|sDc*_i$(hx#tU2V17%(!sW8+x5Y
zT`^H826}gq_YhiCu<hvc-d8qZ7<|QFZy}f?RIB3idg(_HyMAw%UWu(d?EH>gV)?GE
zcLw)I6OoFNQl&X(AvJf}<}GW;N<^Q)kaVQpjz{GwDQfTQzo2QE#qpTtCXM1H*9EcM
z)0-JS7)A0<$g~NT4-Sjch4UzWaHiRk9h<4*DOZkYK2#oGSP*<PA+4~WYhRA(L^xQD
zZIDu4z+If0X)+U;Z<UC#zIpWN(BHu7h03;mTn_(9g<7~gS$XP4yam&8#Bzcnjb1h)
z&1)?c^}52d<b4WRnOjv8GSLBBG`G)D?n4CjectE{A9?dl`^h&5<m>+%+&Jjkvyeam
z85bZ51*;e62(AnP{^K8iA`}IC!x_m^5|f7Bo0!T)$hKKpyW`t^$jA6gB>&SF+=%2?
zWhMx4FcyT$T)aWg7C*Jn1`F@w_w9_Rp7l5au62cl_M9fExNl3*cyF~Dyh~foaL-nj
zyd~^5KwN-@SL?DT6niZ445d@+;H#d7_shVXaDGXA3J5+^&l8qyCeVgwo*UQbu?ejS
zVI-@6n2m>Zp{7$x{i`{3$-5GTGGAn*5TrZqa25(7b@r`}sv#$_B=quRCQYb)LR{Lg
zKhBx|S~H_j>98nEYggGQbux%Qb>iBWTy@qi<G5bkOv8x*MNPOQCT_d;ywT-W80|2a
z>q46@jw!w6y#q5dMA7xqb_4i>{6%B^tmgqLlCetoJruFDqwS<*`Wny0Py-3T$=RYu
zs=i{`6Qgzb6qC@~ao-w^)@q*^iz2lbmmx?jleeo_g{Dc=c>f~9iGKu{6WL&%GQzNk
zY}pis&x2=<O=Q)iS{!PrC-KScdy;PCEKaeRr60|<X&Y3Ghqd)5sBC9AFESgRXECbQ
z<rpiz<t;&Pl~IJ;(hY-7-4C-)J7_ig(l>{=F48}Wg`QR?z4APcibRF7#)v8M@N2#h
zbRe|W04$CcA{w=fx_3w3f!LhhM47REy0X7xN7<292j<(y0s#UJdLd2D@99TIJv}Gt
zb;e@vplrWf9H3aAdYjDD;^cde{Ii&Nd_N6|avG&rF&ftEH!oe*xZCOOWaMYyb#LC9
zWxk%-K+(6c`jaS7o%=Hi6arBo7l;B8-wN)37}+qq;r4+t$Ir|~_#seN1I{S&0O^hO
zH~pBO`lG)+`&$wHmuB6y*9WL}*nxT)$G6fNFqg;;wCjK{094vQ|06f?cTRsuSd3ts
zUl!#<M1^qwiq0T%U8{t{#5)z)#U7+D6(-OYFI}n^Am-(Kk6#sd*flvBW@)d(B1!I1
zbU_lo|9Xq}&ezn))t)K5>W8H374zOCM$dzq)JSQkC4ANH`l%{62cd%_o_RawYL*=~
zqSmCUYx-1ky1=t~ut-2^b>;a>zE@MV_T`|$mfuUI?wG88<$)xCM7KNu^{OXoM_sNk
zHxC=%O6*CF@EF5*@54x(!)LB_zJkp#epC!7>d-YV&<#xUNR}}%Ug#QJFXGA3HUL7t
z<q1Do@pnGlN-Ve611jA_k93xF1ql|{EAg_jX~`h18No4vwep>udXw~9mVy>0CFh%I
zTcuUzwmcP1t9`KQ<6FV`cjg*BR@6<g8q`-pg2YY#Kjz*#tg6M^8m1eh8>BlnB@H6o
zDc#*264E6|O1Cu9QqmwL-Jx_!qjd9au+Ve9-+ANQd*45Np0nKR?6r_J$C@$b7?!EX
zqN>b8Y#y#Ok(uhqD5Pw~jD0H-8hIZm_x<Ly>$P1zujg1Byhqg18+tinsZNa4LzOi^
zvk}`RHW+6^5KaD}v$M4o0kVjqeZ*;Gk;bHjS0g8BYtS7xKNVeg^+86G(HtXH<A6<!
zv7Z?A)TYtP(pMi1)1RtPG~4vDGbLu}*5enyU}e^SCrAuskMLU4N~GhQdJr)8V#ZEm
zwwj%9Uhe1}G&#j;L)A48SVhfglVEEQN=zE5C05A05K06k(JuuRE#5CPD7Of3mZ8I4
zY<p-ApF1x+`z~^60MPqSrI@sEt0_mlLxI_AqR%@=B(F))C)0ih@V`6Z_l{TK{nYDj
zcM}NcCKgb&I>OvEk}MT#cou3hBz?6t+2q}M?O&AQ;0+JTRb{p1FW<(yQyRTr?fHy|
zK<=);e4btzR3j`>>X#EQ_A;mOD<*BSGo2fot|f|hd|yGd!W!+G*-pXfBYHZQW<9ZC
z1Nd4Eg&piN!6ziS<t`<2W*z-q_^-=z@R2XDn{aJsTcahLsMS;X*_u|L%bz}7Aa^1S
zBGjCzOD!v^Fq_8m>pq!7Xn>iCO3NRb#9(*GVS9J!*&*~8s%`6(#9LEz0Bjj0UFha2
ziMj8&p*+%-3WYP*G9d}i``kyfID2`Qs0S1+YD@uADN}><*?oP~uWn+joHfy4;`euQ
z;H78RyG@adM?sKSP&FE2SD7R8D>^Oxid}X?Jw3|{3P%^eR=1RI2Df}3johG$j&V12
zkEek%p$`D#KwbgY8~a55s0&7w{&k*wDF9CVDAz0qnqEl6Ih<xSiF*<|^D>14xv!IZ
zqza46=Bk9e@yK4yu-uV`LkC-Ge$Wm={n1!6V`9qs$GY;^H84ry*BaxkvJoX_R*KW0
zuc|Z&v1bj{d$6ha3?NXh@WVhJyknm?2}w0B05gxeLF-`z@?U~pS<aBjV*;o1=M^8{
z*HJemiE;QQ9yW7JFyWjvhZD1)_sA;gTnt=9*m+%P<77OLjC$9u)Bsf`96=G48Gc=G
zSDIp&*cj>=8oJ(s`X6Id3Aluxs1Du@MDz||QCj>R)qi7R+>KHFeuwq{#WCuS4Lmdy
zQ5&J#8@XjReV?lU%>}+ytyH2mM0X#4PwW3LMyLNz+~q&DsG9BcVZNTLv7X>{V`rUs
zi>q#s_@U)?5D9{E`+r>v5KpJvJod+v$*7#RP3U3<Er;ZTmf1Z#mt|A~kbEx0QMOp}
zhQ2(&bn@nucV9hYt9Fzr2=hf-spc;L_dCyQ3c)b<nuBkv#zBYd*=);)h~XCTU`9Lu
zF(&yCW@h#1B?@-U=v#c<N{(}|mjk1-BG7Yid|O%`A3QF~Xce=g_08nTA@y*Dd|uKO
z2*#1l7jgL{AyIeW7i?$|R;Q%_;5Y}q276yfYV|R12j~luvw|s8f<{$x+tTn`m#?P;
zgFa6mJDXOt(oJoq`>a~{PDkW&pdAmK2X;%GNz+WEV&VVHVVWx`02<kZs(SCZ5mLaK
zs5R!(gSq>#_hVd|IIZP6eipB00<QPflN*Z3iT*WFxU5l7<w<Tz!_)@j(6svQpyNx2
zN{%O=Al*;FoZemKluwo%PtKwBDk6J^hz!S{*D%nc6h@X&dY`SQt8cKU7p}}(Rs>+B
z@_r<fb&X=1(1F<U_A5*Rqpw0foQmv%aCp39Po7bbzMWQRikhg>8G*_Lo82gM1%<)h
zn!LiCwZpMKWq3g6iGB&TncjZ`ZHhHb63IdD7B;N()ofXZrN@oe9d5bDONVoH$*Hcx
z8JlH*?hB(-@k#mT0onZaWC<mx4zK6qFb|gSuRXEe6=@%jVZIfFMUXzuv#3n;H|lW<
zURn}r(mdJ3Kl&}~|BisQt@$(TAs~PRED&JWum4@x-_A(?$fLe5&BCE!-?|w64BI<3
zt>2>>n6Li)_<w_Y1+3ifwh6v-ukH^2dv4;NXjgNolbb5o;;%KfCUwLDH=AZ}R`yKr
z4~<MKRO~XeUFvs|#W!rdd6lsZU~E3^_YLs_T^>o4kf+}IjI}uNN_us<wDCPF#09S+
zvS2i)E$;~SY_BIQYn>9Nw0Xm>dJ;r2IYob5fK~I*{*g>B7QazK^fZmNR_1l^0{ooU
zY8b}iRxj815^5$I{Zx3V4k~X33?xjoW{wdDgm5BZmaeX2hd_?KKAwKZLmM63Crx1T
zM)@VA*yfkdzzd|kyxYzT)h}N^&hEj%yng#(Pul@;*QGJ(*fpV{9NHuk193J(wNuC)
zj!&OTr%nJ`QFRc-lf$v&^rp%zGQ!_+Gaj$>j&}9OHtk4z*+|rw6pCGiUN7(K>)Cws
zv1Ncy7!cKOU5Wz$KEB@Qe|OGnlWe2^mf!0C661<l^5AU`U(_XP=WFPf;Vv00Q0SVG
zgxDuAxx8>VXF=X5)@CblSb!VWC<A+r-9CKKEP@!SY^GzkcBRSVRVG#N%)SBr=@?;$
zs%GJCvZ`_5Ta?t*EbLvi^uVB04-4r!e(;;rPyuVqZlcu}Y5m-vY)?EBDTvUO$P29<
z0@jj=Q{gOqk@8R9Bb*}>TE^`KA+|rz3oYLDqm4ZckM_6c+#=fa+wtp<w}xrhlA)+}
zpj{a~mb#{}Thc>ul(<pB4SL`t#xN*vhLr(^suw#x{P-=h)NXqbvS4mb8r*oSeiGtf
zux|%5!U}D=@ET$|RZ4j+jk-!P`-4&fuj$70Z;0_*4;xseX_y;YXaU8rmEVhlTm3`~
zaNt%GIB=^8?8P_4fMA<D9J~+1x1b^Ox2Xag8ua(>G}Cw2P<S-5Kl;_b*qKJZb2EVo
z*&NKwOpjQZ*qDG5Z>IZ)|N8a*Q^&eht6bFtMt?UWiT)vsRTR2u0vzG>CkPufe|_S%
zVUK}y$c1;HUu0OfmqKD842!;6DC$5~^qP1#KLHEBo&|;7UIamxy}bB>Fe_N6LA&_S
z+cptH<rU`F2l3`L?@dYZ`=r$XMe>B)rL+^f2Ey(gA9dtLmgOFB1%GZvzgp<3{noMe
z1%(Ap4<G@yx1shB!VCZ;eP<YC=w<5wwEo?Hd?v&@4mxmA1On*v#B^r{OMnby?xOfS
z0J_ip_IrT8y_*LR5a7V})o&$?*qZ4X?a15MNzo}%B4k;Xgvj)<dp)eb{rGpHBrepQ
zFxT;OXaNui;4R@nDzh*E48XylTK;(YZrkdr1Js+BCv#N;V6|9P0mHS+3$cCVOo$-4
z(bito(FSR9vBOC=D=2dY0oDn-`8VnxMxVYlwo{pFA>QJp$s-j9g$R7&e!1(FiK$R!
zVlw)8nwvuPEtLyz3A&5k#5s*IWd`DTo`dG5?bjG$BO#sh%ROq-g3KV-J=Z<iB4`(m
zyNLQ-HipH7?f0NkSo|4O5R<^y@F*~_>c0gQGWMt8G>Yfz^%BIY{e2eP5`X-Nfd49+
zPatvn(ZAqn`oBt$x}`(1-8S%VmyK@wHa}W9|1F-T|06%_Ka~chWH2z)Zft3~2yZ@1
za?8wkH1G)H*V8UsQ-htUz+@Q)U{D@?E&jmtLW^Xb=1uOCiip$Nr#0m@k`>nxp3o}W
zdxF!(`WSkHx`^3RbEgY!`Y^moXj|evYDxhVtF#e#>03vyqu#TKPYD{BD@cw+tlP><
z55F*T@3K9vm_c=%cGr?r9*t|paCu#Jm`T20iXUx)y?O`*u@_mp0<tp8RfTf{R(Hs=
zyAZm?9=d%vS+sxrg|~FpDT)P$0RM5XBN-0ytB>f{MKlUs5#tczD`5tr!8~Suz1O0R
zw4SmZu_Z{UW5a?iCJxK!FrKUY=??E$;0Cq$S%cz2b`{sjF}}f@&s%^`>0g^Bzc)Rg
z09HSCX+RMm^Z+`qwK6mSY5*0$Q%qPhD?Jk<MiVn*05D|*Ktn;&B7uY9LZC;ij^YLu
zg@s$R4SJi8iDA>Z<1hfoF-gB~;sDnOY#4q}4eyq4oE`4|?)IC0jnBPCjq={lZr6VS
zz#a&4o`aRLFtPj*qj%elugD|-I{JfCxCxBBn=^^@jV{MIt|T1W?Rgo`P>c1Egl!Ew
zKF1r=C%}5@luq<f8SR6<fx#7>J3I4;R);YoLj1^QWzB<VJ+%fE^%%SMv~_2GTHwt>
z98q__AqIy}cg$|4KQ%m>P53mzEIHV8b|{X}h=3cUnS`pWZjYz0IXu`KaxBiOX|K=z
zMl`V@je&F8KA3*=$bEBH`Mxw(R1Xp1+gCs1Qs68eqSzo;#a@1X0?9l*kSecDRh<?v
zs<D^zT==nlcny*T64V6?o0#3ZRLanHBOSy*=M*8g<5<mOEoK;&Y^7>!epAi;ClUc1
zN`5-S>va1?C=>ZR2IhA-h-3h)=l^g%5<6G?iGJY7K;%OJzRnK6p&vLX2+<$^n7>(7
z%1Qkg2*RPEKD9P;Gjg;cQnY0tawD=~uwh{Ot|AEzRFS;9@GoM@?Zz^I^$`o_EfW(c
zWB2p$|N8s?DXa&|TNy@WJ^IN9u=!-$U)p$^JABZPKTRH)sRz+4&$x5~-}U(tyi2OE
zv4+7CRzwfm;e1BR>HT6QUNSN#|JkX7pnJAn*_3MEqNTBC$^oqQQv?6;{Jn#627qZr
zJI_>+by%W$qzvoKqofF*V7VHrxF@g&ld*n?0+MCs7N?gFJoVE}+IJ{)kSQL($bQLI
zp&E#Iw<COPy-Tk3#+tKf<rU*c(G2^o^IVP69!35oq|P{H6zh`>;{u8)uUN$$xPag~
zS?Zi8FSV;L1BgK0n8Lrt4FFAP7cuY+t|lqpy?!I2<~hhlH(vco>qLwNU8#EOqs>5n
z@I)crr#Nl`wQpe!Od9?g)b~bFcb!Y1U*x;6fxXY@b%VQQLeZ9$oP3%7*2V9LT}H-S
ze1q1A1blXvPEl$MhOyY2aGc5TA#kO(c;A@V(2w<B8!_2-;N^nB)#<uhslHDVzcyfo
zw^-(CDJtYHTOWm$e~IkZ$-2-%yMSA*i%x0D?DDeVt$o5^e;<GC2eK#V6DpT$6oLf=
ztKN|V;7U|{C;X$Q(mUpGT(8iQxzS0{3{v=qgD72BrR0}EivzT9xy#2Lkh4ek8>|hF
z)RiOiyO5+DA28T)pL`HKG_%3jN742pOz}`CxdQuyny+SpJ>6hCn_O<T<2~@=v6wj$
zTMxA{25}7Cx-Ly}fW+eiix9GHC`>wsyRi9VDfqXkJnSzmR>*qbJf;R1LEp7l!60G(
z44!{wTla@Y<n0zP2QYZ<s`PJ5!5qviEG+-hQZP^q42<Od4*+`S>Ga^XNdX7u3v6pA
zVfRSJAcD}Bf>VcldEoP*L<%Q>04BYVS}5Rv(WjW1FjAyBE06-0@Y)j}n@clA7mJ3=
z(T@f2Tu%w5cc*Y+Z6wq4$ifD@1`eM7YJ+bNuCoGpW9GdG)~VK2_NSXParKlnmNl}t
z6MkTRj_=0ye!}Fs&{!_iib|JuZ&J6d>s3S8qo@O~(`gj6_7oTA){+`9b04<?VZSBF
zwOZxY81@J;I|Gt!EF<XH5Xt$7PIb7|vSl4@3zR~Hvw$t3jZ+AR{f%qQgqKGSr52T*
z{bQP7v{IalZ)0QWp9D>gS40ZdSfYKMn>}tneZfEMbQIkdH69W?6uCWPHTUAZkzHIU
zBKTEGvj%2S^z`Pnt4Hxx=?P}<bU!)m>cfkq^d<Q|E=2^fHKfMwN@pmAH59Y}djoKY
z1&BwqL^xpUj(HEOyOoW<IFZkov?A&023PP6=U--hA}AX!Csmpka<<wLm}-4XQmu$T
z&qgrw+J%N`h5l%Db^61?&8qh#yg|kd%j*YqbQl<$@f9PPRZaUZ;|Osh2rRSp*lPnF
zSSI7+(nz2CW=r`jy&kSJ(TRo5qD0xnM0RfwmXLZ2F;ciUeuW@EAZHH4bQbjqA;M4-
zyp1cAh~GNQgqLgL`ng7MxAsM!-b^Tq%cu}D8>~J=G$!&?8l~t3H}Uf67J<h14519*
zQ~Xyj`K<!^^}fdS*KZJ$Vj+hZ+Z{RvZ^scCj<NV{UH0!z`1jUjnStxFe@5lqx-1_Y
zrgS=#Mt+H%79%91$r_rlU;CrugBA(|#41rkt<y^TZjl^tY|5uEo;`QojAQl2BAWT^
zcN%sH{qB>FG=s@o|ErHemo9QXYaW%|i17A`r_RvO0-|vU7Yn`=ub#fVCV8l9<e~GK
zqT+-(GC^*P-R|jeH1V^OSl9DYdWs-pWq?aA`!f~=WYrRWz3_eW@;z)%2{nVBuuSFg
zJjMp)hl8B0OBZnY7<A92-3&S{<Ar!eY}zES;7%h)R5EeobLis*K0(VC$bE_oixFAm
z`x0}748n25z5aNy(pnjpsLw_<Y==QOVq)VJ|L1bLd9DePmoxtLBsN2*E1jGh5Wzfc
zbz4u}th^J+jx0ehPUFjBG`6lrY`(gfBC;8h7QK7=8hlv#3C_%^lbUkYS-!aIX(>`I
zN`^;``3~z)HHAJ0ZV<xh`W3@yq!)A)4Z(z`W`JK}83zpihV~g7^h&qBwTf4sT<l5R
zhvc>JOwf)A<7QXA10MXvT3=1AjJAy_u|}Ls6m%Txw}E)3d}8dl!8KZO+9_Rol=?7B
zQ8=0-Ux{byu%7tF+xaLm6{H_O*Kf98%z8!87eb*9%P}-CiRg`4`7DPkNGdEOXIvzH
zpANaUL5ZXVRL)E=?eOiM)#>)9ugm3o^HC8>H1OoD6gce)$dE?kzQ~*Jnfe*-fFAFT
zes#OsVrvQ1-?etK`eRTdHsJO%S%L%(X>RR-!3(}6OE5BTK}-<9wPf#O=4}r~{9YU2
z|KA#z6hQoK1cQ6WthzHXlly)bw_=HZF$V@t+kwdw%MWwl+rxkJQvU@0J@c7hOP@|J
zp)t$nbl=RyX&OH4V)Ps|ITv~|;cO6FvQ=tN6e27dsQ)Z*f{2siuq5k>^m9&16$vp;
z4f`vS7P%B(_pxyZA<f>(_vz71WK-@YBui#GtB}vef<D^WvXCoQ260nIQaws~Dg-di
z_KWvIBusI>!ARAO2MG%a0N?g*+N85amXGf99M58znh>8;r71ne+>&&UWR9<`OI7`P
zsv-_Sn5hM2J8L(6HXE9R_i~UoOM0N!<G4O0;~aK?RR8S;;=?6-s)+O=Q=;cK-1z}a
zuwL+8>qZ;P&yZkE0HLhD7g`H_sXkWvyD)?hbTY}?*9EdVS7y)lU?0A&Y(78OizJkS
z3?<xji*jq5T)hA^SmGh8CY<2v3{f+KqlrlCnFmNII5I*#bVph8kMB%8u=1KT@$*D8
zowB1+pBk85M@CP&wjvF(4p+D384rU6$$QgK#>8&*!5^Jaqfyv^$U@TbW#cp#QtO~P
zW<*ZHzVnN>XsF!qE-pp&t31>a(e^!hxU||*OMZ?n=WJqb0n%YfitY2ydg7zRXoYD(
zPw;Uwcd+Z=8vV{~8p2dwagUAV4iJ9LC?6=iqNPfb#hYxipU!S?){;7!b&oUKHT7Qm
zoKW|u=GuCPwvp)62<OvNSWohqYdwAYGf!-=J%h@ji_%qYgO?@|-@*TX*B)4|v=2H6
zL)3<&qta-2F80mFd`jPM4XVFA;qUB$LH`|lV3>g1BTR%#A>3Ajg|nw3FqgLYPpIO;
zYdTs5oMd3_Tvx5)dL(m#fhLiT?|NWnDgkMap)oCtVqHK>vTNAjeLmS?6gXmWxU2S@
zF<!J7IfrS0);^!}<u!cQgzlIHr!-0zi;cy0ByYhVkr}7Q`OHFcH8<l_ab6zzmHuaM
z#--tfhVVxsE-c&cF2a-OUPv>cJfKK}sIP$tgWs>cR8Qr`tYQ3+P<S08r^b-QeMzkq
z+A7(-6oN)j-dz8LKw(y93SAqylL>myj`9SL6L!XTGqfT$Q2XlWlNM9%0#kL&nvl3-
z2j=R@LvTH+jt{-48BZk7EP`ReDw(kloYLF9Kx83fQ?jtY+A0*2-w<(9(;A<rmTFf-
zk5uI@;-1k9nE9YrR#xr2;2pRqNM(B>RF04C;4?@A%9g}5P9I_AKkqHAvdrJ%@AT<K
zC!l^SqL&0FqvXw3a7!*pY1kYj`%YyG;wLhs<mjd)&Tt+G(6)wWNsPykoD`i15jb9g
z+SZ2}7>v_;T5BeZ{4g<Rx|In`pB%sXzp|6oxzJS|zG!c?dXZUA^f1*fs+Tz#jhF9v
zv;tdEbWG+b_Ir=6%~EGb%vlr4_n!FBB*X`g;qX|Yh0xynn}^Tis5g6U5iH?y3~QE(
zMq7AS0dl&-rV5#S9?rivW*>c35D@5UG;#<0*aoIf)+VMddPcSuX5Uy>_q*;N6@H<9
zB@p$?fT*AFy+Mfaq0vZGv-Dj&i1rH9NJHwM=&yYb{gqUhzQa5m0<PfqO9EvREN?aF
zi3DvJ=!m2o4S&hPBM=+ONs9kDivNv(b=R|FWnu=l&~D{$*>7J7_YVR8)z|;0_rxOk
zgWa&{U=}Bn{^Ezvxn!(TM;Xx%3><qwiOtzJ{pFw~DKuaOEs4|2Ka7JP>6%6KeIZ$S
z`1!<~gsFxOV}Icq#9Z(u$f&alw>3}7io}*UglRwC@dYd@1%6u3N7T$%o=+Pl%`h2;
z%M(v(g!kePkB=s+Brw2KpC_nF>NfOGA||1+C=TnLxs6Xgt4Lxw0SO!+kdEOf&EI||
zZyTbC>?corg2KxhsJ$xIAMfMKCWW(YbZpT9`Fd9rZK8shG6os$BN=yHlMtE+fIpsR
zYI4$imz!gmb}SyL7Vk5(xEDLknai_5r5z2C)GTkLD8beV4IT8l^xQBq(Z_1d_8e~?
zS+d_G4r?K)!4;aFw7i87c2fc=X;M6{`n-6`lf^Vra80aW*pX}U#R(cJ2HodrC*=xg
z1XioL-DH#GMU3imPZXB&Cnx%r*b{@WrhHzO$Al63#W@Dkuz3$jo(K@yB!=)!p7B3+
zb1lmOjUGwmg~7-{2BoiHcFvDQtZ+-ZfJT0XVzU_0Rri1#*O6uwKS3aIo;YYd7Rns1
z!d%qZ=$LCTLLUpq9geCWcf^m7xQnj2=|<1A#sshanRM8I$?8gLcnzuXQfj0VYeK;z
z+K{A}+SKj7kn&UV7n<tTj4vNrxsv56n6~+|Eg6RyAdyRt<GfvSWzQo?Rr>Dd1(bHU
z*R&%<IH@+-UyP=J6>fRT$>75OL?ZJKIR;KB2ooA;5C|YM1waq1H36{S8;8Jz3fMz5
zp#cX0fj}27d*218?6Iry3?cRmTd_44e+v1J0KCiYVJrL;)j;`T#cRL%)SWpKkycUa
zI*yqqvT9p`D1J=e&n+i|7BZ*l%n5&nx-R-r6%UO@+ch~Ij>aUHoFB?e*`Y1OSnPt@
zN5v7UCuNgrox_BJ_Um{RztOAHM_S=wVULM|a5ncSTX-uuACSA7$~itwK~Q_H&MOc@
zt^l(jN{7LOGu{mSw6h+yD*jN%FQCq@^`oT^iZdKsS+j5a$tLgl`8It4RSdWC?1(%=
zNlPOP#!D9k*0_n}qEUiyy$5XW$t9d-@cO!si5^9iUOd{Rhmjz7*PN_*x|xHQ;gCCZ
zYQ4Y$p=0`nGHB;xYh=n!<FYwhslj|9_Q$%l4T(*;kOz9N2$$$_mH;tq(OO8=(4{!u
z5u%auk_^(b0ZSur3UF9Sm$+qeV5^{62JFOALhZ@&i6}@8DNqqg40%-ALYzU$^z4lR
zLNSX7l5{C;(E+S_y${|cO9(1lvvNIuw?RGQT<`&Kif-rKN%%<2kwic<$afvvE>z%!
z&}UCojr@0EXd8K!ZK69BxT*RjVZNI&X|rm`ZN;-o(#uTaUEAyXW!KS!m~gn49}i9`
ztGk;BDlH8oy$)B}H740ho*>O;<Jx!xD|KL6FS?mBoN_fIX7jw@ewHU=;0HkrV-mLS
zD?X%gRo?%=&wq@MDBwhbmp0{!1`bww)8`Z=<qqVreh52#19%pb-_+ec%>Tl8Lm<ZM
z0x@3f8^)tE93_KM<xRWYjAs?>HiBmiqM8%jf6Q)KSz`Ba{y*!z5d!ePW%?L@qh%#}
zC;0|690rQK0hfp$-5Gtb-aq^ouk=sYUD1n#Y!beS9-qfd1E>7R%T%hX!iI|!J?aL>
zE2pPux57EqZ6g$~(1L0D99~hXv?B-Cl_x~%rf8mgPUfR8GrZ7T&-BZpENe_Z?p#Aj
z<`);3m>iy4f=i>067Til9N=cfD^y0x-~v+Zc;>QtTbK_(If(@E*oGA=%6B_nnfdZz
zR#Az(p4)r@yCe7xQY0ksNKLc}&jyqjx%R4HgsKOb6SfEK(O^n(@nc6<S}=arn{y(w
z=cBuNM|BmS0YmJhf%baB)M9F;HZHjgK26ZlHl+jY!e~+Gwonld(@%rU%8~ZkUf^tP
z;_F?yS%%C^fWxOz)S=FfDRCB3WU*{I`Fx`9e;~U8KD>t!k7p6t0T%hn7>u}FbS^YW
z!n^iqL{%nZ%LI$bC(ri0N(iAX(Tg?J+7pB??zH7Cw$yEp_363A%w|Y=#J1dFT??!}
z<pUB1z3st+b2UUt>|H%zz=@4YY8LTx%4ss0=8PduS{&Ey=5Bb^`r;^1Ljz(}a0@M*
z;DvZmsCeA<YL+5QWLLL&q;$Q_R5%DhHNu{*cg?r-xsbAoJ9!)@pls34?FcZSLxOoN
zToY}veMTuF8BpP!>jqdMg9r3~y?KdQ)%un%*izRkQa1MFn7$a46B^>&$@_V;xZKWO
zce@Avmbd40_0TNZb@yn><lFdyZ#n+0?ebrCs{R}R{p#>^VhuIqZ-NQ#<3S~A(MA&0
zPNuB<5iEC@%&PZMxe7H1NWsoxV-l&)hPH3e(bHegxqxRc=c%qZr%v?(JIe0Pe^ujV
zM`ae_u&5CEX}pPRwZ_?8*_(J?Yi)xoZI$mh)2xdIt_)jrhRF80LKdHzM{8a82aLyh
zJ@yl}MI$v|@K*w<zYOe|8Vpqtg<$9<c?Kp_cE5MN=&J)@_GRgHI-;#w>}6qWf?uPB
z8m^4Cj;#A%hz}!6yBcr3xjGDEBD6&>o|!X2lk&mPYpD4c<zk29qg($)HK!^C{v?9r
zDP@Z!s1<i2;ut})feGW#E@F>yLyT;0@y_M0L6Hi-5&7WTz=$E3n|IFW)^n?r+l9}n
z6l<&b*NM(X@|*NTdV*g1ADn&7Fij>Q^r1*bhKRCjfqFQTF<Psfx12!l<(E4Dk~W1o
zoH^zTC=Uruy5M_;wggUS4);rKkS7lhm?>QS{Et_^w92Elz!O4{A}HlZF^YFc3|Cw0
zB3fKpga(iq*1SL}Bp21-8T1ry?An0q{B+`pgatDy7C&Sc{pA5CAFDb3^QnE3l6td4
zmdaeQr^64BDAu>D;py`N*!r*3KBN!#^Qlv_*7EuflpBqyMMWt)5x2Ueow+UQrj8av
zU>|yHX}^k4lpvu#6{F>o4lL5}>V-;F)16W^iVYJQKJoIT^m<<6eFQC4&6i@Qln5bt
zrFxd|T}%W>M7>*^zN5$ezNIgAb&np051h+m10fmY8zcj3zu%`70Hb^Ot0>HLyTEhn
zH-QE(U}$(}08AwC<cEbBJR17Xzg1F_Ba$(4bg{9w_-RCehW+#7Z-hCf+YZd_9>iU`
z4FIsQ040N1I9P58Fu=_F*WrKHZT!=eD=uz~SX_6>VqE|lVXl2)29318m96VyLIwrS
zMEeK|XeR>0twD{+^*QJ*D^y1VWDdB8Z!a}+$zrfi<3!r%HNA2x#=tT~Dh31c1ylq8
zVlJ=Jpz@|XrG%%{rCPb8sxWiIjEfhE#g&=g);Bs)&ngT66Jf`nE2e^TN<JfLteN8&
zkx=sCtObhXbCJV*4#S1QOgV-T(K(y3+1xzcSL+7AG#wf0^cEYNX=E=*Sv)bXBQdEF
zD{cKVwXBInXU?Q-@$i?9rPkR=Ss#-}I5d+pvHP4z{hPLyq*?63algDj?IOr529KvZ
z9VG8Oen-YsZlD$IW$=Z(Tan>mv-J1w#0bD=@Lt{-TVDAkrn<4~(=ZAwaZ_ul_!YAI
z@4AkE!8xCZTP6*VLKg(^@%KjmyKi`HmJQ_m{I@)QzJGb{?}poSR)%;F`w?erLC@n1
zSeeB{6HDTEuIw>$9Yoa+w`MnvCN6~gs9y+aHH&cauJ1NTD+Lk~ST18x3NF4-rY*3s
zml0=Kw)dbRO={q~p`zKzy1^%{6I6jUk(ShlqCdT{Ow}cv!k2tr#l-k=$V2ON&cYA-
z8M_MOIt#SPJYkmwO{{ZCgi6+zLxsu$MVP?_*-<ye(5rfU<wyJ1Z>v|G>&Hoq^7yZZ
zjf>$MED{6v_@5tOGxxZ6E*Bb##GX=^eSGTYP8SD#qedr`)w#M+F!S2LTb)>&cu-O4
zOP$S&>HIgbgQ3fIeS~;KLNG0E)sL^*SJ)N_F!6^PXu~J$zAa3l|DN96uiw)%e&u#!
zz}#*K2qy2o0SN?GwOr_*SmJf>m-(M_x$iQFz_r<1bhx)O`&*ID!~mfCmhzGRk@EfI
z*Z+3@9m)U!2B`VV0UYSvs{R6n99WpxzaIkr$8YeT@TXa?Dps*h<??*r1fC0b9>v=*
zwsN?k-)-=iI*x%%=`k6{32wlQs#I?_<&*fKbia_c6)12GkQ{kJTL{Oc)-kTa$zpD3
zY{>8{zoJd!kJxyoAxA2>33W$1&b%HU=VHvcC9zt^BN~l3xMGKRpFWbAcU57cA)Hb(
z5?3Wk@GR8vOy8K0-u81W=(3#JrIrYwfkHo1S{waj1RZL?jygHC-R4dtAe6P!n}M}x
zXEZ=y%yi-miu2()xN3E*I6*Ed#d;@#^TM)m@1|BR#qMgKPNPX4C?!&6k5WguTP%Sc
zp#*gZ_>8%5Yc`Iy&7=Od%(9wmO^zjnhEpNIwaEH!_~Q$v034Re0C<10V?e(Zv_Fmk
zpn-SFvkpMFdm94>TZSLcu#K^?gQ<<Z(Jk@iugRA$DDEvP5kdHZq5#<%h`>Lvza)1-
z0X`Q1pRpg;04gH+bm986D;QateG}5P25Rp9MM(GOlW0Vw?@FWx)aSL;vv&mkmxF_o
z)!!=d0>8wXNYB<5D7dSqZ)rpX)Ec!m)U!7vax}8H0!sH<8{SI!8k*f289Ll5{Q?Dl
z>4<JAC}ze#{0(it>+%BiLT}Ii?Y{0aP`}CgG5|<^{#2ltn17?$%b;&{5AQ=It#(GK
zYoTzqIXMfy#QU4~?#%;yO1>j{F2E<t8~yLjdF|t$?c?)59%a7Y!0FFa`}f4>?gbDs
zhF*1jm=v9dGnVaXj~(&R)I))6*2IR>t^JKQ?~-bnv~7aF-a6j088*_ug{WMH%*_|F
zhmCIsjwmm;85Q3+xP$XLTCZWIZRIeuH!D-h(dySVN#gT7)f6BgYw{%$)fyM_bi*{A
ze=aR=`%Hy^h42b2F$JL?4pO$OK0Mp$T*9i{I~-QIHU(GrTB~)^Z3gAp(1ccN&3G|$
zA~;t_pAtDIlaD(ZiF}=i<?H&ia|lau3de{Mhpj$9=GvwjNziHh5z^IWUvxHRy8`wm
z@j&_4HGiMgx`IHeeL;0C)YKxvkNK-`=6PNjLDYl$FQmt|JC@emh8~fINH{(^yQ}X>
z4S~u9w~v>pnThG`V{3o=xc{*By#GGHu>Scz_;cL~8LUW?!W{l_as<5Veu)UV%b)KC
z%X{yJ->e~SbrWtMS)kXs!4J82cr;`e7Z-*fH+CD%Otb*%Z|?$<pZ|v#@P>&5e%$d7
z)6XAlsXKDiFGePi>G55z5;*Yt@4cIULjBIZRfn~UvHDeddgk2uRUiKDesb|@JDRrf
z7*>-^IQ%jlv)sq!?KN*Bh7z(11k|`jXJRIJrX4x5CHkbveNQBE6j3>L55%qPqC5?%
z3v+eavi(nG_2rvRJGQ4eqL-moVWJS)sRW*0^s2wW@U&ZJYnHZ$<!$2PkkfEs!V9bD
zA`?!^E3yJXSBI#nL)(&vOArtskulN>@)3~Bb=7<^ha;gf&akG1uSn;a(2om+nQiJY
z#0r6?`Pyz&-Q(%Bw&5as5I`AX6{V8e8}+LzXK*GMiU*}}O>oV#{T{e{jzT!Y_szyy
zvHq>E$q9qBaOL2MQ2PYxt>NW4-bwa;L;c$=)8At@@UIa5t6nbWYcm5sZ59O`OQ67o
z0nXSAY1@9Ai2dyee**&exKQyklPT#u!NyQ9D#X*oqNg+_Z<?{0ogX8sw1ynGeMB(|
zXFE^36s}79D8(fCE^1wnF1+H|!1S`BtKGyZaSZ6Er$I?%hQ}eseRC=7{rRlrX33-<
z(w>pf+6pc|6$QHA?5TDHFv<XqGng<*KYU&?!er@f#>LCvJ?+sBWeU}Wc|nf=rKwQU
zeg>B?jG>c`+T`)bfTK|;+iQh_7Op+s3~}S-QVX)myARH&QBU{9%%&P>z%(8RjS(?T
zAJ*AYXhrI#HArH?GFJ8y3YvC9Q?`x(H>rqgO;J;LQkv5)y)}~!`nN^jkW-puupfZ<
zK3AG7INe}C%W_$NDDihqKBnKBd`mq)10V9wCf_qv9fo2$9LZ&NXf{?fs;am#qgVHX
z|6gnJF%jKw@-eY9vjdGBfYO0?O}_7k|4x(d?n?jE<jZK1Lk{2Aw|ra)krGhL)H6fB
zf>Hp%gZH%cvnqgqtg>w{VD2T|Vk_^w@0x6}XprT$hIp&QczwinP?48!Qs6c(c%lO6
z2wPgwr!R`##yn$1V4$DKM!ECBL`t*qmros3ookMfA`z>;4ECL$bxN(a1p?s0usqqe
zI_B$<Qd+`-mV-G0OwReb3K!5)Ah8n$UmcZ4S6-5i4vx1|iZ7(`B*SEdYS9ocTynlq
z{Pf&&5EoXlK?@RM@U=ulsIxEP>(h}gbQg`tN6<dWd{E~K+6EoDAlEq?3U~@t(VX_+
zu=<T<x|r6vv*ho=jb{%ah957<ga#hktomh8`fEe99z`|+c-!~#%^En8v$Nxd^*@=l
zfX0>dw#&0_BD}dF4p)ni&|J|=${X3Bc@`$m%Z0I<sTN+KIoEL(NwOL&Y&RQ~Xz7;D
z%bVb#ecXg;nxS0+PkO2T;0=j0efMi*f|XGr(#YWSPMWpJqofK|LPo#~7(AuSssz$)
z7#I9lExqC17b!ZK5>ZKe#BangVe%XGsF=DPivx~7c9e$>uOc%`>x2?<@rXZU2~b0v
z?uB&{G;_GHuzUVxzFq2hXBNYUSl3>M%y1cLvJ34Mh$efyTuORz^+dNxO<1BDub5id
zuZZ~C!B6l|YCcCzr&%7F&%cC9059&N+RG6=Q2ak?@@2(O9B5}EFBS@?^I#eB?1I_?
z$N2X!>23uSIJUt)*KoSzbL-M^>FSvu)M-O)f2=je{N|nc<TwU~NCIijTBHVcqSSKn
zlPq7RN5TCY7wr&nVxgd2VW5K=EKqSG#*PHCJFV5Vm56$M2A-1)E-&NoX-G{i0#uxB
zS<tQ*Wphbgu+MQ{t~VNW5Aq*&W6f-JHMBr5(2Fpd8Mom@TyOJ@_QW(h!;vEvxP##r
z3~}qgxA<`J8ZI{H(aSVSw@*=bl3)*Y6xoCM^1tEA<RXb@nuRfFb3(7xrJ~m`UBE0b
z_9c}++ESciN_O9<NtN6R#vDA;;s_B3MC^Rs!Z~!oWx|#=QL<#TF*=*(-6r1FK0FNV
z(KS*Uwlh3D%gyp(dBkG(CHt9<OtByF9IJTPx>`}{zO(wHeYC^U1=ub<8q1S~)ROu@
z2`U?g-AdQ~NS3w==kud4mZ_kT=V_70DfWY+pV}U-un{TlD-F-<`Q?Hwk#o!iFw<*0
zL@H=KX&>N~Ts*_^Cm7F^>l3&TKyPcD=vL1%Fb4B(gyiBDP1y#akU9#MZ_X$6!iFw`
z-wCC7Z8)kYv89<lS5ayLUh#0&O3TdDtWcY4+rzA(i#tFj4WqUaL$)o}O?9%{a>KIr
zfZ9O2lI{yV?~c0BLV?EP_hN}YR%s8RXn0U7Lmwn(l6}byn{Zo@tTv1@i1mLj(T~qS
z7Q~{v+IEM@1h+|<t)-L0w;kB;mR$zFEw=e}{X}N)IAEVI8dx~FeJjyXKmr;i52ijX
zn;pkY>a^tuk=}pOZW&g*_i{23g?sW=xB1xZg@4f0fx1;cHeluKfr|<DuHTa^PEG(j
zfE{R}#dgQ40=nw}N$Eetf&VYR{-3g@8M(M2)Kj(*m}hR)3bt1^yMwhTy;?4d+Z&z`
zVH15e4uUGWMJ#Ya+u%C*-egg$`BBQKz9$Q`htnl`3@?zwEG+9Pz#7LNb%?Q(E`3pF
zS75<HT^iPvZekQbSw6-hM+l8-!Ao>cR7Nb_9cd6%S#}k7XMI6Q=08`yy`d^|Ei<p)
zBv4!g(}9h&H=?*}Ih2YDiWWBGt$z|*AQUWNC!_l`ZJHFvRT&zA-vC~-Y^li;<1&Ut
zRe-~>eK8_*o}%bsRVa6jpqfP)S*}%NXuJKU7E3}+@0_;#Ud&fKzMgL4){X?QH<`y8
zF3CrpaZg$CP0U)pK3Ntmx}?H4e)_#v_Y&aq;(MM10Rw;n1-$_Sh5Nlb_bX{ycA%f{
zMFJ{w%~oXhxV{UoUkAJZ{HgN>TzzA|t@R#4006)aOa@H`RUpN^qVdOLdAD5xT&ZLH
z_I%!1#NNZQA6)o6rNLk!oZk5{FOYd<7X7LddC<tMHvZvYp$#%EAWOcHs3wUA<k~8I
zI&x<6P=6xSR_pUBgjj*8NB7q!2bNwPZXN{k!F3~We3V*q^zt&JXohAh49laRlVKBc
z7h;nKa3{T*cm@<IP%v5_VD*F7r;uaRWjepOg!+m-^hy%R!?z~q@L1=1=W%YTzawYu
z3}FD~Cu+PvQjqTY7oOJM!Gw(HmEdIg%r@XjqI7^J<<7h(V77RhkEiM&!EK?l<8H3R
zSl||Ca(p6_rDvai{`|II^MiTpY0hz2yVf(9CU>X_@j;wNa-<9}YiW?uqS)h@8|4$#
z$m8|#&6(kqN_Vl0VPWKIZ3Ohv`R<T)zpN@D{T0I-z!+Wy#&G|)7)C`QZlJV$Dq5;4
zvo|&{LH#x};C>L_=2lX_2l4ma5jZqhNnte^VL>Hv#UBfh@MsVUva(7)Jf*?WP=205
zbo;@N!if{8N_3}5bQjaNefpn=|MJ!TDa1RkDzE}x7gONHnz0e{W(S|oP3t~-jAiy7
z-QeQg$M=pH><lSGMEz!A{>+&HQs|Y*`{Wf$G=BW_O%D#Z4To<s<n~--xn&ml;SB?l
z>Qp^P+Vn>a$uq~^#`Cyn8PKpqU-tVVCM(4T9aU|;?AI9X0Wfw4i&XU^qEuo>><+)?
z)52J%8k}#7Ot$PBMi6$X;Mxj_B-ki5G=Je<z$@r@zG6c1`eH`9{YbyNhrF`eTbHF^
z);$BPIgT7oyIY6ay%NhO)XE2E=%b$|WQ2eju9={BdVcA`#>=QsO4>{c-Tnvr*;!zI
z;n+U!u|fnf&a4gykh9fOg!D*>-KH*vzlZqU&id_Kh5!v1-an%p;*W9(3ZU{WY~=tl
z0I3X#46#6w?_v9GRs^(fGP0*Pxb<xY0{pjb67yXYOa6E|8Gk+!I=7F6j-bF@SpPzh
zy&BT^q5LSX+`(Mp7S{AW7lFm0-^#APJ>ecK+@(0c6&YM6v&1LwS04vtrbo9Kj71Q0
z=Hn1wyIr<PKR%#cmn_ndQhU`o;|X8tp%WWm(b#2E*V=U2$z>w>suR+TkBt5cUQ{O^
z|MnB?SC-&pA=YO^CbS+_g{<8)BrJ%N&m(q69vMFQz?Ni<qt_c|^2Ic7hzxSA4XaML
z#6z&k`x&@2kptwVAaW|3*%PN2a$nk9?nvyp)`HRl`q<{!yg}^vMYW~OQd~?u#1k|-
z#aHZCJf$E6mZ9jSB5^OP6+HUrW%?I4B;j_GuH6zoQ`g~r!mpdL=!Za}cwDgMz;i8^
zk3#vhaXMUbPZoOz<EAk%!FV@`+>X^!?(19mUgK10>N{BY?l5of@Vmpj*oR-9d5|-}
z&ifP)7FxbR0<zSbvz}=Kn}vrbGE*Ahfxj{55P*Q-6L1d^?m5n*{U^tHw7)pcqoD}O
zO3Mn#0#V_o<=(Fz%=ga}6z?0)|D_p!tMU%a34U(HasUs3yEfmv=l@^1&wncPqSlq7
zN8pspixA0XI|hYJ9205Tv!0XMg4i`E&bOb_phie~AuBhg+uGOYd38%Zz{=xYE`!k9
zy+MiZIt=84JLl6pd$q>u_7UCUb4o=(hOe7*sa@pc_7&oJiskuyneQRG=UG#GE~Bhh
zqF2?WiJ*NW0?5RREepEQornZ{^g_?oW$VkS{FP|3Pl6Wu@19<5wl-K+haMn>C9Nb|
znkAk-69Wj37cV062<u)l$H`MRn6&jUR9kF{bafGBls`0@6N9PCmMPfx6Jht?TJQ4_
z6Eu;rr%Bdql)|G5(Ij!NEKK;gyCCn^1}h?C#g}*<i}lHaMMZ!oOnwKxTC<eS0C!&H
z1AoJYR(o=(aN<&yI$331fimx)&6^u>)uu1`H;3<vH`p)g-W|eoovjN#A$&3A-;4J3
zWBuX_-FGjkl#9>_Qs6$@Z4DyL@)pFs7Hi}=DXl^zk!nHl*;eL09?e|RsCf%Pq7du-
z%4|Jc%IIqpIK8bS*k-5+2DO<2SpDR@ocU9c=8P;VJulm#w#+wl#BW3gs8XPWotu5J
zDJ#cIDtqPDEDogt?Eo9O^O%7PQ#X%iFNU53du6e3F=!GBp!gUJVB1;HZs&&7Fllm`
zi!QXes!b5#mhPJ;ys>Xkkr<Iotw+8rlM-0nA>h@fN=@l&u8{wfC%Wo?uh9F2g7u}I
zV7%wKUwQn)i+4E^wm&j6kNpLW|1uQ4hl0RBy<>C0eH|C^uPKqQw|pxtfDZCXDy4U|
zMQJdDJRI!osw@-nh$w*vjlM`Zvuwf>C3=IQE{!3{zPu4f$Wo6jGpQ02)lB{6;v`=-
z?m8p*VTm3AG9FEKs9VQ1WbR_i#E0v&k_g&5-o(=>2Ut}R>)e#XNy^dKPwam7_@fRB
znWBl{99rYzt{~L-UE9e-_|Rl#D$m|>UUK<oRHb-?H8Z@@r>x=pgoRzw$OCJ7<Dbkk
zJ^>HDtdfR)GQ1`Gp)rWGrdnLkH9)g&D;oZF=elXW6lOVYBHX$nU3C3xSZpT*qkQ*X
z(i+_NQ~_;xH$$}gd)e-=Q3)n5(Lwu7q09}4oxr_=L#%x|1NIBD=|3OlkRglu_4FTx
zxvG{!C4a`H`Irhi8S{JxT%za8^m+j(-;pxVXDeKsw|*72c0pD=nitdeabKTW=Ni`z
zDuWr1Wo-G?8v=K)z$QW@W|4~vv<N3JsZdD~gKH4h$F{9)wXbJ$ZI>V_1R6HHqc#mw
z+!jf|3sS6Ykc?z4gMzdVtTWD>a*`jfE54;nm8flTAr89<+MjE9xra4hBMv{jZw-LQ
zMUrveLAgBIP=5QoxyuUf)ytfrmTH0~E}59jNoz~^_aPqVL<j9FtNn=iy;0HS9s%1`
z=w`-9zMuOCKG5gNdl9#?DF#4EXr&j|<LNlwy#;=0Rx;hs3u_L3<%K}aO7Lu8Uid$$
zS;=%aU;R_F64+MfWCpOZ-0so*p|$j1A)Lts9NPVLy%O|xy%H3-UI|Pr@)_5&&7i<V
z+csztZg4VflRD+zdgjcVO5=GvsE#*%PM;eZzhM~Iowb({*sN=mBB>PoUaUicvl)F^
z?dd8`rQ?T6NKQ@6oTXUE1=JF?&`cInRs7sBjGC$R$r-ys&!pz$aFz!oR}UFJLqFQn
z=j@p6ts_S#okQs4<r(mWSu^JQB+re>l?CaQF%vYNa%o?X@%-6J4bxLXqxvzuGGg5w
zWM=!0XmY~SND1s`qVt{rc0M`0Y5Y-(q(DXJvb`dxXQ%#&*Ti8`-qi@c$Hum<xTCUJ
zgI@<l$|N7~%?9hgdszTW#qHJ=zeu=xnBLM-LYDF2^~VPj?i9Xe%)H-hX|n!7vk|2D
zW7e_jv9)7?7YnZs)}+)R%iM2i+~1z?XM6r0p#7-!JVJ&aVzc`$yerGvQI7qfua^Ru
z+5cXjLa!egbF#0}h;;}hq&U9-(s<ADz)B}IvGh3fVoTvIWJ0D5O@~q=d81Crhrmq{
zy4H%u)(vr6Y|MBVw3kE+cnn;ky@V?ufLM(~;j9+iGEkYq#uid*1AcFb4(OekC7Z5R
z{jbaR6A&L9P2kUi3txkNu=#>sI+EBg|H^ZRfupN&Ktzt$e%X~gH943TnP@iW9dmlv
z0`)wxW1#Oeqc5Pdi!HF?EKWyc8bSE#K(5WEvrVj6BzKWg6pjEXxf*DYZLq)a9JlFm
zVSchJ&$8^Sq>ksxu@Yrn716t4G~b&mamT4o#Qj^fr|;xy3mm0=D~t_(>)5at{fufz
zEnsS=28?WhZ>b$9*q_DSeH|hh*&jSCI0W=3-!4ETph(XN<WoIjVPR%x`sKXy<KrJ)
zn{O<OJJ)k2AO#Cp&jF>z0k;GRp!3eJ!{2m>{*CMXQ*JfcrG3&0J?3&DNPKvBWVW))
z3_6_^_;5uHvF@{zpTaG{6ho|@0J`U8N!d(X>Smj6bf7PlLy9ugjilih1R8ens?|XR
zkKL~l^$q}|gK<W`YR~1*M`?w+XQN+Jqa8z5@Z*X!yf>;2nS!$9FS|Tn+k`8+jK#M;
zWr^m)W^@`W4ixW=EmeZDoPt6N)3{lrz)@=<tMjpQjTDkIC5zE{SAp`CT0k#LpqKQ~
zc<WbYIb<2H!@yVD{-faylFgc+GSIv;=piw1*_#d*@bc?u(AeilUulPxFrM=)o>byI
zG11p{S;&04UH#DvYn-c8Xh)(WZN-h!W7TQ$O)vT9c?-Dd2hy)(@-zC~8TQpc&1(?f
zLHl@ya^P{S!Kozj?h>zO9U)-OhHkTlr_kVoU|@xr`i<D8W5e{Ln2vW_DD=0BM9fqj
zOsO~!Zp3gxG>^`4%vCCGo8f1Awnwbs*%t3-o?V<^8XB9Wi_2#&VPKm;NqCK0R!LW|
zEa+`%HEkq3V4ft9<Y7<;RfvM!pWh6df_iN524&^CjXe!rf&Xx+Z(r}#@Rf<hq(Vuv
zY2jnR3>7xTXI~Ug^`1Z*c23$POK~6?6zP{f3e9wYLp&mGbbKSdX%8+w-K9gIZ_sr$
z8@0`{dt_B<4KSViFhNn~r0re_O_cE3nfaZxrR;xbqW?;^y1iW%^rL-`L{bjwPNdrA
z-enbY{w3ME2Sq=c=!!bTM|EXf3Y>J&WtJe_djmv!Q2TLd8`+LtZkU%fN7WY?c>IOA
zE%sW-<#xLbvdhIq;8qNF45jVM#aWFAD0!7P5^vp+kss!%2)u16IiypY5Je6?AeN^F
z^ymhbiWCy;aA}mq%n2<Ez+|>=6HHvmR!@iyp~LsA^;EgLcnUn!_Uo#C$r)G1ALk=r
zqZ_%jes)1(_wjiJuSj#He`zHCg9udf(!E_mw-PXk5G-2f>msEWWOTCp)o=4;Ugk%|
zUr=|tYtq;D8dulkYoN*pRKa@cKeN3qFxRanKypR6>e(dowr`8)-*+h#B!TPNsz&hl
zrSrBB2!UzY%CVSFMC}b3*Y-w;TA+Y=B-U}xfx>n}?nl4x*8J%z{5q#snC@YFuwsb|
z(#Is{j&M4Hth(`S=8~2-MJK~<(pzKDOJXM^;bqzB<^$nx-|8M_kqnV;#i+ZP%|2*;
ztWsp5CigKbanbrZ4Ahm96k{$r)g4w^{j;PPKplGx&T1`UVWfU--ou*Mx7CzWx-vo4
zSiesqQoHS(5~AD{!!fb1shDVvLKlBaSw1&wb0v#E??!LttGcu$GpXQiQU30(1S%|#
zmfia%*Yo#5rUdX;nr3}aLrKq-5^1_QadAo|X#@`pwA59X7?%lF3MPi&hSHiRePF+K
zcTpe~C15IN+(9wA!|jrogTc4uh2JzNY<GVmF}OPrg<XL8mCko0{)>9-eNi$AxgWj{
za6lhlVPGvx^o=U3=;{D;$p+eT%QDbODG4z!Q3A+sNel33go;K6PWEO%VvwMXm6enA
z4<gSkFbfKNlcu=sy8-_I0N><Y?jQc9iS}P``G3l(hA=o4$`vZ=I@EmIwG>LY1dY5U
zyY}N6rXR&m<Ql%r*Z#5$hkr63&nsDSthG&CB~aL3>*<`{bjJ6HHG{kLm<dJL@fEL%
zcgNX_#Gchc^RcQ=0+GnA6BAEfyl+0_K#i4Bf;@S&BJAgmZZt82AU!<iiBQPhj?u)W
zoU3l*Y^G4)R{LSgJV{Goh#t;@4HFjGf5^Ot3krl?bj4FemOpgM<X!NajwZ#YZ=>3u
z*Omp~Ks{ra*26syIFg8Z{TXvSJd<-i=AG?BD*n*R$Jz#dJbpB|i57!%YUbRRHkgwS
zuOyJSWPCBXiYO5jzZQ>^m05txwbJuo&I++o;yPXY!l_@d1Q$@?Vg#As@!03|K|CGD
zSGaAS!N0)Lf2sk0bi$;#vV@9ih0D8Md47P0dopjhiNC962~+n%$Gk@(Hq9*py5p0u
zy{{b-*GQjDUgc}j`eU;6UaaevxdZP<ru)J!?JmKoTP?L%bPTJFxL?>{J3l*`$rO8t
z!yo=?>+3nzZokYj1nSd?)s@)`K1h!x0`1PchIm<1uA>bGIKk>t6-|9pkD9Bj5dVxK
z{U%!2Al5JDp!Lbr$~@N~?1QA1UuE7@JBpxMM(whWZzn~47HW!QvL6=*I|f@le7NQD
zG45%>&34FHqUa5qI@lYC-Vlu-JL;&$>`FJp#-t+^QV?ijEPe^jVMuZKylQrz9Icmc
zShRhpJo27XZh@49vERih{%uRr$?C3AX=G^qjamMC=43MWD_)y{@e0(90n7Rpuiy|u
zf2!yKJnyx^fQm~b0HWJaghRvmp}2J4cbiC&LEwJ4-cG=rfV-tX`=r11wtjpWI2z9P
z6Yt{R$nXax{zogF1DISf1GkdcS#CE>f#UwaWz+A6|Ks=fPcgrI@jT1E?){f;^q?aP
zP?<&R$Ix|Flv-XV8uS(FUGh4G+040mLDkj|0!IK~@u!n!DzC9Qwag7&J3-Zoc$g$O
zJVqc!B&pVkbhx22`=lMF4@zXal*iTc;$EB|6q=5a2C7jG!csOAS=;;J1MKG)GB-vR
z9i4C*Y0}&=lpydX1v!hKQgtlh)*rU4lyHc%^f?Ela{^5=)Amtc%Ab0y(0d&f>1<)9
zm(vf|^+i2#ks|Mo<gl6k(svO~7_Y`Rt}C+!Nwp*HiY8enHqCfuKg!v2{cwua{;2Zt
zAQNcY_8ba5me#{}a>Lp<d1iCaEL1&mv1fToy-I;{!UbpIzheF`LHr8@V4VAVp>N2J
zJNkF(BO8|d*+raA{sIE`a+4orQf_`R$p9#CZq|+dkXUM{wtd+%q2(F;QrIg}vGYcn
z_S&ZqRmfRklymUD21C1Z2<)x`8YFMak_0q!Z5PIdTzW}IK^82P85hkE5kJ0ZCiap0
z2$hq66U#pI=6b2(D3M;+KV<a@?4%<Y<H?Ju#Ek~ZG10I(L=k+KLG*0=+H9uw6e>q>
z)*BWaikuBZ#~Qx)PUm&XxGdw@#gcsijh+N$KL^{DK->`~fjY(}dNg%s8<}+(A0&Pa
zaFYM8y03t$YVFph8>PDugiUR_L8ZGJ*>rbGNh64qNJ<GvibyCTNGT;EjfA8$Qc5U!
z*WQHaIrsYi-x%My-(?J8t>t3H=AF-+?|h&6%xt`ROI=*~PQ<rWAP`#;@syxuoov77
z)r>SYl>Ck_f_)`pS!tM85qO!)uO%-0SWMT7AeA1f=GngeK`?DZU{h^Zg%xJ=zw1kK
z|7!0BU(W3vi3*^elL0o5fPf44@HUEEu9#`f;98ul3-h|p#Yq$J`TpCqB{>BJ1^;1f
zNmx~*pdd7l{xggIk7!H&ue|J^AgS|Jy86K_YBDM(a(=hh-#hFc;DJ>(_+++w;xV>~
z+aH@W5nWT-ziSdV=SkCqi{f9x>X^Tcdp%~4trTRUmuJPO*t1xtZs1IVq}%J$k!MpE
zLTp}&997q&`yu+?_R7W$In0dYt5#f&(@zr!DV*zQlsHHx?nf-zhw0#wE#3aih^v_+
zm82E&4jj4oX*hQk6eu3xZJ{GZNMnh{k(kg>EW=SKoxFiJbJUE%qBie2UoBldgPs4r
z@QtFLR^<Gmh9Sjr#)c^oW<du8Yh$9>^F!IL?bp5Q`8nJK9dkZr{h6lxgJBk#m*zFD
zxRV=E;%OMPu`Yzj2@^iOYh9z041=WKhC7VNj7yNzRB|6}SDd4x;%HVs%Y0&tRwX=@
z$CFQIyoZpZr8Iz$n%~q-Y+wQMff#X&caLT4sWCc)3KHvBiz&LSk57eV?DV|xIXxXa
zDrRSqd#6k-Wz)yUcJDd*ZXC*u7esbzyc&hmXKDzZ{Qe4`QZ+pIFa{jUEd7j1ly_9X
zl!!#WbpC~!{Y07R3VaXMl_Q^6JTg4%m;08f1O!rsPZyrr5C^g7^LH45wpwQ%8EQVv
z*M#fd*lcP`0h0;y5sl?KE+3XwG>@($$l%{?+^pm*RiT(xNiVyMm9cvZdw7diJ8-nx
zfjBmUD#(2Ls72~ksa*|*kFttF=$gW&|2QrTPH=(sO;-;f0{8p{M`YK2wh={21aKrC
zz!C40xB*GZPF3@_4-_2q>_X%KaFu^H5|ui+!KqF>Kz2C^?!i#9^6AalfzX9RLREvt
z#*N0t(ag!!*~!(!9f%Bo>Ht>@OAA*EfLzT<4P)B_^8z9!GiIO}5FlFn>$Okyr4a#r
z>63f@S<M3AJ9F^^wa?r<T+mqKbe9*p`+xD3{)7cD5?@H%*lTqFImu2wP!!ZbUVGz>
zd)=CE^~+HjeC#6urh{D^X-jq`Dzb7i<<{QD#E54d$DC2zh-1|uzG5_?MynOtOa<Sk
zYOcBPw{*%}N(Nas(j}S_j>(K{_plrXD|D2KO(>4V1*(dp-wlQP0>%&}>DoU8>7~&p
z60=HWQaeg`J75{69LW~6(90Ma9Xc*hRqa?y^@fKS<lK!e|I8eC#NZN9T3;9YL_JBN
zSS@-MpObV^St)DmNu}*zouH=6J0G8bxN(2Vz>%O@J;r9-qxpoH-N0FkeIEWx%z@5I
zWdh;snE^UwnZ!?5C_0&FAulL~7jls3e)NwHpOU77U@CII=4Da-N}FbZ5(99Mu7K$R
z0nKZuZs_??fr?=NI#{ToC({FEqeOuO)^W2|dHEWFZQ+)Ao4X1U`=PHdR*L*L|9wH}
z8tAe@j;77e&MCyh4n{;kiu=vlVDObN0Dkrnkp|TB!)!4g3z?<}Li*0vRe7L%tS4z-
zQ=gO-3vIWeF03#kz(H8O5;V3j5PHvS=W-__e7vgt7KC6X!Mzbb6D*|qxyrbOVuMaH
z+C}C`J6Xrl!!$T!{A1_a5L_iW@=8K=-ww^uhK$5AyR_lVrOjE1=owr|p@y>8AvfIA
zql#+_n7g;lDKM0J>x!RbfqISu0!ICp%U8h+O`)SaeFnEew7;bDy<wce-LaCRykBx}
zf92R`Elj>ZHE^TAQ2qfs1UXei{rXf_m035u#H;j>PqD_r-}I}he4mbD#tC?=2T@w~
z?dmx5RW=+jmANp48Q>pL1?X3az~GD29a?GR=HzJMYI2gT@cg+P1gWo_9Xk()kVSyR
zu>b&LG$$~I3zt|=l)cL?z3D3$?7A1#mGs-E3~=<$Dtoao0pT1Q6AjpX&VUFJi|E49
zQ>?j8<9V{=!w=+)1%PP_kedLIg&U};JKz1+FZ`#}aC802)eYL*Z#Iltw=-I_h~f<o
z*J&Fx0)5!};_sPpZhX12@#b-#s~?WT7Jv2Jyr1{-z30JEPi0>`f%|0P@dcy=X}Ysb
zW5E(sC?gh0p9m(33s}@am0cix+8||B&QFd4I-2<L#6M);=+$g&vQ@o8Otd+wj)0a8
z51%N$?7GTKza>>(H(9k2ANN2N%4-t%L$6R(IH~P>Hy7#aZXfYZud4bMful+L(PONw
zZZ?P{lW5d3o3^|&a&2l$8W>~CuA;U<{IWcwx``#S@#LEZ+Xlt<s=c6~TOd)p`ZM~j
zDX~xEA~M;vymx0(tfT7Z8eG@<_8za|tsbP16ft^!Vp71Nq391F@?u+c3fz^e)j+Pj
zY27x^?m;9TsUNjVEHj|E*%#?8rX-qDXfh#0)%V>9ajL0<;$DBWQhy>}B|pT>>>)S7
z1{<TDhF|18u4czCqO@>=9gnPMR72RG39)?R%YMQ!>txcbhAt=;rBPFBHTp@T##4_k
zLt>6*N|ehuj83h(jk|W7kR$I_KB{k!G#^s<xHoTGBCGJTTw>liH|i=wz4g&$91CBc
zo`9^%DiFW0bJRnF8kXuW6>50N8qE3w8+bUMR1j+M?sJ$9h}%f`VGkYXdca3y=n^SR
zyox)PfsaJ7-GNlZ*;XRtBSbV*%G?Hx4DMOq;yo=z76*&|70vz|jm(W$Jps7N?bx&=
ztihE%-(uoLe7xW60Ji2{KWk{Jd}Rv@?RcXf%X&6Jj!s<is#C4QM2O{w!uQw*+i56s
zUIg(g8P|PNL7{WU2eeH$H)g4Isy&JxK@b>^Kep{EPpEv~rI2p)QMtxS$GbsV-eYIQ
z`mAuO@fttxPN<>b=dv5OjtV-kRhO|tJ$KaBLo`}_jxTA;vB&xhVa;FF{H%mw>}uK-
zk2>_Yp*_`Z^)2aqi6X8*ixcOJqg=bVXCNaYBl8sB&JK;nXJTg_;tVruD!VUll)_))
zgE?+WW6MYkk{9b;sxgd4ku7z<18F<p)Vz*A(?)wKbBYRky3to6EUx9QZmR{xEuF8e
z^q1jBXcQ(c@81ve02#VPJNPohzgv@filPAbzQ0^gbyO%qm{~&FD49j`gN9SI{6f-R
zgUh8GQGSO^**&uFM&AZ0*5<e+Ft)E?4KYT%XuQ&0``Tc|!+!}aCY+nq+Y8<1apXaz
zbKD)z*nYa&8y{Y~VbU;ydLD{8Q(dv|y5m_yoK)S7eSbfOq$owMH}l9?(v`M`bhUY#
zb5l?@BJPTZCQ<2!t?xDj=7RgVFJC!dYr9I(@K#%6&&;Cd8^tA}ZM$$?C6a+z?3l+H
z2JxRfuc(T*g7!zM)1ME`_lzu(MiIKmmR2th>qQL2H4s&fEIrXP(QK!9^{(mNbPbJS
ztWZMa<Lvhh{W~6c9!U<`FtnxcaCZa>D_t#ZT;1HQf$~c)6IY90<Hk*ybHGKq1;mZ+
z0N@&)04|PXJyw(|+?6Waem>BV1;*iT;|v^>{A&z}2?#L(*(Wr71T9TYVlW|e2NnO4
zhKap9jiQO21&sud8|FNfxWT|Dgf=JA(vVWuRM*nbJj*Jb2`ymalU$(VLf--w_rl8L
zP9sZ1d?GDPWj5#~q@i!fCVTpd&^3G*Ya6JM2BgHHp(2d64c!&wf`*F!u}}V|h_HP3
zjevMnVL-QFu$onmLss9h?ze?3mM_?mnyEDcsYJU|wBEAKwI=R(Nt7bCu7e^tRziZS
zEcjiPD~agbdG^WWi>+UpJiODTjiO6>Y!7QdTEsY-m82VKJDcS<Ulcg(Pq`4=<wWem
zO&*bPdSRu(`;>EiW`Rc)aD4OFh`vthp|5IF2RL?Yj>V_nV4wRMRrX*Cab47%H<A4}
zvtufXi+5sdB2ZfPB5A*&W!SKzb3bIpmcD%Ny&TUo8@1OzP`a#3Efwp;o|wGGh`7`~
zDZ1u|q?mzWWEVfQ*0#zNU7~a+(yhlauZM~#ieTDP5;4H+$!wQgddvN-60S$GXS%{Q
z;Gh>5`QNR71<;@Qt4FR7MslVUiNu?zz|1o#L!s}D6j%}(08%4~f`!3?+5FkO;oPUg
z4N4vTWw>$t{UC#JMmeEZVL$?bna+xj5#i6bkk7YJ&bR*3UL4BikRiQ1;oh2>Ty{{(
zWaJUE!e+Im?91{I>v(6PQ!58!T2a#?!PqVfFTK<#gmp##Y2z&07MvO7%SQXJ-Ey@`
z2~H^a7<3hKrfAB??d=2=5kxl^;Aim?=cITlqikMxSB1rTsAc*K2?!C$;<fG<2$Mx)
z2VX;7L_&*u6xm6tI{A(QzK#-!)ECDyS$Hij?%mr<)I^RR>)hY_oeZdwK2N!Ox%=MD
zabz3!91;WvZ<M5~e+9Lb$r;^lvz`kMYPY@m<7xzGP**jPdPA5(r`Df9(3B;u<H3DU
zE*;i!B%?oso<-&(A!U(mrW!U#Ei>rHfUuD>UH}ePI#q4PcgsQ;Sdm-VJDHl;Llt%{
z%ubiGTzM~Wg=DwX&anzm9}h+V@@4ROr@^7Ip4=28d#%<F46nN`Kjeq)!5AoLpm5m_
zqDY8{U{y|FRse+~Onh<~*ll1Mx>6Dn=V2fljXEzUAbk%#3j-hH=UHb55icHuA`B-N
zKnnsWLC`N~$Ot8V3Ia+DJYatPf5RO;!8j<Wur~tw_8_waA;Hlhn!+K;NL@<W_rKY&
zB-l&)Jqz>2pfA;ZAz3|&4O33GMjxglvI4`(7w?l7qy}{Ndc7PZavJYg@L*8;jIW4r
zKWfQP%5%D&C=k#=6}r-!DR=+QgF9G4Ve*z)8F~py$tEb_^0`onr$5fUej1zTJhSY>
zWz=`HlJblbjuU+$Jz07e{}zbWa9|4rPPjQ6ybi~)R?b)G*Qb-e?;obk_~Uh~`kD84
zA~Qs3k7O?x-BiX5NjLCh&PHdXwKYWmyYxMeHCz^+zJ(rE=y6}T-SAL$9owC*5N*b>
zMeaizR$YOK&E~G~G^q0j%QwrolO-483lc&=>XpmF^TLRdhf6*mQAjd?_mcp;AIr&z
zLPQVQy6EtrWeBPl{GFr}Cm|RgHd?T-B-vnVBQ!D&rm~z+FaQP-A{H%h80Okem?`!E
zS%!uiST&*Hf|hXuQw>2F*-Q|q+2#cc@B%$ApgE0;yZ?qe{>j0lZiezWzv8F{XUDwu
zL+Y+KtxG)&PVV!;uu2j@-@#E%q;pG+9wlU3Kt3RKqpOZdfvXb{ee%eDf5@9bp>*TD
z`Dla~^UKTV{XFB`+orwKU8GBEBr1x!PiLrxunY+GhlO6gB{8S^%w6$3(n}euVdQ}w
zezFr@?onzH(tE-$#z1ld&9{2HAz{^$Gvr>Y3(p;8;^nfa_-G34>rd(UjrhM(j`Xr&
zbJ(aA)LZ7?6#~6(BP*XK*r*qxtm!r=w>_#Vm!`?trxJEvPe}2<=a%%fWj)Nfl$r5>
z3Q3G2d-!svdWfmtT9ig&T#-)BvI+9=52d$P_Z&-Ce|%KiwR?QBA`%RL1ppVC|H-TL
zKe(%CiVq@Xe_!T$*PriW8pS88zZgo;I4~3dHxo1n4gv&+?qmmrW(Ng@2iTjNI0L#K
z<~Be)=I-R`&2G+i65hZvYs#XhBZq+t3>`bb4;aY__{k03z7Blj0{%&9LpOkN#Hs@Q
z4QO5vH~<}ltP-M<QsU6%#*+#NASLJNWCrM#I{{t2-Q2;_*^=2e!mnM3ur59T-~u^L
z_aV?(It0e?f^b93Odwnk3r`62p1+quovrlptorJU<UNR3C&TqX<)}Oo*`rcpT)DHu
zJTbL7(0T=Zsi|9wyb3(>f$RuHEuS!tZM{OFfrg1et~a00i)Yb%QoS6v&CRDvFtfSz
zo(t_)eY>(r5oN8iickxJ$QrLs5NCaNu0ywz>;o=orv;aL+4-TQ{HR|MrO;WzJ^Usi
zHac))j>Gw`bPB2i9x2+B)g;Ff5~@#qBz-r$)jmpy7W4=8Z*-{CjJ76+_XNM0z2R{5
zY{p#q663-(9>(Wrksr~_%ml7_P;oCi7LI47s<<l!MFuL2rzJBRa?}T1ueo=;>~D;c
z+4WJhpFNkbu5g}l&gspkmx#2>Swx$xn$Ka*jK&>EbXWkij1#8@OLai)pX-<CTTW~1
z9Dfko0PJ}Kc(sxf{P|VQ35q^J!N0=KX`uoJ7M&*B87Tuuq*}NFMU-w9G#VDJo`B?q
z+X*P0C1Zgc$oa`9m?Z%ubuC=a$R3DT6q;;6n#2O&a?qSO!3*eh!r=g7YQWWj0ahKf
zHl3Rrx_e&m@SpIIf5Nz8$S65v(Jg*%)Nm_jUS{r_wU#k5B|={1L%nZQcguK653rj@
zWJ%X-VmoLKXp2!vSDzU^v1o&=BKZ0Gv5^nGstIf+2__2NvwVius!1O-+f^eczN6yE
zFUurwxut%=+WAm0S*forC0@1otz;#=zo5*Ly6F&Jf>AYR(hcN&&jPC4?dF3epBDQf
z7nSACTXn`|Z4+A~o%Of5A3Ht>+2GluEm@9n%@)s_02{1_E7>L*NJtjq5K_#+>$Ie7
z&Z98J7t^#<YcQ%wRAAyJ>P|Oa_8e)9_6z#v>YV9xL>4mw;ccyO;_<7ORhiKj{5YI(
zD>Exx4AF=*N-}4#?SEMH{oT|5bnFd!G<<O0+1Ye<_XfY3^u1*54F09#-I@J!BIcN2
zQoAp@^0hkrP|Dn+E1V9}?(VA1S}utv6(}qABUJkKA~*W+R?LoMQNbc@VyPIMDN)1*
z!m9%l`g!h$U>`d^Q{Pe~`cPeqnK72T3k(|krW%mCQFv44ocyaU^FnmDo17>UooVDz
zc_x>S2?OU|ee@YN@bE+SVV1dlt&kJntLvI@m70tXJML#0+=&d!o~S`h%e@e-Wxr<T
zNb)78$`3Qhp&cAzx57*vJ0MNB%-nSwWl6A71y}OklRfv=k0wkXCcxhDLDgxa3qfWR
zdC0&hN>W)Q;n&_?Vjg=bw;`Q813Wg`L&{z(vboP4=sDX}N~(f<H3t8YV>8VDsR6+w
zVA^eAZw^dcVP*)0fZsYs$mKNuH2-ga`L6@!|MArP|3c0RO1WVEz>3ZPV{7kI6*4G^
z>+F#LRdF+GM<<|TnvDe@t^{b(uyX>lAXw0X&-L@Pa|Ag-fS=CfXVcH0ttSM5Xy(HD
zEkBe6at;drxsU!Qs2Ic&dJFoYJhNR-nhc4F&?u)C@9fT^!FOO5YQO9+vTNrlU^c>M
zT=>w)5H7HSLoZ<G&JPBO@C6%k^|ZKYm(Rm&*vd{j?Q$b8zL9A^WqILFu+qKH_?he#
zWfHrsu<nCM8SP_+>;z|xkkL?gf;U!~NY+A=G1v4d<(0c7;)NHqhv1w$)z^Iep9(G1
zasH6nX*TZ0*F#_le9t2@Su+u5;egQ18lRuPFcC%~=Vz&$E96l0e2s_w6*l5a?n#-I
za=U1Tk%u3GdZnbflAP~MAY77@2zz1gR%^a&a{Woifac^KjyAdq#`jrzn$}qd^&pP7
zS`;4FjETb#v;?C9kpCs9NQb~p7Q=r8vj{}wymXLH|B4$Q@>?toTM|*=%MbOk85bta
zvZ6<Gx@6LE82Sk^%oo%(On#j$%Xqwv%zC8PF?>3Lz8il+qI-s?5-Ee4d9dNTQTt%i
z>$Uq%T<%}vgE?LY-|#5~Rnzz@)%j@QH4`qs-nC6+w|CF#rl|Vb0-qb!<0@9_R)YD^
z1It0GI_ANXB>v~wJ+Xu`mp(6sjK?0XUx)X4f3?UojQcA;+PX`(7s^CCDP_d9ZhvXY
zW2(0456ARlt$Wd0%0&nZGPu%WTZgZGnHg(~OicNiUa*07aKg<yoD2F&tC^j>mqkX+
z7_ttntHEEK_dV`bI~ZG4P_@@A4Hr5gL|I`gG3vOC(i}9&t45bIy@Ejn*_i^=g;3!a
zGJW{SPn4(xP@)V#iR2TMz(Et9(vG_!UH-_!wnHzz?H53X(nL&t#f-BV3qIDlzSJKS
zsm|#3_{8VGaS|1rO`Ks<7+|gK)b`IBj-BuR6OZsGBc2hS#&w-2%<Iq9DOSyi#q^5n
z$a%bm_aVsu9-Zbrd_sXTxLRXZ;;jvwPR2|$-S{1pYj8p6A3l(WG)#60yGYLrS+*fp
zdR`@p_06P8^k1u%%|#m>D)Ye-M6n2vze!z3{Jo@pjp-x6xxSUE7iR5fNYACvpxn5q
z@9^2V!3(G10DdQIq)-w^m#fHwWUx1<US{U1?N%E1cR4iUr~ycoP-w%WVtGY>v2GQJ
zy{A#O0)KqwC%Sou4+LZ}ww*^^l?3L*Z3fJlTn%5>_WChz43tz~=NiQtSpOb0SR1V?
z{+xVKjw#1^loM%uw}R-aB8D<*;i|l-(er@ZxHn~2PmK8gQ+o<=LX}s$SFzS|BX@?J
z{7rI&Xs^~U)iZy4!r#!qI@9@!W%2Pa_QoaCRn(ttO+H21_Vz~0y+U%Jz!KWXRx{Xk
zwADnd+xgNV-N$_)g}DUx`Df?sM_q~$sR{Suoo7leQ`9FE9h(i#q8j(-He?u}Zw|(M
z*4T<M+Y>JstFoLlwH)eoydM3P?fJ5od{&0;42xdlHTqRHreG;CZ_WFRDN}*6h5YLq
zL*B+j6HgW|bvZtfBo^S18=aOC1J&?pbPK7X?6NPu)seF|p(PnaD!nDbDiml}uu?`y
zurwUmR3l(N6K{X_*u2JzK?mGOekFJM)6%4j-}9;~Xvp9%Y_BmJq#9IfioUI+z~hy+
zN3^E!K%y~3T9*bB6CEaCR!({*X6)i&Vh_y8EX;qM36xu%8#xk?+k$ez5K;baCIGc+
zs|!~Buj(29>?w7wXRLPiXwV!5)aS!&`&7c1hX=MW3SA)O1{^(X_n&)^KUw%JRoc-f
zbp1PdSu*vwkg`yoF;fxmTh&Y8=U=cWKyQhTr@pwX+}*}?Tvfr2@53WulOu$0&ZEO`
z!!<vq!%M4)G2}q&cCoFrg4f%;DgEu)t;ai;Zuoo-Ab;PpQO$G+TF$I|R)bW0xYJfu
z{t}eEue(W_?c~gGTg*m2;4<CtdMO%i8guG&v7}TQo{?CFgZjZjwx~77hJv#nzCdXm
zA;ad-hmxE|&LNJhsbd1YgV2PLJAR5l&)=+GHr($dLP8S^BfI_AR`XEs-U?60H)->3
z5PY)WLw796Lv7>jZARqgGw@(^xUq?6C*h>v@?ejLauwh4U0^^8hkcF3@Y0Ee2MvIO
zdM{{P3MNLGMj3Vt1isR}oGea=Ch<O{;9}PNZ%7nD@z8_?plKWl4hjz>_`54SvdaTH
zng2sW5J-<-j2zCWrKBYu%ip6cOcL>5*&wZlzr)XND^@Wl7bn>%WMkEe1zK$`->{`@
zWKd%(XuzsmT}KPB7m+4gCXtx*eE-8TJe}2gdx`ivXC=woAz6QVMeC;9weSQ^EhCN-
zwMaK?zwa3O&yDWgS;6L2x9Z7E_C!t)Pi%vqx6u*^z%fbf_zcN^Cl+ibTRej%D^~oq
zBFr?us$k?bf4cQ^Hf{fB)#BOZs6$ICpC+VSz+3_3?C3ul)E})i2a2H>vTI#yBHwnF
zdiLq&-j1ujSD#r|w{9fd4Ks0X!5+zH!H(BS7sscXBJ_KyToS0SfZgY)3MWLa@&|-G
l&GhQt0GA&tq%O8T%96!MVNH-n3@UKoZ%RaJa~^b^|1aG#r?3D3

literal 0
HcmV?d00001

diff --git a/weixin-java-miniapp/src/test/resources/wx-mp-jssecacerts b/weixin-java-miniapp/src/test/resources/wx-mp-jssecacerts
new file mode 100644
index 0000000000000000000000000000000000000000..5f7a420d3723c44a3350f8557943282029478da2
GIT binary patch
literal 116080
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
Kcd0nB2=reeO{JXx

literal 0
HcmV?d00001

diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
index 491dc6b7bc..33678ea8ab 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
@@ -46,7 +46,6 @@ public class WxOpenInMemoryConfigStorage implements WxOpenConfigStorage {
   private Map<String, Token> cardApiTickets = new ConcurrentHashMap<>();
 
 
-
   @Override
   public boolean isComponentAccessTokenExpired() {
     return System.currentTimeMillis() > componentExpiresTime;
@@ -79,7 +78,8 @@ public void updateComponentAccessToken(String componentAccessToken, int expiresI
   }
 
   @Override
-  public void setWxOpenInfo(String componentAppId, String componentAppSecret, String componentToken, String componentAesKey) {
+  public void setWxOpenInfo(String componentAppId, String componentAppSecret, String componentToken,
+                            String componentAesKey) {
     setComponentAppId(componentAppId);
     setComponentAppSecret(componentAppSecret);
     setComponentToken(componentToken);
@@ -146,7 +146,8 @@ public void expireAuthorizerAccessToken(String appId) {
 
   @Override
   public void updateAuthorizerAccessToken(String appId, WxOpenAuthorizerAccessToken authorizerAccessToken) {
-    updateAuthorizerAccessToken(appId, authorizerAccessToken.getAuthorizerAccessToken(), authorizerAccessToken.getExpiresIn());
+    updateAuthorizerAccessToken(appId, authorizerAccessToken.getAuthorizerAccessToken(),
+      authorizerAccessToken.getExpiresIn());
   }
 
   @Override
@@ -202,6 +203,14 @@ private static class Token {
   private static class WxOpenInnerConfigStorage implements WxMpConfigStorage, WxMaConfig {
     private WxOpenConfigStorage wxOpenConfigStorage;
     private String appId;
+    /**
+     * 小程序原始ID
+     */
+    private volatile String originalId;
+    /**
+     * 云环境ID
+     */
+    private volatile String cloudEnv;
     private Lock accessTokenLock = new ReentrantLock();
     private Lock jsapiTicketLock = new ReentrantLock();
     private Lock cardApiTicketLock = new ReentrantLock();
@@ -325,6 +334,24 @@ public String getAppid() {
       return this.appId;
     }
 
+    @Override
+    public String getOriginalId() {
+      return originalId;
+    }
+
+    public void setOriginalId(String originalId) {
+      this.originalId = originalId;
+    }
+
+    @Override
+    public String getCloudEnv() {
+      return this.cloudEnv;
+    }
+
+    public void setCloudEnv(String cloudEnv) {
+      this.cloudEnv = cloudEnv;
+    }
+
     @Override
     public void expireAccessToken() {
       wxOpenConfigStorage.expireAuthorizerAccessToken(appId);

From 8c15b3b4b54c0c7c529adfa67a03292bc51c430f Mon Sep 17 00:00:00 2001
From: S <sshzh90@gmail.com>
Date: Sat, 28 Mar 2020 17:49:53 +0800
Subject: [PATCH 036/114] =?UTF-8?q?:art:=20#1475=20=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=8D=A1=E5=88=B8=E5=92=8C=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E7=BC=BA=E5=A4=B1=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E6=9E=9A=E4=B8=BE=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :sparkles: 一些优化，增加枚举类

* :sparkles: 增加统计字段
---
 .../me/chanjar/weixin/mp/bean/card/Sku.java   |  9 ++++++-
 .../mp/bean/card/enums/CardCodeType.java      | 21 +++++++++++++++
 .../mp/bean/card/enums/CardStatusType.java    | 19 ++++++++++++++
 .../bean/card/enums/CustomFieldNameType.java  | 26 +++++++++++++++++++
 .../WxDataCubeArticleTotalDetail.java         | 25 ++++++++++++++++++
 5 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardCodeType.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardStatusType.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CustomFieldNameType.java

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/Sku.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/Sku.java
index 504d56bf17..005da7f06e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/Sku.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/Sku.java
@@ -15,11 +15,18 @@
 public class Sku implements Serializable {
 
   /**
-   * 卡券库存的数量,不支持填写0，上限为100000000。
+   * 卡券库存的数量，不支持填写0，上限为100000000
    */
   @SerializedName("quantity")
   private Integer quantity = 100000000;
 
+  /**
+   * 卡券全部库存的数量，上限为100000000。
+   * https://developers.weixin.qq.com/doc/offiaccount/Cards_and_Offer/Managing_Coupons_Vouchers_and_Cards.html#4
+   */
+  @SerializedName("total_quantity")
+  private Integer totalQuantity = 100000000;
+
   @Override
   public String toString() {
     return WxMpGsonBuilder.create().toJson(this);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardCodeType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardCodeType.java
new file mode 100644
index 0000000000..35263188e0
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardCodeType.java
@@ -0,0 +1,21 @@
+package me.chanjar.weixin.mp.bean.card.enums;
+
+public enum CardCodeType {
+
+  CODE_TYPE_TEXT("文本"),
+  CODE_TYPE_NONE("不显示任何码型"),
+  CODE_TYPE_ONLY_BARCODE("仅显示一维码"),
+  CODE_TYPE_ONLY_QRCODE("仅显示二维码"),
+  CODE_TYPE_BARCODE("一维码"),
+  CODE_TYPE_QRCODE("二维码");
+
+  private String description;
+
+  CardCodeType(String description) {
+    this.description = description;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardStatusType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardStatusType.java
new file mode 100644
index 0000000000..4108b7d4c2
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardStatusType.java
@@ -0,0 +1,19 @@
+package me.chanjar.weixin.mp.bean.card.enums;
+
+public enum CardStatusType {
+  CARD_STATUS_NOT_VERIFY("待审核"),
+  CARD_STATUS_VERIFY_FAIL("审核失败"),
+  CARD_STATUS_VERIFY_OK("通过审核"),
+  CARD_STATUS_DELETE("卡券被商户删除"),
+  CARD_STATUS_DISPATCH("在公众平台投放过的卡券");
+
+  private String description;
+
+  CardStatusType(String description) {
+    this.description = description;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CustomFieldNameType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CustomFieldNameType.java
new file mode 100644
index 0000000000..53f3df8cf9
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CustomFieldNameType.java
@@ -0,0 +1,26 @@
+package me.chanjar.weixin.mp.bean.card.enums;
+
+/**
+ * 会员信息类目半自定义名称，当开发者变更这类类目信息的value值时 可以选择触发系统模板消息通知用户。
+ */
+public enum CustomFieldNameType {
+
+  FIELD_NAME_TYPE_LEVEL("等级"),
+  FIELD_NAME_TYPE_COUPON("优惠券"),
+  FIELD_NAME_TYPE_STAMP("印花"),
+  FIELD_NAME_TYPE_DISCOUNT("折扣"),
+  FIELD_NAME_TYPE_ACHIEVEMEN("成就"),
+  FIELD_NAME_TYPE_MILEAGE("里程"),
+  FIELD_NAME_TYPE_SET_POINTS("集点"),
+  FIELD_NAME_TYPE_TIMS("次数");
+
+  private String description;
+
+  CustomFieldNameType(String description) {
+    this.description = description;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+}
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 0c3bf2916c..a07974f42c 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
@@ -198,4 +198,29 @@ public class WxDataCubeArticleTotalDetail implements Serializable {
   @SerializedName("feed_share_from_other_cnt")
   private Integer feedShareFromOtherCnt;
 
+
+  /**
+   * intpagefromkanyikanreaduser 看一看来源阅读人数
+   */
+  @SerializedName("int_page_from_kanyikan_read_user")
+  private Integer intPageFromKanyikanReadUser;
+
+  /**
+   * intpagefromkanyikanreadcount 看一看来源阅读次数
+   */
+  @SerializedName("int_page_from_kanyikan_read_count")
+  private Integer intPageFromKanyikanReadCount;
+
+  /**
+   * intpagefromsouyisoureaduser 搜一搜来源阅读人数
+   */
+  @SerializedName("int_page_from_souyisou_read_user")
+  private Integer intPageFromSouyisouReadUser;
+
+  /**
+   * intpagefromsouyisoureadcount 搜一搜来源阅读次数
+   */
+  @SerializedName("int_page_from_souyisou_read_count")
+  private Integer intPageFromSouyisouReadCount;
+
 }

From ef6e2dd6c03258446dec9f437c3400534917dc06 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 28 Mar 2020 18:10:38 +0800
Subject: [PATCH 037/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3javadoc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/impl/WxMaRedisConfigImpl.java      |   2 +
 .../me/chanjar/weixin/mp/api/WxMpService.java |  61 +++-
 .../bean/result/WxMpCurrentAutoReplyInfo.java |   1 +
 .../mp/api/impl/BaseWxMpServiceImplTest.java  | 296 ++++++++++++++++++
 4 files changed, 357 insertions(+), 3 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConfigImpl.java
index a66ad1fa8b..b2ef782d42 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConfigImpl.java
@@ -9,6 +9,8 @@
  * <pre>
  * 需要引入依赖<a href="https://github.com/abelaska/jedis-lock">jedis-lock</a>，才能使用该类。
  * </pre>
+ *
+ * @author <a href="https://github.com/winter4666">winter</a>
  */
 public class WxMaRedisConfigImpl extends AbstractWxMaRedisConfig {
 
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 2d95b4f4eb..7bff10c811 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
@@ -28,12 +28,19 @@ public interface WxMpService {
    * 验证消息的确来自微信服务器.
    * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421135319&token=&lang=zh_CN
    * </pre>
+   *
+   * @param nonce     随机串
+   * @param signature 签名
+   * @param timestamp 时间戳
+   * @return 是否验证通过
    */
   boolean checkSignature(String timestamp, String nonce, String signature);
 
   /**
    * 获取access_token, 不强制刷新access_token.
    *
+   * @return token
+   * @throws WxErrorException .
    * @see #getAccessToken(boolean)
    */
   String getAccessToken() throws WxErrorException;
@@ -50,13 +57,18 @@ public interface WxMpService {
    * 详情请见: http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421140183&token=&lang=zh_CN
    * </pre>
    *
-   * @param forceRefresh 强制刷新
+   * @param forceRefresh 是否强制刷新
+   * @return token
+   * @throws WxErrorException .
    */
   String getAccessToken(boolean forceRefresh) throws WxErrorException;
 
   /**
    * 获得ticket,不强制刷新ticket.
    *
+   * @param type ticket 类型
+   * @return ticket
+   * @throws WxErrorException .
    * @see #getTicket(TicketType, boolean)
    */
   String getTicket(TicketType type) throws WxErrorException;
@@ -68,12 +80,17 @@ public interface WxMpService {
    * </pre>
    *
    * @param forceRefresh 强制刷新
+   * @param type         ticket类型
+   * @return ticket
+   * @throws WxErrorException .
    */
   String getTicket(TicketType type, boolean forceRefresh) throws WxErrorException;
 
   /**
    * 获得jsapi_ticket,不强制刷新jsapi_ticket.
    *
+   * @return jsapi ticket
+   * @throws WxErrorException .
    * @see #getJsapiTicket(boolean)
    */
   String getJsapiTicket() throws WxErrorException;
@@ -87,6 +104,8 @@ public interface WxMpService {
    * </pre>
    *
    * @param forceRefresh 强制刷新
+   * @return jsapi ticket
+   * @throws WxErrorException .
    */
   String getJsapiTicket(boolean forceRefresh) throws WxErrorException;
 
@@ -96,6 +115,10 @@ public interface WxMpService {
    *
    * 详情请见：http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115&token=&lang=zh_CN
    * </pre>
+   *
+   * @param url 地址
+   * @return 生成的签名对象
+   * @throws WxErrorException .
    */
   WxJsapiSignature createJsapiSignature(String url) throws WxErrorException;
 
@@ -104,6 +127,10 @@ public interface WxMpService {
    * 长链接转短链接接口.
    * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=长链接转短链接接口
    * </pre>
+   *
+   * @param longUrl 长url
+   * @return 生成的短地址
+   * @throws WxErrorException .
    */
   String shortUrl(String longUrl) throws WxErrorException;
 
@@ -112,6 +139,10 @@ public interface WxMpService {
    * 语义查询接口.
    * 详情请见：http://mp.weixin.qq.com/wiki/index.php?title=语义理解
    * </pre>
+   *
+   * @param semanticQuery 查询条件
+   * @return 查询结果
+   * @throws WxErrorException .
    */
   WxMpSemanticQueryResult semanticQuery(WxMpSemanticQuery semanticQuery) throws WxErrorException;
 
@@ -136,6 +167,8 @@ public interface WxMpService {
    * </pre>
    *
    * @param redirectURI 用户授权完成后的重定向链接，无需urlencode, 方法内会进行encode
+   * @param scope       scope
+   * @param state       state
    * @return url
    */
   String oauth2buildAuthorizationUrl(String redirectURI, String scope, String state);
@@ -145,6 +178,10 @@ public interface WxMpService {
    * 用code换取oauth2的access token.
    * 详情请见: http://mp.weixin.qq.com/wiki/index.php?title=网页授权获取用户基本信息
    * </pre>
+   *
+   * @param code code
+   * @return token对象
+   * @throws WxErrorException .
    */
   WxMpOAuth2AccessToken oauth2getAccessToken(String code) throws WxErrorException;
 
@@ -152,6 +189,10 @@ public interface WxMpService {
    * <pre>
    * 刷新oauth2的access token.
    * </pre>
+   *
+   * @param refreshToken 刷新token
+   * @return 新的token对象
+   * @throws WxErrorException .
    */
   WxMpOAuth2AccessToken oauth2refreshAccessToken(String refreshToken) throws WxErrorException;
 
@@ -160,7 +201,10 @@ public interface WxMpService {
    * 用oauth2获取用户信息, 当前面引导授权时的scope是snsapi_userinfo的时候才可以.
    * </pre>
    *
-   * @param lang zh_CN, zh_TW, en
+   * @param oAuth2AccessToken token对象
+   * @param lang              zh_CN, zh_TW, en
+   * @return 用户对象
+   * @throws WxErrorException .
    */
   WxMpUser oauth2getUserInfo(WxMpOAuth2AccessToken oAuth2AccessToken, String lang) throws WxErrorException;
 
@@ -168,6 +212,9 @@ public interface WxMpService {
    * <pre>
    * 验证oauth2的access token是否有效.
    * </pre>
+   *
+   * @param oAuth2AccessToken token对象
+   * @return 是否有效
    */
   boolean oauth2validateAccessToken(WxMpOAuth2AccessToken oAuth2AccessToken);
 
@@ -176,6 +223,9 @@ public interface WxMpService {
    * 获取微信服务器IP地址
    * http://mp.weixin.qq.com/wiki/0/2ad4b6bfd29f30f71d39616c2a0fcedc.html
    * </pre>
+   *
+   * @return 微信服务器ip地址数组
+   * @throws WxErrorException .
    */
   String[] getCallbackIP() throws WxErrorException;
 
@@ -188,6 +238,7 @@ public interface WxMpService {
    *
    * @param action   执行的检测动作
    * @param operator 指定平台从某个运营商进行检测
+   * @return 检测结果
    * @throws WxErrorException .
    */
   WxNetCheckResult netCheck(String action, String operator) throws WxErrorException;
@@ -195,7 +246,7 @@ public interface WxMpService {
   /**
    * <pre>
    * 获取公众号的自动回复规则.
-   * http://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1433751299&token=&lang=zh_CN
+   * https://developers.weixin.qq.com/doc/offiaccount/Message_Management/Getting_Rules_for_Auto_Replies.html
    * 开发者可以通过该接口，获取公众号当前使用的自动回复规则，包括关注后自动回复、消息自动回复（60分钟内触发一次）、关键词自动回复。
    * 请注意：
    * 1、第三方平台开发者可以通过本接口，在旗下公众号将业务授权给你后，立即通过本接口检测公众号的自动回复配置，并通过接口再次给公众号设置好自动回复规则，以提升公众号运营者的业务体验。
@@ -207,6 +258,9 @@ public interface WxMpService {
    * http请求方式: GET（请使用https协议）
    * https://api.weixin.qq.com/cgi-bin/get_current_autoreply_info?access_token=ACCESS_TOKEN
    * </pre>
+   *
+   * @return 公众号的自动回复规则
+   * @throws WxErrorException .
    */
   WxMpCurrentAutoReplyInfo getCurrentAutoReplyInfo() throws WxErrorException;
 
@@ -524,6 +578,7 @@ public interface WxMpService {
 
   /**
    * 返回图像处理接口的实现类对象，以方便调用其各个接口.
+   *
    * @return WxMpImgProcService
    */
   WxMpImgProcService getImgProcService();
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 d702eeaf85..7473bb1323 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
@@ -14,6 +14,7 @@
 /**
  * <pre>
  * 公众号的自动回复规则.
+ * 参考文档地址：https://developers.weixin.qq.com/doc/offiaccount/Message_Management/Getting_Rules_for_Auto_Replies.html
  * Created by Binary Wang on 2017-7-8.
  * </pre>
  *
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
index e0b2471bd0..f35a7d4658 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImplTest.java
@@ -151,4 +151,300 @@ public void run() {
     assertEquals(set.size(), 1);
 
   }
+
+  @Test
+  public void testCheckSignature() {
+  }
+
+  @Test
+  public void testGetTicket() {
+  }
+
+  @Test
+  public void testTestGetTicket() {
+  }
+
+  @Test
+  public void testGetJsapiTicket() {
+  }
+
+  @Test
+  public void testTestGetJsapiTicket() {
+  }
+
+  @Test
+  public void testCreateJsapiSignature() {
+  }
+
+  @Test
+  public void testGetAccessToken() {
+  }
+
+  @Test
+  public void testSemanticQuery() {
+  }
+
+  @Test
+  public void testOauth2buildAuthorizationUrl() {
+  }
+
+  @Test
+  public void testBuildQrConnectUrl() {
+  }
+
+  @Test
+  public void testOauth2getAccessToken() {
+  }
+
+  @Test
+  public void testOauth2refreshAccessToken() {
+  }
+
+  @Test
+  public void testOauth2getUserInfo() {
+  }
+
+  @Test
+  public void testOauth2validateAccessToken() {
+  }
+
+  @Test
+  public void testGetCurrentAutoReplyInfo() {
+  }
+
+  @Test
+  public void testClearQuota() {
+  }
+
+  @Test
+  public void testGet() {
+  }
+
+  @Test
+  public void testTestGet() {
+  }
+
+  @Test
+  public void testPost() {
+  }
+
+  @Test
+  public void testTestPost() {
+  }
+
+  @Test
+  public void testExecute() {
+  }
+
+  @Test
+  public void testTestExecute() {
+  }
+
+  @Test
+  public void testExecuteInternal() {
+  }
+
+  @Test
+  public void testGetWxMpConfigStorage() {
+  }
+
+  @Test
+  public void testSetWxMpConfigStorage() {
+  }
+
+  @Test
+  public void testSetMultiConfigStorages() {
+  }
+
+  @Test
+  public void testTestSetMultiConfigStorages() {
+  }
+
+  @Test
+  public void testAddConfigStorage() {
+  }
+
+  @Test
+  public void testRemoveConfigStorage() {
+  }
+
+  @Test
+  public void testSetRetrySleepMillis() {
+  }
+
+  @Test
+  public void testSetMaxRetryTimes() {
+  }
+
+  @Test
+  public void testGetKefuService() {
+  }
+
+  @Test
+  public void testGetMaterialService() {
+  }
+
+  @Test
+  public void testGetMenuService() {
+  }
+
+  @Test
+  public void testGetUserService() {
+  }
+
+  @Test
+  public void testGetUserTagService() {
+  }
+
+  @Test
+  public void testGetQrcodeService() {
+  }
+
+  @Test
+  public void testGetCardService() {
+  }
+
+  @Test
+  public void testGetDataCubeService() {
+  }
+
+  @Test
+  public void testGetBlackListService() {
+  }
+
+  @Test
+  public void testGetStoreService() {
+  }
+
+  @Test
+  public void testGetTemplateMsgService() {
+  }
+
+  @Test
+  public void testGetSubscribeMsgService() {
+  }
+
+  @Test
+  public void testGetDeviceService() {
+  }
+
+  @Test
+  public void testGetShakeService() {
+  }
+
+  @Test
+  public void testGetMemberCardService() {
+  }
+
+  @Test
+  public void testGetRequestHttp() {
+  }
+
+  @Test
+  public void testGetMassMessageService() {
+  }
+
+  @Test
+  public void testSetKefuService() {
+  }
+
+  @Test
+  public void testSetMaterialService() {
+  }
+
+  @Test
+  public void testSetMenuService() {
+  }
+
+  @Test
+  public void testSetUserService() {
+  }
+
+  @Test
+  public void testSetTagService() {
+  }
+
+  @Test
+  public void testSetQrCodeService() {
+  }
+
+  @Test
+  public void testSetCardService() {
+  }
+
+  @Test
+  public void testSetStoreService() {
+  }
+
+  @Test
+  public void testSetDataCubeService() {
+  }
+
+  @Test
+  public void testSetBlackListService() {
+  }
+
+  @Test
+  public void testSetTemplateMsgService() {
+  }
+
+  @Test
+  public void testSetDeviceService() {
+  }
+
+  @Test
+  public void testSetShakeService() {
+  }
+
+  @Test
+  public void testSetMemberCardService() {
+  }
+
+  @Test
+  public void testSetMassMessageService() {
+  }
+
+  @Test
+  public void testGetAiOpenService() {
+  }
+
+  @Test
+  public void testSetAiOpenService() {
+  }
+
+  @Test
+  public void testGetWifiService() {
+  }
+
+  @Test
+  public void testGetOcrService() {
+  }
+
+  @Test
+  public void testGetMarketingService() {
+  }
+
+  @Test
+  public void testSetMarketingService() {
+  }
+
+  @Test
+  public void testSetOcrService() {
+  }
+
+  @Test
+  public void testGetCommentService() {
+  }
+
+  @Test
+  public void testSetCommentService() {
+  }
+
+  @Test
+  public void testGetImgProcService() {
+  }
+
+  @Test
+  public void testSetImgProcService() {
+  }
 }

From a45a98234d713d8b88cc180323b1a48c327a409f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 28 Mar 2020 18:18:20 +0800
Subject: [PATCH 038/114] =?UTF-8?q?#1462=20=E4=BC=98=E5=8C=96=E5=88=B7?=
 =?UTF-8?q?=E8=84=B8=E6=94=AF=E4=BB=98=E8=8E=B7=E5=8F=96=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=88=B7=E8=84=B8=E6=94=AF=E4=BB=98=E5=87=AD=E8=AF=81=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=9D=E8=AF=81=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E5=88=B0=E5=BE=AE=E4=BF=A1=E7=AB=AF=E6=97=B6signType=E6=9C=89?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index abf9a41e0e..908e0c03b0 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -13,6 +13,7 @@
 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;
 import com.github.binarywang.wxpay.constant.WxPayConstants.SignType;
 import com.github.binarywang.wxpay.constant.WxPayConstants.TradeType;
 import com.github.binarywang.wxpay.exception.WxPayException;
@@ -804,6 +805,10 @@ public String queryComment(WxPayQueryCommentRequest request) throws WxPayExcepti
 
   @Override
   public WxPayFaceAuthInfoResult getWxPayFaceAuthInfo(WxPayFaceAuthInfoRequest request) throws WxPayException {
+    if (StringUtils.isEmpty(request.getSignType())) {
+      request.setSignType(WxPayConstants.SignType.MD5);
+    }
+
     request.checkAndSign(this.getConfig());
     String url = "https://payapp.weixin.qq.com/face/get_wxpayface_authinfo";
     String responseContent = this.post(url, request.toXML(), false);

From 73ecaabdb4c84b9cd052b71443315e249adda86d Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 28 Mar 2020 20:58:56 +0800
Subject: [PATCH 039/114] =?UTF-8?q?:bug:=20#1463=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E6=9F=A5=E8=AF=A2=E5=88=86?=
 =?UTF-8?q?=E8=B4=A6=E7=BB=93=E6=9E=9C=E8=AF=B7=E6=B1=82=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8CsubAppId=E4=B8=8D=E5=8F=82=E4=B8=8E?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/profitsharing/ProfitSharingQueryRequest.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryRequest.java
index 5f5282dbd6..d342153a94 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingQueryRequest.java
@@ -61,6 +61,11 @@ public boolean ignoreAppid() {
     return true;
   }
 
+  @Override
+  protected boolean ignoreSubAppId() {
+    return true;
+  }
+
   @Override
   protected void storeMap(Map<String, String> map) {
     map.put("transaction_id", transactionId);

From 1f49ac07813b035909044ab95dc73bd12026c64c Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 28 Mar 2020 21:30:56 +0800
Subject: [PATCH 040/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=8E=BB=E6=8E=89=E4=B9=8B=E5=89=8DPR?=
 =?UTF-8?q?=E5=BC=95=E5=85=A5=E7=9A=84lambda=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E8=AF=81=E5=85=BC=E5=AE=B9java7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wx/miniapp/api/impl/WxMaCloudServiceImpl.java | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
index f01a87a1d9..55a80704c2 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaCloudServiceImpl.java
@@ -49,7 +49,6 @@ public String invokeCloudFunction(String env, String name, String body) throws W
 
   @Override
   public List<String> add(String collection, List list) throws WxErrorException {
-
     String jsonData = WxMaGsonBuilder.create().toJson(list);
     String query = JoinerUtils.blankJoiner.join(
       "db.collection('", collection, "')",
@@ -67,9 +66,7 @@ public List<String> add(String collection, List list) throws WxErrorException {
     }
     JsonArray idArray = jsonObject.getAsJsonArray("id_list");
     List<String> idList = new ArrayList<>();
-    Iterator<JsonElement> idIterator = idArray.iterator();
-    while (idIterator.hasNext()) {
-      JsonElement id = idIterator.next();
+    for (JsonElement id : idArray) {
       idList.add(id.getAsString());
     }
     return idList;
@@ -124,8 +121,7 @@ public Integer delete(String collection, String whereJson) throws WxErrorExcepti
     if (jsonObject.get(WxMaConstants.ERRCODE).getAsInt() != 0) {
       throw new WxErrorException(WxError.fromJson(responseContent));
     }
-    Integer deletedNum = jsonObject.get("deleted").getAsInt();
-    return deletedNum;
+    return jsonObject.get("deleted").getAsInt();
   }
 
   @Override
@@ -174,10 +170,11 @@ public WxCloudDatabaseQueryResult query(String collection, String whereJson, Map
     }
     StringBuilder orderBySb = new StringBuilder();
     if (null != orderBy && !orderBy.isEmpty()) {
-      orderBy.entrySet().forEach(
-        e -> orderBySb.append(".orderBy('").append(e.getKey()).append("', '").append(e.getValue()).append("')")
-      );
+      for (Map.Entry<String, String> entry : orderBy.entrySet()) {
+        orderBySb.append(".orderBy('").append(entry.getKey()).append("', '").append(entry.getValue()).append("')");
+      }
     }
+
     if (null == limit) {
       limit = 100;
     }

From a9cd7d2c2fb5d9ef36b50907ad0cb46bdeac084f Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 28 Mar 2020 22:16:53 +0800
Subject: [PATCH 041/114] :art: #1427 fix XmlUtils.xml2Map() method which was
 vulnerable to XXE vulnerability

---
 .../chanjar/weixin/common/util/XmlUtils.java  | 27 +++++++++++--------
 .../weixin/common/util/XmlUtilsTest.java      | 15 +++++++++--
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/XmlUtils.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/XmlUtils.java
index cd3a7a984c..c2ffdb001b 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/XmlUtils.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/XmlUtils.java
@@ -1,21 +1,21 @@
 package me.chanjar.weixin.common.util;
 
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.Element;
 import org.dom4j.Node;
 import org.dom4j.io.SAXReader;
 import org.dom4j.tree.DefaultText;
+import org.xml.sax.SAXException;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <pre>
@@ -31,13 +31,18 @@ public static Map<String, Object> xml2Map(String xmlString) {
     Map<String, Object> map = new HashMap<>(16);
     try {
       SAXReader saxReader = new SAXReader();
+      saxReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+      saxReader.setFeature("http://javax.xml.XMLConstants/feature/secure-processing", true);
+      saxReader.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+      saxReader.setFeature("http://xml.org/sax/features/external-general-entities", false);
+      saxReader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
       Document doc = saxReader.read(new StringReader(xmlString));
       Element root = doc.getRootElement();
       List<Element> elements = root.elements();
       for (Element element : elements) {
-          map.put(element.getName(), element2MapOrString(element));
+        map.put(element.getName(), element2MapOrString(element));
       }
-    } catch (DocumentException e) {
+    } catch (DocumentException | SAXException e) {
       throw new RuntimeException(e);
     }
 
diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/XmlUtilsTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/XmlUtilsTest.java
index 1afd1c1d9c..7b6bb536f4 100644
--- a/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/XmlUtilsTest.java
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/util/XmlUtilsTest.java
@@ -1,10 +1,10 @@
 package me.chanjar.weixin.common.util;
 
+import org.testng.annotations.Test;
+
 import java.util.List;
 import java.util.Map;
 
-import org.testng.annotations.*;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
@@ -17,6 +17,17 @@
  */
 public class XmlUtilsTest {
 
+  @Test(expectedExceptions = {RuntimeException.class})
+  public void testXml2Map_xxe() {
+    String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+      "<!DOCTYPE test [\n" +
+      "<!ENTITY xxe SYSTEM \"file:///etc/passwd\">\n" +
+      "<!ENTITY xxe2 SYSTEM \"http://localhost/test.php\">\n" +
+      "]>\n" +
+      "<xml></xml>";
+    XmlUtils.xml2Map(xml);
+  }
+
   @Test
   public void testXml2Map() {
     String xml = "<xml>\n" +

From 3048767a430222c9e9367c9f33263a5cf2963d53 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 29 Mar 2020 12:55:06 +0800
Subject: [PATCH 042/114] =?UTF-8?q?:bookmark:=20=20=E5=8F=91=E5=B8=83=203.?=
 =?UTF-8?q?7.4.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 777f6f9134..032bbee045 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.3.B</version>
+  <version>3.7.4.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index e9e621fd2d..a63b4fd21f 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index be6d7a6c88..e4445e5803 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 5262fdb93d..5b8a659d48 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 7fd51a0af0..9ddd1a672d 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 9b506ef005..3d0e8d131f 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index b5c09da2d1..ac35b84c49 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 0ff706d726..5d17c487a9 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 6fb0f93bfc..181af24bf6 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index de4d37fa88..2a9d1c8382 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index b7bc1bdb11..40ce7d2a1e 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index 140a772d5e..a5975f151f 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index a06b8b35bb..7624d5cad5 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.3.B</version>
+    <version>3.7.4.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 96b370ea014fda8c22978a6d1f04b44b75b5d9ac Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 29 Mar 2020 16:13:51 +0800
Subject: [PATCH 043/114] =?UTF-8?q?:new:=20#1373=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=9A=84=E6=94=AF=E6=8C=81=EF=BC=9A=E4=B8=BB=E8=A6=81?=
 =?UTF-8?q?=E6=98=AF=E5=AF=BC=E5=85=A5=E6=8A=BD=E6=A0=B7=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=9A=84=E5=AE=9E=E7=8E=B0=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E6=8E=A5=E6=94=B6=E6=B6=88=E6=81=AF=E6=97=B6=E5=AF=B9?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wx/miniapp/api/WxMaService.java           |  42 +++++-
 .../wx/miniapp/api/impl/WxMaServiceImpl.java  |  13 ++
 .../wx/miniapp/bean/WxMaMessage.java          |   9 ++
 .../miniapp/api/impl/WxMaServiceImplTest.java | 139 +++++++++++++++++-
 4 files changed, 198 insertions(+), 5 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
index 80150968dc..072907ba12 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
@@ -22,6 +22,11 @@ public interface WxMaService {
    */
   String GET_PAID_UNION_ID_URL = "https://api.weixin.qq.com/wxa/getpaidunionid";
 
+  /**
+   * 导入抽样数据
+   */
+  String SET_DYNAMIC_DATA_URL = "https://api.weixin.qq.com/wxa/setdynamicdata";
+
   /**
    * 获取登录后的session信息.
    *
@@ -29,6 +34,22 @@ public interface WxMaService {
    */
   WxMaJscode2SessionResult jsCode2SessionInfo(String jsCode) throws WxErrorException;
 
+  /**
+   * 导入抽样数据
+   * <pre>
+   * 第三方通过调用微信API，将数据写入到setdynamicdata这个API。每个Post数据包不超过5K，若数据过多可开多进（线）程并发导入数据（例如：数据量为十万量级可以开50个线程并行导数据）。
+   * 文档地址：https://wsad.weixin.qq.com/wsad/zh_CN/htmledition/widget-docs-v3/html/custom/quickstart/implement/import/index.html
+   * http请求方式：POST http(s)://api.weixin.qq.com/wxa/setdynamicdata?access_token=ACCESS_TOKEN
+   * </pre>
+   *
+   * @param data     推送到微信后台的数据列表，该数据被微信用于流量分配，注意该字段为string类型而不是object
+   * @param lifespan 数据有效时间，秒为单位，一般为86400，一天一次导入的频率
+   * @param scene    1代表用于搜索的数据
+   * @param type     用于标识数据所属的服务类目
+   * @throws WxErrorException .
+   */
+  void setDynamicData(int lifespan, String type, int scene, String data) throws WxErrorException;
+
   /**
    * <pre>
    * 验证消息的确来自微信服务器.
@@ -73,6 +94,8 @@ public interface WxMaService {
    * @param transactionId 非必填 微信支付订单号
    * @param mchId         非必填 微信支付分配的商户号，和商户订单号配合使用
    * @param outTradeNo    非必填  微信支付商户订单号，和商户号配合使用
+   * @return UnionId.
+   * @throws WxErrorException .
    */
   String getPaidUnionId(String openid, String transactionId, String mchId, String outTradeNo) throws WxErrorException;
 
@@ -97,6 +120,13 @@ public interface WxMaService {
    * 比{@link #get}和{@link #post}方法更灵活，可以自己构造RequestExecutor用来处理不同的参数和不同的返回类型。
    * 可以参考，{@link MediaUploadRequestExecutor}的实现方法
    * </pre>
+   *
+   * @param <E>      .
+   * @param <T>      .
+   * @param data     参数或请求数据
+   * @param executor 执行器
+   * @param uri      接口请求地址
+   * @return .
    */
   <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException;
 
@@ -105,6 +135,8 @@ public interface WxMaService {
    * 设置当微信系统响应系统繁忙时，要等待多少 retrySleepMillis(ms) * 2^(重试次数 - 1) 再发起重试.
    * 默认：1000ms
    * </pre>
+   *
+   * @param retrySleepMillis 重试等待毫秒数
    */
   void setRetrySleepMillis(int retrySleepMillis);
 
@@ -113,6 +145,8 @@ public interface WxMaService {
    * 设置当微信系统响应系统繁忙时，最大重试次数.
    * 默认：5次
    * </pre>
+   *
+   * @param maxRetryTimes 最大重试次数
    */
   void setMaxRetryTimes(int maxRetryTimes);
 
@@ -125,6 +159,8 @@ public interface WxMaService {
 
   /**
    * 注入 {@link WxMaConfig} 的实现.
+   *
+   * @param wxConfigProvider config
    */
   void setWxMaConfig(WxMaConfig wxConfigProvider);
 
@@ -233,18 +269,22 @@ public interface WxMaService {
 
   /**
    * 请求http请求相关信息.
+   *
+   * @return .
    */
   RequestHttp getRequestHttp();
 
   /**
    * 获取物流助手接口服务对象
    *
-   * @return
+   * @return .
    */
   WxMaExpressService getExpressService();
 
   /**
    * 获取云开发接口服务对象
+   *
+   * @return .
    */
   WxMaCloudService getCloudService();
 }
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 537364f288..9c1272eb30 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
@@ -4,7 +4,9 @@
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.WxType;
@@ -183,6 +185,17 @@ public WxMaJscode2SessionResult jsCode2SessionInfo(String jsCode) throws WxError
     return WxMaJscode2SessionResult.fromJson(result);
   }
 
+  @Override
+  public void setDynamicData(int lifespan, String type, int scene, String data) throws WxErrorException {
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("lifespan", lifespan);
+    jsonObject.addProperty("query", WxGsonBuilder.create().toJson(ImmutableMap.of("type", type)));
+    jsonObject.addProperty("data", data);
+    jsonObject.addProperty("scene", scene);
+
+    this.post(SET_DYNAMIC_DATA_URL, jsonObject.toString());
+  }
+
   @Override
   public boolean checkSignature(String timestamp, String nonce, String signature) {
     try {
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
index 483dd7c54a..4e06e42394 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaMessage.java
@@ -135,6 +135,15 @@ public class WxMaMessage implements Serializable {
   @XStreamConverter(value = XStreamCDataConverter.class)
   private String statusCode;
 
+  @SerializedName("Scene")
+  @XStreamAlias("Scene")
+  private Integer scene;
+
+  @SerializedName("Query")
+  @XStreamAlias("Query")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String query;
+
   public static WxMaMessage fromXml(String xml) {
     return XStreamTransformer.fromXml(WxMaMessage.class, xml);
   }
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
index bf5027334d..4e0a886f74 100644
--- a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceImplTest.java
@@ -1,16 +1,17 @@
 package cn.binarywang.wx.miniapp.api.impl;
 
-import org.apache.commons.lang3.StringUtils;
-import org.testng.annotations.*;
-
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.test.ApiTestModule;
 import com.google.inject.Inject;
 import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
 
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
@@ -49,4 +50,134 @@ public void testPost() throws WxErrorException {
 
     System.out.println(postResult);
   }
+
+  @Test
+  public void testGetRequestHttpClient() {
+  }
+
+  @Test
+  public void testGetRequestHttpProxy() {
+  }
+
+  @Test
+  public void testGetRequestType() {
+  }
+
+  @Test
+  public void testInitHttp() {
+  }
+
+  @Test
+  public void testGetRequestHttp() {
+  }
+
+  @Test
+  public void testGetAccessToken() {
+  }
+
+  @Test
+  public void testJsCode2SessionInfo() {
+  }
+
+  @Test
+  public void testSetDynamicData() throws WxErrorException {
+    this.wxService.setDynamicData(86400, "1000001", 1,
+      "{\"items\":[{\"stock_name\":\"腾讯控股\", \"stock_code\":\"00700\", \"stock_market\":\"hk\"}], \"attribute\":{\"count\":2, \"totalcount\": 100, \"id\": \"XXX\", \"seq\": 0}}");
+  }
+
+  @Test
+  public void testCheckSignature() {
+  }
+
+  @Test
+  public void testTestGetAccessToken() {
+  }
+
+  @Test
+  public void testGet() {
+  }
+
+  @Test
+  public void testExecute() {
+  }
+
+  @Test
+  public void testGetWxMaConfig() {
+  }
+
+  @Test
+  public void testSetWxMaConfig() {
+  }
+
+  @Test
+  public void testSetRetrySleepMillis() {
+  }
+
+  @Test
+  public void testSetMaxRetryTimes() {
+  }
+
+  @Test
+  public void testGetMsgService() {
+  }
+
+  @Test
+  public void testGetMediaService() {
+  }
+
+  @Test
+  public void testGetUserService() {
+  }
+
+  @Test
+  public void testGetQrcodeService() {
+  }
+
+  @Test
+  public void testGetTemplateService() {
+  }
+
+  @Test
+  public void testGetSubscribeService() {
+  }
+
+  @Test
+  public void testGetAnalysisService() {
+  }
+
+  @Test
+  public void testGetCodeService() {
+  }
+
+  @Test
+  public void testGetJsapiService() {
+  }
+
+  @Test
+  public void testGetSettingService() {
+  }
+
+  @Test
+  public void testGetShareService() {
+  }
+
+  @Test
+  public void testGetRunService() {
+  }
+
+  @Test
+  public void testGetSecCheckService() {
+  }
+
+  @Test
+  public void testGetPluginService() {
+  }
+
+  @Test
+  public void testGetExpressService() {
+  }
+
+  @Test
+  public void testGetCloudService() {
+  }
 }

From fb3ed0b64286a4c8779d2340613a837d6a08aa1d Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 4 Apr 2020 13:05:04 +0800
Subject: [PATCH 044/114] =?UTF-8?q?:art:=20#1485=20=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E9=83=A8=E5=88=86=E8=AF=B7=E6=B1=82=E7=B1=BB=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A0=E5=8F=82=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

---
 .../binarywang/wx/miniapp/bean/WxMaDomainAction.java   |  4 ++++
 .../wx/miniapp/bean/WxMaPluginListResult.java          |  1 -
 .../binarywang/wx/miniapp/bean/code/WxMaCategory.java  |  4 ++++
 .../wx/miniapp/bean/code/WxMaCodeAuditStatus.java      |  4 ++++
 .../wx/miniapp/bean/code/WxMaCodeCommitRequest.java    |  4 ++++
 .../wx/miniapp/bean/code/WxMaCodeExtConfig.java        |  4 ++++
 .../miniapp/bean/code/WxMaCodeSubmitAuditRequest.java  |  4 ++++
 .../miniapp/bean/code/WxMaCodeVersionDistribution.java |  4 ++++
 .../wx/miniapp/bean/express/WxMaExpressAccount.java    |  4 ++++
 .../wx/miniapp/bean/express/WxMaExpressDelivery.java   |  4 ++++
 .../wx/miniapp/bean/express/WxMaExpressPath.java       |  4 ++++
 .../wx/miniapp/bean/express/WxMaExpressPrinter.java    |  4 ++++
 .../express/request/WxMaExpressAddOrderRequest.java    |  4 ++++
 .../express/request/WxMaExpressBindAccountRequest.java |  5 ++++-
 .../express/request/WxMaExpressGetOrderRequest.java    |  5 ++++-
 .../bean/express/request/WxMaExpressOrderCargo.java    |  5 ++++-
 .../express/request/WxMaExpressOrderCargoDetail.java   |  5 ++++-
 .../bean/express/request/WxMaExpressOrderInsured.java  |  5 ++++-
 .../bean/express/request/WxMaExpressOrderPerson.java   |  5 ++++-
 .../bean/express/request/WxMaExpressOrderShop.java     |  5 ++++-
 .../request/WxMaExpressPrinterUpdateRequest.java       |  5 ++++-
 .../request/WxMaExpressTestUpdateOrderRequest.java     |  5 ++++-
 .../express/result/WxMaExpressOrderInfoResult.java     |  4 ++++
 .../bean/template/WxMaPubTemplateTitleListResult.java  |  5 +++++
 .../miniapp/bean/template/WxMaTemplateAddResult.java   | 10 +++++++---
 .../bean/template/WxMaTemplateLibraryGetResult.java    | 10 ++++++----
 .../bean/template/WxMaTemplateLibraryListResult.java   |  5 +++++
 .../miniapp/bean/template/WxMaTemplateListResult.java  | 10 ++++++----
 28 files changed, 117 insertions(+), 21 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaDomainAction.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaDomainAction.java
index 313f6cbed8..19a6a1cde9 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaDomainAction.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaDomainAction.java
@@ -2,8 +2,10 @@
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -16,6 +18,8 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaDomainAction implements Serializable {
   private static final long serialVersionUID = -2898601966852935708L;
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPluginListResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPluginListResult.java
index bea839276a..55be8d33e8 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPluginListResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaPluginListResult.java
@@ -9,7 +9,6 @@
 
 @Data
 public class WxMaPluginListResult implements Serializable {
-
   private static final long serialVersionUID = -5898572369543593656L;
 
   @SerializedName("plugin_list")
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCategory.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCategory.java
index 32195333eb..5e176cfa61 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCategory.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCategory.java
@@ -1,8 +1,10 @@
 package cn.binarywang.wx.miniapp.bean.code;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -14,6 +16,8 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaCategory implements Serializable {
   private static final long serialVersionUID = -7663757440028175135L;
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeAuditStatus.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeAuditStatus.java
index 6487485060..3faa18660b 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeAuditStatus.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeAuditStatus.java
@@ -2,8 +2,10 @@
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -15,6 +17,8 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaCodeAuditStatus implements Serializable {
   private static final long serialVersionUID = 4655119308692217268L;
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeCommitRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeCommitRequest.java
index ec64da59a3..f59fb1f039 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeCommitRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeCommitRequest.java
@@ -1,8 +1,10 @@
 package cn.binarywang.wx.miniapp.bean.code;
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -14,6 +16,8 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaCodeCommitRequest implements Serializable {
   private static final long serialVersionUID = 7495157056049312108L;
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeExtConfig.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeExtConfig.java
index 5d0314b2c6..c7d4de5491 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeExtConfig.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeExtConfig.java
@@ -4,8 +4,10 @@
 import java.util.List;
 import java.util.Map;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * 上传代码需要用到的第三方自定义的配置
@@ -16,6 +18,8 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaCodeExtConfig implements Serializable {
   private static final long serialVersionUID = -7666911367458178753L;
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeSubmitAuditRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeSubmitAuditRequest.java
index 5b784dbded..b65c4df588 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeSubmitAuditRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeSubmitAuditRequest.java
@@ -2,8 +2,10 @@
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -16,6 +18,8 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaCodeSubmitAuditRequest implements Serializable {
   private static final long serialVersionUID = 8854979405505241314L;
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionDistribution.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionDistribution.java
index 4c0f09644f..dd0a03a918 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionDistribution.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/code/WxMaCodeVersionDistribution.java
@@ -1,7 +1,9 @@
 package cn.binarywang.wx.miniapp.bean.code;
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Map;
 
@@ -12,6 +14,8 @@
  * @since 2018-04-26 19:45
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaCodeVersionDistribution {
   /**
    * 当前版本
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressAccount.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressAccount.java
index bdf72efebd..a3f22b6a4a 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressAccount.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressAccount.java
@@ -5,7 +5,9 @@
 import com.google.gson.JsonParser;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -18,6 +20,8 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressAccount implements Serializable {
 
   private static final JsonParser JSON_PARSER = new JsonParser();
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressDelivery.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressDelivery.java
index 1127479b4c..b23bc4c416 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressDelivery.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressDelivery.java
@@ -5,7 +5,9 @@
 import com.google.gson.JsonParser;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -18,6 +20,8 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressDelivery implements Serializable {
   private static final JsonParser JSON_PARSER = new JsonParser();
   private static final long serialVersionUID = -8394544895730223810L;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java
index ba5a903f4d..5967e5ac9e 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java
@@ -2,7 +2,9 @@
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -13,6 +15,8 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressPath implements Serializable {
 
   private static final long serialVersionUID = 5643624677715536605L;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPrinter.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPrinter.java
index 832fa2e376..764f2ac894 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPrinter.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPrinter.java
@@ -3,7 +3,9 @@
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.JsonParser;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -16,6 +18,8 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressPrinter implements Serializable {
 
   private static final JsonParser JSON_PARSER = new JsonParser();
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressAddOrderRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressAddOrderRequest.java
index 4b404e332b..e11f5beb6e 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressAddOrderRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressAddOrderRequest.java
@@ -4,8 +4,10 @@
 import cn.binarywang.wx.miniapp.bean.express.*;
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -18,6 +20,8 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressAddOrderRequest implements Serializable {
 
   private static final long serialVersionUID = -7538739003766268386L;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressBindAccountRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressBindAccountRequest.java
index fe6877fa9f..be0ef991c1 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressBindAccountRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressBindAccountRequest.java
@@ -2,8 +2,10 @@
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -16,8 +18,9 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressBindAccountRequest implements Serializable {
-
   private static final long serialVersionUID = 3868003945297939946L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressGetOrderRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressGetOrderRequest.java
index b21de172e9..6fe03ddae9 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressGetOrderRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressGetOrderRequest.java
@@ -2,8 +2,10 @@
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -16,8 +18,9 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressGetOrderRequest implements Serializable {
-
   private static final long serialVersionUID = 8239315305577639778L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderCargo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderCargo.java
index ec2c39709d..96817a2256 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderCargo.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderCargo.java
@@ -1,7 +1,9 @@
 package cn.binarywang.wx.miniapp.bean.express.request;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -12,8 +14,9 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressOrderCargo implements Serializable {
-
   private static final long serialVersionUID = 6642536671375396150L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderCargoDetail.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderCargoDetail.java
index 1e61bba897..6dbb3c0292 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderCargoDetail.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderCargoDetail.java
@@ -1,6 +1,8 @@
 package cn.binarywang.wx.miniapp.bean.express.request;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -10,8 +12,9 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressOrderCargoDetail implements Serializable {
-
   private static final long serialVersionUID = 5988620921216969796L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderInsured.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderInsured.java
index 7a30dacadc..d7ccda9aec 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderInsured.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderInsured.java
@@ -3,8 +3,10 @@
 
 import cn.binarywang.wx.miniapp.constant.WxMaConstants;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -15,8 +17,9 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressOrderInsured implements Serializable {
-
   private static final long serialVersionUID = -8636857630937445422L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderPerson.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderPerson.java
index 989380fb49..a70119fbcf 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderPerson.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderPerson.java
@@ -2,7 +2,9 @@
 
 
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -12,8 +14,9 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressOrderPerson implements Serializable {
-
   private static final long serialVersionUID = -7816060207882761506L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderShop.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderShop.java
index 9b1e3d884c..41c08f9e8e 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderShop.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressOrderShop.java
@@ -1,7 +1,9 @@
 package cn.binarywang.wx.miniapp.bean.express.request;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -11,8 +13,9 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressOrderShop implements Serializable {
-
   private static final long serialVersionUID = 7256509453502211830L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressPrinterUpdateRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressPrinterUpdateRequest.java
index a5f9f50dbf..da47f77042 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressPrinterUpdateRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressPrinterUpdateRequest.java
@@ -2,8 +2,10 @@
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -16,8 +18,9 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressPrinterUpdateRequest implements Serializable {
-
   private static final long serialVersionUID = 9119040050963924127L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressTestUpdateOrderRequest.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressTestUpdateOrderRequest.java
index e5d4cb448b..c0a8561243 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressTestUpdateOrderRequest.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/request/WxMaExpressTestUpdateOrderRequest.java
@@ -2,8 +2,10 @@
 
 import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -16,8 +18,9 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressTestUpdateOrderRequest implements Serializable {
-
   private static final long serialVersionUID = -3701602332580704140L;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java
index 01f274fb9c..8a25950a96 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/result/WxMaExpressOrderInfoResult.java
@@ -5,7 +5,9 @@
 import com.google.gson.JsonParser;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.List;
@@ -19,6 +21,8 @@
  * @since 2019-11-26
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class WxMaExpressOrderInfoResult implements Serializable {
   private static final JsonParser JSON_PARSER = new JsonParser();
   private static final long serialVersionUID = -9166603059965942285L;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaPubTemplateTitleListResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaPubTemplateTitleListResult.java
index a249619f9a..21fab6afa2 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaPubTemplateTitleListResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaPubTemplateTitleListResult.java
@@ -1,11 +1,16 @@
 package cn.binarywang.wx.miniapp.bean.template;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * @author ArBing
+ */
 @Data
 public class WxMaPubTemplateTitleListResult implements Serializable {
   private static final long serialVersionUID = -7718911668757837527L;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateAddResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateAddResult.java
index 4b30870d60..eb64920cd2 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateAddResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateAddResult.java
@@ -1,20 +1,24 @@
 package cn.binarywang.wx.miniapp.bean.template;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
 import java.io.Serializable;
 
+/**
+ * @author ArBing
+ */
 @Data
-public class WxMaTemplateAddResult implements Serializable{
-
+public class WxMaTemplateAddResult implements Serializable {
   private static final long serialVersionUID = 872250961973834465L;
 
   @SerializedName("template_id")
   private String templateId;
 
-  public static WxMaTemplateAddResult fromJson(String json){
+  public static WxMaTemplateAddResult fromJson(String json) {
     return WxGsonBuilder.create().fromJson(json, WxMaTemplateAddResult.class);
   }
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateLibraryGetResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateLibraryGetResult.java
index e55ed0d563..9a73d3b638 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateLibraryGetResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateLibraryGetResult.java
@@ -7,9 +7,11 @@
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * @author ArBing
+ */
 @Data
-public class WxMaTemplateLibraryGetResult implements Serializable{
-
+public class WxMaTemplateLibraryGetResult implements Serializable {
   private static final long serialVersionUID = -190847592776636744L;
   private String id;
   private String title;
@@ -17,7 +19,7 @@ public class WxMaTemplateLibraryGetResult implements Serializable{
   private List<KeywordInfo> keywordList;
 
   @Data
-  public static class KeywordInfo{
+  public static class KeywordInfo {
 
     @SerializedName("keyword_id")
     private int keywordId;
@@ -25,7 +27,7 @@ public static class KeywordInfo{
     private String example;
   }
 
-  public static WxMaTemplateLibraryGetResult fromJson(String json){
+  public static WxMaTemplateLibraryGetResult fromJson(String json) {
     return WxGsonBuilder.create().fromJson(json, WxMaTemplateLibraryGetResult.class);
   }
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateLibraryListResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateLibraryListResult.java
index 1926971b65..f32832d349 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateLibraryListResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateLibraryListResult.java
@@ -1,12 +1,17 @@
 package cn.binarywang.wx.miniapp.bean.template;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * @author ArBing
+ */
 @Data
 public class WxMaTemplateLibraryListResult implements Serializable{
   private static final long serialVersionUID = -2780782521447602209L;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateListResult.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateListResult.java
index 0537fefcc5..98708ff172 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateListResult.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/template/WxMaTemplateListResult.java
@@ -7,18 +7,20 @@
 import java.io.Serializable;
 import java.util.List;
 
+/**
+ * @author ArBing
+ */
 @Data
-public class WxMaTemplateListResult implements Serializable{
-
+public class WxMaTemplateListResult implements Serializable {
   private static final long serialVersionUID = -7430535579782184537L;
   private List<TemplateInfo> list;
 
-  public static WxMaTemplateListResult fromJson(String json){
+  public static WxMaTemplateListResult fromJson(String json) {
     return WxGsonBuilder.create().fromJson(json, WxMaTemplateListResult.class);
   }
 
   @Data
-  public static class TemplateInfo{
+  public static class TemplateInfo {
 
     @SerializedName("template_id")
     private String templateId;

From 61e6221bd79d90c1cd898680e9e3ac2f662717fa Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 4 Apr 2020 13:38:27 +0800
Subject: [PATCH 045/114] =?UTF-8?q?:art:=20#1483=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=BC=82=E6=AD=A5=E9=80=9A=E7=9F=A5=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E6=97=B6=E4=BD=BF=E7=94=A8=E9=80=9A=E7=9F=A5=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E7=AD=BE=E5=90=8D=E7=B1=BB=E5=9E=8B=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E9=AA=8C=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index 908e0c03b0..1f0e52838c 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -155,7 +155,7 @@ public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) throws WxPa
       log.debug("微信支付异步通知请求参数：{}", xmlData);
       WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlData);
       log.debug("微信支付异步通知请求解析后的对象：{}", result);
-      result.checkResult(this, this.getConfig().getSignType(), false);
+      result.checkResult(this, result.getSignType(), false);
       return result;
     } catch (WxPayException e) {
       throw e;

From 7f6780a4e30d9675bf1f75b0702e384b9c3d56a3 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 4 Apr 2020 13:44:58 +0800
Subject: [PATCH 046/114] =?UTF-8?q?:art:=20#1482=20=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E8=B6=85=E8=BF=87=E9=87=8D=E8=AF=95=E6=AC=A1=E6=95=B0=E6=97=B6?=
 =?UTF-8?q?=E5=B0=86=E5=BE=AE=E4=BF=A1=E5=8E=9F=E5=A7=8B=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8A=9B=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 9c1272eb30..87903ea859 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
@@ -239,7 +239,10 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
         if (retryTimes + 1 > this.maxRetryTimes) {
           log.warn("重试达到最大次数【{}】", maxRetryTimes);
           //最后一次重试失败后，直接抛出异常，不再等待
-          throw new RuntimeException("微信服务端异常，超出重试次数");
+          throw new WxErrorException(WxError.builder()
+            .errorCode(e.getError().getErrorCode())
+            .errorMsg("微信服务端异常，超出重试次数！")
+            .build());
         }
 
         WxError error = e.getError();

From 2cd362dc40d5fe7b60c5add63dc986dbc2ee10c3 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 4 Apr 2020 14:40:50 +0800
Subject: [PATCH 047/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E9=83=A8=E5=88=86=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
index 73b548c24f..117c9c96c4 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -345,9 +345,9 @@ protected <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E
       WxError error = e.getError();
       /*
        * 发生以下情况时尝试刷新access_token
-       * 40001 获取access_token时AppSecret错误，或者access_token无效
-       * 42001 access_token超时
-       * 40014 不合法的access_token，请开发者认真比对access_token的有效性（如是否过期），或查看是否正在为恰当的公众号调用接口
+       * 40001 获取 access_token 时 AppSecret 错误，或者 access_token 无效。请开发者认真比对 AppSecret 的正确性，或查看是否正在为恰当的公众号调用接口
+       * 42001 access_token 超时，请检查 access_token 的有效期，请参考基础支持 - 获取 access_token 中，对 access_token 的详细机制说明
+       * 40014 不合法的 access_token ，请开发者认真比对 access_token 的有效性（如是否过期），或查看是否正在为恰当的公众号调用接口
        */
       if (error.getErrorCode() == 42001 || error.getErrorCode() == 40001 || error.getErrorCode() == 40014) {
         // 强制设置wxMpConfigStorage它的access token过期了，这样在下一次请求里就会刷新access token

From 1a8ec43d260329f10cdddb285f0f541b6d1fef4f Mon Sep 17 00:00:00 2001
From: 007gzs <007gzs@gmail.com>
Date: Sat, 4 Apr 2020 15:47:22 +0800
Subject: [PATCH 048/114] =?UTF-8?q?:bug:=20#1424=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0execute=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E5=8A=A0=E5=90=8C=E6=AD=A5=E9=94=81=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E5=B9=B6=E5=8F=91=E6=80=A7=E8=83=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/open/api/impl/WxOpenServiceAbstractImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceAbstractImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceAbstractImpl.java
index b7084c9eb1..e4e66890b3 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceAbstractImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceAbstractImpl.java
@@ -42,7 +42,7 @@ public void setWxOpenConfigStorage(WxOpenConfigStorage wxOpenConfigStorage) {
    */
   public abstract void initHttp();
 
-  protected synchronized <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
+  protected <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) throws WxErrorException {
     try {
       T result = executor.execute(uri, data, WxType.Open);
       this.log.debug("\n【请求地址】: {}\n【请求参数】：{}\n【响应数据】：{}", uri, data, result);

From a05b2ce36679eba14bb6e17b3877376df98d9be8 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 4 Apr 2020 17:49:47 +0800
Subject: [PATCH 049/114] :art: add serialVersionUID for some class

---
 .../java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java
index f1f9f91c34..83b37f12ec 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java
@@ -12,6 +12,7 @@
  */
 @Data
 public final class MemberCardUpdate implements Serializable {
+  private static final long serialVersionUID = -4755309390784904858L;
 
   //以下字段顺序根据微信官方文档顺序相同，不能传入非文档之外的字段
   //https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1466494654_K9rNz

From d703f2d35ce3d4ceef33e2bfe4f5ffecde5d9b43 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 4 Apr 2020 19:24:01 +0800
Subject: [PATCH 050/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.7.5?=
 =?UTF-8?q?.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 032bbee045..f3d6b3dae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.4.B</version>
+  <version>3.7.5.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index a63b4fd21f..540adede94 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index e4445e5803..979df6798e 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 5b8a659d48..2aab1e1c9a 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 9ddd1a672d..db6b0a5b3a 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 3d0e8d131f..345cbf8435 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index ac35b84c49..f859bf6632 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 5d17c487a9..25b4d4fe7e 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 181af24bf6..b22b105cd8 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 2a9d1c8382..d5dd56ed12 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 40ce7d2a1e..8484902cdb 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index a5975f151f..14a9c14fb4 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 7624d5cad5..6e0ff7b0f2 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.4.B</version>
+    <version>3.7.5.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 04f7d7605746068606b048edae127e0fa2dbae9c Mon Sep 17 00:00:00 2001
From: 007gzs <007gzs@gmail.com>
Date: Sat, 4 Apr 2020 19:28:49 +0800
Subject: [PATCH 051/114] =?UTF-8?q?:art:=20#1487=20=E5=BC=80=E6=94=BE?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=A8=A1=E5=9D=97=E4=B8=89=E6=96=B9=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=8E=B7=E5=8F=96token=E6=96=B9=E6=B3=95=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81redis=E5=88=86=E5=B8=83=E5=BC=8F=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 三方平台支持redis分布式锁；getComponentAccessToken 加锁

* getAuthorizerAccessToken 加锁
---
 pom.xml                                       |  6 ++
 weixin-java-common/pom.xml                    |  9 +++
 .../util/locks/JedisDistributedLock.java      | 71 +++++++++++++++++++
 .../weixin/open/api/WxOpenConfigStorage.java  |  6 ++
 .../AbstractWxOpenInRedisConfigStorage.java   |  9 ++-
 .../api/impl/WxOpenComponentServiceImpl.java  | 37 +++++++---
 .../api/impl/WxOpenInMemoryConfigStorage.java | 27 ++++++-
 .../api/impl/WxOpenInRedisConfigStorage.java  |  8 +++
 8 files changed, 160 insertions(+), 13 deletions(-)
 create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/JedisDistributedLock.java

diff --git a/pom.xml b/pom.xml
index f3d6b3dae9..a173a07837 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,6 +243,12 @@
         <version>2.9.0</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>com.github.jedis-lock</groupId>
+        <artifactId>jedis-lock</artifactId>
+        <version>1.0.0</version>
+        <scope>provided</scope>
+      </dependency>
       <dependency>
         <groupId>org.redisson</groupId>
         <artifactId>redisson</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 25b4d4fe7e..f0b0994345 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -118,6 +118,15 @@
       <artifactId>dom4j</artifactId>
       <version>2.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>redis.clients</groupId>
+      <artifactId>jedis</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.jedis-lock</groupId>
+      <artifactId>jedis-lock</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/JedisDistributedLock.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/JedisDistributedLock.java
new file mode 100644
index 0000000000..636e7e245f
--- /dev/null
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/JedisDistributedLock.java
@@ -0,0 +1,71 @@
+package me.chanjar.weixin.common.util.locks;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import redis.clients.jedis.Jedis;
+import redis.clients.util.Pool;
+
+/**
+ * JedisPool 分布式锁
+ *
+ * @author <a href="https://github.com/007gzs">007</a>
+ */
+public class JedisDistributedLock implements Lock {
+  private final Pool<Jedis> jedisPool;
+  private final JedisLock lock;
+
+  public JedisDistributedLock(Pool<Jedis> jedisPool, String key){
+    this.jedisPool = jedisPool;
+    this.lock = new JedisLock(key);
+  }
+
+  @Override
+  public void lock() {
+    try (Jedis jedis = jedisPool.getResource()) {
+      if (!lock.acquire(jedis)) {
+        throw new RuntimeException("acquire timeouted");
+      }
+    } catch (InterruptedException e) {
+      throw new RuntimeException("lock failed", e);
+    }
+  }
+
+  @Override
+  public void lockInterruptibly() throws InterruptedException {
+    try (Jedis jedis = jedisPool.getResource()) {
+      if (!lock.acquire(jedis)) {
+        throw new RuntimeException("acquire timeouted");
+      }
+    }
+  }
+
+  @Override
+  public boolean tryLock() {
+    try (Jedis jedis = jedisPool.getResource()) {
+      return lock.acquire(jedis);
+    } catch (InterruptedException e) {
+      throw new RuntimeException("lock failed", e);
+    }
+  }
+
+  @Override
+  public boolean tryLock(long time, TimeUnit unit) throws InterruptedException {
+    try (Jedis jedis = jedisPool.getResource()) {
+      return lock.acquire(jedis);
+    }
+  }
+
+  @Override
+  public void unlock() {
+    try (Jedis jedis = jedisPool.getResource()) {
+      lock.release(jedis);
+    }
+  }
+
+  @Override
+  public Condition newCondition() {
+    throw new RuntimeException("unsupported method");
+  }
+
+}
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenConfigStorage.java
index 79969228ad..5a51c3bfa1 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenConfigStorage.java
@@ -6,6 +6,8 @@
 import me.chanjar.weixin.open.bean.WxOpenAuthorizerAccessToken;
 import me.chanjar.weixin.open.bean.WxOpenComponentAccessToken;
 
+import java.util.concurrent.locks.Lock;
+
 /**
  * @author <a href="https://github.com/007gzs">007</a>
  */
@@ -53,6 +55,10 @@ public interface WxOpenConfigStorage {
 
   WxMaConfig getWxMaConfig(String appId);
 
+  Lock getComponentAccessTokenLock();
+
+  Lock getLockByKey(String key);
+
   /**
    * 应该是线程安全的
    *
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/AbstractWxOpenInRedisConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/AbstractWxOpenInRedisConfigStorage.java
index 0d0b1bf255..52799da57c 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/AbstractWxOpenInRedisConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/AbstractWxOpenInRedisConfigStorage.java
@@ -13,6 +13,9 @@ public abstract class AbstractWxOpenInRedisConfigStorage extends WxOpenInMemoryC
 
   protected final static String AUTHORIZER_REFRESH_TOKEN_KEY = "wechat_authorizer_refresh_token:";
   protected final static String AUTHORIZER_ACCESS_TOKEN_KEY = "wechat_authorizer_access_token:";
+
+  protected final static String LOCK_KEY = "wechat_lock:";
+
   protected final static String JSAPI_TICKET_KEY = "wechat_jsapi_ticket:";
   protected final static String CARD_API_TICKET_KEY = "wechat_card_api_ticket:";
 
@@ -26,6 +29,7 @@ public abstract class AbstractWxOpenInRedisConfigStorage extends WxOpenInMemoryC
   protected String authorizerAccessTokenKey;
   protected String jsapiTicketKey;
   protected String cardApiTicket;
+  protected String lockKey;
 
   @Override
   public void setComponentAppId(String componentAppId) {
@@ -36,8 +40,9 @@ public void setComponentAppId(String componentAppId) {
     componentAccessTokenKey = prefix + COMPONENT_ACCESS_TOKEN_KEY.concat(componentAppId);
     authorizerRefreshTokenKey = prefix + AUTHORIZER_REFRESH_TOKEN_KEY.concat(componentAppId);
     authorizerAccessTokenKey = prefix + AUTHORIZER_ACCESS_TOKEN_KEY.concat(componentAppId);
-    this.jsapiTicketKey = JSAPI_TICKET_KEY.concat(componentAppId);
-    this.cardApiTicket = CARD_API_TICKET_KEY.concat(componentAppId);
+    lockKey = prefix + LOCK_KEY.concat(componentAppId);
+    jsapiTicketKey = prefix + JSAPI_TICKET_KEY.concat(componentAppId);
+    cardApiTicket = prefix + CARD_API_TICKET_KEY.concat(componentAppId);
   }
 
   protected String getKey(String prefix, String appId) {
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
index 27e765698b..4f1fc90069 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
@@ -23,6 +23,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.locks.Lock;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -109,8 +110,16 @@ public boolean checkSignature(String timestamp, String nonce, String signature)
 
   @Override
   public String getComponentAccessToken(boolean forceRefresh) throws WxErrorException {
-
-    if (this.getWxOpenConfigStorage().isComponentAccessTokenExpired() || forceRefresh) {
+    final WxOpenConfigStorage config = this.getWxOpenConfigStorage();
+    if (!config.isComponentAccessTokenExpired() && !forceRefresh) {
+      return config.getComponentAccessToken();
+    }
+    Lock lock = config.getComponentAccessTokenLock();
+    lock.lock();
+    try {
+      if (!config.isComponentAccessTokenExpired() && !forceRefresh) {
+        return config.getComponentAccessToken();
+      }
       JsonObject jsonObject = new JsonObject();
       jsonObject.addProperty("component_appid", getWxOpenConfigStorage().getComponentAppId());
       jsonObject.addProperty("component_appsecret", getWxOpenConfigStorage().getComponentAppSecret());
@@ -118,9 +127,11 @@ public String getComponentAccessToken(boolean forceRefresh) throws WxErrorExcept
 
       String responseContent = this.getWxOpenService().post(API_COMPONENT_TOKEN_URL, jsonObject.toString());
       WxOpenComponentAccessToken componentAccessToken = WxOpenComponentAccessToken.fromJson(responseContent);
-      getWxOpenConfigStorage().updateComponentAccessToken(componentAccessToken);
+      config.updateComponentAccessToken(componentAccessToken);
+      return config.getComponentAccessToken();
+    } finally {
+      lock.unlock();
     }
-    return this.getWxOpenConfigStorage().getComponentAccessToken();
   }
 
   @Override
@@ -346,8 +357,16 @@ public void setAuthorizerOption(String authorizerAppid, String optionName, Strin
 
   @Override
   public String getAuthorizerAccessToken(String appId, boolean forceRefresh) throws WxErrorException {
-
-    if (this.getWxOpenConfigStorage().isAuthorizerAccessTokenExpired(appId) || forceRefresh) {
+    WxOpenConfigStorage config = getWxOpenConfigStorage();
+    if (!config.isAuthorizerAccessTokenExpired(appId) && !forceRefresh){
+      return config.getAuthorizerAccessToken(appId);
+    }
+    Lock lock = config.getWxMpConfigStorage(appId).getAccessTokenLock();
+    lock.lock();
+    try{
+      if (!config.isAuthorizerAccessTokenExpired(appId) && !forceRefresh){
+        return config.getAuthorizerAccessToken(appId);
+      }
       JsonObject jsonObject = new JsonObject();
       jsonObject.addProperty("component_appid", getWxOpenConfigStorage().getComponentAppId());
       jsonObject.addProperty("authorizer_appid", appId);
@@ -355,9 +374,11 @@ public String getAuthorizerAccessToken(String appId, boolean forceRefresh) throw
       String responseContent = post(API_AUTHORIZER_TOKEN_URL, jsonObject.toString());
 
       WxOpenAuthorizerAccessToken wxOpenAuthorizerAccessToken = WxOpenAuthorizerAccessToken.fromJson(responseContent);
-      getWxOpenConfigStorage().updateAuthorizerAccessToken(appId, wxOpenAuthorizerAccessToken);
+      config.updateAuthorizerAccessToken(appId, wxOpenAuthorizerAccessToken);
+      return config.getAuthorizerAccessToken(appId);
+    }finally {
+      lock.unlock();
     }
-    return this.getWxOpenConfigStorage().getAuthorizerAccessToken(appId);
   }
 
   @Override
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
index 33678ea8ab..966db0612a 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
@@ -44,6 +44,9 @@ public class WxOpenInMemoryConfigStorage implements WxOpenConfigStorage {
   private Map<String, Token> authorizerAccessTokens = new ConcurrentHashMap<>();
   private Map<String, Token> jsapiTickets = new ConcurrentHashMap<>();
   private Map<String, Token> cardApiTickets = new ConcurrentHashMap<>();
+  private Map<String, Lock> locks = new ConcurrentHashMap<>();
+
+  private Lock componentAccessTokenLock = getLockByKey("componentAccessTokenLock");
 
 
   @Override
@@ -61,6 +64,21 @@ public void updateComponentAccessToken(WxOpenComponentAccessToken componentAcces
     updateComponentAccessToken(componentAccessToken.getComponentAccessToken(), componentAccessToken.getExpiresIn());
   }
 
+  @Override
+  public Lock getLockByKey(String key){
+    Lock lock = locks.get(key);
+    if (lock == null) {
+      synchronized (WxOpenInMemoryConfigStorage.class){
+        lock = locks.get(key);
+        if (lock == null) {
+          lock = new ReentrantLock();
+          locks.put(key, lock);
+        }
+      }
+    }
+    return lock;
+  }
+  
   @Override
   public WxMpConfigStorage getWxMpConfigStorage(String appId) {
     return new WxOpenInnerConfigStorage(this, appId);
@@ -211,13 +229,16 @@ private static class WxOpenInnerConfigStorage implements WxMpConfigStorage, WxMa
      * 云环境ID
      */
     private volatile String cloudEnv;
-    private Lock accessTokenLock = new ReentrantLock();
-    private Lock jsapiTicketLock = new ReentrantLock();
-    private Lock cardApiTicketLock = new ReentrantLock();
+    private final Lock accessTokenLock;
+    private final Lock jsapiTicketLock;
+    private final Lock cardApiTicketLock;
 
     private WxOpenInnerConfigStorage(WxOpenConfigStorage wxOpenConfigStorage, String appId) {
       this.wxOpenConfigStorage = wxOpenConfigStorage;
       this.appId = appId;
+      this.accessTokenLock = wxOpenConfigStorage.getLockByKey(appId + ":accessTokenLock");
+      this.jsapiTicketLock = wxOpenConfigStorage.getLockByKey(appId + ":jsapiTicketLock");
+      this.cardApiTicketLock = wxOpenConfigStorage.getLockByKey(appId + ":cardApiTicketLock");
     }
 
     @Override
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
index f1b903d472..a681e2931e 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
@@ -1,9 +1,12 @@
 package me.chanjar.weixin.open.api.impl;
 
+import me.chanjar.weixin.common.util.locks.JedisDistributedLock;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.util.Pool;
 
+import java.util.concurrent.locks.Lock;
+
 /**
  * @author <a href="https://github.com/007gzs">007</a>
  */
@@ -163,4 +166,9 @@ public void updateCardApiTicket(String appId, String cardApiTicket, int expiresI
       jedis.setex(this.getKey(this.cardApiTicket, appId), expiresInSeconds - 200, cardApiTicket);
     }
   }
+
+  @Override
+  public Lock getLockByKey(String key) {
+    return new JedisDistributedLock(jedisPool, getKey(lockKey, key));
+  }
 }

From d752c48dc8a005988bed952866bca8558b1f44a3 Mon Sep 17 00:00:00 2001
From: 007gzs <007gzs@gmail.com>
Date: Sat, 4 Apr 2020 21:38:59 +0800
Subject: [PATCH 052/114] =?UTF-8?q?:art:=20#1488=20=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E5=9D=97=E6=94=AF=E6=8C=81=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=BC=8F=E9=94=81=EF=BC=8C=E8=AE=BE=E7=BD=AEtoken=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E5=8A=A0=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wx/miniapp/api/impl/WxMaServiceImpl.java  | 12 ++++++++-
 .../mp/api/impl/BaseWxMpServiceImpl.java      | 12 ++++++++-
 .../mp/config/impl/WxMpRedisConfigImpl.java   | 11 ++++++++
 .../api/impl/WxOpenComponentServiceImpl.java  | 25 +++++++++++++++++--
 4 files changed, 56 insertions(+), 4 deletions(-)

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 87903ea859..06533243b3 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
@@ -288,7 +288,17 @@ private <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E d
         || error.getErrorCode() == ERR_42001
         || error.getErrorCode() == ERR_40014) {
         // 强制设置WxMaConfig的access token过期了，这样在下一次请求里就会刷新access token
-        this.getWxMaConfig().expireAccessToken();
+        Lock lock = this.getWxMaConfig().getAccessTokenLock();
+        lock.lock();
+        try {
+          if(StringUtils.equals(this.getWxMaConfig().getAccessToken(), accessToken)){
+            this.getWxMaConfig().expireAccessToken();
+          }
+        } catch (Exception ex){
+          this.getWxMaConfig().expireAccessToken();
+        }finally {
+          lock.unlock();
+        }
         if (this.getWxMaConfig().autoRefreshToken()) {
           return this.execute(executor, uri, data);
         }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
index 117c9c96c4..09275cd6d7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -351,7 +351,17 @@ protected <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E
        */
       if (error.getErrorCode() == 42001 || error.getErrorCode() == 40001 || error.getErrorCode() == 40014) {
         // 强制设置wxMpConfigStorage它的access token过期了，这样在下一次请求里就会刷新access token
-        this.getWxMpConfigStorage().expireAccessToken();
+        Lock lock = this.getWxMpConfigStorage().getAccessTokenLock();
+        lock.lock();
+        try{
+          if(StringUtils.equals(this.getWxMpConfigStorage().getAccessToken(), accessToken)){
+            this.getWxMpConfigStorage().expireAccessToken();
+          }
+        } catch (Exception ex){
+          this.getWxMpConfigStorage().expireAccessToken();
+        } finally {
+          lock.unlock();
+        }
         if (this.getWxMpConfigStorage().autoRefreshToken()) {
           return this.execute(executor, uri, data);
         }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
index 4d2d1783ed..8c61c9b2cd 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
@@ -1,9 +1,13 @@
 package me.chanjar.weixin.mp.config.impl;
 
+import me.chanjar.weixin.common.util.locks.JedisDistributedLock;
 import me.chanjar.weixin.mp.enums.TicketType;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * 基于Redis的微信配置provider.
  *
@@ -17,6 +21,7 @@
 @SuppressWarnings("hiding")
 public class WxMpRedisConfigImpl extends WxMpDefaultConfigImpl {
   private static final String ACCESS_TOKEN_KEY = "wx:access_token:";
+  private static final String LOCK_KEY = "wx:lock:";
 
   /**
    * 使用连接池保证线程安全.
@@ -24,6 +29,7 @@ public class WxMpRedisConfigImpl extends WxMpDefaultConfigImpl {
   private final JedisPool jedisPool;
 
   private String accessTokenKey;
+  private String lockKey;
 
   public WxMpRedisConfigImpl(JedisPool jedisPool) {
     this.jedisPool = jedisPool;
@@ -36,6 +42,11 @@ public WxMpRedisConfigImpl(JedisPool jedisPool) {
   public void setAppId(String appId) {
     super.setAppId(appId);
     this.accessTokenKey = ACCESS_TOKEN_KEY.concat(appId);
+    this.lockKey = ACCESS_TOKEN_KEY.concat(appId).concat(":");
+    accessTokenLock = new JedisDistributedLock(jedisPool, lockKey.concat("accessTokenLock"));
+    jsapiTicketLock = new JedisDistributedLock(jedisPool, lockKey.concat("jsapiTicketLock"));
+    sdkTicketLock = new JedisDistributedLock(jedisPool, lockKey.concat("sdkTicketLock"));
+    cardApiTicketLock = new JedisDistributedLock(jedisPool, lockKey.concat("cardApiTicketLock"));
   }
 
   private String getTicketRedisKey(TicketType type) {
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
index 4f1fc90069..e0035abe74 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
@@ -155,7 +155,18 @@ public String post(String uri, String postData, String accessTokenKey) throws Wx
        */
       if (error.getErrorCode() == 42001 || error.getErrorCode() == 40001 || error.getErrorCode() == 40014) {
         // 强制设置wxMpConfigStorage它的access token过期了，这样在下一次请求里就会刷新access token
-        this.getWxOpenConfigStorage().expireComponentAccessToken();
+        Lock lock = this.getWxOpenConfigStorage().getComponentAccessTokenLock();
+        lock.lock();
+        try {
+          if (StringUtils.equals(componentAccessToken, this.getWxOpenConfigStorage().getComponentAccessToken()){
+            this.getWxOpenConfigStorage().expireComponentAccessToken();
+          }
+        } catch (Exception ex) {
+          this.getWxOpenConfigStorage().expireComponentAccessToken();
+        }finally {
+          lock.unlock();
+        }
+
         if (this.getWxOpenConfigStorage().autoRefreshToken()) {
           return this.post(uri, postData, accessTokenKey);
         }
@@ -188,7 +199,17 @@ public String get(String uri, String accessTokenKey) throws WxErrorException {
        */
       if (error.getErrorCode() == 42001 || error.getErrorCode() == 40001 || error.getErrorCode() == 40014) {
         // 强制设置wxMpConfigStorage它的access token过期了，这样在下一次请求里就会刷新access token
-        this.getWxOpenConfigStorage().expireComponentAccessToken();
+        Lock lock = this.getWxOpenConfigStorage().getComponentAccessTokenLock();
+        lock.lock();
+        try {
+          if (StringUtils.equals(componentAccessToken, this.getWxOpenConfigStorage().getComponentAccessToken()){
+            this.getWxOpenConfigStorage().expireComponentAccessToken();
+          }
+        } catch (Exception ex) {
+          this.getWxOpenConfigStorage().expireComponentAccessToken();
+        }finally {
+          lock.unlock();
+        }
         if (this.getWxOpenConfigStorage().autoRefreshToken()) {
           return this.get(uri, accessTokenKey);
         }

From c175a31c45578385a2ea9dd2cc91c940d4b29ae9 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 4 Apr 2020 22:09:56 +0800
Subject: [PATCH 053/114] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/locks/JedisDistributedLock.java       |  2 ++
 .../api/impl/WxOpenComponentServiceImpl.java   | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/JedisDistributedLock.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/JedisDistributedLock.java
index 636e7e245f..b136a4c25a 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/JedisDistributedLock.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/locks/JedisDistributedLock.java
@@ -3,6 +3,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
+
+import com.github.jedis.lock.JedisLock;
 import redis.clients.jedis.Jedis;
 import redis.clients.util.Pool;
 
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
index e0035abe74..4483e0a0c8 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
@@ -23,8 +23,8 @@
 
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.locks.Lock;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
 
 /**
  * @author <a href="https://github.com/007gzs">007</a>
@@ -158,12 +158,12 @@ public String post(String uri, String postData, String accessTokenKey) throws Wx
         Lock lock = this.getWxOpenConfigStorage().getComponentAccessTokenLock();
         lock.lock();
         try {
-          if (StringUtils.equals(componentAccessToken, this.getWxOpenConfigStorage().getComponentAccessToken()){
+          if (StringUtils.equals(componentAccessToken, this.getWxOpenConfigStorage().getComponentAccessToken())) {
             this.getWxOpenConfigStorage().expireComponentAccessToken();
           }
         } catch (Exception ex) {
           this.getWxOpenConfigStorage().expireComponentAccessToken();
-        }finally {
+        } finally {
           lock.unlock();
         }
 
@@ -202,12 +202,12 @@ public String get(String uri, String accessTokenKey) throws WxErrorException {
         Lock lock = this.getWxOpenConfigStorage().getComponentAccessTokenLock();
         lock.lock();
         try {
-          if (StringUtils.equals(componentAccessToken, this.getWxOpenConfigStorage().getComponentAccessToken()){
+          if (StringUtils.equals(componentAccessToken, this.getWxOpenConfigStorage().getComponentAccessToken())) {
             this.getWxOpenConfigStorage().expireComponentAccessToken();
           }
         } catch (Exception ex) {
           this.getWxOpenConfigStorage().expireComponentAccessToken();
-        }finally {
+        } finally {
           lock.unlock();
         }
         if (this.getWxOpenConfigStorage().autoRefreshToken()) {
@@ -379,13 +379,13 @@ public void setAuthorizerOption(String authorizerAppid, String optionName, Strin
   @Override
   public String getAuthorizerAccessToken(String appId, boolean forceRefresh) throws WxErrorException {
     WxOpenConfigStorage config = getWxOpenConfigStorage();
-    if (!config.isAuthorizerAccessTokenExpired(appId) && !forceRefresh){
+    if (!config.isAuthorizerAccessTokenExpired(appId) && !forceRefresh) {
       return config.getAuthorizerAccessToken(appId);
     }
     Lock lock = config.getWxMpConfigStorage(appId).getAccessTokenLock();
     lock.lock();
-    try{
-      if (!config.isAuthorizerAccessTokenExpired(appId) && !forceRefresh){
+    try {
+      if (!config.isAuthorizerAccessTokenExpired(appId) && !forceRefresh) {
         return config.getAuthorizerAccessToken(appId);
       }
       JsonObject jsonObject = new JsonObject();
@@ -397,7 +397,7 @@ public String getAuthorizerAccessToken(String appId, boolean forceRefresh) throw
       WxOpenAuthorizerAccessToken wxOpenAuthorizerAccessToken = WxOpenAuthorizerAccessToken.fromJson(responseContent);
       config.updateAuthorizerAccessToken(appId, wxOpenAuthorizerAccessToken);
       return config.getAuthorizerAccessToken(appId);
-    }finally {
+    } finally {
       lock.unlock();
     }
   }

From 458c645fa46ce72ea05e3cf1f01d26de8a730041 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 4 Apr 2020 22:26:52 +0800
Subject: [PATCH 054/114] =?UTF-8?q?:art:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wx/graal/GraalProcessor.java   | 24 ++++++++++++++-----
 .../wx/miniapp/api/impl/WxMaServiceImpl.java  |  6 ++---
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/weixin-graal/src/main/java/cn/binarywang/wx/graal/GraalProcessor.java b/weixin-graal/src/main/java/cn/binarywang/wx/graal/GraalProcessor.java
index c09190c3c5..2cf569187e 100644
--- a/weixin-graal/src/main/java/cn/binarywang/wx/graal/GraalProcessor.java
+++ b/weixin-graal/src/main/java/cn/binarywang/wx/graal/GraalProcessor.java
@@ -20,11 +20,15 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-// 目前仅仅处理@Data，且必须在lombok自己的processor之前执行，千万注意！！！！！
+/**
+ * 目前仅仅处理@Data，且必须在lombok自己的processor之前执行，千万注意！！！！！
+ *
+ * @author outersky
+ */
+
 @SupportedAnnotationTypes("lombok.Data")
 @SupportedSourceVersion(SourceVersion.RELEASE_7)
 public class GraalProcessor extends AbstractProcessor {
-
   private static final String REFLECTION_CONFIG_JSON = "reflection-config.json";
   private static final String NATIVE_IMAGE_PROPERTIES = "native-image.properties";
 
@@ -40,10 +44,14 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     }
 
     //只有最后一轮才可以写文件，否则文件会被重复打开，报错！
-    if (!roundEnv.processingOver()) return false;
+    if (!roundEnv.processingOver()) {
+      return false;
+    }
 
     // 如果没有文件要写，跳过
-    if (classSet.isEmpty()) return false;
+    if (classSet.isEmpty()) {
+      return false;
+    }
 
     writeFiles();
 
@@ -72,7 +80,9 @@ private void setShortestPackageName(String packageName) {
    */
   private String getPackageName(String fullClassName) {
     int last = fullClassName.lastIndexOf('.');
-    if (last == -1) return fullClassName;
+    if (last == -1) {
+      return fullClassName;
+    }
     return fullClassName.substring(0, last);
   }
 
@@ -158,7 +168,9 @@ private void handleSuperClass(TypeElement typeElement) {
       TypeElement s = (TypeElement) ((DeclaredType) superclass).asElement();
       String sName = s.toString();
       // ignore java.**/javax.**
-      if (sName.startsWith("java.") || sName.startsWith("javax.")) return;
+      if (sName.startsWith("java.") || sName.startsWith("javax.")) {
+        return;
+      }
       registerClass(sName);
       handleSuperClass(s);
     }
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 06533243b3..a2897a4acc 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
@@ -291,12 +291,12 @@ private <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E d
         Lock lock = this.getWxMaConfig().getAccessTokenLock();
         lock.lock();
         try {
-          if(StringUtils.equals(this.getWxMaConfig().getAccessToken(), accessToken)){
+          if (StringUtils.equals(this.getWxMaConfig().getAccessToken(), accessToken)) {
             this.getWxMaConfig().expireAccessToken();
           }
-        } catch (Exception ex){
+        } catch (Exception ex) {
           this.getWxMaConfig().expireAccessToken();
-        }finally {
+        } finally {
           lock.unlock();
         }
         if (this.getWxMaConfig().autoRefreshToken()) {

From a9766960c3dca07a8bc1d8d9bc209d420f4f257e Mon Sep 17 00:00:00 2001
From: yjwang <35523753+yjwang3300300@users.noreply.github.com>
Date: Sun, 5 Apr 2020 21:58:19 +0800
Subject: [PATCH 055/114] =?UTF-8?q?:new:=20#1429=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=92=AD=E7=B1=BB=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* #1429 增加小程序直播类相关接口

* 新增：获取所有直播间列表，区分分页

* 优化代码格式

Co-authored-by: yjwang <yjwang@wisu.com.cn>
---
 .../wx/miniapp/api/WxMaLiveService.java       |  62 +++++++++++
 .../wx/miniapp/api/WxMaService.java           |   7 ++
 .../miniapp/api/impl/WxMaLiveServiceImpl.java | 100 ++++++++++++++++++
 .../wx/miniapp/api/impl/WxMaServiceImpl.java  |   6 ++
 .../wx/miniapp/bean/WxMaGetLiveInfo.java      |  88 +++++++++++++++
 .../api/impl/WxMaLiveServiceImplTest.java     |  55 ++++++++++
 6 files changed, 318 insertions(+)
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaLiveService.java
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
 create mode 100644 weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImplTest.java

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaLiveService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaLiveService.java
new file mode 100644
index 0000000000..8a39e2957b
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaLiveService.java
@@ -0,0 +1,62 @@
+package cn.binarywang.wx.miniapp.api;
+
+import cn.binarywang.wx.miniapp.bean.WxMaGetLiveInfo;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+import java.util.List;
+
+/**
+ * <pre>
+ *  直播相关操作接口.
+ *  Created by yjwang on 2020/4/5.
+ * </pre>
+ *
+ * @author <a href="https://github.com/yjwang3300300">yjwang</a>
+ */
+public interface WxMaLiveService {
+  String GET_LIVE_INFO = "http://api.weixin.qq.com/wxa/business/getliveinfo";
+
+  /**
+   * 获取直播房间列表.（分页）
+   *
+   * @param start 起始拉取房间，start = 0 表示从第 1 个房间开始拉取
+   * @param limit 每次拉取的个数上限，不要设置过大，建议 100 以内
+   * @return .
+   * @throws WxErrorException .
+   */
+  WxMaGetLiveInfo getLiveInfo(Integer start, Integer limit) throws WxErrorException;
+
+  /**
+   * 获取所有直播间信息（没有分页直接获取全部）
+   * @return
+   * @throws WxErrorException
+   */
+  List<WxMaGetLiveInfo.RoomInfo> getLiveinfos() throws WxErrorException;
+
+  /**
+   *
+   * 获取直播房间回放数据信息.
+   *
+   * @param action 获取回放
+   * @param room_id 直播间   id
+   * @param start 起始拉取视频，start =   0   表示从第    1   个视频片段开始拉取
+   * @param limit 每次拉取的个数上限，不要设置过大，建议  100 以内
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaGetLiveInfo getLiveReplay(String action, Integer room_id, Integer start, Integer limit) throws WxErrorException;
+
+  /**
+   *
+   * 获取直播房间回放数据信息.
+   *
+   *  获取回放 （默认：get_replay）
+   * @param room_id 直播间   id
+   * @param start 起始拉取视频，start =   0   表示从第    1   个视频片段开始拉取
+   * @param limit 每次拉取的个数上限，不要设置过大，建议  100 以内
+   * @return
+   * @throws WxErrorException
+   */
+  WxMaGetLiveInfo getLiveReplay(Integer room_id, Integer start, Integer limit) throws WxErrorException;
+
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
index 072907ba12..6b4a715661 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
@@ -287,4 +287,11 @@ public interface WxMaService {
    * @return .
    */
   WxMaCloudService getCloudService();
+
+  /**
+   * 获取直播接口服务对象
+   *
+   * @return .
+   */
+  WxMaLiveService getLiveService();
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java
new file mode 100644
index 0000000000..6f1a154bb1
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImpl.java
@@ -0,0 +1,100 @@
+package cn.binarywang.wx.miniapp.api.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaLiveService;
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaGetLiveInfo;
+import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import lombok.AllArgsConstructor;
+import me.chanjar.weixin.common.WxType;
+import me.chanjar.weixin.common.error.WxError;
+import me.chanjar.weixin.common.error.WxErrorException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <pre>
+ *  Created by yjwang on 2020/4/5.
+ * </pre>
+ *
+ * @author <a href="https://github.com/yjwang3300300">yjwang</a>
+ */
+@AllArgsConstructor
+public class WxMaLiveServiceImpl implements WxMaLiveService {
+  private static final JsonParser JSON_PARSER = new JsonParser();
+  private WxMaService service;
+
+  @Override
+  public WxMaGetLiveInfo getLiveInfo(Integer start, Integer limit) throws WxErrorException {
+    JsonObject jsonObject = getJsonObject(start, limit, null);
+    return WxMaGetLiveInfo.fromJson(jsonObject.toString());
+  }
+
+  @Override
+  public List<WxMaGetLiveInfo.RoomInfo> getLiveinfos() throws WxErrorException {
+    List<WxMaGetLiveInfo.RoomInfo> results = new ArrayList<>();
+    Integer start = 0;
+    Integer limit = 80;
+    Integer tatal = 0;
+    WxMaGetLiveInfo liveInfo = null;
+    do {
+      if (tatal != 0 && tatal <= start) {
+        break;
+      }
+      liveInfo = getLiveInfo(start, limit);
+      if (liveInfo == null) {
+        return null;
+      }
+      results.addAll(liveInfo.getRoomInfos());
+      tatal = liveInfo.getTotal();
+      start = results.size();
+      try {
+        Thread.sleep(100);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+    } while (results.size() <= tatal);
+    return results;
+  }
+
+  @Override
+  public WxMaGetLiveInfo getLiveReplay(String action, Integer room_id, Integer start, Integer limit) throws WxErrorException {
+    Map<String, Object> map = new HashMap(4);
+    map.put("action", action);
+    map.put("room_id", room_id);
+    JsonObject jsonObject = getJsonObject(start, limit, map);
+    return WxMaGetLiveInfo.fromJson(jsonObject.toString());
+  }
+
+  @Override
+  public WxMaGetLiveInfo getLiveReplay(Integer room_id, Integer start, Integer limit) throws WxErrorException {
+    return getLiveReplay("get_replay", room_id, start, limit);
+  }
+
+  /**
+   * 包装一下
+   *
+   * @param start
+   * @param limit
+   * @param map
+   * @return
+   * @throws WxErrorException
+   */
+  private JsonObject getJsonObject(Integer start, Integer limit, Map<String, Object> map) throws WxErrorException {
+    if (map == null) {
+      map = new HashMap(2);
+    }
+    map.put("start", start);
+    map.put("limit", limit);
+    String responseContent = service.post(GET_LIVE_INFO, WxMaGsonBuilder.create().toJson(map));
+    JsonObject jsonObject = JSON_PARSER.parse(responseContent).getAsJsonObject();
+    if (jsonObject.get("errcode").getAsInt() != 0) {
+      throw new WxErrorException(WxError.fromJson(responseContent, WxType.MiniApp));
+    }
+    return jsonObject;
+  }
+}
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 a2897a4acc..88984c3533 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
@@ -60,6 +60,7 @@ public class WxMaServiceImpl implements WxMaService, RequestHttp<CloseableHttpCl
   private WxMaExpressService expressService = new WxMaExpressServiceImpl(this);
   private WxMaSubscribeService subscribeService = new WxMaSubscribeServiceImpl(this);
   private WxMaCloudService cloudService = new WxMaCloudServiceImpl(this);
+  private WxMaLiveService liveService = new WxMaLiveServiceImpl(this);
 
   private int retrySleepMillis = 1000;
   private int maxRetryTimes = 5;
@@ -415,4 +416,9 @@ public WxMaExpressService getExpressService() {
   public WxMaCloudService getCloudService() {
     return this.cloudService;
   }
+
+  @Override
+  public WxMaLiveService getLiveService() {
+    return this.liveService;
+  }
 }
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
new file mode 100644
index 0000000000..c0470f52c2
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
@@ -0,0 +1,88 @@
+package cn.binarywang.wx.miniapp.bean;
+
+import cn.binarywang.wx.miniapp.util.json.WxMaGsonBuilder;
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 获取直播房间列表
+ *
+ * @author yjwang
+ * @date 2020/4/5
+ */
+@Data
+public class WxMaGetLiveInfo implements Serializable {
+  private static final long serialVersionUID = 7285263767524755887L;
+  private Integer errcode;
+  private String errmsg;
+  private Integer total;
+  /**
+   * 直播间列表
+   */
+  @SerializedName("room_info")
+  private List<RoomInfo> roomInfos;
+  /**
+   * 获取回放源视频列表
+   */
+  @SerializedName("live_replay")
+  private List<LiveReplay> liveReplay;
+
+  public static WxMaGetLiveInfo fromJson(String json) {
+    return WxMaGsonBuilder.create().fromJson(json, WxMaGetLiveInfo.class);
+  }
+
+  /**
+   * 直播列表
+   */
+  @Data
+  public static class RoomInfo implements Serializable {
+    private static final long serialVersionUID = 7745775280267417154L;
+    private String name;
+    private Integer roomid;
+    @SerializedName("cover_img")
+    private String coverImg;
+    @SerializedName("live_satus")
+    private Integer liveSatus;
+    @SerializedName("start_time")
+    private Long startTime;
+    @SerializedName("end_time")
+    private Long endTime;
+    @SerializedName("anchor_name")
+    private String anchorName;
+    @SerializedName("anchor_img")
+    private String anchorImg;
+    private List<Goods> goods;
+  }
+
+  /**
+   * 商品列表
+   */
+  @Data
+  public static class Goods implements Serializable {
+    private static final long serialVersionUID = 5769245932149287574L;
+    @SerializedName("cover_img")
+    private String coverImg;
+    private String url;
+    private String price;
+    private String name;
+  }
+
+  /**
+   * 回放数据列表
+   */
+  @Data
+  public static class LiveReplay implements Serializable {
+    private static final long serialVersionUID = 7683927205627536320L;
+    @SerializedName("expire_time")
+    private String expireTime;
+    @SerializedName("create_time")
+    private String createTime;
+    @SerializedName("media_url")
+    private String mediaUrl;
+  }
+
+
+}
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImplTest.java
new file mode 100644
index 0000000000..5ccd16a037
--- /dev/null
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/api/impl/WxMaLiveServiceImplTest.java
@@ -0,0 +1,55 @@
+package cn.binarywang.wx.miniapp.api.impl;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaGetLiveInfo;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import cn.binarywang.wx.miniapp.test.ApiTestModule;
+import cn.binarywang.wx.miniapp.test.TestConfig;
+import com.google.common.collect.ImmutableMap;
+import com.google.gson.JsonObject;
+import com.google.inject.Inject;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * 测试直播相关的接口
+ *
+ * @author <a href="https://github.com/yjwang3300300">yjwang</a>
+ */
+@Test
+@Guice(modules = ApiTestModule.class)
+public class WxMaLiveServiceImplTest {
+
+  @Inject
+  private WxMaService wxService;
+
+  @Test
+  public void getLiveInfo() throws Exception {
+    WxMaGetLiveInfo list = this.wxService.getLiveService().getLiveInfo(0,10);
+    assertNotNull(list);
+    System.out.println(list.toString());
+  }
+
+  @Test
+  public void getLiveReplay() throws Exception {
+    // [12, 11, 10, 9, 8, 7, 6, 5, 3, 2]
+    WxMaGetLiveInfo list = this.wxService.getLiveService().getLiveReplay(11,0,10);
+    assertNotNull(list);
+    System.out.println(list.toString());
+  }
+
+  @Test
+  public void getLiveinfos() throws Exception {
+    List<WxMaGetLiveInfo.RoomInfo> list = this.wxService.getLiveService().getLiveinfos();
+    assertNotNull(list);
+    System.out.println(list.toString());
+  }
+}

From 6633ea3ca7a3bbb4ef4e44b4706448e3a1742750 Mon Sep 17 00:00:00 2001
From: S <sshzh90@gmail.com>
Date: Thu, 9 Apr 2020 13:39:33 +0800
Subject: [PATCH 056/114] =?UTF-8?q?:art:=20#1496=20=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E5=8D=A1=E5=88=B8=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=97=A8=E5=BA=97?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AEID=E5=AD=97=E6=AE=B5=E7=9A=84=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/api/impl/WxMpMemberCardServiceImpl.java       | 2 +-
 .../main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java  | 3 ++-
 .../java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java | 3 ++-
 .../weixin/mp/bean/card/enums/CardWechatFieldType.java      | 6 +++++-
 .../weixin/mp/bean/datacube/WxDataCubeArticleResult.java    | 3 ++-
 .../chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java | 3 ++-
 6 files changed, 14 insertions(+), 6 deletions(-)

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 5e434d61e1..dc70a7b9d0 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
@@ -188,7 +188,7 @@ private WxMpCardCreateResult validCheck(WxMpMemberCardCreateMessage createMessag
         dateInfoType.getDescription()));
     }
 
-    if (!baseInfo.isUseAllLocations() && StringUtils.isBlank(baseInfo.getLocationIdList())) {
+    if (!baseInfo.isUseAllLocations() && baseInfo.getLocationIdList().isEmpty()) {
       return WxMpCardCreateResult.failure("会员卡基本信息的门店使用范围选择指定门店,门店列表:locationIdList不能为空");
     }
 
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
index ed3354947f..f7ed2ed95c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
@@ -1,6 +1,7 @@
 package me.chanjar.weixin.mp.bean.card;
 
 import java.io.Serializable;
+import java.util.List;
 
 import com.google.gson.annotations.SerializedName;
 import lombok.Data;
@@ -104,7 +105,7 @@ public class BaseInfo implements Serializable {
    * 门店位置ID,调用 POI门店管理接口 获取门店位置ID.
    */
   @SerializedName("location_id_list")
-  private String locationIdList;
+  private List<String> locationIdList;
 
   /**
    * 会员卡是否支持全部门店,填写后商户门店更新时会自动同步至卡券.
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java
index e7681decdf..44b92eff4d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java
@@ -5,6 +5,7 @@
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 微信会员卡基本信息更新
@@ -54,7 +55,7 @@ public class BaseInfoUpdate implements Serializable {
    * 门店位置ID,调用 POI门店管理接口 获取门店位置ID.
    */
   @SerializedName("location_id_list")
-  private String locationIdList;
+  private List<String> locationIdList;
 
   /**
    * 会员卡是否支持全部门店,填写后商户门店更新时会自动同步至卡券.
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java
index 3a62c6f49d..1d57bbda97 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/enums/CardWechatFieldType.java
@@ -14,7 +14,11 @@ public enum CardWechatFieldType {
   USER_FORM_INFO_FLAG_IDCARD("身份证"),
   USER_FORM_INFO_FLAG_EMAIL("邮箱"),
   USER_FORM_INFO_FLAG_LOCATION("详细地址"),
-  USER_FORM_INFO_FLAG_EDUCATION_BACKGRO("教育背景"),
+
+  /**
+   * 原文档为 USER_FORM_INFO_FLAG_EDUCATION_BACKGRO， 测试不通过，可能是文档错误
+   */
+  USER_FORM_INFO_FLAG_EDUCATION_BACKGROUND("教育背景"),
   USER_FORM_INFO_FLAG_INDUSTRY("行业"),
   USER_FORM_INFO_FLAG_INCOME("收入"),
   USER_FORM_INFO_FLAG_HABIT("兴趣爱好");
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 39198821d4..f625072f80 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
@@ -108,7 +108,8 @@ public class WxDataCubeArticleResult extends WxDataCubeBaseResult {
 
   /**
    * user_source
-   * 在获取图文阅读分时数据时才有该字段，代表用户从哪里进入来阅读该图文。0:会话;1.好友;2.朋友圈;3.腾讯微博;4.历史消息页;5.其他
+   * 在获取图文统计数据、图文阅读分时数据时才有该字段，代表用户从哪里进入来阅读该图文。
+   * 99999999.全部；0:会话;1.好友;2.朋友圈;3.腾讯微博;4.历史消息页;5.其他;6.看一看;7.搜一搜；
    */
   @SerializedName("user_source")
   private Integer userSource;
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java
index 4fa75b7f98..ecacc36de5 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImplTest.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.api.impl;
 
+import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import me.chanjar.weixin.common.bean.WxCardApiSignature;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -134,7 +135,7 @@ public void testCreateGrouponCard() throws WxErrorException {
     base.setCustomUrlSubTitle("副标题tip");
     base.setPromotionUrlName("更多优惠");
     base.setPromotionUrl("http://www.qq.com");
-    base.setLocationIdList("1234");
+    base.setLocationIdList(Lists.newArrayList("1234"));
 
     //团购券
     WxMpCardCreateRequest grouponMessage = new WxMpCardCreateRequest();

From 4a88064aba3ccd19d5b7f73d6bb639eb9b740cf6 Mon Sep 17 00:00:00 2001
From: Gyv12345 <gyv12345@163.com>
Date: Sat, 11 Apr 2020 12:57:01 +0800
Subject: [PATCH 057/114] =?UTF-8?q?:fix:=20#1499=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1oa=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/bean/WxCpXmlMessage.java        | 59 +++++++++++++++++++
 .../control/TemplateSelector.java             |  4 +-
 2 files changed, 62 insertions(+), 1 deletion(-)

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 712eed83f0..f90aed034d 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
@@ -396,6 +396,12 @@ public class WxCpXmlMessage implements Serializable {
   @XStreamAlias("SendLocationInfo")
   private SendLocationInfo sendLocationInfo = new SendLocationInfo();
 
+
+  @XStreamAlias("ApprovalInfo")
+  private ApprovalInfo approvalInfo=new ApprovalInfo();
+
+
+
   protected static WxCpXmlMessage fromXml(String xml) {
     //修改微信变态的消息内容格式，方便解析
     xml = xml.replace("</PicList><PicList>", "");
@@ -515,4 +521,57 @@ public static class SendLocationInfo {
 
   }
 
+  @XStreamAlias("ApprovalInfo")
+  @Data
+  public static class ApprovalInfo {
+
+    /**
+     * 审批编号
+     */
+    @XStreamAlias("SpNo")
+    private String spNo;
+    /**
+     * 审批申请类型名称（审批模板名称）
+     */
+    @XStreamAlias("SpName")
+    private String spName;
+    /**
+     * 申请单状态：1-审批中；2-已通过；3-已驳回；4-已撤销；6-通过后撤销；7-已删除；10-已支付
+     */
+    @XStreamAlias("SpStatus")
+    private Integer spStatus;
+
+    /**
+     * 审批模板id。
+     */
+    @XStreamAlias("templateId")
+    private String templateId;
+    /**
+     * 审批申请提交时间,Unix时间戳
+     */
+    @XStreamAlias("ApplyTime")
+    private Integer applyTime;
+
+    /**
+     * 申请人信息
+     */
+    @XStreamAlias("Applyer")
+    private Applyer applyer;
+    /**
+     * 审批申请单变化类型
+     */
+    @XStreamAlias("StatuChangeEvent")
+    private Integer statuChangeEvent;
+
+    @XStreamAlias("Applyer")
+    @Data
+    public static class Applyer {
+      @XStreamAlias("Applyer")
+      private String UserId;
+      @XStreamAlias("Party")
+      private String party;
+    }
+
+  }
+
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/control/TemplateSelector.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/control/TemplateSelector.java
index 1eb1c9359c..c8076aaa11 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/control/TemplateSelector.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/oa/templatedata/control/TemplateSelector.java
@@ -1,13 +1,15 @@
 package me.chanjar.weixin.cp.bean.oa.templatedata.control;
 
+import lombok.Data;
 import me.chanjar.weixin.cp.bean.oa.templatedata.TemplateOptions;
 
 import java.io.Serializable;
 import java.util.List;
 
 /**
- * @author
+ * @author gyv12345@163.com
  */
+@Data
 public class TemplateSelector implements Serializable {
 
   private static final long serialVersionUID = 4995408101489736881L;

From 1487ce3e29ce8b9d3f4e0d890a3a0b370c38e62b Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 11 Apr 2020 22:09:33 +0800
Subject: [PATCH 058/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.7.6?=
 =?UTF-8?q?.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index a173a07837..dff83a69ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.5.B</version>
+  <version>3.7.6.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 540adede94..a0390d3802 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index 979df6798e..919702f869 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 2aab1e1c9a..95b477f3bd 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index db6b0a5b3a..3a2befea66 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 345cbf8435..13111887c5 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index f859bf6632..c20e7b345a 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index f0b0994345..6ccd191934 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index b22b105cd8..8c46baa889 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index d5dd56ed12..2ac646a37c 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 8484902cdb..2e0db8ad05 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index 14a9c14fb4..ff5b72fb4f 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 6e0ff7b0f2..a4554c69d3 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.5.B</version>
+    <version>3.7.6.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 3af0a2bebaab76a26b185687e331b04fede6b5a0 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 12 Apr 2020 11:23:13 +0800
Subject: [PATCH 059/114] =?UTF-8?q?:art:=20#1497=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=BE=A4=E5=8F=91=E5=9B=BE=E6=96=87?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=BF=9D=E6=8C=81=E8=B7=9F=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E6=8E=A5=E5=8F=A3=E4=B8=80=E8=87=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=87=8F=E5=B0=91=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/mp/bean/WxMpMassNews.java  | 55 +------------
 .../material/WxMpMaterialArticleUpdate.java   |  2 +-
 .../mp/bean/material/WxMpMaterialNews.java    | 82 +------------------
 .../mp/bean/material/WxMpNewsArticle.java     | 82 +++++++++++++++++++
 .../weixin/mp/util/json/WxMpGsonBuilder.java  |  5 +-
 .../json/WxMpMassNewsArticleGsonAdapter.java  | 70 ----------------
 .../mp/util/json/WxMpMassNewsGsonAdapter.java |  7 +-
 .../WxMpMaterialArticleUpdateGsonAdapter.java |  4 +-
 .../json/WxMpMaterialNewsGsonAdapter.java     |  7 +-
 ...r.java => WxMpNewsArticleGsonAdapter.java} | 11 ++-
 .../impl/WxMpMassMessageServiceImplTest.java  | 42 +++++-----
 .../api/impl/WxMpMaterialServiceImplTest.java | 10 +--
 12 files changed, 130 insertions(+), 247 deletions(-)
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpNewsArticle.java
 delete mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java
 rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/{WxMpMaterialNewsArticleGsonAdapter.java => WxMpNewsArticleGsonAdapter.java} (84%)

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 a2b35b7c9c..d4cbc046da 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
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import lombok.Data;
+import me.chanjar.weixin.mp.bean.material.WxMpNewsArticle;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 /**
@@ -16,9 +17,9 @@
 public class WxMpMassNews implements Serializable {
   private static final long serialVersionUID = 565937155013581016L;
 
-  private List<WxMpMassNewsArticle> articles = new ArrayList<>();
+  private List<WxMpNewsArticle> articles = new ArrayList<>();
 
-  public void addArticle(WxMpMassNewsArticle article) {
+  public void addArticle(WxMpNewsArticle article) {
     this.articles.add(article);
   }
 
@@ -35,54 +36,4 @@ public String toString() {
     return WxMpGsonBuilder.create().toJson(this);
   }
 
-  /**
-   * <pre>
-   * 群发图文消息article.
-   * 1. thumbMediaId  (必填) 图文消息缩略图的media_id，可以在基础支持-上传多媒体文件接口中获得
-   * 2. author          图文消息的作者
-   * 3. title           (必填) 图文消息的标题
-   * 4. contentSourceUrl 在图文消息页面点击“阅读原文”后的页面链接
-   * 5. content (必填)  图文消息页面的内容，支持HTML标签
-   * 6. digest          图文消息的描述
-   * 7, showCoverPic  是否显示封面，true为显示，false为不显示
-   * </pre>
-   *
-   * @author chanjarster
-   */
-  @Data
-  public static class WxMpMassNewsArticle {
-    /**
-     * (必填) 图文消息缩略图的media_id，可以在基础支持-上传多媒体文件接口中获得.
-     */
-    private String thumbMediaId;
-    /**
-     * 图文消息的作者.
-     */
-    private String author;
-    /**
-     * (必填) 图文消息的标题.
-     */
-    private String title;
-    /**
-     * 在图文消息页面点击“阅读原文”后的页面链接.
-     */
-    private String contentSourceUrl;
-    /**
-     * (必填) 图文消息页面的内容，支持HTML标签.
-     */
-    private String content;
-    /**
-     * 图文消息的描述.
-     */
-    private String digest;
-    /**
-     * 是否显示封面，true为显示，false为不显示.
-     */
-    private boolean showCoverPic;
-
-    @Override
-    public String toString() {
-      return WxMpGsonBuilder.create().toJson(this);
-    }
-  }
 }
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 13e7701bb7..04bfc919fa 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
@@ -11,7 +11,7 @@ public class WxMpMaterialArticleUpdate implements Serializable {
 
   private String mediaId;
   private int index;
-  private WxMpMaterialNews.WxMpMaterialNewsArticle articles;
+  private WxMpNewsArticle articles;
 
   public String toJson() {
     return WxMpGsonBuilder.create().toJson(this);
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 ba49a1d834..dbb855a582 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
@@ -20,13 +20,13 @@ public class WxMpMaterialNews implements Serializable {
   private Date createTime;
   private Date updateTime;
 
-  private List<WxMpMaterialNewsArticle> articles = new ArrayList<>();
+  private List<WxMpNewsArticle> articles = new ArrayList<>();
 
-  public List<WxMpMaterialNewsArticle> getArticles() {
+  public List<WxMpNewsArticle> getArticles() {
     return this.articles;
   }
 
-  public void addArticle(WxMpMaterialNewsArticle article) {
+  public void addArticle(WxMpNewsArticle article) {
     this.articles.add(article);
   }
 
@@ -43,80 +43,4 @@ public String toString() {
     return this.toJson();
   }
 
-  /**
-   * <pre>
-   * 群发图文消息article.
-   * 1. thumbMediaId  (必填) 图文消息的封面图片素材id（必须是永久mediaID）
-   * 2. author          图文消息的作者
-   * 3. title           (必填) 图文消息的标题
-   * 4. contentSourceUrl 在图文消息页面点击“阅读原文”后的页面链接
-   * 5. content (必填)  图文消息页面的内容，支持HTML标签
-   * 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
-   */
-  @Data
-  public static class WxMpMaterialNewsArticle implements Serializable{
-
-    private static final long serialVersionUID = -635384661692321171L;
-    /**
-     * (必填) 图文消息缩略图的media_id，可以在基础支持-上传多媒体文件接口中获得.
-     */
-    private String thumbMediaId;
-    /**
-     * 图文消息的封面url.
-     */
-    private String thumbUrl;
-    /**
-     * 图文消息的作者.
-     */
-    private String author;
-    /**
-     * (必填) 图文消息的标题.
-     */
-    private String title;
-    /**
-     * 在图文消息页面点击“阅读原文”后的页面链接.
-     */
-    private String contentSourceUrl;
-    /**
-     * (必填) 图文消息页面的内容，支持HTML标签.
-     */
-    private String content;
-    /**
-     * 图文消息的描述.
-     */
-    private String digest;
-    /**
-     * 是否显示封面，true为显示，false为不显示.
-     */
-    private boolean showCoverPic;
-
-    /**
-     * 点击图文消息跳转链接.
-     */
-    private String url;
-
-    /**
-     * need_open_comment
-     * 是否打开评论，0不打开，1打开.
-     */
-    private Boolean needOpenComment;
-
-    /**
-     * only_fans_can_comment
-     * 是否粉丝才可评论，0所有人可评论，1粉丝才可评论.
-     */
-    private Boolean onlyFansCanComment;
-
-    @Override
-    public String toString() {
-      return WxMpGsonBuilder.create().toJson(this);
-    }
-  }
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpNewsArticle.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpNewsArticle.java
new file mode 100644
index 0000000000..3e08a94b91
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/material/WxMpNewsArticle.java
@@ -0,0 +1,82 @@
+package me.chanjar.weixin.mp.bean.material;
+
+import lombok.Data;
+import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
+
+import java.io.Serializable;
+
+/**
+ * <pre>
+ * 图文消息article.
+ * 1. thumbMediaId  (必填) 图文消息的封面图片素材id（必须是永久mediaID）
+ * 2. author          图文消息的作者
+ * 3. title           (必填) 图文消息的标题
+ * 4. contentSourceUrl 在图文消息页面点击“阅读原文”后的页面链接
+ * 5. content (必填)  图文消息页面的内容，支持HTML标签
+ * 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
+ */
+@Data
+public class WxMpNewsArticle implements Serializable {
+  private static final long serialVersionUID = -635384661692321171L;
+  /**
+   * (必填) 图文消息缩略图的media_id，可以在基础支持-上传多媒体文件接口中获得.
+   */
+  private String thumbMediaId;
+  /**
+   * 图文消息的封面url.
+   */
+  private String thumbUrl;
+  /**
+   * 图文消息的作者.
+   */
+  private String author;
+  /**
+   * (必填) 图文消息的标题.
+   */
+  private String title;
+  /**
+   * 在图文消息页面点击“阅读原文”后的页面链接.
+   */
+  private String contentSourceUrl;
+  /**
+   * (必填) 图文消息页面的内容，支持HTML标签.
+   */
+  private String content;
+  /**
+   * 图文消息的描述.
+   */
+  private String digest;
+  /**
+   * 是否显示封面，true为显示，false为不显示.
+   */
+  private boolean showCoverPic;
+
+  /**
+   * 点击图文消息跳转链接.
+   */
+  private String url;
+
+  /**
+   * need_open_comment
+   * 是否打开评论，0不打开，1打开.
+   */
+  private Boolean needOpenComment;
+
+  /**
+   * only_fans_can_comment
+   * 是否粉丝才可评论，0所有人可评论，1粉丝才可评论.
+   */
+  private Boolean onlyFansCanComment;
+
+  @Override
+  public String toString() {
+    return WxMpGsonBuilder.create().toJson(this);
+  }
+}
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 1d1ae9095f..b7a4df93f5 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
@@ -8,10 +8,10 @@
 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.material.*;
 import me.chanjar.weixin.mp.bean.membercard.WxMpMemberCardActivateTempInfoResult;
 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.*;
 import me.chanjar.weixin.mp.bean.subscribe.WxMpSubscribeMessage;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateIndustry;
@@ -45,11 +45,10 @@ public class WxMpGsonBuilder {
     INSTANCE.registerTypeAdapter(WxDataCubeUserCumulate.class, new WxMpUserCumulateGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMaterialUploadResult.class, new WxMpMaterialUploadResultAdapter());
     INSTANCE.registerTypeAdapter(WxMpMaterialVideoInfoResult.class, new WxMpMaterialVideoInfoResultAdapter());
-    INSTANCE.registerTypeAdapter(WxMpMassNews.WxMpMassNewsArticle.class, new WxMpMassNewsArticleGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMaterialArticleUpdate.class, new WxMpMaterialArticleUpdateGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMaterialCountResult.class, new WxMpMaterialCountResultAdapter());
     INSTANCE.registerTypeAdapter(WxMpMaterialNews.class, new WxMpMaterialNewsGsonAdapter());
-    INSTANCE.registerTypeAdapter(WxMpMaterialNews.WxMpMaterialNewsArticle.class, new WxMpMaterialNewsArticleGsonAdapter());
+    INSTANCE.registerTypeAdapter(WxMpNewsArticle.class, new WxMpNewsArticleGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMaterialNewsBatchGetResult.class, new WxMpMaterialNewsBatchGetGsonAdapter());
     INSTANCE.registerTypeAdapter(WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem.class, new WxMpMaterialNewsBatchGetGsonItemAdapter());
     INSTANCE.registerTypeAdapter(WxMpMaterialFileBatchGetResult.class, new WxMpMaterialFileBatchGetGsonAdapter());
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java
deleted file mode 100644
index 70343de94d..0000000000
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsArticleGsonAdapter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-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.WxMpMassNews;
-import org.apache.commons.lang3.BooleanUtils;
-
-import java.lang.reflect.Type;
-
-/**
- * @author codepiano
- */
-public class WxMpMassNewsArticleGsonAdapter implements JsonSerializer<WxMpMassNews.WxMpMassNewsArticle>, JsonDeserializer<WxMpMassNews.WxMpMassNewsArticle> {
-
-  @Override
-  public JsonElement serialize(WxMpMassNews.WxMpMassNewsArticle article, Type typeOfSrc, JsonSerializationContext context) {
-    JsonObject articleJson = new JsonObject();
-
-    articleJson.addProperty("thumb_media_id", article.getThumbMediaId());
-    articleJson.addProperty("title", article.getTitle());
-    articleJson.addProperty("content", article.getContent());
-    if (null != article.getAuthor()) {
-      articleJson.addProperty("author", article.getAuthor());
-    }
-    if (null != article.getContentSourceUrl()) {
-      articleJson.addProperty("content_source_url", article.getContentSourceUrl());
-    }
-    if (null != article.getDigest()) {
-      articleJson.addProperty("digest", article.getDigest());
-    }
-    articleJson.addProperty("show_cover_pic", article.isShowCoverPic() ? "1" : "0");
-    return articleJson;
-  }
-
-  @Override
-  public WxMpMassNews.WxMpMassNewsArticle deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
-    JsonObject articleInfo = jsonElement.getAsJsonObject();
-    WxMpMassNews.WxMpMassNewsArticle article = new WxMpMassNews.WxMpMassNewsArticle();
-
-    JsonElement title = articleInfo.get("title");
-    if (title != null && !title.isJsonNull()) {
-      article.setTitle(GsonHelper.getAsString(title));
-    }
-    JsonElement content = articleInfo.get("content");
-    if (content != null && !content.isJsonNull()) {
-      article.setContent(GsonHelper.getAsString(content));
-    }
-    JsonElement contentSourceUrl = articleInfo.get("content_source_url");
-    if (contentSourceUrl != null && !contentSourceUrl.isJsonNull()) {
-      article.setContentSourceUrl(GsonHelper.getAsString(contentSourceUrl));
-    }
-    JsonElement author = articleInfo.get("author");
-    if (author != null && !author.isJsonNull()) {
-      article.setAuthor(GsonHelper.getAsString(author));
-    }
-    JsonElement digest = articleInfo.get("digest");
-    if (digest != null && !digest.isJsonNull()) {
-      article.setDigest(GsonHelper.getAsString(digest));
-    }
-    JsonElement thumbMediaId = articleInfo.get("thumb_media_id");
-    if (thumbMediaId != null && !thumbMediaId.isJsonNull()) {
-      article.setThumbMediaId(GsonHelper.getAsString(thumbMediaId));
-    }
-    JsonElement showCoverPic = articleInfo.get("show_cover_pic");
-    if (showCoverPic != null && !showCoverPic.isJsonNull()) {
-      article.setShowCoverPic(BooleanUtils.toBoolean(showCoverPic.getAsInt()));
-    }
-    return article;
-  }
-}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsGsonAdapter.java
index b780300e4e..015ad9262a 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMassNewsGsonAdapter.java
@@ -2,6 +2,7 @@
 
 import com.google.gson.*;
 import me.chanjar.weixin.mp.bean.WxMpMassNews;
+import me.chanjar.weixin.mp.bean.material.WxMpNewsArticle;
 
 import java.lang.reflect.Type;
 
@@ -12,8 +13,8 @@ public JsonElement serialize(WxMpMassNews message, Type typeOfSrc, JsonSerializa
     JsonObject newsJson = new JsonObject();
 
     JsonArray articleJsonArray = new JsonArray();
-    for (WxMpMassNews.WxMpMassNewsArticle article : message.getArticles()) {
-      JsonObject articleJson = WxMpGsonBuilder.create().toJsonTree(article, WxMpMassNews.WxMpMassNewsArticle.class).getAsJsonObject();
+    for (WxMpNewsArticle article : message.getArticles()) {
+      JsonObject articleJson = WxMpGsonBuilder.create().toJsonTree(article, WxMpNewsArticle.class).getAsJsonObject();
       articleJsonArray.add(articleJson);
     }
     newsJson.add("articles", articleJsonArray);
@@ -29,7 +30,7 @@ public WxMpMassNews deserialize(JsonElement jsonElement, Type type, JsonDeserial
       JsonArray articles = json.getAsJsonArray("articles");
       for (JsonElement article1 : articles) {
         JsonObject articleInfo = article1.getAsJsonObject();
-        WxMpMassNews.WxMpMassNewsArticle article = WxMpGsonBuilder.create().fromJson(articleInfo, WxMpMassNews.WxMpMassNewsArticle.class);
+        WxMpNewsArticle article = WxMpGsonBuilder.create().fromJson(articleInfo, WxMpNewsArticle.class);
         wxMpMassNews.addArticle(article);
       }
     }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialArticleUpdateGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialArticleUpdateGsonAdapter.java
index bdbbde561d..cb7784e9f5 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialArticleUpdateGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialArticleUpdateGsonAdapter.java
@@ -5,7 +5,7 @@
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialArticleUpdate;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
+import me.chanjar.weixin.mp.bean.material.WxMpNewsArticle;
 
 import java.lang.reflect.Type;
 
@@ -16,7 +16,7 @@ public JsonElement serialize(WxMpMaterialArticleUpdate wxMpMaterialArticleUpdate
     JsonObject articleUpdateJson = new JsonObject();
     articleUpdateJson.addProperty("media_id", wxMpMaterialArticleUpdate.getMediaId());
     articleUpdateJson.addProperty("index", wxMpMaterialArticleUpdate.getIndex());
-    articleUpdateJson.add("articles", WxMpGsonBuilder.create().toJsonTree(wxMpMaterialArticleUpdate.getArticles(), WxMpMaterialNews.WxMpMaterialNewsArticle.class));
+    articleUpdateJson.add("articles", WxMpGsonBuilder.create().toJsonTree(wxMpMaterialArticleUpdate.getArticles(), WxMpNewsArticle.class));
     return articleUpdateJson;
   }
 
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 c406360f6f..3204090b75 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
@@ -3,6 +3,7 @@
 import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
 import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
+import me.chanjar.weixin.mp.bean.material.WxMpNewsArticle;
 
 import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
@@ -15,8 +16,8 @@ public JsonElement serialize(WxMpMaterialNews wxMpMaterialNews, Type typeOfSrc,
     JsonObject newsJson = new JsonObject();
 
     JsonArray articleJsonArray = new JsonArray();
-    for (WxMpMaterialNews.WxMpMaterialNewsArticle article : wxMpMaterialNews.getArticles()) {
-      JsonObject articleJson = WxMpGsonBuilder.create().toJsonTree(article, WxMpMaterialNews.WxMpMaterialNewsArticle.class).getAsJsonObject();
+    for (WxMpNewsArticle article : wxMpMaterialNews.getArticles()) {
+      JsonObject articleJson = WxMpGsonBuilder.create().toJsonTree(article, WxMpNewsArticle.class).getAsJsonObject();
       articleJsonArray.add(articleJson);
     }
     newsJson.add("articles", articleJsonArray);
@@ -42,7 +43,7 @@ public WxMpMaterialNews deserialize(JsonElement jsonElement, Type type, JsonDese
       JsonArray articles = json.getAsJsonArray("news_item");
       for (JsonElement article1 : articles) {
         JsonObject articleInfo = article1.getAsJsonObject();
-        WxMpMaterialNews.WxMpMaterialNewsArticle article = WxMpGsonBuilder.create().fromJson(articleInfo, WxMpMaterialNews.WxMpMaterialNewsArticle.class);
+        WxMpNewsArticle article = WxMpGsonBuilder.create().fromJson(articleInfo, WxMpNewsArticle.class);
         wxMpMaterialNews.addArticle(article);
       }
     }
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/WxMpNewsArticleGsonAdapter.java
similarity index 84%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpMaterialNewsArticleGsonAdapter.java
rename to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpNewsArticleGsonAdapter.java
index faad5ec528..ff88cb9cbd 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/WxMpNewsArticleGsonAdapter.java
@@ -2,7 +2,7 @@
 
 import com.google.gson.*;
 import me.chanjar.weixin.common.util.json.GsonHelper;
-import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
+import me.chanjar.weixin.mp.bean.material.WxMpNewsArticle;
 import org.apache.commons.lang3.BooleanUtils;
 
 import java.lang.reflect.Type;
@@ -10,10 +10,9 @@
 /**
  * @author codepiano
  */
-public class WxMpMaterialNewsArticleGsonAdapter implements JsonSerializer<WxMpMaterialNews.WxMpMaterialNewsArticle>, JsonDeserializer<WxMpMaterialNews.WxMpMaterialNewsArticle> {
-
+public class WxMpNewsArticleGsonAdapter implements JsonSerializer<WxMpNewsArticle>, JsonDeserializer<WxMpNewsArticle> {
   @Override
-  public JsonElement serialize(WxMpMaterialNews.WxMpMaterialNewsArticle article, Type typeOfSrc, JsonSerializationContext context) {
+  public JsonElement serialize(WxMpNewsArticle article, Type typeOfSrc, JsonSerializationContext context) {
     JsonObject articleJson = new JsonObject();
 
     articleJson.addProperty("thumb_media_id", article.getThumbMediaId());
@@ -47,9 +46,9 @@ public JsonElement serialize(WxMpMaterialNews.WxMpMaterialNewsArticle article, T
   }
 
   @Override
-  public WxMpMaterialNews.WxMpMaterialNewsArticle deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
+  public WxMpNewsArticle deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
     JsonObject articleInfo = jsonElement.getAsJsonObject();
-    WxMpMaterialNews.WxMpMaterialNewsArticle article = new WxMpMaterialNews.WxMpMaterialNewsArticle();
+    WxMpNewsArticle article = new WxMpNewsArticle();
 
     JsonElement title = articleInfo.get("title");
     if (title != null && !title.isJsonNull()) {
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 f2d7683021..b31cc748ea 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
@@ -12,14 +12,17 @@
 import me.chanjar.weixin.mp.bean.WxMpMassOpenIdsMessage;
 import me.chanjar.weixin.mp.bean.WxMpMassTagMessage;
 import me.chanjar.weixin.mp.bean.WxMpMassVideo;
+import me.chanjar.weixin.mp.bean.material.WxMpNewsArticle;
 import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
 import me.chanjar.weixin.mp.bean.result.WxMpMassUploadResult;
-import org.testng.annotations.*;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Guice;
+import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertNotNull;
 
 /**
  * 测试群发消息
@@ -35,15 +38,13 @@ public class WxMpMassMessageServiceImplTest {
   @Test
   public void testTextMassOpenIdsMessageSend() throws WxErrorException {
     // 发送群发消息
-    TestConfigStorage configProvider = (TestConfigStorage) this.wxService
-      .getWxMpConfigStorage();
+    TestConfigStorage configProvider = (TestConfigStorage) this.wxService      .getWxMpConfigStorage();
     WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
     massMessage.setMsgType(WxConsts.MassMsgType.TEXT);
-    massMessage.setContent("测试群发消息\n欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
+    massMessage.setContent("测试群发消息\n欢迎欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
     massMessage.getToUsers().add(configProvider.getOpenid());
 
-    WxMpMassSendResult massResult = this.wxService.getMassMessageService()
-      .massOpenIdsMessageSend(massMessage);
+    WxMpMassSendResult massResult = this.wxService.getMassMessageService().massOpenIdsMessageSend(massMessage);
     assertNotNull(massResult);
     assertNotNull(massResult.getMsgId());
   }
@@ -51,15 +52,13 @@ public void testTextMassOpenIdsMessageSend() throws WxErrorException {
   @Test(dataProvider = "massMessages")
   public void testMediaMassOpenIdsMessageSend(String massMsgType, String mediaId) throws WxErrorException {
     // 发送群发消息
-    TestConfigStorage configProvider = (TestConfigStorage) this.wxService
-      .getWxMpConfigStorage();
+    TestConfigStorage configProvider = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
     WxMpMassOpenIdsMessage massMessage = new WxMpMassOpenIdsMessage();
     massMessage.setMsgType(massMsgType);
     massMessage.setMediaId(mediaId);
     massMessage.getToUsers().add(configProvider.getOpenid());
 
-    WxMpMassSendResult massResult = this.wxService.getMassMessageService()
-      .massOpenIdsMessageSend(massMessage);
+    WxMpMassSendResult massResult = this.wxService.getMassMessageService().massOpenIdsMessageSend(massMessage);
     assertNotNull(massResult);
     assertNotNull(massResult.getMsgId());
   }
@@ -68,26 +67,23 @@ public void testMediaMassOpenIdsMessageSend(String massMsgType, String mediaId)
   public void testTextMassGroupMessageSend() throws WxErrorException {
     WxMpMassTagMessage massMessage = new WxMpMassTagMessage();
     massMessage.setMsgType(WxConsts.MassMsgType.TEXT);
-    massMessage.setContent("测试群发消息\n欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
+    massMessage.setContent("测试群发消息\n欢迎欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
     massMessage
       .setTagId(this.wxService.getUserTagService().tagGet().get(0).getId());
 
-    WxMpMassSendResult massResult = this.wxService.getMassMessageService()
-      .massGroupMessageSend(massMessage);
+    WxMpMassSendResult massResult = this.wxService.getMassMessageService().massGroupMessageSend(massMessage);
     assertNotNull(massResult);
     assertNotNull(massResult.getMsgId());
   }
 
   @Test(dataProvider = "massMessages")
-  public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)
-    throws WxErrorException {
+  public void testMediaMassGroupMessageSend(String massMsgType, String mediaId)    throws WxErrorException {
     WxMpMassTagMessage massMessage = new WxMpMassTagMessage();
     massMessage.setMsgType(massMsgType);
     massMessage.setMediaId(mediaId);
     massMessage.setTagId(this.wxService.getUserTagService().tagGet().get(0).getId());
 
-    WxMpMassSendResult massResult = this.wxService.getMassMessageService()
-      .massGroupMessageSend(massMessage);
+    WxMpMassSendResult massResult = this.wxService.getMassMessageService().massGroupMessageSend(massMessage);
     assertNotNull(massResult);
     assertNotNull(massResult.getMsgId());
   }
@@ -155,15 +151,15 @@ public Object[][] massMessages() throws WxErrorException, IOException {
 
       // 上传图文消息
       WxMpMassNews news = new WxMpMassNews();
-      WxMpMassNews.WxMpMassNewsArticle article1 = new WxMpMassNews.WxMpMassNewsArticle();
+      WxMpNewsArticle article1 = new WxMpNewsArticle();
       article1.setTitle("标题1");
-      article1.setContent("内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1");
+      article1.setContent("内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1内容1");
       article1.setThumbMediaId(uploadMediaRes.getMediaId());
       news.addArticle(article1);
 
-      WxMpMassNews.WxMpMassNewsArticle article2 = new WxMpMassNews.WxMpMassNewsArticle();
+      WxMpNewsArticle article2 = new WxMpNewsArticle();
       article2.setTitle("标题2");
-      article2.setContent("内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2内容2");
+      article2.setContent("内容2内容2内容2内容2内容2内容2内容2内容2内2内容2内容2内容2内容2内容2内容2内容2内容2内容2");
       article2.setThumbMediaId(uploadMediaRes.getMediaId());
       article2.setShowCoverPic(true);
       article2.setAuthor("作者2");
@@ -183,7 +179,7 @@ public Object[][] massMessages() throws WxErrorException, IOException {
 
   @Test
   public void testMassDelete() throws Exception {
-    this.wxService.getMassMessageService().delete(1L,2);
+    this.wxService.getMassMessageService().delete(1L, 2);
   }
 
 }
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 6d14b336f5..707f1df311 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
@@ -103,7 +103,7 @@ public void testUploadMaterial(String mediaType, String fileType, String fileNam
   public void testAddNews() throws WxErrorException {
     // 单图文消息
     WxMpMaterialNews wxMpMaterialNewsSingle = new WxMpMaterialNews();
-    WxMpMaterialNews.WxMpMaterialNewsArticle article = new WxMpMaterialNews.WxMpMaterialNewsArticle();
+    WxMpNewsArticle article = new WxMpNewsArticle();
     article.setAuthor("author");
     article.setThumbMediaId(this.thumbMediaId);
     article.setTitle("single title");
@@ -115,7 +115,7 @@ public void testAddNews() throws WxErrorException {
 
     // 多图文消息
     WxMpMaterialNews wxMpMaterialNewsMultiple = new WxMpMaterialNews();
-    WxMpMaterialNews.WxMpMaterialNewsArticle article1 = new WxMpMaterialNews.WxMpMaterialNewsArticle();
+    WxMpNewsArticle article1 = new WxMpNewsArticle();
     article1.setAuthor("author1");
     article1.setThumbMediaId(this.thumbMediaId);
     article1.setTitle("multi title1");
@@ -124,7 +124,7 @@ public void testAddNews() throws WxErrorException {
     article1.setShowCoverPic(true);
     article1.setDigest("");
 
-    WxMpMaterialNews.WxMpMaterialNewsArticle article2 = new WxMpMaterialNews.WxMpMaterialNewsArticle();
+    WxMpNewsArticle article2 = new WxMpNewsArticle();
     article2.setAuthor("author2");
     article2.setThumbMediaId(this.thumbMediaId);
     article2.setTitle("multi title2");
@@ -196,7 +196,7 @@ public void testUpdateNewsInfo() throws WxErrorException {
       .getMaterialService().materialNewsInfo(this.singleNewsMediaId);
     assertNotNull(wxMpMaterialNewsSingle);
     WxMpMaterialArticleUpdate wxMpMaterialArticleUpdateSingle = new WxMpMaterialArticleUpdate();
-    WxMpMaterialNews.WxMpMaterialNewsArticle articleSingle = wxMpMaterialNewsSingle.getArticles().get(0);
+    WxMpNewsArticle articleSingle = wxMpMaterialNewsSingle.getArticles().get(0);
     articleSingle.setContent("content single update");
     wxMpMaterialArticleUpdateSingle.setMediaId(this.singleNewsMediaId);
     wxMpMaterialArticleUpdateSingle.setArticles(articleSingle);
@@ -213,7 +213,7 @@ public void testUpdateNewsInfo() throws WxErrorException {
       .getMaterialService().materialNewsInfo(this.multiNewsMediaId);
     assertNotNull(wxMpMaterialNewsMultiple);
     WxMpMaterialArticleUpdate wxMpMaterialArticleUpdateMulti = new WxMpMaterialArticleUpdate();
-    WxMpMaterialNews.WxMpMaterialNewsArticle articleMulti = wxMpMaterialNewsMultiple.getArticles().get(1);
+    WxMpNewsArticle articleMulti = wxMpMaterialNewsMultiple.getArticles().get(1);
     articleMulti.setContent("content 2 update");
     wxMpMaterialArticleUpdateMulti.setMediaId(this.multiNewsMediaId);
     wxMpMaterialArticleUpdateMulti.setArticles(articleMulti);

From 6f57472a02272f61a16e0b6b05481898f4ffed47 Mon Sep 17 00:00:00 2001
From: BeHappyWsz <32267661+BeHappyWsz@users.noreply.github.com>
Date: Mon, 13 Apr 2020 20:11:39 +0800
Subject: [PATCH 060/114] =?UTF-8?q?:bug:=20#1500=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E7=B4=A0=E6=9D=90=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=9APrefix=20?=
 =?UTF-8?q?string=20too=20short?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../http/apache/ApacheMediaDownloadRequestExecutor.java    | 7 ++++++-
 .../http/jodd/JoddHttpMediaDownloadRequestExecutor.java    | 7 ++++++-
 .../http/okhttp/OkHttpMediaDownloadRequestExecutor.java    | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

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 51c37f59a5..aeb3bb301e 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
@@ -63,7 +63,12 @@ public File execute(String uri, String queryParam, WxType wxType) throws WxError
         fileName = String.valueOf(System.currentTimeMillis());
       }
 
-      return FileUtils.createTmpFile(inputStream, FilenameUtils.getBaseName(fileName), FilenameUtils.getExtension(fileName),
+      String baseName = FilenameUtils.getBaseName(fileName);
+      if (StringUtils.isBlank(fileName) || baseName.length() < 3) {
+        baseName = String.valueOf(System.currentTimeMillis());
+      }
+
+      return FileUtils.createTmpFile(inputStream, baseName, FilenameUtils.getExtension(fileName),
         super.tmpDirFile);
 
     } finally {
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 4f310274df..df508869f0 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
@@ -60,9 +60,14 @@ public File execute(String uri, String queryParam, WxType wxType) throws WxError
       return null;
     }
 
+    String baseName = FilenameUtils.getBaseName(fileName);
+    if (StringUtils.isBlank(fileName) || baseName.length() < 3) {
+      baseName = String.valueOf(System.currentTimeMillis());
+    }
+
     try (InputStream inputStream = new ByteArrayInputStream(response.bodyBytes())) {
       return FileUtils.createTmpFile(inputStream,
-        FilenameUtils.getBaseName(fileName),
+        baseName,
         FilenameUtils.getExtension(fileName),
         super.tmpDirFile);
     }
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 729f1e186f..b6574cfe56 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
@@ -58,8 +58,13 @@ public File execute(String uri, String queryParam, WxType wxType) throws WxError
       return null;
     }
 
+    String baseName = FilenameUtils.getBaseName(fileName);
+    if (StringUtils.isBlank(fileName) || baseName.length() < 3) {
+      baseName = String.valueOf(System.currentTimeMillis());
+    }
+
     File file = File.createTempFile(
-      FilenameUtils.getBaseName(fileName), "." + FilenameUtils.getExtension(fileName), super.tmpDirFile
+      baseName, "." + FilenameUtils.getExtension(fileName), super.tmpDirFile
     );
 
     try (BufferedSink sink = Okio.buffer(Okio.sink(file))) {

From 2e75e465c7a67a69a1096907e2556192945ad0b6 Mon Sep 17 00:00:00 2001
From: Mario Luo <luokaiqiongmou@foxmail.com>
Date: Mon, 13 Apr 2020 20:13:03 +0800
Subject: [PATCH 061/114] =?UTF-8?q?:art:=20#1503=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=A8=A1=E5=9D=97=E6=8F=90=E5=8F=96?=
 =?UTF-8?q?redis=E6=8A=BD=E8=B1=A1=E5=B1=82=E3=80=81=E6=94=AF=E6=8C=81key?=
 =?UTF-8?q?=E5=89=8D=E7=BC=80=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/config/impl/WxMpRedisConfigImpl.java   | 75 ++++++++-----------
 .../mp/config/redis/BaseWxMpRedisOps.java     | 37 +++++++++
 .../mp/config/redis/JedisWxMpRedisOps.java    | 51 +++++++++++++
 .../weixin/mp/config/redis/WxMpRedisOps.java  | 25 +++++++
 4 files changed, 145 insertions(+), 43 deletions(-)
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/WxMpRedisOps.java

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
index 8c61c9b2cd..4b33f85257 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
@@ -1,12 +1,12 @@
 package me.chanjar.weixin.mp.config.impl;
 
-import me.chanjar.weixin.common.util.locks.JedisDistributedLock;
+import com.sun.istack.internal.NotNull;
+import me.chanjar.weixin.mp.config.redis.JedisWxMpRedisOps;
+import me.chanjar.weixin.mp.config.redis.WxMpRedisOps;
 import me.chanjar.weixin.mp.enums.TicketType;
-import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 基于Redis的微信配置provider.
@@ -20,19 +20,23 @@
  */
 @SuppressWarnings("hiding")
 public class WxMpRedisConfigImpl extends WxMpDefaultConfigImpl {
-  private static final String ACCESS_TOKEN_KEY = "wx:access_token:";
-  private static final String LOCK_KEY = "wx:lock:";
+  private static final String ACCESS_TOKEN_KEY_TPL = "%s:access_token:%s";
+  private static final String TICKET_KEY_TPL = "%s:ticket:key:%s:%s";
+  private static final String LOCK_KEY_TPL = "%s:lock:%s:";
 
-  /**
-   * 使用连接池保证线程安全.
-   */
-  private final JedisPool jedisPool;
+  private final WxMpRedisOps redisOps;
+  private final String keyPrefix;
 
   private String accessTokenKey;
   private String lockKey;
 
-  public WxMpRedisConfigImpl(JedisPool jedisPool) {
-    this.jedisPool = jedisPool;
+  public WxMpRedisConfigImpl(@NotNull JedisPool jedisPool) {
+    this(new JedisWxMpRedisOps(jedisPool), "wx");
+  }
+
+  public WxMpRedisConfigImpl(@NotNull WxMpRedisOps redisOps, @NotNull String keyPrefix) {
+    this.redisOps = redisOps;
+    this.keyPrefix = keyPrefix;
   }
 
   /**
@@ -41,72 +45,57 @@ public WxMpRedisConfigImpl(JedisPool jedisPool) {
   @Override
   public void setAppId(String appId) {
     super.setAppId(appId);
-    this.accessTokenKey = ACCESS_TOKEN_KEY.concat(appId);
-    this.lockKey = ACCESS_TOKEN_KEY.concat(appId).concat(":");
-    accessTokenLock = new JedisDistributedLock(jedisPool, lockKey.concat("accessTokenLock"));
-    jsapiTicketLock = new JedisDistributedLock(jedisPool, lockKey.concat("jsapiTicketLock"));
-    sdkTicketLock = new JedisDistributedLock(jedisPool, lockKey.concat("sdkTicketLock"));
-    cardApiTicketLock = new JedisDistributedLock(jedisPool, lockKey.concat("cardApiTicketLock"));
+    this.accessTokenKey = String.format(ACCESS_TOKEN_KEY_TPL, this.keyPrefix, appId);
+    this.lockKey = String.format(LOCK_KEY_TPL, this.keyPrefix, appId);
+    accessTokenLock = this.redisOps.getLock(lockKey.concat("accessTokenLock"));
+    jsapiTicketLock = this.redisOps.getLock(lockKey.concat("jsapiTicketLock"));
+    sdkTicketLock = this.redisOps.getLock(lockKey.concat("sdkTicketLock"));
+    cardApiTicketLock = this.redisOps.getLock(lockKey.concat("cardApiTicketLock"));
   }
 
   private String getTicketRedisKey(TicketType type) {
-    return String.format("wx:ticket:key:%s:%s", this.appId, type.getCode());
+    return String.format(TICKET_KEY_TPL, this.keyPrefix, appId, type.getCode());
   }
 
   @Override
   public String getAccessToken() {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.get(this.accessTokenKey);
-    }
+    return redisOps.getValue(this.accessTokenKey);
   }
 
   @Override
   public boolean isAccessTokenExpired() {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.ttl(accessTokenKey) < 2;
-    }
+    Long expire = redisOps.getExpire(this.accessTokenKey);
+    return expire == null || expire < 2;
   }
 
   @Override
   public synchronized void updateAccessToken(String accessToken, int expiresInSeconds) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.setex(this.accessTokenKey, expiresInSeconds - 200, accessToken);
-    }
+    redisOps.setValue(this.accessTokenKey, accessToken, expiresInSeconds - 200, TimeUnit.SECONDS);
   }
 
   @Override
   public void expireAccessToken() {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.expire(this.accessTokenKey, 0);
-    }
+    redisOps.expire(this.accessTokenKey, 0, TimeUnit.SECONDS);
   }
 
   @Override
   public String getTicket(TicketType type) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.get(this.getTicketRedisKey(type));
-    }
+    return redisOps.getValue(this.getTicketRedisKey(type));
   }
 
   @Override
   public boolean isTicketExpired(TicketType type) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.ttl(this.getTicketRedisKey(type)) < 2;
-    }
+    return redisOps.getExpire(this.getTicketRedisKey(type)) < 2;
   }
 
   @Override
   public synchronized void updateTicket(TicketType type, String jsapiTicket, int expiresInSeconds) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.setex(this.getTicketRedisKey(type), expiresInSeconds - 200, jsapiTicket);
-    }
+    redisOps.setValue(this.getTicketRedisKey(type), jsapiTicket, expiresInSeconds - 200, TimeUnit.SECONDS);
   }
 
   @Override
   public void expireTicket(TicketType type) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.expire(this.getTicketRedisKey(type), 0);
-    }
+    redisOps.expire(this.getTicketRedisKey(type), 0, TimeUnit.SECONDS);
   }
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java
new file mode 100644
index 0000000000..8ec836415f
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java
@@ -0,0 +1,37 @@
+package me.chanjar.weixin.mp.config.redis;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+/**
+ * 微信公众号redis操作基本类
+ * <p>
+ * 非内置实现redis相关操作, 请实现该类
+ */
+public class BaseWxMpRedisOps implements WxMpRedisOps {
+
+  @Override
+  public String getValue(String key) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void setValue(String key, String value, int expire, TimeUnit timeUnit) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Long getExpire(String key) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public void expire(String key, int expire, TimeUnit timeUnit) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Lock getLock(String key) {
+    throw new UnsupportedOperationException();
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java
new file mode 100644
index 0000000000..0ba21bcd5b
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java
@@ -0,0 +1,51 @@
+package me.chanjar.weixin.mp.config.redis;
+
+import lombok.AllArgsConstructor;
+import me.chanjar.weixin.common.util.locks.JedisDistributedLock;
+import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisPool;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+/**
+ * Jedis实现相关操作
+ */
+@AllArgsConstructor
+public class JedisWxMpRedisOps implements WxMpRedisOps {
+
+  private JedisPool jedisPool;
+
+  @Override
+  public String getValue(String key) {
+    try (Jedis jedis = this.jedisPool.getResource()) {
+      return jedis.get(key);
+    }
+  }
+
+  @Override
+  public void setValue(String key, String value, int expire, TimeUnit timeUnit) {
+    try (Jedis jedis = this.jedisPool.getResource()) {
+      jedis.psetex(key, timeUnit.toMillis(expire), value);
+    }
+  }
+
+  @Override
+  public Long getExpire(String key) {
+    try (Jedis jedis = this.jedisPool.getResource()) {
+      return jedis.ttl(key);
+    }
+  }
+
+  @Override
+  public void expire(String key, int expire, TimeUnit timeUnit) {
+    try (Jedis jedis = this.jedisPool.getResource()) {
+      jedis.pexpire(key, timeUnit.toMillis(expire));
+    }
+  }
+
+  @Override
+  public Lock getLock(String key) {
+    return new JedisDistributedLock(jedisPool, key);
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/WxMpRedisOps.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/WxMpRedisOps.java
new file mode 100644
index 0000000000..d57d037c80
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/WxMpRedisOps.java
@@ -0,0 +1,25 @@
+package me.chanjar.weixin.mp.config.redis;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+/**
+ * 微信公众号Redis相关操作
+ * <p>
+ * 该接口不承诺稳定, 外部实现请继承{@link BaseWxMpRedisOps}
+ *
+ * @see BaseWxMpRedisOps 实现需要继承该类
+ * @see JedisWxMpRedisOps jedis实现
+ */
+public interface WxMpRedisOps {
+
+  String getValue(String key);
+
+  void setValue(String key, String value, int expire, TimeUnit timeUnit);
+
+  Long getExpire(String key);
+
+  void expire(String key, int expire, TimeUnit timeUnit);
+
+  Lock getLock(String key);
+}

From f101374a6ea4f1ae87b9758afc1c34b7b6653410 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 14 Apr 2020 10:03:04 +0800
Subject: [PATCH 062/114] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E5=BC=95=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
index 4b33f85257..3e6fef7dd4 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
@@ -1,6 +1,5 @@
 package me.chanjar.weixin.mp.config.impl;
 
-import com.sun.istack.internal.NotNull;
 import me.chanjar.weixin.mp.config.redis.JedisWxMpRedisOps;
 import me.chanjar.weixin.mp.config.redis.WxMpRedisOps;
 import me.chanjar.weixin.mp.enums.TicketType;
@@ -30,11 +29,11 @@ public class WxMpRedisConfigImpl extends WxMpDefaultConfigImpl {
   private String accessTokenKey;
   private String lockKey;
 
-  public WxMpRedisConfigImpl(@NotNull JedisPool jedisPool) {
+  public WxMpRedisConfigImpl(JedisPool jedisPool) {
     this(new JedisWxMpRedisOps(jedisPool), "wx");
   }
 
-  public WxMpRedisConfigImpl(@NotNull WxMpRedisOps redisOps, @NotNull String keyPrefix) {
+  public WxMpRedisConfigImpl(WxMpRedisOps redisOps, String keyPrefix) {
     this.redisOps = redisOps;
     this.keyPrefix = keyPrefix;
   }

From 2112db791da64ccaf655f002629a905c6fccd1eb Mon Sep 17 00:00:00 2001
From: yjwang <35523753+yjwang3300300@users.noreply.github.com>
Date: Fri, 17 Apr 2020 12:42:46 +0800
Subject: [PATCH 063/114] =?UTF-8?q?:bug:=20#1512=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=92=AD=E5=AE=98=E6=96=B9?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3live=5Fsatus=E5=AD=97=E6=AE=B5=E6=8B=BC?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?live=5Fstatus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
index c0470f52c2..5d8ad4e301 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
@@ -44,8 +44,8 @@ public static class RoomInfo implements Serializable {
     private Integer roomid;
     @SerializedName("cover_img")
     private String coverImg;
-    @SerializedName("live_satus")
-    private Integer liveSatus;
+    @SerializedName("live_status")
+    private Integer liveStatus;
     @SerializedName("start_time")
     private Long startTime;
     @SerializedName("end_time")

From dc01e0b1edcfa3c2e72f46d21bc9c96446c7d86d Mon Sep 17 00:00:00 2001
From: Mario Luo <luokaiqiongmou@foxmail.com>
Date: Fri, 17 Apr 2020 15:45:43 +0800
Subject: [PATCH 064/114] =?UTF-8?q?:art:=20#1516=20=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7spring-boot-starter=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=A2=9E=E5=8A=A0http=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E5=92=8C=E4=BB=A3=E7=90=86=E7=AD=89=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wx-java-mp-spring-boot-starter/README.md  |  25 ++--
 .../wx-java-mp-spring-boot-starter/pom.xml    |   8 +-
 .../config/WxMpServiceAutoConfiguration.java  |  56 ++++++++-
 .../config/WxMpStorageAutoConfiguration.java  |  88 ++++++++------
 .../mp/extend/RedisTemplateWxMpRedisOps.java  |  40 +++++++
 .../wxjava/mp/properties/RedisProperties.java |  66 -----------
 .../wxjava/mp/properties/WxMpProperties.java  | 109 ++++++++++++++++--
 .../OkHttpMediaDownloadRequestExecutor.java   |   2 -
 8 files changed, 269 insertions(+), 125 deletions(-)
 create mode 100644 spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/extend/RedisTemplateWxMpRedisOps.java
 delete mode 100644 spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java

diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md b/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md
index ec7f343c62..58c8efbdea 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md
@@ -11,18 +11,25 @@
 2. 添加配置(application.properties)
     ```properties
     # 公众号配置(必填)
-    wx.mp.appId = @appId
-	wx.mp.secret = @secret
-	wx.mp.token = @token
-	wx.mp.aesKey = @aesKey
-	# 存储配置redis(可选)
-	wx.mp.config-storage.type = redis
-	wx.mp.config-storage.redis.host = 127.0.0.1
-	wx.mp.config-storage.redis.port = 6379
+    wx.mp.appId = appId
+    wx.mp.secret = @secret
+    wx.mp.token = @token
+    wx.mp.aesKey = @aesKey
+    # 存储配置redis(可选)
+    wx.mp.config-storage.type = redis                     # 配置类型: memory(默认), redis, jedis, redistemplate
+    wx.mp.config-storage.key-prefix = wx                  # 相关redis前缀配置: wx(默认)
+    wx.mp.config-storage.redis.host = 127.0.0.1
+    wx.mp.config-storage.redis.port = 6379
+    # http客户端配置
+    wx.mp.config-storage.http-client-type=httpclient      # http客户端类型: httpclient(默认), okhttp, joddhttp
+    wx.mp.config-storage.http-proxy-host=
+    wx.mp.config-storage.http-proxy-port=
+    wx.mp.config-storage.http-proxy-username=
+    wx.mp.config-storage.http-proxy-password=
     ```
 3. 支持自动注入的类型
 
-`WxMpService`以及相关的服务类, 比如: `wxMpService.getXxxService`。
+`WxMpService`以及~~相关的服务类, 比如: `wxMpService.getXxxService`。~~
 
 
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 95b477f3bd..bb6687340b 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -25,10 +25,10 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.redisson</groupId>
-      <artifactId>redisson</artifactId>
-      <scope>compile</scope>
-      <optional>true</optional>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-redis</artifactId>
+      <version>${spring.boot.version}</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpServiceAutoConfiguration.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpServiceAutoConfiguration.java
index 7d96226733..17d1083ed6 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpServiceAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpServiceAutoConfiguration.java
@@ -1,7 +1,11 @@
 package com.binarywang.spring.starter.wxjava.mp.config;
 
+import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
 import me.chanjar.weixin.mp.api.*;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceHttpClientImpl;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceJoddHttpImpl;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceOkHttpImpl;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
@@ -17,113 +21,161 @@ public class WxMpServiceAutoConfiguration {
 
   @Bean
   @ConditionalOnMissingBean
-  public WxMpService wxMpService(WxMpConfigStorage configStorage) {
-    WxMpService wxMpService = new WxMpServiceImpl();
+  public WxMpService wxMpService(WxMpConfigStorage configStorage, WxMpProperties wxMpProperties) {
+    WxMpProperties.HttpClientType httpClientType = wxMpProperties.getConfigStorage().getHttpClientType();
+    WxMpService wxMpService;
+    if (httpClientType == WxMpProperties.HttpClientType.okhttp) {
+      wxMpService = newWxMpServiceJoddHttpImpl();
+    } else if (httpClientType == WxMpProperties.HttpClientType.joddhttp) {
+      wxMpService = newWxMpServiceOkHttpImpl();
+    } else if (httpClientType == WxMpProperties.HttpClientType.httpclient) {
+      wxMpService = newWxMpServiceHttpClientImpl();
+    } else {
+      wxMpService = newWxMpServiceImpl();
+    }
+
     wxMpService.setWxMpConfigStorage(configStorage);
     return wxMpService;
   }
 
+  private WxMpService newWxMpServiceImpl() {
+    return new WxMpServiceImpl();
+  }
+
+  private WxMpService newWxMpServiceHttpClientImpl() {
+    return new WxMpServiceHttpClientImpl();
+  }
+
+  private WxMpService newWxMpServiceOkHttpImpl() {
+    return new WxMpServiceOkHttpImpl();
+  }
+
+  private WxMpService newWxMpServiceJoddHttpImpl() {
+    return new WxMpServiceJoddHttpImpl();
+  }
+
   @Bean
+  @Deprecated
   public WxMpKefuService wxMpKefuService(WxMpService wxMpService) {
     return wxMpService.getKefuService();
   }
 
   @Bean
+  @Deprecated
   public WxMpMaterialService wxMpMaterialService(WxMpService wxMpService) {
     return wxMpService.getMaterialService();
   }
 
   @Bean
+  @Deprecated
   public WxMpMenuService wxMpMenuService(WxMpService wxMpService) {
     return wxMpService.getMenuService();
   }
 
   @Bean
+  @Deprecated
   public WxMpUserService wxMpUserService(WxMpService wxMpService) {
     return wxMpService.getUserService();
   }
 
   @Bean
+  @Deprecated
   public WxMpUserTagService wxMpUserTagService(WxMpService wxMpService) {
     return wxMpService.getUserTagService();
   }
 
   @Bean
+  @Deprecated
   public WxMpQrcodeService wxMpQrcodeService(WxMpService wxMpService) {
     return wxMpService.getQrcodeService();
   }
 
   @Bean
+  @Deprecated
   public WxMpCardService wxMpCardService(WxMpService wxMpService) {
     return wxMpService.getCardService();
   }
 
   @Bean
+  @Deprecated
   public WxMpDataCubeService wxMpDataCubeService(WxMpService wxMpService) {
     return wxMpService.getDataCubeService();
   }
 
   @Bean
+  @Deprecated
   public WxMpUserBlacklistService wxMpUserBlacklistService(WxMpService wxMpService) {
     return wxMpService.getBlackListService();
   }
 
   @Bean
+  @Deprecated
   public WxMpStoreService wxMpStoreService(WxMpService wxMpService) {
     return wxMpService.getStoreService();
   }
 
   @Bean
+  @Deprecated
   public WxMpTemplateMsgService wxMpTemplateMsgService(WxMpService wxMpService) {
     return wxMpService.getTemplateMsgService();
   }
 
   @Bean
+  @Deprecated
   public WxMpSubscribeMsgService wxMpSubscribeMsgService(WxMpService wxMpService) {
     return wxMpService.getSubscribeMsgService();
   }
 
   @Bean
+  @Deprecated
   public WxMpDeviceService wxMpDeviceService(WxMpService wxMpService) {
     return wxMpService.getDeviceService();
   }
 
   @Bean
+  @Deprecated
   public WxMpShakeService wxMpShakeService(WxMpService wxMpService) {
     return wxMpService.getShakeService();
   }
 
   @Bean
+  @Deprecated
   public WxMpMemberCardService wxMpMemberCardService(WxMpService wxMpService) {
     return wxMpService.getMemberCardService();
   }
 
   @Bean
+  @Deprecated
   public WxMpMassMessageService wxMpMassMessageService(WxMpService wxMpService) {
     return wxMpService.getMassMessageService();
   }
 
   @Bean
+  @Deprecated
   public WxMpAiOpenService wxMpAiOpenService(WxMpService wxMpService) {
     return wxMpService.getAiOpenService();
   }
 
   @Bean
+  @Deprecated
   public WxMpWifiService wxMpWifiService(WxMpService wxMpService) {
     return wxMpService.getWifiService();
   }
 
   @Bean
+  @Deprecated
   public WxMpMarketingService wxMpMarketingService(WxMpService wxMpService) {
     return wxMpService.getMarketingService();
   }
 
   @Bean
+  @Deprecated
   public WxMpCommentService wxMpCommentService(WxMpService wxMpService) {
     return wxMpService.getCommentService();
   }
 
   @Bean
+  @Deprecated
   public WxMpOcrService wxMpOcrService(WxMpService wxMpService) {
     return wxMpService.getOcrService();
   }
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
index f25caf90ba..5eb0ef5cd1 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
@@ -1,15 +1,20 @@
 package com.binarywang.spring.starter.wxjava.mp.config;
 
-import com.binarywang.spring.starter.wxjava.mp.properties.RedisProperties;
+import com.binarywang.spring.starter.wxjava.mp.extend.RedisTemplateWxMpRedisOps;
 import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
 import lombok.RequiredArgsConstructor;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
+import me.chanjar.weixin.mp.config.redis.JedisWxMpRedisOps;
+import me.chanjar.weixin.mp.config.redis.WxMpRedisOps;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
@@ -22,55 +27,77 @@
 @RequiredArgsConstructor
 public class WxMpStorageAutoConfiguration {
 
-  private final WxMpProperties properties;
   private final ApplicationContext applicationContext;
 
+  private final WxMpProperties wxMpProperties;
+
+  @Value("${wx.mp.config-storage.redis.host:")
+  private String redisHost;
+
+  @Value("${wx.mp.configStorage.redis.host:")
+  private String redisHost2;
+
   @Bean
   @ConditionalOnMissingBean(WxMpConfigStorage.class)
-  public WxMpConfigStorage wxMpInMemoryConfigStorage() {
-    WxMpProperties.ConfigStorage storage = properties.getConfigStorage();
-    WxMpProperties.StorageType type = storage.getType();
-
-    if (type == WxMpProperties.StorageType.redis) {
-      return getWxMpInRedisConfigStorage();
+  public WxMpConfigStorage wxMpConfigStorage() {
+    WxMpProperties.StorageType type = wxMpProperties.getConfigStorage().getType();
+    WxMpConfigStorage config;
+    if (type == WxMpProperties.StorageType.redis || type == WxMpProperties.StorageType.jedis) {
+      config = wxMpInJedisConfigStorage();
+    } else if (type == WxMpProperties.StorageType.redistemplate) {
+      config = wxMpInRedisTemplateConfigStorage();
+    } else {
+      config = wxMpInMemoryConfigStorage();
     }
-    return getWxMpInMemoryConfigStorage();
+    return config;
   }
 
-  private WxMpDefaultConfigImpl getWxMpInMemoryConfigStorage() {
+  private WxMpConfigStorage wxMpInMemoryConfigStorage() {
     WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl();
     setWxMpInfo(config);
     return config;
   }
 
-  private WxMpRedisConfigImpl getWxMpInRedisConfigStorage() {
-    RedisProperties.ImplType implType = properties.getConfigStorage().getRedis().getImpl();
-    boolean reuseBean = properties.getConfigStorage().getRedis().isReuseBean();
-    if (implType == RedisProperties.ImplType.jedis) {
-      JedisPool pool = null;
-      if (reuseBean) {
-        pool = getBean(JedisPool.class);
-      }
-      if (pool == null) {
-        pool = getJedisPool();
-      }
-      WxMpRedisConfigImpl config = new WxMpRedisConfigImpl(pool);
-      setWxMpInfo(config);
-      return config;
+  private WxMpConfigStorage wxMpInJedisConfigStorage() {
+    JedisPool jedisPool;
+    if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) {
+      jedisPool = getJedisPool();
+    } else {
+      jedisPool = applicationContext.getBean(JedisPool.class);
     }
-    throw new UnsupportedOperationException();
+    WxMpRedisOps redisOps = new JedisWxMpRedisOps(jedisPool);
+    WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix());
+    setWxMpInfo(wxMpRedisConfig);
+    return wxMpRedisConfig;
+  }
+
+  private WxMpConfigStorage wxMpInRedisTemplateConfigStorage() {
+    StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
+    WxMpRedisOps redisOps = new RedisTemplateWxMpRedisOps(redisTemplate);
+    WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix());
+    setWxMpInfo(wxMpRedisConfig);
+    return wxMpRedisConfig;
   }
 
   private void setWxMpInfo(WxMpDefaultConfigImpl config) {
+    WxMpProperties properties = wxMpProperties;
+    WxMpProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
     config.setAppId(properties.getAppId());
     config.setSecret(properties.getSecret());
     config.setToken(properties.getToken());
     config.setAesKey(properties.getAesKey());
+
+    config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
+    config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
+    config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
+    if (configStorageProperties.getHttpProxyPort() != null) {
+      config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
+    }
   }
 
   private JedisPool getJedisPool() {
-    WxMpProperties.ConfigStorage storage = properties.getConfigStorage();
-    RedisProperties redis = storage.getRedis();
+    WxMpProperties.ConfigStorage storage = wxMpProperties.getConfigStorage();
+    WxMpProperties.RedisProperties redis = storage.getRedis();
 
     JedisPoolConfig config = new JedisPoolConfig();
     if (redis.getMaxActive() != null) {
@@ -91,11 +118,4 @@ private JedisPool getJedisPool() {
     return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(),
       redis.getDatabase());
   }
-
-  private <T> T getBean(Class<T> clazz) {
-    if (this.applicationContext.getBeanNamesForType(clazz, false, false).length > 0) {
-      return this.applicationContext.getBean(clazz);
-    }
-    return null;
-  }
 }
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/extend/RedisTemplateWxMpRedisOps.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/extend/RedisTemplateWxMpRedisOps.java
new file mode 100644
index 0000000000..4939aba89d
--- /dev/null
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/extend/RedisTemplateWxMpRedisOps.java
@@ -0,0 +1,40 @@
+package com.binarywang.spring.starter.wxjava.mp.extend;
+
+import lombok.RequiredArgsConstructor;
+import me.chanjar.weixin.mp.config.redis.BaseWxMpRedisOps;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
+@RequiredArgsConstructor
+public class RedisTemplateWxMpRedisOps extends BaseWxMpRedisOps {
+
+  private final StringRedisTemplate redisTemplate;
+
+  @Override
+  public String getValue(String key) {
+    return redisTemplate.opsForValue().get(key);
+  }
+
+  @Override
+  public void setValue(String key, String value, int expire, TimeUnit timeUnit) {
+    redisTemplate.opsForValue().set(key, value, expire, timeUnit);
+  }
+
+  @Override
+  public Long getExpire(String key) {
+    return redisTemplate.getExpire(key);
+  }
+
+  @Override
+  public void expire(String key, int expire, TimeUnit timeUnit) {
+    redisTemplate.expire(key, expire, timeUnit);
+  }
+
+  @Override
+  public Lock getLock(String key) {
+    return new ReentrantLock();
+  }
+}
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java
deleted file mode 100644
index 840cf6e35e..0000000000
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.binarywang.spring.starter.wxjava.mp.properties;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * Redis配置.
- *
- * @author someone
- */
-@Data
-public class RedisProperties implements Serializable {
-  private static final long serialVersionUID = -5924815351660074401L;
-
-  /**
-   * 操作Redis的实现
-   */
-  private ImplType impl = ImplType.jedis;
-
-  /**
-   * 操作Redis的实现如果在spring容器里是否直接使用
-   */
-  private boolean reuseBean = true;
-
-  /**
-   * 主机地址.
-   */
-  private String host = "127.0.0.1";
-
-  /**
-   * 端口号.
-   */
-  private int port = 6379;
-
-  /**
-   * 密码.
-   */
-  private String password;
-
-  /**
-   * 超时.
-   */
-  private int timeout = 2000;
-
-  /**
-   * 数据库.
-   */
-  private int database = 0;
-
-  private Integer maxActive;
-  private Integer maxIdle;
-  private Integer maxWaitMillis;
-  private Integer minIdle;
-
-  public enum ImplType {
-    /**
-     * jedis.
-     */
-    jedis,
-    /**
-     * redisson.
-     */
-//    redisson
-  }
-}
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java
index 4a9bfbbfe6..60b39d9cdc 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java
@@ -2,7 +2,6 @@
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 import java.io.Serializable;
 
@@ -41,19 +40,54 @@ public class WxMpProperties {
   private String aesKey;
 
   /**
-   * 存储策略, memory, redis.
+   * 存储策略
    */
-  private final ConfigStorage configStorage = new ConfigStorage();
-
+  private ConfigStorage configStorage = new ConfigStorage();
 
   @Data
   public static class ConfigStorage implements Serializable {
     private static final long serialVersionUID = 4815731027000065434L;
 
+    /**
+     * 存储类型.
+     */
     private StorageType type = memory;
 
-    @NestedConfigurationProperty
-    private final RedisProperties redis = new RedisProperties();
+    /**
+     * 指定key前缀.
+     */
+    private String keyPrefix = "wx";
+
+    /**
+     * redis连接配置.
+     */
+    private RedisProperties redis = new RedisProperties();
+
+    /**
+     * http客户端类型.
+     */
+    private HttpClientType httpClientType = HttpClientType.httpclient;
+
+    /**
+     * http代理主机.
+     */
+    private String httpProxyHost;
+
+    /**
+     * http代理端口.
+     */
+    private Integer httpProxyPort;
+
+    /**
+     * http代理用户名.
+     */
+    private String httpProxyUsername;
+
+    /**
+     * http代理密码.
+     */
+    private String httpProxyPassword;
+
   }
 
   public enum StorageType {
@@ -62,8 +96,67 @@ public enum StorageType {
      */
     memory,
     /**
-     * redis.
+     * jedis.
+     */
+    redis,
+    /**
+     * redis(JedisClient).
+     */
+    jedis,
+    /**
+     * redis(RedisTemplate).
      */
-    redis
+    redistemplate
   }
+
+  public enum HttpClientType {
+    /**
+     * HttpClient.
+     */
+    httpclient,
+    /**
+     * OkHttp.
+     */
+    okhttp,
+    /**
+     * JoddHttp.
+     */
+    joddhttp
+  }
+
+  @Data
+  public static class RedisProperties implements Serializable {
+    private static final long serialVersionUID = -5924815351660074401L;
+
+    /**
+     * 主机地址.
+     */
+    private String host = "127.0.0.1";
+
+    /**
+     * 端口号.
+     */
+    private int port = 6379;
+
+    /**
+     * 密码.
+     */
+    private String password;
+
+    /**
+     * 超时.
+     */
+    private int timeout = 2000;
+
+    /**
+     * 数据库.
+     */
+    private int database = 0;
+
+    private Integer maxActive;
+    private Integer maxIdle;
+    private Integer maxWaitMillis;
+    private Integer minIdle;
+  }
+
 }
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 b6574cfe56..86710ccced 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
@@ -14,8 +14,6 @@
 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.File;
 import java.io.IOException;

From ea444f22637ed97021c9f0643bd85020ac682d50 Mon Sep 17 00:00:00 2001
From: S <sshzh90@gmail.com>
Date: Sat, 18 Apr 2020 11:53:21 +0800
Subject: [PATCH 065/114] =?UTF-8?q?:art:=20#1519=20=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E5=8D=A1=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=85=E9=83=A8=E5=88=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/mp/bean/card/MemberCard.java  | 13 +++++++++++++
 .../weixin/mp/bean/card/MemberCardUpdate.java       | 13 +++++++++++++
 .../membercard/WxMpMemberCardUpdateMessage.java     | 10 +++++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java
index bbe42acabb..76d7f2175c 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java
@@ -122,6 +122,19 @@ public final class MemberCard implements Serializable {
   @SerializedName("custom_cell1")
   private CustomCell1 customCell1;
 
+  /**
+   * 自定义会员信息类目，会员卡激活后显示.
+   */
+  @SerializedName("custom_cell2")
+  private CustomCell1 customCell2;
+
+
+  /**
+   * 自定义会员信息类目，会员卡激活后显示.
+   */
+  @SerializedName("custom_cell3")
+  private CustomCell1 customCell3;
+
   /**
    * 积分规则,JSON结构积分规则.
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java
index 83b37f12ec..00333117a5 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java
@@ -119,6 +119,19 @@ public final class MemberCardUpdate implements Serializable {
   @SerializedName("custom_cell1")
   private CustomCell1 customCell1;
 
+  /**
+   * 自定义会员信息类目，会员卡激活后显示.
+   */
+  @SerializedName("custom_cell2")
+  private CustomCell1 customCell2;
+
+
+  /**
+   * 自定义会员信息类目，会员卡激活后显示.
+   */
+  @SerializedName("custom_cell3")
+  private CustomCell1 customCell3;
+
   /**
    * 积分规则,JSON结构积分规则.
    */
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 d4323e0996..bc7d866163 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
@@ -40,10 +40,18 @@ public class WxMpMemberCardUpdateMessage implements Serializable {
    */
   private Integer bonus;
   /**
-   * 本次积分变动值，传负数代表减少
+   * 本次积分变动值，传负数代表减少，错误单词，只是为了保持兼容
    */
+  @Deprecated
   @SerializedName("add_bonus")
   private Integer addBounus;
+
+
+  /**
+   * 本次积分变动值，传负数代表减少
+   */
+  @SerializedName("add_bonus")
+  private Integer addBonus;
   /**
    * 商家自定义积分消耗记录，不超过14个汉字
    */

From d938182141b426d644bc40bbfab721d64cac4879 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 18 Apr 2020 12:09:41 +0800
Subject: [PATCH 066/114] =?UTF-8?q?:art:=20#1507=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1MpnewsArticle=E7=B1=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=9F=90=E4=BA=9B=E6=83=85=E5=86=B5=E4=B8=8B=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/me/chanjar/weixin/cp/bean/article/MpnewsArticle.java | 4 ++++
 1 file changed, 4 insertions(+)

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 595d12c5bc..2b2a9fe051 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,7 +1,9 @@
 package me.chanjar.weixin.cp.bean.article;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -13,6 +15,8 @@
  * @author Binary Wang
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Builder(builderMethodName = "newBuilder")
 public class MpnewsArticle implements Serializable {
   private static final long serialVersionUID = 6985871812170756481L;

From 340f341947626a3ec68e72efaf4d204f8e47673a Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 18 Apr 2020 12:14:07 +0800
Subject: [PATCH 067/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
index 3e6fef7dd4..cbf5eaf369 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.config.impl;
 
+import lombok.Data;
 import me.chanjar.weixin.mp.config.redis.JedisWxMpRedisOps;
 import me.chanjar.weixin.mp.config.redis.WxMpRedisOps;
 import me.chanjar.weixin.mp.enums.TicketType;
@@ -17,8 +18,11 @@
  *
  * @author nickwong
  */
+@Data
 @SuppressWarnings("hiding")
 public class WxMpRedisConfigImpl extends WxMpDefaultConfigImpl {
+  private static final long serialVersionUID = -988502871997239733L;
+  
   private static final String ACCESS_TOKEN_KEY_TPL = "%s:access_token:%s";
   private static final String TICKET_KEY_TPL = "%s:ticket:key:%s:%s";
   private static final String LOCK_KEY_TPL = "%s:lock:%s:";

From 7feca8d9628122ebe2e5415f153b70972c5727de Mon Sep 17 00:00:00 2001
From: Mario Luo <luokaiqiongmou@foxmail.com>
Date: Sat, 18 Apr 2020 23:08:25 +0800
Subject: [PATCH 068/114] =?UTF-8?q?:art:=20#1521=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=20spring-boot-starter=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=96=B0=E7=89=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   8 ++
 .../pom.xml                                   |  11 ++
 .../miniapp/config/WxMaAutoConfiguration.java | 101 ++++++++++++--
 .../miniapp/properties/WxMaProperties.java    | 110 +++++++++++++++
 .../config/WxMpStorageAutoConfiguration.java  |  10 +-
 weixin-java-common/pom.xml                    |   9 +-
 .../weixin/common/redis/BaseWxRedisOps.java   |   6 +-
 .../weixin/common/redis/JedisWxRedisOps.java  |  13 +-
 .../common/redis/RedisTemplateWxRedisOps.java |   5 +-
 .../common/redis/RedissonWxRedisOps.java      |  39 ++++++
 .../weixin/common/redis/WxRedisOps.java       |  27 ++++
 .../config/impl/WxMaDefaultConfigImpl.java    |   4 +-
 .../impl/WxMaRedisBetterConfigImpl.java       | 130 ++++++++++++++++++
 .../wx/miniapp/constant/TicketType.java       |  30 ++++
 .../mp/config/impl/WxMpRedisConfigImpl.java   |  12 +-
 .../weixin/mp/config/redis/WxMpRedisOps.java  |  25 ----
 16 files changed, 477 insertions(+), 63 deletions(-)
 rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java => weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/BaseWxRedisOps.java (84%)
 rename weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java => weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java (82%)
 rename spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/extend/RedisTemplateWxMpRedisOps.java => weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java (83%)
 create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedissonWxRedisOps.java
 create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/WxRedisOps.java
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java
 delete mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/WxMpRedisOps.java

diff --git a/pom.xml b/pom.xml
index dff83a69ed..07da003e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,14 @@
         <groupId>org.redisson</groupId>
         <artifactId>redisson</artifactId>
         <version>3.12.0</version>
+        <optional>true</optional>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-redis</artifactId>
+        <version>1.8.23.RELEASE</version>
+        <optional>true</optional>
         <scope>provided</scope>
       </dependency>
       <dependency>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index 919702f869..9d44613758 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -19,6 +19,17 @@
       <artifactId>weixin-java-miniapp</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>redis.clients</groupId>
+      <artifactId>jedis</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-redis</artifactId>
+      <version>${spring.boot.version}</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/config/WxMaAutoConfiguration.java b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/config/WxMaAutoConfiguration.java
index 109b398d13..1c6d7865f3 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/config/WxMaAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/config/WxMaAutoConfiguration.java
@@ -4,15 +4,23 @@
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl;
 import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
 import lombok.AllArgsConstructor;
+import me.chanjar.weixin.common.redis.JedisWxRedisOps;
+import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
 
 /**
  * 自动配置.
@@ -26,7 +34,9 @@
 @EnableConfigurationProperties(WxMaProperties.class)
 @ConditionalOnProperty(prefix = "wx.miniapp", value = "enabled", matchIfMissing = true)
 public class WxMaAutoConfiguration {
-  private WxMaProperties properties;
+
+  private final WxMaProperties wxMaProperties;
+  private final ApplicationContext applicationContext;
 
   /**
    * 小程序service.
@@ -35,16 +45,87 @@ public class WxMaAutoConfiguration {
    */
   @Bean
   @ConditionalOnMissingBean(WxMaService.class)
-  public WxMaService service() {
-    WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
-    config.setAppid(StringUtils.trimToNull(this.properties.getAppid()));
-    config.setSecret(StringUtils.trimToNull(this.properties.getSecret()));
-    config.setToken(StringUtils.trimToNull(this.properties.getToken()));
-    config.setAesKey(StringUtils.trimToNull(this.properties.getAesKey()));
-    config.setMsgDataFormat(StringUtils.trimToNull(this.properties.getMsgDataFormat()));
-
+  public WxMaService service(WxMaConfig wxMaConfig) {
     final WxMaServiceImpl service = new WxMaServiceImpl();
-    service.setWxMaConfig(config);
+    service.setWxMaConfig(wxMaConfig);
     return service;
   }
+
+  @Bean
+  @ConditionalOnMissingBean(WxMaConfig.class)
+  public WxMaConfig wxMaConfig() {
+    WxMaProperties.StorageType type = wxMaProperties.getConfigStorage().getType();
+    WxMaDefaultConfigImpl config;
+    if (type == WxMaProperties.StorageType.jedis) {
+      config = wxMaInJedisConfigStorage();
+    } else if (type == WxMaProperties.StorageType.redistemplate) {
+      config = wxMaInRedisTemplateConfigStorage();
+    } else {
+      config = wxMaInMemoryConfigStorage();
+    }
+
+    config.setAppid(StringUtils.trimToNull(this.wxMaProperties.getAppid()));
+    config.setSecret(StringUtils.trimToNull(this.wxMaProperties.getSecret()));
+    config.setToken(StringUtils.trimToNull(this.wxMaProperties.getToken()));
+    config.setAesKey(StringUtils.trimToNull(this.wxMaProperties.getAesKey()));
+    config.setMsgDataFormat(StringUtils.trimToNull(this.wxMaProperties.getMsgDataFormat()));
+
+    WxMaProperties.ConfigStorage configStorageProperties = wxMaProperties.getConfigStorage();
+    config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
+    config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
+    config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
+    if (configStorageProperties.getHttpProxyPort() != null) {
+      config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
+    }
+    return config;
+  }
+
+  private WxMaDefaultConfigImpl wxMaInMemoryConfigStorage() {
+    WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+    return config;
+  }
+
+  private WxMaDefaultConfigImpl wxMaInJedisConfigStorage() {
+    WxMaProperties.RedisProperties redisProperties = wxMaProperties.getConfigStorage().getRedis();
+    JedisPool jedisPool;
+    if (redisProperties != null && StringUtils.isNotEmpty(redisProperties.getHost())) {
+      jedisPool = getJedisPool();
+    } else {
+      jedisPool = applicationContext.getBean(JedisPool.class);
+    }
+    WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
+    WxMaRedisBetterConfigImpl wxMaRedisConfig = new WxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
+    return wxMaRedisConfig;
+  }
+
+  private WxMaDefaultConfigImpl wxMaInRedisTemplateConfigStorage() {
+    StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
+    WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
+    WxMaRedisBetterConfigImpl wxMaRedisConfig = new WxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
+    return wxMaRedisConfig;
+  }
+
+  private JedisPool getJedisPool() {
+    WxMaProperties.ConfigStorage storage = wxMaProperties.getConfigStorage();
+    WxMaProperties.RedisProperties redis = storage.getRedis();
+
+    JedisPoolConfig config = new JedisPoolConfig();
+    if (redis.getMaxActive() != null) {
+      config.setMaxTotal(redis.getMaxActive());
+    }
+    if (redis.getMaxIdle() != null) {
+      config.setMaxIdle(redis.getMaxIdle());
+    }
+    if (redis.getMaxWaitMillis() != null) {
+      config.setMaxWaitMillis(redis.getMaxWaitMillis());
+    }
+    if (redis.getMinIdle() != null) {
+      config.setMinIdle(redis.getMinIdle());
+    }
+    config.setTestOnBorrow(true);
+    config.setTestWhileIdle(true);
+
+    return new JedisPool(config, redis.getHost(), redis.getPort(), redis.getTimeout(), redis.getPassword(),
+      redis.getDatabase());
+  }
 }
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java
index 6477e61fa2..5af54dfe1b 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java
@@ -3,6 +3,8 @@
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
+import java.io.Serializable;
+
 /**
  * 属性配置类.
  *
@@ -36,4 +38,112 @@ public class WxMaProperties {
    * 消息格式，XML或者JSON.
    */
   private String msgDataFormat;
+
+  /**
+   * 存储策略
+   */
+  private ConfigStorage configStorage = new ConfigStorage();
+
+  @Data
+  public static class ConfigStorage implements Serializable {
+    private static final long serialVersionUID = 4815731027000065434L;
+
+    /**
+     * 存储类型.
+     */
+    private StorageType type = StorageType.memory;
+
+    /**
+     * 指定key前缀.
+     */
+    private String keyPrefix = "wa";
+
+    /**
+     * redis连接配置.
+     */
+    private RedisProperties redis;
+
+    /**
+     * http客户端类型.
+     */
+    private HttpClientType httpClientType = HttpClientType.httpclient;
+
+    /**
+     * http代理主机.
+     */
+    private String httpProxyHost;
+
+    /**
+     * http代理端口.
+     */
+    private Integer httpProxyPort;
+
+    /**
+     * http代理用户名.
+     */
+    private String httpProxyUsername;
+
+    /**
+     * http代理密码.
+     */
+    private String httpProxyPassword;
+
+  }
+
+  public enum StorageType {
+    /**
+     * 内存.
+     */
+    memory,
+    /**
+     * redis(JedisClient).
+     */
+    jedis,
+    /**
+     * redis(RedisTemplate).
+     */
+    redistemplate
+  }
+
+  public enum HttpClientType {
+    /**
+     * HttpClient.
+     */
+    httpclient
+  }
+
+  @Data
+  public static class RedisProperties implements Serializable {
+    private static final long serialVersionUID = -5924815351660074401L;
+
+    /**
+     * 主机地址.
+     */
+    private String host;
+
+    /**
+     * 端口号.
+     */
+    private int port = 6379;
+
+    /**
+     * 密码.
+     */
+    private String password;
+
+    /**
+     * 超时.
+     */
+    private int timeout = 2000;
+
+    /**
+     * 数据库.
+     */
+    private int database = 0;
+
+    private Integer maxActive;
+    private Integer maxIdle;
+    private Integer maxWaitMillis;
+    private Integer minIdle;
+  }
 }
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
index 5eb0ef5cd1..fc15e7605e 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
@@ -1,13 +1,13 @@
 package com.binarywang.spring.starter.wxjava.mp.config;
 
-import com.binarywang.spring.starter.wxjava.mp.extend.RedisTemplateWxMpRedisOps;
 import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
 import lombok.RequiredArgsConstructor;
+import me.chanjar.weixin.common.redis.JedisWxRedisOps;
+import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
-import me.chanjar.weixin.mp.config.redis.JedisWxMpRedisOps;
-import me.chanjar.weixin.mp.config.redis.WxMpRedisOps;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -65,7 +65,7 @@ private WxMpConfigStorage wxMpInJedisConfigStorage() {
     } else {
       jedisPool = applicationContext.getBean(JedisPool.class);
     }
-    WxMpRedisOps redisOps = new JedisWxMpRedisOps(jedisPool);
+    WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
     WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix());
     setWxMpInfo(wxMpRedisConfig);
     return wxMpRedisConfig;
@@ -73,7 +73,7 @@ private WxMpConfigStorage wxMpInJedisConfigStorage() {
 
   private WxMpConfigStorage wxMpInRedisTemplateConfigStorage() {
     StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
-    WxMpRedisOps redisOps = new RedisTemplateWxMpRedisOps(redisTemplate);
+    WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
     WxMpRedisConfigImpl wxMpRedisConfig = new WxMpRedisConfigImpl(redisOps, wxMpProperties.getConfigStorage().getKeyPrefix());
     setWxMpInfo(wxMpRedisConfig);
     return wxMpRedisConfig;
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 6ccd191934..7f85454ed2 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -122,11 +122,18 @@
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
     </dependency>
-
     <dependency>
       <groupId>com.github.jedis-lock</groupId>
       <artifactId>jedis-lock</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.redisson</groupId>
+      <artifactId>redisson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-redis</artifactId>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/BaseWxRedisOps.java
similarity index 84%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java
rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/BaseWxRedisOps.java
index 8ec836415f..17e992ab25 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/BaseWxMpRedisOps.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/BaseWxRedisOps.java
@@ -1,14 +1,14 @@
-package me.chanjar.weixin.mp.config.redis;
+package me.chanjar.weixin.common.redis;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 
 /**
- * 微信公众号redis操作基本类
+ * 微信redis操作基本类
  * <p>
  * 非内置实现redis相关操作, 请实现该类
  */
-public class BaseWxMpRedisOps implements WxMpRedisOps {
+public abstract class BaseWxRedisOps implements WxRedisOps {
 
   @Override
   public String getValue(String key) {
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
similarity index 82%
rename from weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java
rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
index 0ba21bcd5b..0762e67dc7 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/JedisWxMpRedisOps.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
@@ -1,6 +1,6 @@
-package me.chanjar.weixin.mp.config.redis;
+package me.chanjar.weixin.common.redis;
 
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import me.chanjar.weixin.common.util.locks.JedisDistributedLock;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
@@ -8,13 +8,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 
-/**
- * Jedis实现相关操作
- */
-@AllArgsConstructor
-public class JedisWxMpRedisOps implements WxMpRedisOps {
+@RequiredArgsConstructor
+public class JedisWxRedisOps implements WxRedisOps {
 
-  private JedisPool jedisPool;
+  private final JedisPool jedisPool;
 
   @Override
   public String getValue(String key) {
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/extend/RedisTemplateWxMpRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
similarity index 83%
rename from spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/extend/RedisTemplateWxMpRedisOps.java
rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
index 4939aba89d..0687032871 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/extend/RedisTemplateWxMpRedisOps.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
@@ -1,7 +1,6 @@
-package com.binarywang.spring.starter.wxjava.mp.extend;
+package me.chanjar.weixin.common.redis;
 
 import lombok.RequiredArgsConstructor;
-import me.chanjar.weixin.mp.config.redis.BaseWxMpRedisOps;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 import java.util.concurrent.TimeUnit;
@@ -9,7 +8,7 @@
 import java.util.concurrent.locks.ReentrantLock;
 
 @RequiredArgsConstructor
-public class RedisTemplateWxMpRedisOps extends BaseWxMpRedisOps {
+public class RedisTemplateWxRedisOps implements WxRedisOps {
 
   private final StringRedisTemplate redisTemplate;
 
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedissonWxRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedissonWxRedisOps.java
new file mode 100644
index 0000000000..e06db302e7
--- /dev/null
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedissonWxRedisOps.java
@@ -0,0 +1,39 @@
+package me.chanjar.weixin.common.redis;
+
+import lombok.RequiredArgsConstructor;
+import org.redisson.api.RedissonClient;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+@RequiredArgsConstructor
+public class RedissonWxRedisOps implements WxRedisOps {
+
+  private final RedissonClient redissonClient;
+
+  @Override
+  public String getValue(String key) {
+    Object value = redissonClient.getBucket(key).get();
+    return value == null ? null : value.toString();
+  }
+
+  @Override
+  public void setValue(String key, String value, int expire, TimeUnit timeUnit) {
+    redissonClient.getBucket(key).set(value, expire, timeUnit);
+  }
+
+  @Override
+  public Long getExpire(String key) {
+    return redissonClient.getBucket(key).remainTimeToLive();
+  }
+
+  @Override
+  public void expire(String key, int expire, TimeUnit timeUnit) {
+    redissonClient.getBucket(key).expire(expire, timeUnit);
+  }
+
+  @Override
+  public Lock getLock(String key) {
+    return redissonClient.getLock(key);
+  }
+}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/WxRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/WxRedisOps.java
new file mode 100644
index 0000000000..5489165e74
--- /dev/null
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/WxRedisOps.java
@@ -0,0 +1,27 @@
+package me.chanjar.weixin.common.redis;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+/**
+ * 微信Redis相关操作
+ * <p>
+ * 该接口不承诺稳定, 外部实现请继承{@link BaseWxRedisOps}
+ *
+ * @see BaseWxRedisOps 实现需要继承该类
+ * @see JedisWxRedisOps jedis实现
+ * @see RedissonWxRedisOps redisson实现
+ * @see RedisTemplateWxRedisOps redisTemplate实现
+ */
+public interface WxRedisOps {
+
+  String getValue(String key);
+
+  void setValue(String key, String value, int expire, TimeUnit timeUnit);
+
+  Long getExpire(String key);
+
+  void expire(String key, int expire, TimeUnit timeUnit);
+
+  Lock getLock(String key);
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java
index b75fa711ff..94e09bc5ca 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaDefaultConfigImpl.java
@@ -46,8 +46,8 @@ public class WxMaDefaultConfigImpl implements WxMaConfig {
    */
   private volatile String cardApiTicket;
   private volatile long cardApiTicketExpiresTime;
-  private Lock jsapiTicketLock = new ReentrantLock();
-  private Lock cardApiTicketLock = new ReentrantLock();
+  protected volatile Lock jsapiTicketLock = new ReentrantLock();
+  protected volatile Lock cardApiTicketLock = new ReentrantLock();
   private volatile ApacheHttpClientBuilder apacheHttpClientBuilder;
 
   /**
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
new file mode 100644
index 0000000000..e53ed198bf
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
@@ -0,0 +1,130 @@
+package cn.binarywang.wx.miniapp.config.impl;
+
+import cn.binarywang.wx.miniapp.constant.TicketType;
+import me.chanjar.weixin.common.redis.JedisWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
+import redis.clients.jedis.JedisPool;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 基于redis存储的微信小程序配置类
+ */
+public class WxMaRedisBetterConfigImpl extends WxMaDefaultConfigImpl {
+  private static final String ACCESS_TOKEN_KEY_TPL = "%s:access_token:%s";
+  private static final String TICKET_KEY_TPL = "%s:ticket:key:%s:%s";
+  private static final String LOCK_KEY_TPL = "%s:lock:%s:";
+
+  private final WxRedisOps redisOps;
+  private final String keyPrefix;
+
+  private volatile String accessTokenKey;
+  private volatile String lockKey;
+
+  public WxMaRedisBetterConfigImpl(JedisPool jedisPool) {
+    this(new JedisWxRedisOps(jedisPool), "wa");
+  }
+
+  public WxMaRedisBetterConfigImpl(WxRedisOps redisOps, String keyPrefix) {
+    this.redisOps = redisOps;
+    this.keyPrefix = keyPrefix;
+  }
+
+  @Override
+  public void setAppid(String appId) {
+    super.setAppid(appId);
+    this.accessTokenKey = String.format(ACCESS_TOKEN_KEY_TPL, this.keyPrefix, appId);
+    this.lockKey = String.format(LOCK_KEY_TPL, this.keyPrefix, appId);
+    super.accessTokenLock = this.redisOps.getLock(lockKey.concat("accessTokenLock"));
+    super.jsapiTicketLock = this.redisOps.getLock(lockKey.concat("jsapiTicketLock"));
+    super.cardApiTicketLock = this.redisOps.getLock(lockKey.concat("cardApiTicketLock"));
+  }
+
+  //------------------------------------------------------------------------
+  // token相关
+  //------------------------------------------------------------------------
+  @Override
+  public String getAccessToken() {
+    return redisOps.getValue(this.accessTokenKey);
+  }
+
+  @Override
+  public boolean isAccessTokenExpired() {
+    Long expire = redisOps.getExpire(this.accessTokenKey);
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public synchronized void updateAccessToken(String accessToken, int expiresInSeconds) {
+    redisOps.setValue(this.accessTokenKey, accessToken, expiresInSeconds - 200, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void expireAccessToken() {
+    redisOps.expire(this.accessTokenKey, 0, TimeUnit.SECONDS);
+  }
+
+  //------------------------------------------------------------------------
+  // ticket相关
+  //------------------------------------------------------------------------
+  @Override
+  public String getJsapiTicket() {
+    return doGetTicket(TicketType.JSAPI);
+  }
+
+  @Override
+  public boolean isJsapiTicketExpired() {
+    return doIsTicketExpired(TicketType.JSAPI);
+  }
+
+  @Override
+  public void expireJsapiTicket() {
+    doExpireTicket(TicketType.JSAPI);
+  }
+
+  @Override
+  public synchronized void updateJsapiTicket(String jsapiTicket, int expiresInSeconds) {
+    doUpdateTicket(TicketType.JSAPI, jsapiTicket, expiresInSeconds);
+  }
+
+  @Override
+  public String getCardApiTicket() {
+    return doGetTicket(TicketType.WX_CARD);
+  }
+
+  @Override
+  public boolean isCardApiTicketExpired() {
+    return doIsTicketExpired(TicketType.WX_CARD);
+  }
+
+  @Override
+  public void expireCardApiTicket() {
+    doExpireTicket(TicketType.WX_CARD);
+  }
+
+  @Override
+  public synchronized void updateCardApiTicket(String cardApiTicket, int expiresInSeconds) {
+    doUpdateTicket(TicketType.WX_CARD, cardApiTicket, expiresInSeconds);
+  }
+
+  private String getTicketRedisKey(TicketType type) {
+    return String.format(TICKET_KEY_TPL, this.keyPrefix, this.appid, type.getCode());
+  }
+
+  private String doGetTicket(TicketType type) {
+    return redisOps.getValue(this.getTicketRedisKey(type));
+  }
+
+  private boolean doIsTicketExpired(TicketType type) {
+    return redisOps.getExpire(this.getTicketRedisKey(type)) < 2;
+  }
+
+  private void doUpdateTicket(TicketType type, String ticket, int expiresInSeconds) {
+    redisOps.setValue(this.getTicketRedisKey(type), ticket, expiresInSeconds - 200, TimeUnit.SECONDS);
+  }
+
+  private void doExpireTicket(TicketType type) {
+    redisOps.expire(this.getTicketRedisKey(type), 0, TimeUnit.SECONDS);
+  }
+
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java
new file mode 100644
index 0000000000..e8b07de0c0
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java
@@ -0,0 +1,30 @@
+package cn.binarywang.wx.miniapp.constant;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * <pre>
+ * ticket类型枚举
+ * Created by Binary Wang on 2018/11/18.
+ * </pre>
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ */
+@Getter
+@RequiredArgsConstructor
+public enum TicketType {
+  /**
+   * jsapi
+   */
+  JSAPI("jsapi"),
+  /**
+   * 微信卡券
+   */
+  WX_CARD("wx_card");
+  /**
+   * type代码
+   */
+  private final String code;
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
index cbf5eaf369..8460d46414 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
@@ -1,8 +1,8 @@
 package me.chanjar.weixin.mp.config.impl;
 
 import lombok.Data;
-import me.chanjar.weixin.mp.config.redis.JedisWxMpRedisOps;
-import me.chanjar.weixin.mp.config.redis.WxMpRedisOps;
+import me.chanjar.weixin.common.redis.JedisWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
 import me.chanjar.weixin.mp.enums.TicketType;
 import redis.clients.jedis.JedisPool;
 
@@ -22,22 +22,22 @@
 @SuppressWarnings("hiding")
 public class WxMpRedisConfigImpl extends WxMpDefaultConfigImpl {
   private static final long serialVersionUID = -988502871997239733L;
-  
+
   private static final String ACCESS_TOKEN_KEY_TPL = "%s:access_token:%s";
   private static final String TICKET_KEY_TPL = "%s:ticket:key:%s:%s";
   private static final String LOCK_KEY_TPL = "%s:lock:%s:";
 
-  private final WxMpRedisOps redisOps;
+  private final WxRedisOps redisOps;
   private final String keyPrefix;
 
   private String accessTokenKey;
   private String lockKey;
 
   public WxMpRedisConfigImpl(JedisPool jedisPool) {
-    this(new JedisWxMpRedisOps(jedisPool), "wx");
+    this(new JedisWxRedisOps(jedisPool), "wx");
   }
 
-  public WxMpRedisConfigImpl(WxMpRedisOps redisOps, String keyPrefix) {
+  public WxMpRedisConfigImpl(WxRedisOps redisOps, String keyPrefix) {
     this.redisOps = redisOps;
     this.keyPrefix = keyPrefix;
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/WxMpRedisOps.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/WxMpRedisOps.java
deleted file mode 100644
index d57d037c80..0000000000
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/redis/WxMpRedisOps.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package me.chanjar.weixin.mp.config.redis;
-
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-/**
- * 微信公众号Redis相关操作
- * <p>
- * 该接口不承诺稳定, 外部实现请继承{@link BaseWxMpRedisOps}
- *
- * @see BaseWxMpRedisOps 实现需要继承该类
- * @see JedisWxMpRedisOps jedis实现
- */
-public interface WxMpRedisOps {
-
-  String getValue(String key);
-
-  void setValue(String key, String value, int expire, TimeUnit timeUnit);
-
-  Long getExpire(String key);
-
-  void expire(String key, int expire, TimeUnit timeUnit);
-
-  Lock getLock(String key);
-}

From d60106c9c3b4f32cf400542855b75dcc57ef8633 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 18 Apr 2020 23:14:29 +0800
Subject: [PATCH 069/114] =?UTF-8?q?:art:=20#1520=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E6=94=B6=E6=B6=88=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=AD=E5=8A=A0=E5=85=A5=E7=BE=A4ID=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/me/chanjar/weixin/cp/bean/WxCpXmlMessage.java     | 7 +++++++
 1 file changed, 7 insertions(+)

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 f90aed034d..ccae5a4644 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
@@ -233,6 +233,13 @@ public class WxCpXmlMessage implements Serializable {
   @XStreamConverter(value = XStreamCDataConverter.class)
   private String position;
 
+  /**
+   * 群ID.
+   */
+  @XStreamAlias("ChatId")
+  @XStreamConverter(value = XStreamCDataConverter.class)
+  private String chatId;
+
   /**
    * 性别，1表示男性，2表示女性.
    */

From 7ace4173643acda605af6df18cd7eff341db83d0 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 19 Apr 2020 09:40:07 +0800
Subject: [PATCH 070/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.7.7?=
 =?UTF-8?q?.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 07da003e07..cd9a3b19a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.6.B</version>
+  <version>3.7.7.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index a0390d3802..c7249ec939 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index 9d44613758..1bc9dd1bce 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index bb6687340b..c65e0ad324 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 3a2befea66..95fe3b63b4 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 13111887c5..ca652e84e9 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index c20e7b345a..7a55408d8e 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 7f85454ed2..32db997c20 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 8c46baa889..4ffe9f4797 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 2ac646a37c..b1c94d5ce7 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 2e0db8ad05..8989f7aa8c 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index ff5b72fb4f..10d551c02c 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index a4554c69d3..2d1cc13125 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.6.B</version>
+    <version>3.7.7.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 585bd94b8a781fe8e8c630ba5c0786f0ddf9c1e5 Mon Sep 17 00:00:00 2001
From: Mario Luo <luokaiqiongmou@foxmail.com>
Date: Sun, 19 Apr 2020 22:36:04 +0800
Subject: [PATCH 071/114] =?UTF-8?q?:art:=20#1522=20=E5=BC=80=E6=94=BE?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BC=98=E5=8C=96redis=E5=AD=98=E5=82=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB=EF=BC=8C=E5=90=8C=E6=97=B6=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=20spring=20boot=20starter=20=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=89=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../README.md                                 |  49 ++--
 .../wx-java-mp-spring-boot-starter/README.md  |   8 +-
 .../README.md                                 |  35 +--
 .../wx-java-open-spring-boot-starter/pom.xml  |  10 +-
 .../WxOpenStorageAutoConfiguration.java       |  81 +++---
 .../open/properties/RedisProperties.java      |   2 +-
 .../open/properties/WxOpenProperties.java     |  51 +++-
 .../weixin/common/redis/JedisWxRedisOps.java  |   4 +-
 .../api/impl/WxOpenInRedisConfigStorage.java  | 106 +++-----
 .../impl/WxOpenInRedissonConfigStorage.java   | 250 +++++++++---------
 10 files changed, 325 insertions(+), 271 deletions(-)

diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md
index fe75ef4e3e..e58dfc8c84 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/README.md
@@ -1,26 +1,35 @@
-# 使用说明
-1. 在自己的Spring Boot项目里，引入maven依赖
-```xml
+# wx-java-miniapp-spring-boot-starter
+## 快速开始
+1. 引入依赖
+    ```xml
     <dependency>
         <groupId>com.github.binarywang</groupId>
         <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
         <version>${version}</version>
     </dependency>
- ```
-2. 添加配置(application.yml)
-```yml
-wx:
-  miniapp:
-    appid: 111
-    secret: 111
-    token: 111
-    aesKey: 111
-    msgDataFormat: JSON
-```
-
-
-
-
-
-
+    ```
+2. 添加配置(application.properties)
+    ```properties
+    # 公众号配置(必填)
+    wx.miniapp.appid = appId
+    wx.miniapp.secret = @secret
+    wx.miniapp.token = @token
+    wx.miniapp.aesKey = @aesKey
+    wx.miniapp.msgDataFormat = @msgDataFormat                  # 消息格式，XML或者JSON.
+    # 存储配置redis(可选)
+    # 注意: 指定redis.host值后不会使用容器注入的redis连接(JedisPool)
+    wx.miniapp.config-storage.type = jedis                     # 配置类型: memory(默认), jedis, redistemplate
+    wx.miniapp.config-storage.key-prefix = wa                  # 相关redis前缀配置: wa(默认)
+    wx.miniapp.config-storage.redis.host = 127.0.0.1
+    wx.miniapp.config-storage.redis.port = 6379
+    # http客户端配置
+    wx.miniapp.config-storage.http-client-type=httpclient      # http客户端类型: httpclient(默认)
+    wx.miniapp.config-storage.http-proxy-host=
+    wx.miniapp.config-storage.http-proxy-port=
+    wx.miniapp.config-storage.http-proxy-username=
+    wx.miniapp.config-storage.http-proxy-password=
+    ```
+3. 自动注入的类型
+- `WxMaService`
+- `WxMaConfig`
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md b/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md
index 58c8efbdea..65cc5bbbf1 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md
@@ -1,4 +1,4 @@
-# wx-java-mp-starter
+# wx-java-mp-spring-boot-starter
 ## 快速开始
 1. 引入依赖
     ```xml
@@ -27,9 +27,9 @@
     wx.mp.config-storage.http-proxy-username=
     wx.mp.config-storage.http-proxy-password=
     ```
-3. 支持自动注入的类型
-
-`WxMpService`以及~~相关的服务类, 比如: `wxMpService.getXxxService`。~~
+3. 自动注入的类型
+- `WxMpService`以及~~相关的服务类, 比如: `wxMpService.getXxxService`。~~
+- `WxMpConfigStorage`
 
 
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/README.md b/spring-boot-starters/wx-java-open-spring-boot-starter/README.md
index fd00f03531..44333f8e4f 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/README.md
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/README.md
@@ -9,26 +9,27 @@
     </dependency>
     ```
 2. 添加配置(application.properties)
-    ```
-    # 开放平台配置(必填)
-    wx.open.appId = @appId
-	  wx.open.secret = @secret
-	  wx.open.token = @token
-	  wx.open.aesKey = @aesKey
-	  # 存储配置redis(可选), 优先使用(wx.open.config-storage.redis)配置的redis, 支持自定注入的JedisPool
-	  wx.open.config-storage.type = redis             # 可选值, memory(默认), redis
-	  wx.open.config-storage.redis.host = 127.0.0.1
-	  wx.open.config-storage.redis.port = 6379
+    ```properties
+    # 公众号配置(必填)
+    wx.open.appId = appId
+    wx.open.secret = @secret
+    wx.open.token = @token
+    wx.open.aesKey = @aesKey
+    # 存储配置redis(可选)
+    # 优先注入容器的(JedisPool, RedissonClient), 当配置了wx.open.config-storage.redis.host, 不会使用容器注入redis连接配置
+    wx.open.config-storage.type = redis                     # 配置类型: memory(默认), redis(jedis), jedis, redisson, redistemplate
+    wx.open.config-storage.key-prefix = wx                  # 相关redis前缀配置: wx(默认)
+    wx.open.config-storage.redis.host = 127.0.0.1
+    wx.open.config-storage.redis.port = 6379
+    # http客户端配置
+    wx.open.config-storage.http-client-type=httpclient      # http客户端类型: httpclient(默认)
+    wx.open.config-storage.http-proxy-host=
+    wx.open.config-storage.http-proxy-port=
+    wx.open.config-storage.http-proxy-username=
+    wx.open.config-storage.http-proxy-password=
     ```
 3. 支持自动注入的类型: `WxOpenService, WxOpenMessageRouter, WxOpenComponentService`
 
 4. 覆盖自动配置: 自定义注入的bean会覆盖自动注入的
   - WxOpenConfigStorage
   - WxOpenService
-
-
-
-
-
-
-
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 95fe3b63b4..0684ef091c 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -22,12 +22,18 @@
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.redisson</groupId>
       <artifactId>redisson</artifactId>
-      <scope>compile</scope>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.data</groupId>
+      <artifactId>spring-data-redis</artifactId>
+      <version>${spring.boot.version}</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
index a92b3483b9..c97f00451d 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
@@ -3,20 +3,23 @@
 import com.binarywang.spring.starter.wxjava.open.properties.RedisProperties;
 import com.binarywang.spring.starter.wxjava.open.properties.WxOpenProperties;
 import lombok.RequiredArgsConstructor;
+import me.chanjar.weixin.common.redis.JedisWxRedisOps;
+import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
+import me.chanjar.weixin.common.redis.RedissonWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
 import me.chanjar.weixin.open.api.WxOpenConfigStorage;
 import me.chanjar.weixin.open.api.impl.WxOpenInMemoryConfigStorage;
 import me.chanjar.weixin.open.api.impl.WxOpenInRedisConfigStorage;
-import me.chanjar.weixin.open.api.impl.WxOpenInRedissonConfigStorage;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
 import org.redisson.config.TransportMode;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 
@@ -29,15 +32,7 @@
 @RequiredArgsConstructor
 public class WxOpenStorageAutoConfiguration {
   private final WxOpenProperties properties;
-
-  @Autowired(required = false)
-  private JedisPool jedisPool;
-
-  @Autowired(required = false)
-  private RedissonClient redissonClient;
-
-  @Value("${wx.open.config-storage.redis.host:}")
-  private String redisHost;
+  private final ApplicationContext applicationContext;
 
   @Bean
   @ConditionalOnMissingBean(WxOpenConfigStorage.class)
@@ -45,43 +40,63 @@ public WxOpenConfigStorage wxOpenConfigStorage() {
     WxOpenProperties.ConfigStorage storage = properties.getConfigStorage();
     WxOpenProperties.StorageType type = storage.getType();
 
-    if (type == WxOpenProperties.StorageType.redis) {
-      return getWxOpenInRedisConfigStorage();
+    WxOpenInMemoryConfigStorage config;
+    if (type == WxOpenProperties.StorageType.redis || type == WxOpenProperties.StorageType.jedis) {
+      config = getWxOpenInRedisConfigStorage();
+    } else if (type == WxOpenProperties.StorageType.redisson) {
+      config = getWxOpenInRedissonConfigStorage();
+    } else if (type == WxOpenProperties.StorageType.redistemplate) {
+      config = getWxOpenInRedisTemplateConfigStorage();
+    } else {
+      config = getWxOpenInMemoryConfigStorage();
     }
 
-    if (type == WxOpenProperties.StorageType.jedis) {
-      return getWxOpenInRedisConfigStorage();
-    }
-
-    if (type == WxOpenProperties.StorageType.redisson) {
-      return getWxOpenInRedissonConfigStorage();
+    WxOpenProperties.ConfigStorage configStorageProperties = properties.getConfigStorage();
+    config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
+    config.setHttpProxyHost(configStorageProperties.getHttpProxyHost());
+    config.setHttpProxyUsername(configStorageProperties.getHttpProxyUsername());
+    config.setHttpProxyPassword(configStorageProperties.getHttpProxyPassword());
+    if (configStorageProperties.getHttpProxyPort() != null) {
+      config.setHttpProxyPort(configStorageProperties.getHttpProxyPort());
     }
-    return getWxOpenInMemoryConfigStorage();
+    return config;
   }
 
   private WxOpenInMemoryConfigStorage getWxOpenInMemoryConfigStorage() {
     WxOpenInMemoryConfigStorage config = new WxOpenInMemoryConfigStorage();
-    config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
     return config;
   }
 
   private WxOpenInRedisConfigStorage getWxOpenInRedisConfigStorage() {
-    JedisPool poolToUse = jedisPool;
-    if (jedisPool == null || StringUtils.isNotEmpty(redisHost)) {
-      poolToUse = getJedisPool();
+    RedisProperties redisProperties = properties.getConfigStorage().getRedis();
+    JedisPool jedisPool;
+    if (redisProperties != null && StringUtils.isNotEmpty(redisProperties.getHost())) {
+      jedisPool = getJedisPool();
+    } else {
+      jedisPool = applicationContext.getBean(JedisPool.class);
     }
-    WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(poolToUse, properties.getConfigStorage().getKeyPrefix());
-    config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
+    WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
+    WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(redisOps, properties.getConfigStorage().getKeyPrefix());
     return config;
   }
 
-  private WxOpenInRedissonConfigStorage getWxOpenInRedissonConfigStorage() {
-    RedissonClient redissonClientToUse = this.redissonClient;
-    if (redissonClient == null) {
-      redissonClientToUse = getRedissonClient();
+  private WxOpenInRedisConfigStorage getWxOpenInRedissonConfigStorage() {
+    RedisProperties redisProperties = properties.getConfigStorage().getRedis();
+    RedissonClient redissonClient;
+    if (redisProperties != null && StringUtils.isNotEmpty(redisProperties.getHost())) {
+      redissonClient = getRedissonClient();
+    } else {
+      redissonClient = applicationContext.getBean(RedissonClient.class);
     }
-    WxOpenInRedissonConfigStorage config = new WxOpenInRedissonConfigStorage(redissonClientToUse, properties.getConfigStorage().getKeyPrefix());
-    config.setWxOpenInfo(properties.getAppId(), properties.getSecret(), properties.getToken(), properties.getAesKey());
+    WxRedisOps redisOps = new RedissonWxRedisOps(redissonClient);
+    WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(redisOps, properties.getConfigStorage().getKeyPrefix());
+    return config;
+  }
+
+  private WxOpenInRedisConfigStorage getWxOpenInRedisTemplateConfigStorage() {
+    StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
+    WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
+    WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(redisOps, properties.getConfigStorage().getKeyPrefix());
     return config;
   }
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/RedisProperties.java b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/RedisProperties.java
index 565afa07f5..a03d3a47f6 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/RedisProperties.java
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/RedisProperties.java
@@ -16,7 +16,7 @@ public class RedisProperties implements Serializable {
   /**
    * 主机地址.
    */
-  private String host = "127.0.0.1";
+  private String host;
 
   /**
    * 端口号.
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
index 77aabad54a..9c9986bacc 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
@@ -40,7 +40,7 @@ public class WxOpenProperties {
   private String aesKey;
 
   /**
-   * 存储策略, memory, redis.
+   * 存储策略.
    */
   private ConfigStorage configStorage = new ConfigStorage();
 
@@ -49,11 +49,45 @@ public class WxOpenProperties {
   public static class ConfigStorage implements Serializable {
     private static final long serialVersionUID = 4815731027000065434L;
 
+    /**
+     * 存储类型.
+     */
     private StorageType type = memory;
 
+    /**
+     * 指定key前缀.
+     */
+    private String keyPrefix = "wx";
+
+    /**
+     * redis连接配置.
+     */
     private RedisProperties redis = new RedisProperties();
 
-    private String keyPrefix;
+    /**
+     * http客户端类型.
+     */
+    private HttpClientType httpClientType = HttpClientType.httpclient;
+
+    /**
+     * http代理主机.
+     */
+    private String httpProxyHost;
+
+    /**
+     * http代理端口.
+     */
+    private Integer httpProxyPort;
+
+    /**
+     * http代理用户名.
+     */
+    private String httpProxyUsername;
+
+    /**
+     * http代理密码.
+     */
+    private String httpProxyPassword;
 
   }
 
@@ -73,6 +107,17 @@ public enum StorageType {
     /**
      * redisson.
      */
-    redisson
+    redisson,
+    /**
+     * redistemplate
+     */
+    redistemplate
+  }
+
+  public enum HttpClientType {
+    /**
+     * HttpClient.
+     */
+    httpclient
   }
 }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
index 0762e67dc7..ede2fcd8bd 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
@@ -3,7 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import me.chanjar.weixin.common.util.locks.JedisDistributedLock;
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
+import redis.clients.util.Pool;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
@@ -11,7 +11,7 @@
 @RequiredArgsConstructor
 public class JedisWxRedisOps implements WxRedisOps {
 
-  private final JedisPool jedisPool;
+  private final Pool<Jedis> jedisPool;
 
   @Override
   public String getValue(String key) {
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
index a681e2931e..31c199bba7 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
@@ -1,10 +1,12 @@
 package me.chanjar.weixin.open.api.impl;
 
-import me.chanjar.weixin.common.util.locks.JedisDistributedLock;
+import lombok.NonNull;
+import me.chanjar.weixin.common.redis.JedisWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
 import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
 import redis.clients.util.Pool;
 
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 
 /**
@@ -12,163 +14,127 @@
  */
 public class WxOpenInRedisConfigStorage extends AbstractWxOpenInRedisConfigStorage {
 
-  protected final Pool<Jedis> jedisPool;
+  private final WxRedisOps redisOps;
 
   public WxOpenInRedisConfigStorage(Pool<Jedis> jedisPool) {
-    this.jedisPool = jedisPool;
+    this(jedisPool, null);
   }
 
-  public WxOpenInRedisConfigStorage(Pool<Jedis> jedisPool, String keyPrefix) {
-    this.jedisPool = jedisPool;
-    this.keyPrefix = keyPrefix;
+  public WxOpenInRedisConfigStorage(@NonNull Pool<Jedis> jedisPool, String keyPrefix) {
+    this(new JedisWxRedisOps(jedisPool), keyPrefix);
   }
 
-  public WxOpenInRedisConfigStorage(JedisPool jedisPool) {
-    this.jedisPool = jedisPool;
+  public WxOpenInRedisConfigStorage(@NonNull WxRedisOps redisOps, String keyPrefix) {
+    this.redisOps = redisOps;
+    this.keyPrefix = keyPrefix;
   }
 
   @Override
   public String getComponentVerifyTicket() {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.get(this.componentVerifyTicketKey);
-    }
+    return redisOps.getValue(this.componentVerifyTicketKey);
   }
 
   @Override
   public void setComponentVerifyTicket(String componentVerifyTicket) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.set(this.componentVerifyTicketKey, componentVerifyTicket);
-    }
+    redisOps.setValue(this.componentVerifyTicketKey, componentVerifyTicket, Integer.MAX_VALUE, TimeUnit.SECONDS);
   }
 
   @Override
   public String getComponentAccessToken() {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.get(this.componentAccessTokenKey);
-    }
+    return redisOps.getValue(this.componentAccessTokenKey);
   }
 
   @Override
   public boolean isComponentAccessTokenExpired() {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.ttl(this.componentAccessTokenKey) < 2;
-    }
+    Long expire = redisOps.getExpire(this.componentAccessTokenKey);
+    return expire == null || expire < 2;
   }
 
   @Override
   public void expireComponentAccessToken() {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.expire(this.componentAccessTokenKey, 0);
-    }
+    redisOps.expire(this.componentAccessTokenKey, 0, TimeUnit.SECONDS);
   }
 
   @Override
   public void updateComponentAccessToken(String componentAccessToken, int expiresInSeconds) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.setex(this.componentAccessTokenKey, expiresInSeconds - 200, componentAccessToken);
-    }
+    redisOps.setValue(this.componentAccessTokenKey, componentAccessToken, expiresInSeconds - 200, TimeUnit.SECONDS);
   }
 
   @Override
   public String getAuthorizerRefreshToken(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.get(this.getKey(this.authorizerRefreshTokenKey, appId));
-    }
+    return redisOps.getValue(this.getKey(this.authorizerRefreshTokenKey, appId));
   }
 
   @Override
   public void setAuthorizerRefreshToken(String appId, String authorizerRefreshToken) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.set(this.getKey(this.authorizerRefreshTokenKey, appId), authorizerRefreshToken);
-    }
+    redisOps.setValue(this.getKey(this.authorizerRefreshTokenKey, appId), authorizerRefreshToken, 0, TimeUnit.SECONDS);
   }
 
   @Override
   public String getAuthorizerAccessToken(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.get(this.getKey(this.authorizerAccessTokenKey, appId));
-    }
+    return redisOps.getValue(this.getKey(this.authorizerAccessTokenKey, appId));
   }
 
   @Override
   public boolean isAuthorizerAccessTokenExpired(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.ttl(this.getKey(this.authorizerAccessTokenKey, appId)) < 2;
-    }
+    Long expire = redisOps.getExpire(this.getKey(this.authorizerAccessTokenKey, appId));
+    return expire == null || expire < 2;
   }
 
   @Override
   public void expireAuthorizerAccessToken(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.expire(this.getKey(this.authorizerAccessTokenKey, appId), 0);
-    }
+    redisOps.expire(this.getKey(this.authorizerAccessTokenKey, appId), 0, TimeUnit.SECONDS);
   }
 
   @Override
   public void updateAuthorizerAccessToken(String appId, String authorizerAccessToken, int expiresInSeconds) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.setex(this.getKey(this.authorizerAccessTokenKey, appId), expiresInSeconds - 200, authorizerAccessToken);
-    }
+    redisOps.setValue(this.getKey(this.authorizerAccessTokenKey, appId), authorizerAccessToken, expiresInSeconds - 200, TimeUnit.SECONDS);
   }
 
   @Override
   public String getJsapiTicket(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.get(this.getKey(this.jsapiTicketKey, appId));
-    }
+    return redisOps.getValue(this.getKey(this.jsapiTicketKey, appId));
   }
 
   @Override
   public boolean isJsapiTicketExpired(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.ttl(this.getKey(this.jsapiTicketKey, appId)) < 2;
-    }
+    Long expire = redisOps.getExpire(this.getKey(this.jsapiTicketKey, appId));
+    return expire == null || expire < 2;
   }
 
   @Override
   public void expireJsapiTicket(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.expire(this.getKey(this.jsapiTicketKey, appId), 0);
-    }
+    redisOps.expire(this.getKey(this.jsapiTicketKey, appId), 0, TimeUnit.SECONDS);
   }
 
   @Override
   public void updateJsapiTicket(String appId, String jsapiTicket, int expiresInSeconds) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.setex(this.getKey(this.jsapiTicketKey, appId), expiresInSeconds - 200, jsapiTicket);
-    }
+    redisOps.setValue(this.getKey(this.jsapiTicketKey, appId), jsapiTicket, expiresInSeconds - 200, TimeUnit.SECONDS);
   }
 
   @Override
   public String getCardApiTicket(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.get(this.getKey(this.cardApiTicket, appId));
-    }
+    return redisOps.getValue(this.getKey(this.cardApiTicket, appId));
   }
 
   @Override
   public boolean isCardApiTicketExpired(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      return jedis.ttl(this.getKey(this.cardApiTicket, appId)) < 2;
-    }
+    Long expire = redisOps.getExpire(this.getKey(this.cardApiTicket, appId));
+    return expire == null || expire < 2;
   }
 
   @Override
   public void expireCardApiTicket(String appId) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.expire(this.getKey(this.cardApiTicket, appId), 0);
-    }
+    redisOps.expire(this.getKey(this.cardApiTicket, appId), 0, TimeUnit.SECONDS);
   }
 
   @Override
   public void updateCardApiTicket(String appId, String cardApiTicket, int expiresInSeconds) {
-    try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.setex(this.getKey(this.cardApiTicket, appId), expiresInSeconds - 200, cardApiTicket);
-    }
+    redisOps.setValue(this.getKey(this.cardApiTicket, appId), cardApiTicket, expiresInSeconds - 200, TimeUnit.SECONDS);
   }
 
   @Override
   public Lock getLockByKey(String key) {
-    return new JedisDistributedLock(jedisPool, getKey(lockKey, key));
+    return redisOps.getLock(key);
   }
 }
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedissonConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedissonConfigStorage.java
index 7fdf1ba1b6..070d9ebf88 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedissonConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedissonConfigStorage.java
@@ -1,128 +1,140 @@
 package me.chanjar.weixin.open.api.impl;
 
-import java.util.concurrent.TimeUnit;
+import lombok.NonNull;
+import me.chanjar.weixin.common.redis.RedissonWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
 import org.redisson.api.RedissonClient;
 
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
 /**
  * @author yangyidian
  * @date 2020/01/06
  **/
-public class WxOpenInRedissonConfigStorage extends AbstractWxOpenInRedisConfigStorage{
-
-    private RedissonClient redissonClient;
-
-    public WxOpenInRedissonConfigStorage(RedissonClient redissonClient, String keyPrefix) {
-        this.keyPrefix = keyPrefix;
-        this.redissonClient = redissonClient;
-    }
-
-    public WxOpenInRedissonConfigStorage(RedissonClient redissonClient) {
-        this.redissonClient = redissonClient;
-    }
-
-    @Override
-    public String getComponentVerifyTicket() {
-        Object value = redissonClient.getBucket(this.componentVerifyTicketKey).get();
-        return value == null ? null : value.toString();
-    }
-
-    @Override
-    public void setComponentVerifyTicket(String componentVerifyTicket) {
-        redissonClient.getBucket(this.componentVerifyTicketKey).set(componentVerifyTicket);
-    }
-
-    @Override
-    public String getComponentAccessToken() {
-        Object value = redissonClient.getBucket(this.componentAccessTokenKey).get();
-        return value == null ? null : value.toString();
-    }
-
-    @Override
-    public boolean isComponentAccessTokenExpired() {
-        return redissonClient.getBucket(this.componentAccessTokenKey).remainTimeToLive() < 2;
-    }
-
-    @Override
-    public void expireComponentAccessToken() {
-        redissonClient.getBucket(this.componentAccessTokenKey).expire(0, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void updateComponentAccessToken(String componentAccessToken, int expiresInSeconds) {
-        redissonClient.getBucket(this.componentAccessTokenKey).set(componentAccessToken, expiresInSeconds - 200, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public String getAuthorizerRefreshToken(String appId) {
-        Object value = redissonClient.getBucket(this.getKey(this.authorizerRefreshTokenKey, appId)).get();
-        return value == null ? null : value.toString();
-    }
-
-    @Override
-    public void setAuthorizerRefreshToken(String appId, String authorizerRefreshToken) {
-        redissonClient.getBucket(this.getKey(this.authorizerRefreshTokenKey, appId)).set(authorizerRefreshToken);
-    }
-
-    @Override
-    public String getAuthorizerAccessToken(String appId) {
-        Object value = redissonClient.getBucket(this.getKey(this.authorizerAccessTokenKey, appId)).get();
-        return value == null ? null : value.toString();
-    }
-
-    @Override
-    public boolean isAuthorizerAccessTokenExpired(String appId) {
-        return redissonClient.getBucket(this.getKey(this.authorizerAccessTokenKey, appId)).remainTimeToLive() < 2;
-    }
-
-    @Override
-    public void expireAuthorizerAccessToken(String appId) {
-        redissonClient.getBucket(this.getKey(this.authorizerAccessTokenKey, appId)).expire(0, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void updateAuthorizerAccessToken(String appId, String authorizerAccessToken, int expiresInSeconds) {
-        redissonClient.getBucket(this.getKey(this.authorizerAccessTokenKey, appId)).set(authorizerAccessToken, expiresInSeconds - 200, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public String getJsapiTicket(String appId) {
-        Object value = redissonClient.getBucket(this.getKey(this.jsapiTicketKey, appId)).get();
-        return value == null ? null : value.toString();
-    }
-
-    @Override
-    public boolean isJsapiTicketExpired(String appId) {
-        return redissonClient.getBucket(this.getKey(this.jsapiTicketKey, appId)).remainTimeToLive() < 2;
-    }
-
-    @Override
-    public void expireJsapiTicket(String appId) {
-        redissonClient.getBucket(this.getKey(this.jsapiTicketKey, appId)).expire(0, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void updateJsapiTicket(String appId, String jsapiTicket, int expiresInSeconds) {
-        redissonClient.getBucket(this.getKey(this.jsapiTicketKey, appId)).set(jsapiTicket, expiresInSeconds - 200, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public String getCardApiTicket(String appId) {
-        Object value = redissonClient.getBucket(this.getKey(this.cardApiTicket, appId)).get();
-        return value == null ? null : value.toString();
-    }
-
-    @Override
-    public boolean isCardApiTicketExpired(String appId) {
-        return redissonClient.getBucket(this.getKey(this.cardApiTicket, appId)).remainTimeToLive() < 2;
-    }
-
-    @Override
-    public void expireCardApiTicket(String appId) {
-        redissonClient.getBucket(this.getKey(this.cardApiTicket, appId)).expire(0 ,TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void updateCardApiTicket(String appId, String cardApiTicket, int expiresInSeconds) {
-        redissonClient.getBucket(this.getKey(this.cardApiTicket, appId)).set(cardApiTicket, expiresInSeconds - 200, TimeUnit.SECONDS);
-    }
+public class WxOpenInRedissonConfigStorage extends AbstractWxOpenInRedisConfigStorage {
+
+  private final WxRedisOps redisOps;
+
+  public WxOpenInRedissonConfigStorage(@NonNull RedissonClient redissonClient, String keyPrefix) {
+    this(new RedissonWxRedisOps(redissonClient), keyPrefix);
+  }
+
+  public WxOpenInRedissonConfigStorage(@NonNull RedissonClient redissonClient) {
+    this(redissonClient, null);
+  }
+
+  private WxOpenInRedissonConfigStorage(@NonNull WxRedisOps redisOps, String keyPrefix) {
+    this.redisOps = redisOps;
+    this.keyPrefix = keyPrefix;
+  }
+
+  @Override
+  public String getComponentVerifyTicket() {
+    return redisOps.getValue(this.componentVerifyTicketKey);
+  }
+
+  @Override
+  public void setComponentVerifyTicket(String componentVerifyTicket) {
+    redisOps.setValue(this.componentVerifyTicketKey, componentVerifyTicket, Integer.MAX_VALUE, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public String getComponentAccessToken() {
+    return redisOps.getValue(this.componentAccessTokenKey);
+  }
+
+  @Override
+  public boolean isComponentAccessTokenExpired() {
+    Long expire = redisOps.getExpire(this.componentAccessTokenKey);
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void expireComponentAccessToken() {
+    redisOps.expire(this.componentAccessTokenKey, 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateComponentAccessToken(String componentAccessToken, int expiresInSeconds) {
+    redisOps.setValue(this.componentAccessTokenKey, componentAccessToken, expiresInSeconds - 200, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public String getAuthorizerRefreshToken(String appId) {
+    return redisOps.getValue(this.getKey(this.authorizerRefreshTokenKey, appId));
+  }
+
+  @Override
+  public void setAuthorizerRefreshToken(String appId, String authorizerRefreshToken) {
+    redisOps.setValue(this.getKey(this.authorizerRefreshTokenKey, appId), authorizerRefreshToken, 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public String getAuthorizerAccessToken(String appId) {
+    return redisOps.getValue(this.getKey(this.authorizerAccessTokenKey, appId));
+  }
+
+  @Override
+  public boolean isAuthorizerAccessTokenExpired(String appId) {
+    Long expire = redisOps.getExpire(this.getKey(this.authorizerAccessTokenKey, appId));
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void expireAuthorizerAccessToken(String appId) {
+    redisOps.expire(this.getKey(this.authorizerAccessTokenKey, appId), 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateAuthorizerAccessToken(String appId, String authorizerAccessToken, int expiresInSeconds) {
+    redisOps.setValue(this.getKey(this.authorizerAccessTokenKey, appId), authorizerAccessToken, expiresInSeconds - 200, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public String getJsapiTicket(String appId) {
+    return redisOps.getValue(this.getKey(this.jsapiTicketKey, appId));
+  }
+
+  @Override
+  public boolean isJsapiTicketExpired(String appId) {
+    Long expire = redisOps.getExpire(this.getKey(this.jsapiTicketKey, appId));
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void expireJsapiTicket(String appId) {
+    redisOps.expire(this.getKey(this.jsapiTicketKey, appId), 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateJsapiTicket(String appId, String jsapiTicket, int expiresInSeconds) {
+    redisOps.setValue(this.getKey(this.jsapiTicketKey, appId), jsapiTicket, expiresInSeconds - 200, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public String getCardApiTicket(String appId) {
+    return redisOps.getValue(this.getKey(this.cardApiTicket, appId));
+  }
+
+  @Override
+  public boolean isCardApiTicketExpired(String appId) {
+    Long expire = redisOps.getExpire(this.getKey(this.cardApiTicket, appId));
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void expireCardApiTicket(String appId) {
+    redisOps.expire(this.getKey(this.cardApiTicket, appId), 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateCardApiTicket(String appId, String cardApiTicket, int expiresInSeconds) {
+    redisOps.setValue(this.getKey(this.cardApiTicket, appId), cardApiTicket, expiresInSeconds - 200, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public Lock getLockByKey(String key) {
+    return redisOps.getLock(key);
+  }
 }

From 619b3773263dca95e9f5fad0bf50d69796184be2 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 21 Apr 2020 12:28:35 +0800
Subject: [PATCH 072/114] =?UTF-8?q?:bug:=20#1524=20=E4=BF=AE=E5=A4=8DWxMaE?=
 =?UTF-8?q?xpressPath.PathItem=E5=86=85=E9=83=A8=E7=B1=BB=E4=B8=BApublic?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E8=AE=BF=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wx/miniapp/bean/express/WxMaExpressPath.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java
index 5967e5ac9e..bbd3feacdb 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/express/WxMaExpressPath.java
@@ -11,6 +11,7 @@
 
 /**
  * 运单轨迹对象
+ *
  * @author <a href="https://github.com/mr-xiaoyu">xiaoyu</a>
  * @since 2019-11-26
  */
@@ -18,7 +19,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 public class WxMaExpressPath implements Serializable {
-
   private static final long serialVersionUID = 5643624677715536605L;
 
   /**
@@ -55,7 +55,7 @@ public static WxMaExpressPath fromJson(String json) {
   }
 
   @Data
-  private static class PathItem{
+  public static class PathItem {
 
     /**
      * 轨迹节点 Unix 时间戳

From 6da4b4fca15af64a4f9f782297c70f46272b63e9 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 25 Apr 2020 13:31:27 +0800
Subject: [PATCH 073/114] =?UTF-8?q?:art:=20#1528=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E8=8E=B7=E5=8F=96=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=9B=B4=E5=A4=9A=E7=9A=84?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E9=94=99=E8=AF=AF=E7=A0=81?=
 =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/common/error/WxCpErrorMsgEnum.java | 318 +++++++++++++++++-
 .../cp/api/WxCpExternalContactService.java    |   2 +-
 .../impl/WxCpExternalContactServiceImpl.java  |  73 ++--
 .../bean/WxCpUserWithExternalPermission.java  |  36 +-
 .../WxCpExternalContactServiceImplTest.java   |   2 +-
 5 files changed, 369 insertions(+), 62 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxCpErrorMsgEnum.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxCpErrorMsgEnum.java
index 5529d69759..4c3dbb7cf1 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxCpErrorMsgEnum.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxCpErrorMsgEnum.java
@@ -5,7 +5,7 @@
 /**
  * <pre>
  * 企业微信全局错误码.
- * 参考文档：<a href="https://work.weixin.qq.com/api/doc#10649">企业微信全局错误码</a>
+ * 参考文档：<a href="https://work.weixin.qq.com/api/doc/90000/90139/90313">企业微信全局错误码</a>
  * Created by Binary Wang on 2018/5/13.
  * </pre>
  *
@@ -609,6 +609,322 @@ public enum WxCpErrorMsgEnum {
    * 不符合的state参数；必须是[a-zA-Z0-9]的参数值，长度不可超过128个字节.
    */
   CODE_84025(84025, "不符合的state参数；必须是[a-zA-Z0-9]的参数值，长度不可超过128个字节"),
+  /**
+   * 缺少caller参数.
+   */
+  CODE_84052(84052, "缺少caller参数"),
+  /**
+   * 缺少callee参数.
+   */
+  CODE_84053(84053, "缺少callee参数"),
+  /**
+   * 缺少auth_corpid参数.
+   */
+  CODE_84054(84054, "缺少auth_corpid参数"),
+  /**
+   * 超过拨打公费电话频率。排查方法：同一个客服5秒内只能调用api拨打一次公费电话
+   */
+  CODE_84055(84055, "超过拨打公费电话频率。排查方法：同一个客服5秒内只能调用api拨打一次公费电话"),
+  /**
+   * 被拨打用户安装应用时未授权拨打公费电话权限.
+   */
+  CODE_84056(84056, "被拨打用户安装应用时未授权拨打公费电话权限"),
+  /**
+   * 公费电话余额不足.
+   */
+  CODE_84057(84057, "公费电话余额不足"),
+  /**
+   * caller
+   */
+  CODE_84058(84058, "caller 呼叫号码不支持"),
+  /**
+   * 号码非法.
+   */
+  CODE_84059(84059, "号码非法"),
+  /**
+   * callee
+   */
+  CODE_84060(84060, "callee 呼叫号码不支持"),
+  /**
+   * 不存在外部联系人的关系.
+   */
+  CODE_84061(84061, "不存在外部联系人的关系"),
+  /**
+   * 未开启公费电话应用.
+   */
+  CODE_84062(84062, "未开启公费电话应用"),
+  /**
+   * caller不存在.
+   */
+  CODE_84063(84063, "caller不存在"),
+  /**
+   * callee不存在.
+   */
+  CODE_84064(84064, "callee不存在"),
+  /**
+   * caller跟callee电话号码一致。排查方法：不允许自己拨打给自己
+   */
+  CODE_84065(84065, "caller跟callee电话号码一致。排查方法：不允许自己拨打给自己"),
+  /**
+   * 服务商拨打次数超过限制。排查方法：单个企业管理员，在一天（以上午10
+   */
+  CODE_84066(84066, "服务商拨打次数超过限制。排查方法：单个企业管理员，在一天（以上午10:00为起始时间）内，对应单个服务商，只能被呼叫【4】次。"),
+  /**
+   * 管理员收到的服务商公费电话个数超过限制。排查方法：单个企业管理员，在一天（以上午10
+   */
+  CODE_84067(84067, "管理员收到的服务商公费电话个数超过限制。排查方法：单个企业管理员，在一天（以上午10:00为起始时间）内，一共只能被【3】个服务商成功呼叫。"),
+  /**
+   * 拨打方被限制拨打公费电话.
+   */
+  CODE_84069(84069, "拨打方被限制拨打公费电话"),
+  /**
+   * 不支持的电话号码。排查方法：拨打方或者被拨打方电话号码不支持
+   */
+  CODE_84070(84070, "不支持的电话号码。排查方法：拨打方或者被拨打方电话号码不支持"),
+  /**
+   * 不合法的外部联系人授权码。排查方法：非法或者已经消费过
+   */
+  CODE_84071(84071, "不合法的外部联系人授权码。排查方法：非法或者已经消费过"),
+  /**
+   * 应用未配置客服.
+   */
+  CODE_84072(84072, "应用未配置客服"),
+  /**
+   * 客服userid不在应用配置的客服列表中.
+   */
+  CODE_84073(84073, "客服userid不在应用配置的客服列表中"),
+  /**
+   * 没有外部联系人权限.
+   */
+  CODE_84074(84074, "没有外部联系人权限"),
+  /**
+   * 不合法或过期的authcode.
+   */
+  CODE_84075(84075, "不合法或过期的authcode"),
+  /**
+   * 缺失authcode.
+   */
+  CODE_84076(84076, "缺失authcode"),
+  /**
+   * 订单价格过高，无法受理.
+   */
+  CODE_84077(84077, "订单价格过高，无法受理"),
+  /**
+   * 购买人数不正确.
+   */
+  CODE_84078(84078, "购买人数不正确"),
+  /**
+   * 价格策略不存在.
+   */
+  CODE_84079(84079, "价格策略不存在"),
+  /**
+   * 订单不存在.
+   */
+  CODE_84080(84080, "订单不存在"),
+  /**
+   * 存在未支付订单.
+   */
+  CODE_84081(84081, "存在未支付订单"),
+  /**
+   * 存在申请退款中的订单.
+   */
+  CODE_84082(84082, "存在申请退款中的订单"),
+  /**
+   * 非服务人员.
+   */
+  CODE_84083(84083, "非服务人员"),
+  /**
+   * 非跟进用户.
+   */
+  CODE_84084(84084, "非跟进用户"),
+  /**
+   * 应用已下架.
+   */
+  CODE_84085(84085, "应用已下架"),
+  /**
+   * 订单人数超过可购买最大人数.
+   */
+  CODE_84086(84086, "订单人数超过可购买最大人数"),
+  /**
+   * 打开订单支付前禁止关闭订单.
+   */
+  CODE_84087(84087, "打开订单支付前禁止关闭订单"),
+  /**
+   * 禁止关闭已支付的订单.
+   */
+  CODE_84088(84088, "禁止关闭已支付的订单"),
+  /**
+   * 订单已支付.
+   */
+  CODE_84089(84089, "订单已支付"),
+  /**
+   * 缺失user_ticket.
+   */
+  CODE_84090(84090, "缺失user_ticket"),
+  /**
+   * 订单价格不可低于下限.
+   */
+  CODE_84091(84091, "订单价格不可低于下限"),
+  /**
+   * 无法发起代下单操作.
+   */
+  CODE_84092(84092, "无法发起代下单操作"),
+  /**
+   * 代理关系已占用，无法代下单.
+   */
+  CODE_84093(84093, "代理关系已占用，无法代下单"),
+  /**
+   * 该应用未配置代理分润规则，请先联系应用服务商处理.
+   */
+  CODE_84094(84094, "该应用未配置代理分润规则，请先联系应用服务商处理"),
+  /**
+   * 免费试用版，无法扩容.
+   */
+  CODE_84095(84095, "免费试用版，无法扩容"),
+  /**
+   * 免费试用版，无法续期.
+   */
+  CODE_84096(84096, "免费试用版，无法续期"),
+  /**
+   * 当前企业有未处理订单.
+   */
+  CODE_84097(84097, "当前企业有未处理订单"),
+  /**
+   * 固定总量，无法扩容.
+   */
+  CODE_84098(84098, "固定总量，无法扩容"),
+  /**
+   * 非购买状态，无法扩容.
+   */
+  CODE_84099(84099, "非购买状态，无法扩容"),
+  /**
+   * 未购买过此应用，无法续期.
+   */
+  CODE_84100(84100, "未购买过此应用，无法续期"),
+  /**
+   * 企业已试用付费版本，无法全新购买.
+   */
+  CODE_84101(84101, "企业已试用付费版本，无法全新购买"),
+  /**
+   * 企业当前应用状态已过期，无法扩容.
+   */
+  CODE_84102(84102, "企业当前应用状态已过期，无法扩容"),
+  /**
+   * 仅可修改未支付订单.
+   */
+  CODE_84103(84103, "仅可修改未支付订单"),
+  /**
+   * 订单已支付，无法修改.
+   */
+  CODE_84104(84104, "订单已支付，无法修改"),
+  /**
+   * 订单已被取消，无法修改.
+   */
+  CODE_84105(84105, "订单已被取消，无法修改"),
+  /**
+   * 企业含有该应用的待支付订单，无法代下单.
+   */
+  CODE_84106(84106, "企业含有该应用的待支付订单，无法代下单"),
+  /**
+   * 企业含有该应用的退款中订单，无法代下单.
+   */
+  CODE_84107(84107, "企业含有该应用的退款中订单，无法代下单"),
+  /**
+   * 企业含有该应用的待生效订单，无法代下单.
+   */
+  CODE_84108(84108, "企业含有该应用的待生效订单，无法代下单"),
+  /**
+   * 订单定价不能未0.
+   */
+  CODE_84109(84109, "订单定价不能未0"),
+  /**
+   * 新安装应用不在试用状态，无法升级为付费版.
+   */
+  CODE_84110(84110, "新安装应用不在试用状态，无法升级为付费版"),
+  /**
+   * 无足够可用优惠券.
+   */
+  CODE_84111(84111, "无足够可用优惠券"),
+  /**
+   * 无法关闭未支付订单.
+   */
+  CODE_84112(84112, "无法关闭未支付订单"),
+  /**
+   * 无付费信息.
+   */
+  CODE_84113(84113, "无付费信息"),
+  /**
+   * 虚拟版本不支持下单.
+   */
+  CODE_84114(84114, "虚拟版本不支持下单"),
+  /**
+   * 虚拟版本不支持扩容.
+   */
+  CODE_84115(84115, "虚拟版本不支持扩容"),
+  /**
+   * 虚拟版本不支持续期.
+   */
+  CODE_84116(84116, "虚拟版本不支持续期"),
+  /**
+   * 在虚拟正式版期内不能扩容.
+   */
+  CODE_84117(84117, "在虚拟正式版期内不能扩容"),
+  /**
+   * 虚拟正式版期内不能变更版本.
+   */
+  CODE_84118(84118, "虚拟正式版期内不能变更版本"),
+  /**
+   * 当前企业未报备，无法进行代下单.
+   */
+  CODE_84119(84119, "当前企业未报备，无法进行代下单"),
+  /**
+   * 当前应用版本已删除.
+   */
+  CODE_84120(84120, "当前应用版本已删除"),
+  /**
+   * 应用版本已删除，无法扩容.
+   */
+  CODE_84121(84121, "应用版本已删除，无法扩容"),
+  /**
+   * 应用版本已删除，无法续期.
+   */
+  CODE_84122(84122, "应用版本已删除，无法续期"),
+  /**
+   * 非虚拟版本，无法升级.
+   */
+  CODE_84123(84123, "非虚拟版本，无法升级"),
+  /**
+   * 非行业方案订单，不能添加部分应用版本的订单.
+   */
+  CODE_84124(84124, "非行业方案订单，不能添加部分应用版本的订单"),
+  /**
+   * 购买人数不能少于最少购买人数.
+   */
+  CODE_84125(84125, "购买人数不能少于最少购买人数"),
+  /**
+   * 购买人数不能多于最大购买人数.
+   */
+  CODE_84126(84126, "购买人数不能多于最大购买人数"),
+  /**
+   * 无应用管理权限.
+   */
+  CODE_84127(84127, "无应用管理权限"),
+  /**
+   * 无该行业方案下全部应用的管理权限.
+   */
+  CODE_84128(84128, "无该行业方案下全部应用的管理权限"),
+  /**
+   * 付费策略已被删除，无法下单.
+   */
+  CODE_84129(84129, "付费策略已被删除，无法下单"),
+  /**
+   * 订单生效时间不合法.
+   */
+  CODE_84130(84130, "订单生效时间不合法"),
+  /**
+   * 文件转译解析错误。排查方法：只支持utf8文件转译，可能是不支持的文件类型或者格式
+   */
+  CODE_84200(84200, "文件转译解析错误。排查方法：只支持utf8文件转译，可能是不支持的文件类型或者格式"),
   /**
    * 包含不合法的词语.
    */
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
index 0680f3e27c..5aa2336a71 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpExternalContactService.java
@@ -85,7 +85,7 @@ public interface WxCpExternalContactService {
    * @return List of CpUser id
    * @throws WxErrorException .
    */
-  List<String> listFollowUser() throws WxErrorException;
+  List<String> listFollowers() throws WxErrorException;
 
   /**
    * 企业和第三方可通过此接口，获取所有离职成员的客户列表，并可进一步调用离职成员的外部联系人再分配接口将这些客户重新分配给其他企业成员。
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
index 0e26194d25..044155847e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImpl.java
@@ -2,23 +2,26 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import lombok.RequiredArgsConstructor;
+import me.chanjar.weixin.common.error.WxCpErrorMsgEnum;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.WxCpExternalContactService;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.*;
 import org.apache.commons.lang3.ArrayUtils;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
 import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.ExternalContact.*;
 
+/**
+ * @author 曹祖鹏 & yuanqixun
+ */
+@RequiredArgsConstructor
 public class WxCpExternalContactServiceImpl implements WxCpExternalContactService {
-  private WxCpService mainService;
-
-  public WxCpExternalContactServiceImpl(WxCpService mainService) {
-    this.mainService = mainService;
-  }
+  private final WxCpService mainService;
 
   @Override
   public WxCpUserExternalContactInfo getExternalContact(String userId) throws WxErrorException {
@@ -37,22 +40,30 @@ public WxCpUserExternalContactInfo getContactDetail(String userId) throws WxErro
   @Override
   public List<String> listExternalContacts(String userId) throws WxErrorException {
     final String url = this.mainService.getWxCpConfigStorage().getApiUrl(LIST_EXTERNAL_CONTACT + userId);
-    String responseContent = this.mainService.get(url, null);
-    return WxCpUserExternalContactList.fromJson(responseContent).getExternalUserId();
+    try {
+      String responseContent = this.mainService.get(url, null);
+      return WxCpUserExternalContactList.fromJson(responseContent).getExternalUserId();
+    } catch (WxErrorException e) {
+      // not external contact,无客户则返回空列表
+      if (e.getError().getErrorCode() == WxCpErrorMsgEnum.CODE_84061.getCode()) {
+        return Collections.emptyList();
+      }
+      throw e;
+    }
   }
 
   @Override
-  public List<String> listFollowUser() throws WxErrorException {
+  public List<String> listFollowers() throws WxErrorException {
     final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GET_FOLLOW_USER_LIST);
     String responseContent = this.mainService.get(url, null);
-    return WxCpUserWithExternalPermission.fromJson(responseContent).getFollowUser();
+    return WxCpUserWithExternalPermission.fromJson(responseContent).getFollowers();
   }
 
   @Override
   public WxCpUserExternalUnassignList listUnassignedList(Integer pageIndex, Integer pageSize) throws WxErrorException {
     JsonObject json = new JsonObject();
-    json.addProperty("page_id",pageIndex == null ? 0 : pageIndex);
-    json.addProperty("page_size",pageSize == null ? 100 : pageSize);
+    json.addProperty("page_id", pageIndex == null ? 0 : pageIndex);
+    json.addProperty("page_size", pageSize == null ? 100 : pageSize);
     final String url = this.mainService.getWxCpConfigStorage().getApiUrl(LIST_UNASSIGNED_CONTACT);
     final String result = this.mainService.post(url, json.toString());
     return WxCpUserExternalUnassignList.fromJson(result);
@@ -72,18 +83,18 @@ public WxCpBaseResp transferExternalContact(String externalUserid, String handOv
   @Override
   public WxCpUserExternalGroupChatList listGroupChat(Integer pageIndex, Integer pageSize, int status, String[] userIds, String[] partyIds) throws WxErrorException {
     JsonObject json = new JsonObject();
-    json.addProperty("offset",pageIndex == null ? 0 : pageIndex);
-    json.addProperty("limit",pageSize == null ? 100 : pageSize);
-    json.addProperty("status_filter",status);
-    if(ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)){
+    json.addProperty("offset", pageIndex == null ? 0 : pageIndex);
+    json.addProperty("limit", pageSize == null ? 100 : pageSize);
+    json.addProperty("status_filter", status);
+    if (ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)) {
       JsonObject ownerFilter = new JsonObject();
-      if(ArrayUtils.isNotEmpty(userIds)){
+      if (ArrayUtils.isNotEmpty(userIds)) {
         json.add("userid", new Gson().toJsonTree(userIds).getAsJsonArray());
       }
-      if(ArrayUtils.isNotEmpty(partyIds)){
+      if (ArrayUtils.isNotEmpty(partyIds)) {
         json.add("partyid", new Gson().toJsonTree(partyIds).getAsJsonArray());
       }
-      json.add("owner_filter",ownerFilter);
+      json.add("owner_filter", ownerFilter);
     }
     final String url = this.mainService.getWxCpConfigStorage().getApiUrl(GROUP_CHAT_LIST);
     final String result = this.mainService.post(url, json.toString());
@@ -102,13 +113,13 @@ public WxCpUserExternalGroupChatInfo getGroupChat(String chatId) throws WxErrorE
   @Override
   public WxCpUserExternalUserBehaviorStatistic getUserBehaviorStatistic(Date startTime, Date endTime, String[] userIds, String[] partyIds) throws WxErrorException {
     JsonObject json = new JsonObject();
-    json.addProperty("start_time", startTime.getTime()/1000);
-    json.addProperty("end_time", endTime.getTime()/1000);
-    if(ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)){
-      if(ArrayUtils.isNotEmpty(userIds)){
+    json.addProperty("start_time", startTime.getTime() / 1000);
+    json.addProperty("end_time", endTime.getTime() / 1000);
+    if (ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)) {
+      if (ArrayUtils.isNotEmpty(userIds)) {
         json.add("userid", new Gson().toJsonTree(userIds).getAsJsonArray());
       }
-      if(ArrayUtils.isNotEmpty(partyIds)){
+      if (ArrayUtils.isNotEmpty(partyIds)) {
         json.add("partyid", new Gson().toJsonTree(partyIds).getAsJsonArray());
       }
     }
@@ -120,20 +131,20 @@ public WxCpUserExternalUserBehaviorStatistic getUserBehaviorStatistic(Date start
   @Override
   public WxCpUserExternalGroupChatStatistic getGroupChatStatistic(Date startTime, Integer orderBy, Integer orderAsc, Integer pageIndex, Integer pageSize, String[] userIds, String[] partyIds) throws WxErrorException {
     JsonObject json = new JsonObject();
-    json.addProperty("day_begin_time", startTime.getTime()/1000);
+    json.addProperty("day_begin_time", startTime.getTime() / 1000);
     json.addProperty("order_by", orderBy == null ? 1 : orderBy);
-    json.addProperty("order_asc",orderAsc == null ? 0 : orderAsc);
-    json.addProperty("offset",pageIndex == null ? 0 : pageIndex);
-    json.addProperty("limit",pageSize == null ? 500 : pageSize);
-    if(ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)){
+    json.addProperty("order_asc", orderAsc == null ? 0 : orderAsc);
+    json.addProperty("offset", pageIndex == null ? 0 : pageIndex);
+    json.addProperty("limit", pageSize == null ? 500 : pageSize);
+    if (ArrayUtils.isNotEmpty(userIds) || ArrayUtils.isNotEmpty(partyIds)) {
       JsonObject ownerFilter = new JsonObject();
-      if(ArrayUtils.isNotEmpty(userIds)){
+      if (ArrayUtils.isNotEmpty(userIds)) {
         json.add("userid_list", new Gson().toJsonTree(userIds).getAsJsonArray());
       }
-      if(ArrayUtils.isNotEmpty(partyIds)){
+      if (ArrayUtils.isNotEmpty(partyIds)) {
         json.add("userid_list", new Gson().toJsonTree(partyIds).getAsJsonArray());
       }
-      json.add("owner_filter",ownerFilter);
+      json.add("owner_filter", ownerFilter);
     }
     final String url = this.mainService.getWxCpConfigStorage().getApiUrl(LIST_GROUP_CHAT_DATA);
     final String result = this.mainService.post(url, json.toString());
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserWithExternalPermission.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserWithExternalPermission.java
index 2530c79dc8..e64a273d74 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserWithExternalPermission.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpUserWithExternalPermission.java
@@ -2,46 +2,26 @@
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import lombok.Data;
 import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 import java.util.List;
 
+/**
+ * @author 曹祖鹏
+ */
+@Data
 public class WxCpUserWithExternalPermission {
   @SerializedName("errcode")
   @Expose
-  private Long errcode;
+  private Long errCode;
   @SerializedName("errmsg")
   @Expose
-  private String errmsg;
+  private String errMsg;
 
   @SerializedName("follow_user")
   @Expose
-  private List<String> followUser = null;
-
-  public Long getErrcode() {
-    return errcode;
-  }
-
-  public void setErrcode(Long errcode) {
-    this.errcode = errcode;
-  }
-
-  public String getErrmsg() {
-    return errmsg;
-  }
-
-  public void setErrmsg(String errmsg) {
-    this.errmsg = errmsg;
-  }
-
-  public List<String> getFollowUser() {
-    return followUser;
-  }
-
-  public void setFollowUser(List<String> followUser) {
-    this.followUser = followUser;
-  }
-
+  private List<String> followers = null;
 
   public static WxCpUserWithExternalPermission fromJson(String json) {
     return WxCpGsonBuilder.create().fromJson(json, WxCpUserWithExternalPermission.class);
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
index 97d8c02ca3..309b14bc26 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/WxCpExternalContactServiceImplTest.java
@@ -38,7 +38,7 @@ public void testListExternalContacts() throws WxErrorException {
 
   @Test
   public void testListExternalWithPermission() throws WxErrorException {
-    List<String> ret = this.wxCpService.getExternalContactService().listFollowUser();
+    List<String> ret = this.wxCpService.getExternalContactService().listFollowers();
     System.out.println(ret);
     assertNotNull(ret);
   }

From ebe46822ef52228d4c4094d112b12ba6f68cde30 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 25 Apr 2020 21:53:05 +0800
Subject: [PATCH 074/114] =?UTF-8?q?:art:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=8A=BD=E5=8F=96=E5=85=AC=E5=85=B1=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=88=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/common/service/WxService.java      | 41 +++++++++++++++++++
 .../wx/miniapp/api/WxMaService.java           | 18 +-------
 .../wx/miniapp/api/impl/WxMaServiceImpl.java  | 34 +++++++--------
 .../me/chanjar/weixin/mp/api/WxMpService.java | 23 +----------
 .../mp/api/impl/BaseWxMpServiceImpl.java      | 10 ++++-
 .../mp/api/impl/WxMpOcrServiceImpl.java       | 32 +++++++++------
 6 files changed, 89 insertions(+), 69 deletions(-)
 create mode 100644 weixin-java-common/src/main/java/me/chanjar/weixin/common/service/WxService.java

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/service/WxService.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/service/WxService.java
new file mode 100644
index 0000000000..fc49bfd9ce
--- /dev/null
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/service/WxService.java
@@ -0,0 +1,41 @@
+package me.chanjar.weixin.common.service;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+
+/**
+ * 微信服务接口.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2020-04-25
+ */
+public interface WxService {
+  /**
+   * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求.
+   *
+   * @param queryParam 参数
+   * @param url        请求接口地址
+   * @return 接口响应字符串
+   * @throws WxErrorException 异常
+   */
+  String get(String url, String queryParam) throws WxErrorException;
+
+  /**
+   * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的POST请求.
+   *
+   * @param postData 请求参数json值
+   * @param url      请求接口地址
+   * @return 接口响应字符串
+   * @throws WxErrorException 异常
+   */
+  String post(String url, String postData) throws WxErrorException;
+
+  /**
+   * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的POST请求.
+   *
+   * @param url 请求接口地址
+   * @param obj 请求对象
+   * @return 接口响应字符串
+   * @throws WxErrorException 异常
+   */
+  String post(String url, Object obj) throws WxErrorException;
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
index 6b4a715661..875d9430d4 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/WxMaService.java
@@ -3,6 +3,7 @@
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.service.WxService;
 import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
@@ -10,7 +11,7 @@
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
-public interface WxMaService {
+public interface WxMaService extends WxService {
   /**
    * 获取access_token.
    */
@@ -99,21 +100,6 @@ public interface WxMaService {
    */
   String getPaidUnionId(String openid, String transactionId, String mchId, String outTradeNo) throws WxErrorException;
 
-  /**
-   * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求.
-   */
-  String get(String url, String queryParam) throws WxErrorException;
-
-  /**
-   * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的POST请求.
-   */
-  String post(String url, String postData) throws WxErrorException;
-
-  /**
-   * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的POST请求.
-   */
-  String post(String url, Object obj) throws WxErrorException;
-
   /**
    * <pre>
    * Service没有实现某个API的时候，可以用这个，
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 88984c3533..e7608eef0f 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
@@ -44,23 +44,23 @@ public class WxMaServiceImpl implements WxMaService, RequestHttp<CloseableHttpCl
   private HttpHost httpProxy;
   private WxMaConfig wxMaConfig;
 
-  private WxMaMsgService kefuService = new WxMaMsgServiceImpl(this);
-  private WxMaMediaService materialService = new WxMaMediaServiceImpl(this);
-  private WxMaUserService userService = new WxMaUserServiceImpl(this);
-  private WxMaQrcodeService qrCodeService = new WxMaQrcodeServiceImpl(this);
-  private WxMaTemplateService templateService = new WxMaTemplateServiceImpl(this);
-  private WxMaAnalysisService analysisService = new WxMaAnalysisServiceImpl(this);
-  private WxMaCodeService codeService = new WxMaCodeServiceImpl(this);
-  private WxMaSettingService settingService = new WxMaSettingServiceImpl(this);
-  private WxMaJsapiService jsapiService = new WxMaJsapiServiceImpl(this);
-  private WxMaShareService shareService = new WxMaShareServiceImpl(this);
-  private WxMaRunService runService = new WxMaRunServiceImpl(this);
-  private WxMaSecCheckService secCheckService = new WxMaSecCheckServiceImpl(this);
-  private WxMaPluginService pluginService = new WxMaPluginServiceImpl(this);
-  private WxMaExpressService expressService = new WxMaExpressServiceImpl(this);
-  private WxMaSubscribeService subscribeService = new WxMaSubscribeServiceImpl(this);
-  private WxMaCloudService cloudService = new WxMaCloudServiceImpl(this);
-  private WxMaLiveService liveService = new WxMaLiveServiceImpl(this);
+  private final WxMaMsgService kefuService = new WxMaMsgServiceImpl(this);
+  private final WxMaMediaService materialService = new WxMaMediaServiceImpl(this);
+  private final WxMaUserService userService = new WxMaUserServiceImpl(this);
+  private final WxMaQrcodeService qrCodeService = new WxMaQrcodeServiceImpl(this);
+  private final WxMaTemplateService templateService = new WxMaTemplateServiceImpl(this);
+  private final WxMaAnalysisService analysisService = new WxMaAnalysisServiceImpl(this);
+  private final WxMaCodeService codeService = new WxMaCodeServiceImpl(this);
+  private final WxMaSettingService settingService = new WxMaSettingServiceImpl(this);
+  private final WxMaJsapiService jsapiService = new WxMaJsapiServiceImpl(this);
+  private final WxMaShareService shareService = new WxMaShareServiceImpl(this);
+  private final WxMaRunService runService = new WxMaRunServiceImpl(this);
+  private final WxMaSecCheckService secCheckService = new WxMaSecCheckServiceImpl(this);
+  private final WxMaPluginService pluginService = new WxMaPluginServiceImpl(this);
+  private final WxMaExpressService expressService = new WxMaExpressServiceImpl(this);
+  private final WxMaSubscribeService subscribeService = new WxMaSubscribeServiceImpl(this);
+  private final WxMaCloudService cloudService = new WxMaCloudServiceImpl(this);
+  private final WxMaLiveService liveService = new WxMaLiveServiceImpl(this);
 
   private int retrySleepMillis = 1000;
   private int maxRetryTimes = 5;
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 7bff10c811..db8d008653 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
@@ -3,6 +3,7 @@
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
 import me.chanjar.weixin.common.bean.WxNetCheckResult;
 import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.common.service.WxService;
 import me.chanjar.weixin.common.util.http.MediaUploadRequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
@@ -22,7 +23,7 @@
  *
  * @author chanjarster
  */
-public interface WxMpService {
+public interface WxMpService extends WxService {
   /**
    * <pre>
    * 验证消息的确来自微信服务器.
@@ -276,26 +277,6 @@ public interface WxMpService {
    */
   void clearQuota(String appid) throws WxErrorException;
 
-  /**
-   * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求.
-   *
-   * @param queryParam 参数
-   * @param url        请求接口地址
-   * @return 接口响应字符串
-   * @throws WxErrorException 异常
-   */
-  String get(String url, String queryParam) throws WxErrorException;
-
-  /**
-   * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的POST请求.
-   *
-   * @param postData 请求参数json值
-   * @param url      请求接口地址
-   * @return 接口响应字符串
-   * @throws WxErrorException 异常
-   */
-  String post(String url, String postData) throws WxErrorException;
-
   /**
    * <pre>
    * Service没有实现某个API的时候，可以用这个，
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
index 09275cd6d7..58ba8446d4 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -18,6 +18,7 @@
 import me.chanjar.weixin.common.util.RandomUtils;
 import me.chanjar.weixin.common.util.crypto.SHA1;
 import me.chanjar.weixin.common.util.http.*;
+import me.chanjar.weixin.common.util.json.WxGsonBuilder;
 import me.chanjar.weixin.mp.api.*;
 import me.chanjar.weixin.mp.bean.WxMpSemanticQuery;
 import me.chanjar.weixin.mp.bean.result.WxMpCurrentAutoReplyInfo;
@@ -57,13 +58,13 @@ public abstract class BaseWxMpServiceImpl<H, P> implements WxMpService, RequestH
   private WxMpDataCubeService dataCubeService = new WxMpDataCubeServiceImpl(this);
   private WxMpUserBlacklistService blackListService = new WxMpUserBlacklistServiceImpl(this);
   private WxMpTemplateMsgService templateMsgService = new WxMpTemplateMsgServiceImpl(this);
-  private WxMpSubscribeMsgService subscribeMsgService = new WxMpSubscribeMsgServiceImpl(this);
+  private final WxMpSubscribeMsgService subscribeMsgService = new WxMpSubscribeMsgServiceImpl(this);
   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 WxMpAiOpenService aiOpenService = new WxMpAiOpenServiceImpl(this);
-  private WxMpWifiService wifiService = new WxMpWifiServiceImpl(this);
+  private final WxMpWifiService wifiService = new WxMpWifiServiceImpl(this);
   private WxMpMarketingService marketingService = new WxMpMarketingServiceImpl(this);
   private WxMpCommentService commentService = new WxMpCommentServiceImpl(this);
   private WxMpOcrService ocrService = new WxMpOcrServiceImpl(this);
@@ -286,6 +287,11 @@ public String post(WxMpApiUrl url, String postData) throws WxErrorException {
     return this.post(url.getUrl(this.getWxMpConfigStorage()), postData);
   }
 
+  @Override
+  public String post(String url, Object obj) throws WxErrorException {
+    return this.execute(SimplePostRequestExecutor.create(this), url, WxGsonBuilder.create().toJson(obj));
+  }
+
   @Override
   public <T, E> T execute(RequestExecutor<T, E> executor, WxMpApiUrl url, E data) throws WxErrorException {
     return this.execute(executor, url.getUrl(this.getWxMpConfigStorage()), data);
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java
index 118a02c94c..dbf3dd0395 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpOcrServiceImpl.java
@@ -38,7 +38,7 @@
  */
 @RequiredArgsConstructor
 public class WxMpOcrServiceImpl implements WxMpOcrService {
-  private final WxMpService wxMpService;
+  private final WxMpService mainService;
 
   @Override
   public WxMpOcrIdCardResult idCard(String imgUrl) throws WxErrorException {
@@ -48,14 +48,15 @@ public WxMpOcrIdCardResult idCard(String imgUrl) throws WxErrorException {
       // ignore cannot happen
     }
 
-    final String result = this.wxMpService.get(String.format(IDCARD.getUrl(this.wxMpService.getWxMpConfigStorage()),
+    final String result = this.mainService.get(String.format(IDCARD.getUrl(this.mainService.getWxMpConfigStorage()),
       imgUrl), null);
     return WxMpOcrIdCardResult.fromJson(result);
   }
 
   @Override
   public WxMpOcrIdCardResult idCard(File imgFile) throws WxErrorException {
-    String result = this.wxMpService.execute(OcrDiscernRequestExecutor.create(this.wxMpService.getRequestHttp()), FILEIDCARD.getUrl(this.wxMpService.getWxMpConfigStorage()), imgFile);
+    String result = this.mainService.execute(OcrDiscernRequestExecutor.create(this.mainService.getRequestHttp()),
+      FILEIDCARD.getUrl(this.mainService.getWxMpConfigStorage()), imgFile);
     return WxMpOcrIdCardResult.fromJson(result);
   }
 
@@ -67,14 +68,15 @@ public WxMpOcrBankCardResult bankCard(String imgUrl) throws WxErrorException {
       // ignore cannot happen
     }
 
-    final String result = this.wxMpService.get(String.format(BANK_CARD.getUrl(this.wxMpService.getWxMpConfigStorage()),
+    final String result = this.mainService.get(String.format(BANK_CARD.getUrl(this.mainService.getWxMpConfigStorage()),
       imgUrl), null);
     return WxMpOcrBankCardResult.fromJson(result);
   }
 
   @Override
   public WxMpOcrBankCardResult bankCard(File imgFile) throws WxErrorException {
-    String result = this.wxMpService.execute(OcrDiscernRequestExecutor.create(this.wxMpService.getRequestHttp()), FILE_BANK_CARD.getUrl(this.wxMpService.getWxMpConfigStorage()), imgFile);
+    String result = this.mainService.execute(OcrDiscernRequestExecutor.create(this.mainService.getRequestHttp()),
+      FILE_BANK_CARD.getUrl(this.mainService.getWxMpConfigStorage()), imgFile);
     return WxMpOcrBankCardResult.fromJson(result);
   }
 
@@ -86,14 +88,15 @@ public WxMpOcrDrivingResult driving(String imgUrl) throws WxErrorException {
       // ignore cannot happen
     }
 
-    final String result = this.wxMpService.get(String.format(DRIVING.getUrl(this.wxMpService.getWxMpConfigStorage()),
+    final String result = this.mainService.get(String.format(DRIVING.getUrl(this.mainService.getWxMpConfigStorage()),
       imgUrl), null);
     return WxMpOcrDrivingResult.fromJson(result);
   }
 
   @Override
   public WxMpOcrDrivingResult driving(File imgFile) throws WxErrorException {
-    String result = this.wxMpService.execute(OcrDiscernRequestExecutor.create(this.wxMpService.getRequestHttp()), FILE_DRIVING.getUrl(this.wxMpService.getWxMpConfigStorage()), imgFile);
+    String result = this.mainService.execute(OcrDiscernRequestExecutor.create(this.mainService.getRequestHttp()),
+      FILE_DRIVING.getUrl(this.mainService.getWxMpConfigStorage()), imgFile);
     return WxMpOcrDrivingResult.fromJson(result);
   }
 
@@ -105,14 +108,15 @@ public WxMpOcrDrivingLicenseResult drivingLicense(String imgUrl) throws WxErrorE
       // ignore cannot happen
     }
 
-    final String result = this.wxMpService.get(String.format(DRIVING_LICENSE.getUrl(this.wxMpService.getWxMpConfigStorage()),
+    final String result = this.mainService.get(String.format(DRIVING_LICENSE.getUrl(this.mainService.getWxMpConfigStorage()),
       imgUrl), null);
     return WxMpOcrDrivingLicenseResult.fromJson(result);
   }
 
   @Override
   public WxMpOcrDrivingLicenseResult drivingLicense(File imgFile) throws WxErrorException {
-    String result = this.wxMpService.execute(OcrDiscernRequestExecutor.create(this.wxMpService.getRequestHttp()), FILE_DRIVING_LICENSE.getUrl(this.wxMpService.getWxMpConfigStorage()), imgFile);
+    String result = this.mainService.execute(OcrDiscernRequestExecutor.create(this.mainService.getRequestHttp()),
+      FILE_DRIVING_LICENSE.getUrl(this.mainService.getWxMpConfigStorage()), imgFile);
     return WxMpOcrDrivingLicenseResult.fromJson(result);
   }
 
@@ -124,14 +128,15 @@ public WxMpOcrBizLicenseResult bizLicense(String imgUrl) throws WxErrorException
       // ignore cannot happen
     }
 
-    final String result = this.wxMpService.get(String.format(BIZ_LICENSE.getUrl(this.wxMpService.getWxMpConfigStorage()),
+    final String result = this.mainService.get(String.format(BIZ_LICENSE.getUrl(this.mainService.getWxMpConfigStorage()),
       imgUrl), null);
     return WxMpOcrBizLicenseResult.fromJson(result);
   }
 
   @Override
   public WxMpOcrBizLicenseResult bizLicense(File imgFile) throws WxErrorException {
-    String result = this.wxMpService.execute(OcrDiscernRequestExecutor.create(this.wxMpService.getRequestHttp()), FILE_BIZ_LICENSE.getUrl(this.wxMpService.getWxMpConfigStorage()), imgFile);
+    String result = this.mainService.execute(OcrDiscernRequestExecutor.create(this.mainService.getRequestHttp()),
+      FILE_BIZ_LICENSE.getUrl(this.mainService.getWxMpConfigStorage()), imgFile);
     return WxMpOcrBizLicenseResult.fromJson(result);
   }
 
@@ -143,14 +148,15 @@ public WxMpOcrCommResult comm(String imgUrl) throws WxErrorException {
       // ignore cannot happen
     }
 
-    final String result = this.wxMpService.get(String.format(COMM.getUrl(this.wxMpService.getWxMpConfigStorage()),
+    final String result = this.mainService.get(String.format(COMM.getUrl(this.mainService.getWxMpConfigStorage()),
       imgUrl), null);
     return WxMpOcrCommResult.fromJson(result);
   }
 
   @Override
   public WxMpOcrCommResult comm(File imgFile) throws WxErrorException {
-    String result = this.wxMpService.execute(OcrDiscernRequestExecutor.create(this.wxMpService.getRequestHttp()), FILE_COMM.getUrl(this.wxMpService.getWxMpConfigStorage()), imgFile);
+    String result = this.mainService.execute(OcrDiscernRequestExecutor.create(this.mainService.getRequestHttp()),
+      FILE_COMM.getUrl(this.mainService.getWxMpConfigStorage()), imgFile);
     return WxMpOcrCommResult.fromJson(result);
   }
 }

From 1ccce79b6b993f9d1b7acd0ad25c04a3e9e8588d Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 25 Apr 2020 23:15:15 +0800
Subject: [PATCH 075/114] =?UTF-8?q?:bug:=20=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=8C=E7=BB=93=E5=88=86=E8=B4=A6=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=95=86=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=E6=97=B6=E9=9C=80=E8=A6=81=E5=BF=BD=E7=95=A5subAppId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/profitsharing/ProfitSharingFinishRequest.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingFinishRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingFinishRequest.java
index 3a0ee93648..c8200b4cc9 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingFinishRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/profitsharing/ProfitSharingFinishRequest.java
@@ -66,10 +66,15 @@ public class ProfitSharingFinishRequest extends BaseWxPayRequest {
   private String description;
 
   @Override
-  protected void checkConstraints() throws WxPayException {
+  protected void checkConstraints() {
     this.setSignType(WxPayConstants.SignType.HMAC_SHA256);
   }
 
+  @Override
+  protected boolean ignoreSubAppId() {
+    return true;
+  }
+
   @Override
   protected void storeMap(Map<String, String> map) {
     map.put("transaction_id", transactionId);

From 9472dd3d4f2afc490fd64a4ee897a8de43bef0d3 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 26 Apr 2020 00:12:52 +0800
Subject: [PATCH 076/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.7.8?=
 =?UTF-8?q?.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd9a3b19a5..eef2516b48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.7.B</version>
+  <version>3.7.8.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index c7249ec939..34d3c68784 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index 1bc9dd1bce..c745342091 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index c65e0ad324..ac86bf534e 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 0684ef091c..1be01e9433 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index ca652e84e9..266a45b871 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index 7a55408d8e..312850f584 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 32db997c20..5fe026ecb0 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 4ffe9f4797..67c821b157 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index b1c94d5ce7..594c40991d 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index 8989f7aa8c..ad839d35cd 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index 10d551c02c..0bcfb8ee35 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 2d1cc13125..37156b36fc 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.7.B</version>
+    <version>3.7.8.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From 172638bd3fef13a29d21b46be0efbd98c16b9ae7 Mon Sep 17 00:00:00 2001
From: niefy <34568539+niefy@users.noreply.github.com>
Date: Mon, 27 Apr 2020 17:03:48 +0800
Subject: [PATCH 077/114] =?UTF-8?q?:art:=20#1534=20=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E6=A8=A1=E5=9D=97=E6=9B=B4=E6=94=B9http=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E9=BB=98=E8=AE=A4connectionRequestTimeout=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E4=BB=A5=E9=81=BF=E5=85=8D=E9=AB=98=E5=B9=B6?=
 =?UTF-8?q?=E5=8F=91=E5=9C=BA=E6=99=AF=E4=B8=8B=E5=87=BA=E7=8E=B0Connectio?=
 =?UTF-8?q?nPoolTimeoutException=E5=BC=82=E5=B8=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/util/http/apache/DefaultApacheHttpClientBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 dfca21a7b2..8dfb90239a 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
@@ -45,7 +45,7 @@
 public class DefaultApacheHttpClientBuilder implements ApacheHttpClientBuilder {
   protected final Logger log = LoggerFactory.getLogger(DefaultApacheHttpClientBuilder.class);
   private final AtomicBoolean prepared = new AtomicBoolean(false);
-  private int connectionRequestTimeout = 3000;
+  private int connectionRequestTimeout = -1;
   private int connectionTimeout = 5000;
   private int soTimeout = 5000;
   private int idleConnTimeout = 60000;

From 8805e97e625edd25233fce620c611998ec4ee126 Mon Sep 17 00:00:00 2001
From: yuanqixun <yuanqixun@163.com>
Date: Thu, 30 Apr 2020 17:00:39 +0800
Subject: [PATCH 078/114] =?UTF-8?q?:new:=20#1538=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=BC=81=E4=B8=9A=E6=8E=88=E6=9D=83=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/cp/api/WxCpTpService.java  |  11 +
 .../cp/api/impl/BaseWxCpTpServiceImpl.java    |  14 +-
 .../weixin/cp/bean/WxCpTpAuthInfo.java        | 204 ++++++++++++++++++
 .../cp/bean/WxCpTpPermanentCodeInfo.java      |   2 +-
 .../weixin/cp/constant/WxCpApiPathConsts.java |   1 +
 .../api/impl/BaseWxCpTpServiceImplTest.java   |  73 +++++++
 6 files changed, 300 insertions(+), 5 deletions(-)
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAuthInfo.java

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTpService.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTpService.java
index 0c9a0a0a41..ad2f403af6 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTpService.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpTpService.java
@@ -6,6 +6,7 @@
 import me.chanjar.weixin.common.util.http.RequestExecutor;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.cp.bean.WxCpMaJsCode2SessionResult;
+import me.chanjar.weixin.cp.bean.WxCpTpAuthInfo;
 import me.chanjar.weixin.cp.bean.WxCpTpCorp;
 import me.chanjar.weixin.cp.bean.WxCpTpPermanentCodeInfo;
 import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
@@ -119,6 +120,16 @@ public interface WxCpTpService {
    */
   String getPreAuthUrl(String redirectUri,String state) throws WxErrorException;
 
+  /**
+   * 获取企业的授权信息
+   *
+   * @param authCorpId 授权企业的corpId
+   * @param permanentCode 授权企业的永久授权码
+   * @return
+   * @throws WxErrorException
+   */
+  WxCpTpAuthInfo getAuthInfo(String authCorpId,String permanentCode) throws WxErrorException;
+
   /**
    * 当本Service没有实现某个API的时候，可以用这个，针对所有微信API中的GET请求.
    *
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImpl.java
index bbc8e3c18c..dea647f3f9 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImpl.java
@@ -16,10 +16,7 @@
 import me.chanjar.weixin.common.util.http.SimpleGetRequestExecutor;
 import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
 import me.chanjar.weixin.cp.api.WxCpTpService;
-import me.chanjar.weixin.cp.bean.WxCpMaJsCode2SessionResult;
-import me.chanjar.weixin.cp.bean.WxCpTpCorp;
-import me.chanjar.weixin.cp.bean.WxCpTpPermanentCodeInfo;
-import me.chanjar.weixin.cp.bean.WxCpTpPreauthCode;
+import me.chanjar.weixin.cp.bean.*;
 import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
 import org.apache.commons.lang3.StringUtils;
 
@@ -148,6 +145,15 @@ public String getPreAuthUrl(String redirectUri,String state) throws WxErrorExcep
     return preAuthUrl;
   }
 
+  @Override
+  public WxCpTpAuthInfo getAuthInfo(String authCorpId, String permanentCode) throws WxErrorException{
+    JsonObject jsonObject = new JsonObject();
+    jsonObject.addProperty("auth_corpid", authCorpId);
+    jsonObject.addProperty("permanent_code", permanentCode);
+    String result = post(configStorage.getApiUrl(GET_AUTH_INFO), jsonObject.toString());
+    return WxCpTpAuthInfo.fromJson(result);
+  }
+
   @Override
   public String get(String url, String queryParam) throws WxErrorException {
     return execute(SimpleGetRequestExecutor.create(this), url, queryParam);
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAuthInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAuthInfo.java
new file mode 100644
index 0000000000..e57678b1dc
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAuthInfo.java
@@ -0,0 +1,204 @@
+package me.chanjar.weixin.cp.bean;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+import lombok.Setter;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * 服务商模式获取授权信息
+ *
+ * @author Daniel Qian
+ */
+@Getter
+@Setter
+public class WxCpTpAuthInfo extends WxCpBaseResp {
+
+  private static final long serialVersionUID = -5028321625140879571L;
+
+  /**
+   * 服务商信息
+   */
+  @SerializedName("dealer_corp_info")
+  private DealerCorpInfo dealerCorpInfo;
+
+  /**
+   * 授权企业信息
+   */
+  @SerializedName("auth_corp_info")
+  private AuthCorpInfo authCorpInfo;
+
+  /**
+   * 授权信息。如果是通讯录应用，且没开启实体应用，是没有该项的。通讯录应用拥有企业通讯录的全部信息读写权限
+   */
+  @SerializedName("auth_info")
+  private AuthInfo authInfo;
+
+  @Getter
+  @Setter
+  public static class DealerCorpInfo {
+    @SerializedName("corpid")
+    private String corpId;
+
+    @SerializedName("corp_name")
+    private String corpName;
+  }
+
+  @Getter
+  @Setter
+  public static class AuthCorpInfo {
+    @SerializedName("corpid")
+    private String corpId;
+
+    @SerializedName("corp_name")
+    private String corpName;
+
+    @SerializedName("corp_type")
+    private String corpType;
+
+    @SerializedName("corp_square_logo_url")
+    private String corpSquareLogoUrl;
+
+    @SerializedName("corp_round_logo_url")
+    private String corpRoundLogoUrl;
+
+    @SerializedName("corp_user_max")
+    private String corpUserMax;
+
+    @SerializedName("corp_agent_max")
+    private String corpAgentMax;
+
+    /**
+     * 所绑定的企业微信主体名称(仅认证过的企业有)
+     */
+    @SerializedName("corp_full_name")
+    private String corpFullName;
+
+    /**
+     * 认证到期时间
+     */
+    @SerializedName("verified_end_time")
+    private Long verifiedEndTime;
+
+    /**
+     * 企业类型，1. 企业; 2. 政府以及事业单位; 3. 其他组织, 4.团队号
+     */
+    @SerializedName("subject_type")
+    private Integer subjectType;
+
+    /**
+     * 授权企业在微工作台（原企业号）的二维码，可用于关注微工作台
+     */
+    @SerializedName("corp_wxqrcode")
+    private String corpWxqrcode;
+
+    @SerializedName("corp_scale")
+    private String corpScale;
+
+    @SerializedName("corp_industry")
+    private String corpIndustry;
+
+    @SerializedName("corp_sub_industry")
+    private String corpSubIndustry;
+
+    @SerializedName("location")
+    private String location;
+
+  }
+
+  /**
+   * 授权信息
+   */
+  @Getter
+  @Setter
+  public static class AuthInfo {
+
+    /**
+     * 授权的应用信息，注意是一个数组，但仅旧的多应用套件授权时会返回多个agent，对新的单应用授权，永远只返回一个agent
+     */
+    @SerializedName("agent")
+    private List<Agent> agent;
+
+  }
+
+  @Getter
+  @Setter
+  public static class Agent {
+    @SerializedName("agentid")
+    private Integer agentid;
+
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("round_logo_url")
+    private String roundLogoUrl;
+
+    @SerializedName("square_logo_url")
+    private String squareLogoUrl;
+
+    /**
+     * 旧的多应用套件中的对应应用id，新开发者请忽略
+     */
+    @SerializedName("appid")
+    @Deprecated
+    private String appid;
+
+    /**
+     * 应用权限
+     */
+    @SerializedName("privilege")
+    private Privilege privilege;
+
+  }
+
+  /**
+   * 应用对应的权限
+   */
+  @Getter
+  @Setter
+  public static class Privilege {
+
+    /**
+     * 权限等级。
+     * 1:通讯录基本信息只读
+     * 2:通讯录全部信息只读
+     * 3:通讯录全部信息读写
+     * 4:单个基本信息只读
+     * 5:通讯录全部信息只写
+     */
+    @SerializedName("level")
+    private Integer level;
+
+    @SerializedName("allow_party")
+    private List<Integer> allowParty;
+
+    @SerializedName("allow_user")
+    private List<String> allowUser;
+
+    @SerializedName("allow_tag")
+    private List<Integer> allowTag;
+
+    @SerializedName("extra_party")
+    private List<Integer> extraParty;
+
+    @SerializedName("extra_user")
+    private List<String> extraUser;
+
+    @SerializedName("extra_tag")
+    private List<Integer> extraTag;
+
+
+  }
+
+
+  public static WxCpTpAuthInfo fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpTpAuthInfo.class);
+  }
+
+  public String toJson() {
+    return WxCpGsonBuilder.create().toJson(this);
+  }
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
index c703c28a69..cb5bb85e39 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 /**
- * 微信部门.
+ * 服务商模式获取永久授权码信息
  *
  * @author Daniel Qian
  */
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
index da3774ca8d..f10a4dd124 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java
@@ -94,6 +94,7 @@ public static class Tp {
     public static final String GET_SUITE_TOKEN = "/cgi-bin/service/get_suite_token";
     public static final String GET_PROVIDER_TOKEN = "/cgi-bin/service/get_provider_token";
     public static final String GET_PREAUTH_CODE = "/cgi-bin/service/get_pre_auth_code";
+    public static final String GET_AUTH_INFO = "/cgi-bin/service/get_auth_info";
   }
 
   public static class User {
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
index e8e813b04b..b8e572eb29 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
@@ -4,6 +4,7 @@
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.api.WxCpTpService;
+import me.chanjar.weixin.cp.bean.WxCpTpAuthInfo;
 import me.chanjar.weixin.cp.bean.WxCpTpCorp;
 import me.chanjar.weixin.cp.bean.WxCpTpPermanentCodeInfo;
 import me.chanjar.weixin.cp.config.WxCpTpConfigStorage;
@@ -11,6 +12,7 @@
 import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
 import org.testng.annotations.Test;
 
+import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Tp.GET_AUTH_INFO;
 import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Tp.GET_PERMANENT_CODE;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
@@ -196,6 +198,77 @@ public void testGetPermanentCodeInfo() throws WxErrorException{
     assertNotNull(tpPermanentCodeInfo.getAuthCorpInfo().getCorpSquareLogoUrl());
   }
 
+  @Test
+  public void testGetAuthInfo() throws WxErrorException{
+    String returnJson = "{\n" +
+      "    \"errcode\":0 ,\n" +
+      "    \"errmsg\":\"ok\" ,\n" +
+      "    \"dealer_corp_info\": \n" +
+      "    {\n" +
+      "        \"corpid\": \"xxxx\",\n" +
+      "        \"corp_name\": \"name\"\n" +
+      "    },\n" +
+      "    \"auth_corp_info\": \n" +
+      "    {\n" +
+      "        \"corpid\": \"xxxx\",\n" +
+      "        \"corp_name\": \"name\",\n" +
+      "        \"corp_type\": \"verified\",\n" +
+      "        \"corp_square_logo_url\": \"yyyyy\",\n" +
+      "        \"corp_user_max\": 50,\n" +
+      "        \"corp_agent_max\": 30,\n" +
+      "        \"corp_full_name\":\"full_name\",\n" +
+      "        \"verified_end_time\":1431775834,\n" +
+      "        \"subject_type\": 1,\n" +
+      "        \"corp_wxqrcode\": \"zzzzz\",\n" +
+      "        \"corp_scale\": \"1-50人\",\n" +
+      "        \"corp_industry\": \"IT服务\",\n" +
+      "        \"corp_sub_industry\": \"计算机软件/硬件/信息服务\",\n" +
+      "        \"location\":\"广东省广州市\"\n" +
+      "    },\n" +
+      "    \"auth_info\":\n" +
+      "    {\n" +
+      "        \"agent\" :\n" +
+      "        [\n" +
+      "            {\n" +
+      "                \"agentid\":1,\n" +
+      "                \"name\":\"NAME\",\n" +
+      "                \"round_logo_url\":\"xxxxxx\",\n" +
+      "                \"square_logo_url\":\"yyyyyy\",\n" +
+      "                \"appid\":1,\n" +
+      "                \"privilege\":\n" +
+      "                {\n" +
+      "                    \"level\":1,\n" +
+      "                    \"allow_party\":[1,2,3],\n" +
+      "                    \"allow_user\":[\"zhansan\",\"lisi\"],\n" +
+      "                    \"allow_tag\":[1,2,3],\n" +
+      "                    \"extra_party\":[4,5,6],\n" +
+      "                    \"extra_user\":[\"wangwu\"],\n" +
+      "                    \"extra_tag\":[4,5,6]\n" +
+      "                }\n" +
+      "            },\n" +
+      "            {\n" +
+      "                \"agentid\":2,\n" +
+      "                \"name\":\"NAME2\",\n" +
+      "                \"round_logo_url\":\"xxxxxx\",\n" +
+      "                \"square_logo_url\":\"yyyyyy\",\n" +
+      "                \"appid\":5\n" +
+      "            }\n" +
+      "        ]\n" +
+      "    }\n" +
+      "}\n";
+
+    final WxCpTpConfigStorage configStorage = new WxCpTpDefaultConfigImpl();
+    tpService.setWxCpTpConfigStorage(configStorage);
+    JsonObject jsonObject = new JsonObject();
+    String authCorpId = "xxxxx";
+    String permanentCode = "xxxxx";
+    jsonObject.addProperty("auth_corpid", authCorpId);
+    jsonObject.addProperty("permanent_code", permanentCode);
+    doReturn(returnJson).when(tpService).post(configStorage.getApiUrl(GET_AUTH_INFO), jsonObject.toString());
+    WxCpTpAuthInfo authInfo = tpService.getAuthInfo(authCorpId,permanentCode);
+    assertNotNull(authInfo.getAuthCorpInfo().getCorpId());
+  }
+
   @Test
   public void testGet() {
   }

From a90793885aaab33c083ad2eafa5b1d865e87b291 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 2 May 2020 21:07:38 +0800
Subject: [PATCH 079/114] =?UTF-8?q?:arrow=5Fup:=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BE=9D=E8=B5=96jar=E5=8C=85=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 18 +++++++-------
 weixin-java-miniapp/pom.xml                   |  2 +-
 .../mp/api/impl/WxMpServiceJoddHttpImpl.java  |  2 +-
 .../qrcode/QrCodeJoddHttpRequestExecutor.java |  2 +-
 .../impl/WxMpMemberCardServiceImplTest.java   |  1 -
 .../mp/bean/message/WxMpXmlMessageTest.java   | 24 +++++++++----------
 weixin-java-pay/pom.xml                       |  4 ++--
 7 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index eef2516b48..f7cb82aa06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <httpclient.version>4.5</httpclient.version>
-    <jetty.version>9.4.17.v20190418</jetty.version>
+    <jetty.version>9.4.28.v20200408</jetty.version>
   </properties>
 
   <dependencyManagement>
@@ -130,13 +130,13 @@
       <dependency>
         <groupId>org.jodd</groupId>
         <artifactId>jodd-http</artifactId>
-        <version>3.7.1</version>
+        <version>5.1.4</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>okhttp</artifactId>
-        <version>3.7.0</version>
+        <version>4.5.0</version>
         <scope>provided</scope>
       </dependency>
 
@@ -163,7 +163,7 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.5</version>
+        <version>3.10</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -191,31 +191,31 @@
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>2.9.7</version>
+        <version>2.10.6</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>
-        <version>1.1.11</version>
+        <version>1.2.3</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>com.google.inject</groupId>
         <artifactId>guice</artifactId>
-        <version>3.0</version>
+        <version>4.2.3</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>
-        <version>6.10</version>
+        <version>7.1.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-all</artifactId>
-        <version>1.9.5</version>
+        <version>1.10.19</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 594c40991d..c25c053d99 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.59</version>
+      <version>1.65</version>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
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 6cb0e77313..c57d478776 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
@@ -46,7 +46,7 @@ public void initHttp() {
       httpProxy = new ProxyInfo(ProxyInfo.ProxyType.HTTP, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
     }
 
-    httpClient = JoddHttp.httpConnectionProvider;
+    httpClient = new SocketHttpConnectionProvider();
   }
 
   @Override
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java
index 6945575021..2cbbc20e24 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java
@@ -4,7 +4,7 @@
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
 import jodd.http.ProxyInfo;
-import jodd.util.MimeTypes;
+import jodd.net.MimeTypes;
 import jodd.util.StringPool;
 
 import me.chanjar.weixin.common.WxType;
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
index 96eb671370..7f611ab8a9 100644
--- 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
@@ -95,7 +95,6 @@ public void testGetUserInfo() throws Exception {
   @Test
   public void testUpdateUserMemberCard() throws Exception {
     WxMpMemberCardUpdateMessage updateMessage = new WxMpMemberCardUpdateMessage();
-    updateMessage.setAddBounus(100);
     updateMessage.setBonus(1000);
     updateMessage.setCardId(cardId);
     updateMessage.setCode(code);
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 50bb0ac09d..b8d8843624 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
@@ -79,9 +79,9 @@ public void testFromXml() {
     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.getLocationX().doubleValue(), 23.134521d);
+    assertEquals(wxMessage.getLocationY().doubleValue(), 113.358803d);
+    assertEquals(wxMessage.getScale().doubleValue(), 20d);
     assertEquals(wxMessage.getLabel(), "位置信息");
     assertEquals(wxMessage.getDescription(), "公众平台官网链接");
     assertEquals(wxMessage.getUrl(), "url");
@@ -89,9 +89,9 @@ public void testFromXml() {
     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.getLatitude().doubleValue(), 23.137466);
+    assertEquals(wxMessage.getLongitude().doubleValue(), 113.352425);
+    assertEquals(wxMessage.getPrecision().doubleValue(), 119.385040);
     assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
     assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
     assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L));
@@ -170,9 +170,9 @@ public void testFromXml2() {
     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.getLocationX().doubleValue(), 23.134521d);
+    assertEquals(wxMessage.getLocationY().doubleValue(), 113.358803d);
+    assertEquals(wxMessage.getScale().doubleValue(), 20d);
     assertEquals(wxMessage.getLabel(), "位置信息");
     assertEquals(wxMessage.getDescription(), "公众平台官网链接");
     assertEquals(wxMessage.getUrl(), "url");
@@ -180,9 +180,9 @@ public void testFromXml2() {
     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.getLatitude().doubleValue(), 23.137466);
+    assertEquals(wxMessage.getLongitude().doubleValue(), 113.352425);
+    assertEquals(wxMessage.getPrecision().doubleValue(), 119.385040);
     assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
     assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
     assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L));
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 37156b36fc..2dbe39c2b7 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -38,12 +38,12 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      <version>1.9.3</version>
+      <version>1.9.4</version>
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
-      <version>1.59</version>
+      <version>1.65</version>
     </dependency>
 
     <dependency>

From 561da62060189a5338037dd715815a9e8e0ee8ed Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 2 May 2020 21:17:10 +0800
Subject: [PATCH 080/114] =?UTF-8?q?:bug:=20#1540=20=E4=BF=AE=E5=A4=8DWxDev?=
 =?UTF-8?q?iceBindDeviceResult=E7=B1=BB=E9=87=8C=E7=9A=84Device=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E7=B1=BB=E4=B8=BApublic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/mp/bean/device/WxDeviceBindDeviceResult.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 ec032e8617..6227a6ef44 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
@@ -28,12 +28,12 @@ public static WxDeviceBindDeviceResult fromJson(String json) {
   }
 
   @Data
-  private class Device {
+  public static class Device {
     @SerializedName("device_type")
     private String deviceType;
+
     @SerializedName("device_id")
     private String deviceId;
-
   }
 
 }

From 09100e6766b7b2bd774f6056a04747b1576700f0 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 2 May 2020 21:20:54 +0800
Subject: [PATCH 081/114] =?UTF-8?q?:art:=20#1539=20=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E7=B1=BB=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=A0=81=E7=9A=84msg=E4=BF=A1=E6=81=AF=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/me/chanjar/weixin/common/error/WxMpErrorMsgEnum.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxMpErrorMsgEnum.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxMpErrorMsgEnum.java
index c75f759660..486791986b 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxMpErrorMsgEnum.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxMpErrorMsgEnum.java
@@ -86,9 +86,9 @@ public enum WxMpErrorMsgEnum {
    */
   CODE_40016(40016, "不合法的按钮个数"),
   /**
-   * 不合法的按钮个数.
+   * 不合法的按钮类型.
    */
-  CODE_40017(40017, "不合法的按钮个数"),
+  CODE_40017(40017, "不合法的按钮类型"),
   /**
    * 不合法的按钮名字长度.
    */

From 42d92c02916bff01500918ce533aa1b6df16e9a5 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 2 May 2020 21:24:36 +0800
Subject: [PATCH 082/114] =?UTF-8?q?:art:=20=E8=A7=84=E8=8C=83=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/cp/bean/WxCpTpAuthInfo.java        | 22 ++++++++--------
 .../cp/bean/WxCpTpPermanentCodeInfo.java      | 25 +++++++++----------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAuthInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAuthInfo.java
index e57678b1dc..4354865a28 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAuthInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpAuthInfo.java
@@ -10,12 +10,11 @@
 /**
  * 服务商模式获取授权信息
  *
- * @author Daniel Qian
+ * @author yuanqixun
  */
 @Getter
 @Setter
 public class WxCpTpAuthInfo extends WxCpBaseResp {
-
   private static final long serialVersionUID = -5028321625140879571L;
 
   /**
@@ -92,7 +91,7 @@ public static class AuthCorpInfo {
      * 授权企业在微工作台（原企业号）的二维码，可用于关注微工作台
      */
     @SerializedName("corp_wxqrcode")
-    private String corpWxqrcode;
+    private String corpWxQrcode;
 
     @SerializedName("corp_scale")
     private String corpScale;
@@ -119,7 +118,7 @@ public static class AuthInfo {
      * 授权的应用信息，注意是一个数组，但仅旧的多应用套件授权时会返回多个agent，对新的单应用授权，永远只返回一个agent
      */
     @SerializedName("agent")
-    private List<Agent> agent;
+    private List<Agent> agents;
 
   }
 
@@ -127,7 +126,7 @@ public static class AuthInfo {
   @Setter
   public static class Agent {
     @SerializedName("agentid")
-    private Integer agentid;
+    private Integer agentId;
 
     @SerializedName("name")
     private String name;
@@ -172,23 +171,22 @@ public static class Privilege {
     private Integer level;
 
     @SerializedName("allow_party")
-    private List<Integer> allowParty;
+    private List<Integer> allowParties;
 
     @SerializedName("allow_user")
-    private List<String> allowUser;
+    private List<String> allowUsers;
 
     @SerializedName("allow_tag")
-    private List<Integer> allowTag;
+    private List<Integer> allowTags;
 
     @SerializedName("extra_party")
-    private List<Integer> extraParty;
+    private List<Integer> extraParties;
 
     @SerializedName("extra_user")
-    private List<String> extraUser;
+    private List<String> extraUsers;
 
     @SerializedName("extra_tag")
-    private List<Integer> extraTag;
-
+    private List<Integer> extraTags;
 
   }
 
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
index cb5bb85e39..cd57119d1e 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/WxCpTpPermanentCodeInfo.java
@@ -10,7 +10,7 @@
 /**
  * 服务商模式获取永久授权码信息
  *
- * @author Daniel Qian
+ * @author yunaqixun
  */
 @Getter
 @Setter
@@ -22,7 +22,7 @@ public class WxCpTpPermanentCodeInfo extends WxCpBaseResp {
   private String accessToken;
 
   @SerializedName("expires_in")
-  private Long ExpiresIn;
+  private Long expiresIn;
 
   @SerializedName("permanent_code")
   private String permanentCode;
@@ -92,7 +92,7 @@ public static class AuthCorpInfo {
      * 授权企业在微工作台（原企业号）的二维码，可用于关注微工作台
      */
     @SerializedName("corp_wxqrcode")
-    private String corpWxqrcode;
+    private String corpWxQrcode;
 
     @SerializedName("corp_scale")
     private String corpScale;
@@ -119,7 +119,7 @@ public static class AuthInfo {
      * 授权的应用信息，注意是一个数组，但仅旧的多应用套件授权时会返回多个agent，对新的单应用授权，永远只返回一个agent
      */
     @SerializedName("agent")
-    private List<Agent> agent;
+    private List<Agent> agents;
 
   }
 
@@ -127,7 +127,7 @@ public static class AuthInfo {
   @Setter
   public static class Agent {
     @SerializedName("agentid")
-    private Integer agentid;
+    private Integer agentId;
 
     @SerializedName("name")
     private String name;
@@ -160,7 +160,7 @@ public static class Agent {
   @Setter
   public static class AuthUserInfo {
     @SerializedName("userid")
-    private String userid;
+    private String userId;
 
     @SerializedName("name")
     private String name;
@@ -188,27 +188,26 @@ public static class Privilege {
     private Integer level;
 
     @SerializedName("allow_party")
-    private List<Integer> allowParty;
+    private List<Integer> allowParties;
 
     @SerializedName("allow_user")
-    private List<String> allowUser;
+    private List<String> allowUsers;
 
     @SerializedName("allow_tag")
-    private List<Integer> allowTag;
+    private List<Integer> allowTags;
 
     @SerializedName("extra_party")
-    private List<Integer> extraParty;
+    private List<Integer> extraParties;
 
     @SerializedName("extra_user")
-    private List<String> extraUser;
+    private List<String> extraUsers;
 
     @SerializedName("extra_tag")
-    private List<Integer> extraTag;
+    private List<Integer> extraTags;
 
 
   }
 
-
   public static WxCpTpPermanentCodeInfo fromJson(String json) {
     return WxCpGsonBuilder.create().fromJson(json, WxCpTpPermanentCodeInfo.class);
   }

From 424a835c455180639fb65d80c005867ffb821c84 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 2 May 2020 22:29:32 +0800
Subject: [PATCH 083/114] =?UTF-8?q?:art:=20=E7=A7=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99TicketType=EF=BC=8C=E7=A7=BB=E5=88=B0common=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E8=BF=9B=E8=A1=8C=E5=85=B1=E4=BA=AB=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/common/enums}/TicketType.java      |  7 +++-
 .../cp/api/impl/WxCpServiceJoddHttpImpl.java  |  4 +--
 .../api/impl/BaseWxCpTpServiceImplTest.java   |  6 ++--
 .../weixin/cp/bean/WxCpXmlMessageTest.java    | 12 +++----
 .../impl/WxMaRedisBetterConfigImpl.java       |  2 +-
 .../impl/WxMaRedisConnectionConfigImpl.java   |  9 ++---
 .../me/chanjar/weixin/mp/api/WxMpService.java |  2 +-
 .../mp/api/impl/BaseWxMpServiceImpl.java      |  2 +-
 .../mp/api/impl/WxMpCardServiceImpl.java      |  2 +-
 .../weixin/mp/config/WxMpConfigStorage.java   |  2 +-
 .../mp/config/impl/WxMpDefaultConfigImpl.java |  2 +-
 .../mp/config/impl/WxMpRedisConfigImpl.java   |  2 +-
 .../chanjar/weixin/mp/enums/TicketType.java   | 35 -------------------
 .../mp/api/impl/WxMpServiceImplTest.java      |  2 +-
 .../api/impl/WxOpenInMemoryConfigStorage.java |  4 +--
 .../MaQrCodeJoddHttpRequestExecutor.java      |  2 +-
 16 files changed, 31 insertions(+), 64 deletions(-)
 rename {weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant => weixin-java-common/src/main/java/me/chanjar/weixin/common/enums}/TicketType.java (85%)
 delete mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/TicketType.java

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
similarity index 85%
rename from weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java
rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
index e8b07de0c0..afbd1ec382 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/constant/TicketType.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
@@ -1,4 +1,4 @@
-package cn.binarywang.wx.miniapp.constant;
+package me.chanjar.weixin.common.enums;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -18,10 +18,15 @@ public enum TicketType {
    * jsapi
    */
   JSAPI("jsapi"),
+  /**
+   * sdk
+   */
+  SDK("2"),
   /**
    * 微信卡券
    */
   WX_CARD("wx_card");
+
   /**
    * type代码
    */
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 cc76e9cf4c..6aff7ed530 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
@@ -3,8 +3,8 @@
 import jodd.http.HttpConnectionProvider;
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
-import jodd.http.JoddHttp;
 import jodd.http.ProxyInfo;
+import jodd.http.net.SocketHttpConnectionProvider;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.error.WxError;
@@ -68,7 +68,7 @@ public void initHttp() {
         configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
     }
 
-    httpClient = JoddHttp.httpConnectionProvider;
+    httpClient = new SocketHttpConnectionProvider();
   }
 
   @Override
diff --git a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
index b8e572eb29..1c489e3515 100644
--- a/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
+++ b/weixin-java-cp/src/test/java/me/chanjar/weixin/cp/api/impl/BaseWxCpTpServiceImplTest.java
@@ -133,7 +133,7 @@ public void testGetPermanentCode() throws WxErrorException {
     assertThat(tpCorp.getPermanentCode()).isEqualTo("xxxx");
 
     final WxCpTpPermanentCodeInfo tpPermanentCodeInfo = tpService.getPermanentCodeInfo(authCode);
-    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getAgentid()).isEqualTo(1);
+    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgents().get(0).getAgentId()).isEqualTo(1);
 
   }
 
@@ -193,8 +193,8 @@ public void testGetPermanentCodeInfo() throws WxErrorException{
     jsonObject.addProperty("auth_code", authCode);
     doReturn(returnJson).when(tpService).post(configStorage.getApiUrl(GET_PERMANENT_CODE), jsonObject.toString());
     final WxCpTpPermanentCodeInfo tpPermanentCodeInfo = tpService.getPermanentCodeInfo(authCode);
-    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getAgentid()).isEqualTo(1000012);
-    assertNotNull(tpPermanentCodeInfo.getAuthInfo().getAgent().get(0).getSquareLogoUrl());
+    assertThat(tpPermanentCodeInfo.getAuthInfo().getAgents().get(0).getAgentId()).isEqualTo(1000012);
+    assertNotNull(tpPermanentCodeInfo.getAuthInfo().getAgents().get(0).getSquareLogoUrl());
     assertNotNull(tpPermanentCodeInfo.getAuthCorpInfo().getCorpSquareLogoUrl());
   }
 
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 f10b5d4fc3..0a9f17a626 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
@@ -70,9 +70,9 @@ public void testFromXml() {
     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.getLocationX().doubleValue(), 23.134521d);
+    assertEquals(wxMessage.getLocationY().doubleValue(), 113.358803d);
+    assertEquals(wxMessage.getScale().doubleValue(), 20d);
     assertEquals(wxMessage.getLabel(), "位置信息");
     assertEquals(wxMessage.getDescription(), "公众平台官网链接");
     assertEquals(wxMessage.getUrl(), "url");
@@ -80,9 +80,9 @@ public void testFromXml() {
     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.getLatitude().doubleValue(), 23.137466);
+    assertEquals(wxMessage.getLongitude().doubleValue(), 113.352425);
+    assertEquals(wxMessage.getPrecision().doubleValue(), 119.385040);
     assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
     assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
     assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1));
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
index e53ed198bf..3932531a16 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisBetterConfigImpl.java
@@ -1,6 +1,6 @@
 package cn.binarywang.wx.miniapp.config.impl;
 
-import cn.binarywang.wx.miniapp.constant.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.common.redis.JedisWxRedisOps;
 import me.chanjar.weixin.common.redis.WxRedisOps;
 import redis.clients.jedis.JedisPool;
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConnectionConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConnectionConfigImpl.java
index e48cda2040..0b710aeec5 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConnectionConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedisConnectionConfigImpl.java
@@ -1,5 +1,6 @@
 package cn.binarywang.wx.miniapp.config.impl;
 
+import lombok.RequiredArgsConstructor;
 import redis.clients.jedis.Jedis;
 
 /**
@@ -9,13 +10,9 @@
  * 需要引入依赖<a href="https://github.com/abelaska/jedis-lock">jedis-lock</a>，才能使用该类。
  * </pre>
  */
+@RequiredArgsConstructor
 public class WxMaRedisConnectionConfigImpl extends AbstractWxMaRedisConfig {
-
-  public WxMaRedisConnectionConfigImpl(Jedis jedis) {
-    this.jedis = jedis;
-  }
-
-  private Jedis jedis;
+  private final Jedis jedis;
 
   @Override
   protected Jedis getJedis() {
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 db8d008653..3803ef9793 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
@@ -13,7 +13,7 @@
 import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.enums.WxMpApiUrl;
 
 import java.util.Map;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
index 58ba8446d4..fb4ae5d0dd 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -26,7 +26,7 @@
 import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.enums.WxMpApiUrl;
 import me.chanjar.weixin.mp.util.WxMpConfigStorageHolder;
 import org.apache.commons.lang3.StringUtils;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java
index 1bf61ffe39..faba08acd8 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpCardServiceImpl.java
@@ -13,7 +13,7 @@
 import me.chanjar.weixin.mp.api.WxMpCardService;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.card.*;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.enums.WxMpApiUrl;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 import org.apache.commons.codec.digest.DigestUtils;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java
index 7c3c46292f..d0d7003a25 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/WxMpConfigStorage.java
@@ -3,7 +3,7 @@
 import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.bean.WxMpHostConfig;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 
 import java.io.File;
 import java.util.concurrent.locks.Lock;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java
index 08e7d0830c..0cb350f72d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpDefaultConfigImpl.java
@@ -10,7 +10,7 @@
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
 import me.chanjar.weixin.mp.bean.WxMpHostConfig;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 
 /**
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
index 8460d46414..dbb3878218 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/config/impl/WxMpRedisConfigImpl.java
@@ -3,7 +3,7 @@
 import lombok.Data;
 import me.chanjar.weixin.common.redis.JedisWxRedisOps;
 import me.chanjar.weixin.common.redis.WxRedisOps;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import redis.clients.jedis.JedisPool;
 
 import java.util.concurrent.TimeUnit;
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/TicketType.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/TicketType.java
deleted file mode 100644
index 02de06f6d1..0000000000
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/TicketType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package me.chanjar.weixin.mp.enums;
-
-import lombok.Getter;
-
-/**
- * <pre>
- * ticket类型枚举
- * Created by Binary Wang on 2018/11/18.
- * </pre>
- *
- * @author <a href="https://github.com/binarywang">Binary Wang</a>
- */
-@Getter
-public enum TicketType {
-  /**
-   * jsapi
-   */
-  JSAPI("jsapi"),
-  /**
-   * sdk
-   */
-  SDK("2"),
-  /**
-   * 微信卡券
-   */
-  WX_CARD("wx_card");
-  /**
-   * type代码
-   */
-  private String code;
-
-  TicketType(String code) {
-    this.code = code;
-  }
-}
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 a434144cc1..c450775d25 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
@@ -12,7 +12,7 @@
 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 me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 
 import static org.testng.Assert.*;
 
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
index 966db0612a..bcd6001e5c 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
@@ -7,7 +7,7 @@
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.bean.WxMpHostConfig;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.mp.enums.TicketType;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.open.api.WxOpenConfigStorage;
 import me.chanjar.weixin.open.bean.WxOpenAuthorizerAccessToken;
 import me.chanjar.weixin.open.bean.WxOpenComponentAccessToken;
@@ -78,7 +78,7 @@ public Lock getLockByKey(String key){
     }
     return lock;
   }
-  
+
   @Override
   public WxMpConfigStorage getWxMpConfigStorage(String appId) {
     return new WxOpenInnerConfigStorage(this, appId);
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java
index f376dd4546..c06fbafa74 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/executor/MaQrCodeJoddHttpRequestExecutor.java
@@ -4,7 +4,7 @@
 import jodd.http.HttpRequest;
 import jodd.http.HttpResponse;
 import jodd.http.ProxyInfo;
-import jodd.util.MimeTypes;
+import jodd.net.MimeTypes;
 import jodd.util.StringPool;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.error.WxError;

From 98aef34fdb87ed0b4acdf6667b83419dc9d59e7b Mon Sep 17 00:00:00 2001
From: yuanqixun <yuanqixun@163.com>
Date: Sun, 3 May 2020 21:29:43 +0800
Subject: [PATCH 084/114] =?UTF-8?q?:art:=20#1542=20=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=A8=A1=E5=9D=97=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0Redisson=E7=9A=84=E5=AE=9E=E7=8E=B0=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=88=86=E5=B8=83=E5=BC=8F=E9=94=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 增加Redisson的实现，解决分布式锁问题

* key值重复添加了appid。

Co-authored-by: 袁启勋 <xun.yuan@infoship.cn>
---
 weixin-java-miniapp/pom.xml                   |   4 +
 .../config/impl/WxMaRedissonConfigImpl.java   | 153 ++++++++++++++++++
 .../impl/WxMaRedissonConfigImplTest.java      |  72 +++++++++
 3 files changed, 229 insertions(+)
 create mode 100644 weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
 create mode 100644 weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImplTest.java

diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index c25c053d99..8180d67c94 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -80,6 +80,10 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.redisson</groupId>
+      <artifactId>redisson</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.github.jedis-lock</groupId>
       <artifactId>jedis-lock</artifactId>
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
new file mode 100644
index 0000000000..ef5facb82a
--- /dev/null
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
@@ -0,0 +1,153 @@
+package cn.binarywang.wx.miniapp.config.impl;
+
+import lombok.NonNull;
+import me.chanjar.weixin.common.bean.WxAccessToken;
+import me.chanjar.weixin.common.redis.RedissonWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
+import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RedissonClient;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+/**
+ * 基于Redisson的实现
+ *
+ * @author yuanqixun
+ * @date 2020/5/3
+ */
+public class WxMaRedissonConfigImpl extends WxMaDefaultConfigImpl {
+
+  protected final static String LOCK_KEY = "wechat_ma_lock:";
+  protected final static String MA_ACCESS_TOKEN_KEY = "wechat_ma_access_token_key:";
+  protected final static String MA_JSAPI_TICKET_KEY = "wechat_ma_jsapi_ticket_key:";
+  protected final static String MA_CARD_API_TICKET_KEY = "wechat_ma_card_api_ticket_key:";
+
+  /**
+   * redis 存储的 key 的前缀，可为空
+   */
+  /**
+   * redis 存储的 key 的前缀，可为空
+   */
+  protected String keyPrefix;
+  protected String accessTokenKey;
+  protected String jsapiTicketKey;
+  protected String cardApiTicketKey;
+  protected String lockKey;
+
+  private final WxRedisOps redisOps;
+
+  public WxMaRedissonConfigImpl(@NonNull RedissonClient redissonClient, String keyPrefix) {
+    this(new RedissonWxRedisOps(redissonClient), keyPrefix);
+  }
+
+  public WxMaRedissonConfigImpl(@NonNull RedissonClient redissonClient) {
+    this(redissonClient, null);
+  }
+
+  private WxMaRedissonConfigImpl(@NonNull WxRedisOps redisOps, String keyPrefix) {
+    this.redisOps = redisOps;
+    this.keyPrefix = keyPrefix;
+  }
+
+  @Override
+  public void setAppid(String appid) {
+    super.setAppid(appid);
+    String prefix = StringUtils.isBlank(keyPrefix) ? "" :
+      (StringUtils.endsWith(keyPrefix, ":") ? keyPrefix : (keyPrefix + ":"));
+    lockKey = prefix + LOCK_KEY.concat(appid);
+    accessTokenKey = prefix + MA_ACCESS_TOKEN_KEY.concat(appid);
+    jsapiTicketKey = prefix + MA_JSAPI_TICKET_KEY.concat(appid);
+    cardApiTicketKey = prefix + MA_CARD_API_TICKET_KEY.concat(appid);
+  }
+
+  protected Lock getLockByKey(String key) {
+    return redisOps.getLock(key);
+  }
+
+  @Override
+  public Lock getAccessTokenLock() {
+    return getLockByKey(this.lockKey.concat(":").concat("accessToken"));
+  }
+
+  @Override
+  public Lock getCardApiTicketLock() {
+    return getLockByKey(this.lockKey.concat(":").concat("cardApiTicket"));
+
+  }
+
+  @Override
+  public Lock getJsapiTicketLock() {
+    return getLockByKey(this.lockKey.concat(":").concat("jsapiTicket"));
+  }
+
+  @Override
+  public String getAccessToken() {
+    return redisOps.getValue(this.accessTokenKey);
+  }
+
+  @Override
+  public boolean isAccessTokenExpired() {
+    Long expire = redisOps.getExpire(this.accessTokenKey);
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void updateAccessToken(WxAccessToken accessToken) {
+    redisOps.setValue(this.accessTokenKey, accessToken.getAccessToken(), accessToken.getExpiresIn(), TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateAccessToken(String accessToken, int expiresInSeconds) {
+    redisOps.setValue(this.accessTokenKey, accessToken, expiresInSeconds, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public String getJsapiTicket() {
+    return redisOps.getValue(this.jsapiTicketKey);
+  }
+
+  @Override
+  public boolean isJsapiTicketExpired() {
+    Long expire = redisOps.getExpire(this.jsapiTicketKey);
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void expireJsapiTicket() {
+    redisOps.expire(this.jsapiTicketKey, 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateJsapiTicket(String jsapiTicket, int expiresInSeconds) {
+    redisOps.setValue(this.jsapiTicketKey, jsapiTicket, expiresInSeconds, TimeUnit.SECONDS);
+
+  }
+
+  @Override
+  public String getCardApiTicket() {
+    return redisOps.getValue(cardApiTicketKey);
+  }
+
+  @Override
+  public boolean isCardApiTicketExpired() {
+    Long expire = redisOps.getExpire(this.cardApiTicketKey);
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void expireCardApiTicket() {
+    redisOps.expire(this.cardApiTicketKey, 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateCardApiTicket(String cardApiTicket, int expiresInSeconds) {
+    redisOps.setValue(this.cardApiTicketKey, cardApiTicket, expiresInSeconds, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void expireAccessToken() {
+    redisOps.expire(this.accessTokenKey, 0, TimeUnit.SECONDS);
+  }
+
+}
diff --git a/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImplTest.java b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImplTest.java
new file mode 100644
index 0000000000..d4fb45963d
--- /dev/null
+++ b/weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImplTest.java
@@ -0,0 +1,72 @@
+package cn.binarywang.wx.miniapp.config.impl;
+
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import lombok.SneakyThrows;
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.redisson.config.TransportMode;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+/**
+ * @author yqx
+ * @date 2020/5/3
+ */
+public class WxMaRedissonConfigImplTest {
+
+  WxMaDefaultConfigImpl wxMaConfig;
+
+  @BeforeMethod
+  public void setUp() {
+    Config config = new Config();
+    config.useSingleServer().setAddress("redis://127.0.0.1:6379")
+      .setDatabase(0);
+    config.setTransportMode(TransportMode.NIO);
+    RedissonClient redisson = Redisson.create(config);
+    wxMaConfig = new WxMaRedissonConfigImpl(redisson);
+    wxMaConfig.setAppid("appid12345678");
+    wxMaConfig.updateAccessToken("accessToken", 5); //有效期5秒
+    wxMaConfig.updateJsapiTicket("jsapiTicket", 5);
+    wxMaConfig.updateCardApiTicket("cardApiTicket", 5);
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetAccessToken() {
+    String accessToken = wxMaConfig.getAccessToken();
+    Assert.assertEquals(accessToken, "accessToken");
+    Assert.assertFalse(wxMaConfig.isAccessTokenExpired());
+    Thread.sleep(6000);//休眠6s
+    Assert.assertTrue(wxMaConfig.isAccessTokenExpired());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetJsapiTicket() {
+    String jsapiTicket = wxMaConfig.getJsapiTicket();
+    Assert.assertEquals(jsapiTicket, "jsapiTicket");
+    Assert.assertFalse(wxMaConfig.isJsapiTicketExpired());
+    Thread.sleep(6000);//休眠6s
+    Assert.assertTrue(wxMaConfig.isJsapiTicketExpired());
+  }
+
+  @SneakyThrows
+  @Test
+  public void testGetCardApiTicket() {
+    String cardApiTicket = wxMaConfig.getCardApiTicket();
+    Assert.assertEquals(cardApiTicket, "cardApiTicket");
+    Assert.assertFalse(wxMaConfig.isCardApiTicketExpired());
+    Thread.sleep(6000);//休眠6s
+    Assert.assertTrue(wxMaConfig.isCardApiTicketExpired());
+  }
+
+  @Test
+  public void testIsAccessTokenExpired() {
+    Assert.assertFalse(wxMaConfig.isAccessTokenExpired());
+    wxMaConfig.expireAccessToken();
+    Assert.assertTrue(wxMaConfig.isAccessTokenExpired());
+  }
+}

From eb38e86a78467111d69b5706b2fb7c2d02cc02fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E7=A5=9E?= <981040863@qq.com>
Date: Wed, 6 May 2020 11:01:12 +0800
Subject: [PATCH 085/114] =?UTF-8?q?:new:=20#1544=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0=E6=96=B0=E5=A2=9E=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8userstr=E5=8F=82=E6=95=B0=E8=A7=A3=E7=BB=91=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=E8=80=85=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/open/api/WxOpenMaService.java   |  8 ++++++++
 .../weixin/open/api/impl/WxOpenMaServiceImpl.java  | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
index 2b6e2d13a2..c64156d04a 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMaService.java
@@ -295,6 +295,14 @@ public interface WxOpenMaService extends WxMaService {
    */
   WxOpenResult unbindTester(String wechatid) throws WxErrorException;
 
+  /**
+   * 解除绑定小程序体验者，其他平台绑定的体验者无法获取到wechatid，可用此方法解绑，详见文档
+   * https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/Mini_Programs/unbind_tester.html
+   *
+   * @param userstr 人员对应的唯一字符串， 可通过获取已绑定的体验者列表获取人员对应的字符串
+   */
+  WxOpenResult unbindTesterByUserstr(String userstr) throws WxErrorException;
+
   /**
    * 获得体验者列表
    */
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java
index 1d30a57f19..6cbf584c33 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java
@@ -194,6 +194,20 @@ public WxOpenResult unbindTester(String wechatid) throws WxErrorException {
     return WxMaGsonBuilder.create().fromJson(response, WxOpenResult.class);
   }
 
+  /**
+   * 解除绑定小程序体验者
+   * @param userstr 人员对应的唯一字符串， 可通过获取已绑定的体验者列表获取人员对应的字符串
+   * @return
+   * @throws WxErrorException
+   */
+  @Override
+  public WxOpenResult unbindTesterByUserstr(String userstr) throws WxErrorException {
+    JsonObject paramJson = new JsonObject();
+    paramJson.addProperty("userstr", userstr);
+    String response = post(API_UNBIND_TESTER, GSON.toJson(paramJson));
+    return WxMaGsonBuilder.create().fromJson(response, WxOpenResult.class);
+  }
+
   /**
    * 获得体验者列表
    *

From 8f5a9e0d760951409dddddbd5cf0b359d5107697 Mon Sep 17 00:00:00 2001
From: Howard Liu <liuxinghao1988@gmail.com>
Date: Thu, 7 May 2020 09:33:44 +0800
Subject: [PATCH 086/114] =?UTF-8?q?:bug:=20#1547=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E5=8F=82=E6=95=B0=E5=8C=85=E5=90=AB=E4=B8=AD=E6=96=87?=
 =?UTF-8?q?=E6=97=B6=E5=87=BA=E7=8E=B0=E4=B9=B1=E7=A0=81=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/binarywang/wx/miniapp/util/QrcodeRequestExecutor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeRequestExecutor.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeRequestExecutor.java
index a79f917597..dc0704b6a7 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeRequestExecutor.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/util/QrcodeRequestExecutor.java
@@ -48,7 +48,7 @@ public File execute(String uri, AbstractWxMaQrcodeWrapper qrcodeWrapper, WxType
       );
     }
 
-    httpPost.setEntity(new StringEntity(qrcodeWrapper.toJson()));
+    httpPost.setEntity(new StringEntity(qrcodeWrapper.toJson(), ContentType.APPLICATION_JSON));
 
     try (final CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost);
          final InputStream inputStream = InputStreamResponseHandler.INSTANCE.handleResponse(response)) {

From ef7516c191ad163abb0a6ba4e752aeda0eb96f65 Mon Sep 17 00:00:00 2001
From: 1ibo <422423229@qq.com>
Date: Mon, 11 May 2020 17:45:28 +0800
Subject: [PATCH 087/114] =?UTF-8?q?:new:=20#1556=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E6=88=96=E9=80=80=E6=AC=BE?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E7=9A=84=E6=97=B6=E5=80=99=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?xml=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/notify/WxPayNotifyResponse.java      | 27 +++++++++++++++++++
 .../bean/notify/WxPayNotifyResponseTest.java  | 18 +++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponse.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponse.java
index ed1353284f..3b1cfe7a84 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponse.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponse.java
@@ -60,4 +60,31 @@ public static String success(String msg) {
     return xstream.toXML(response).replace("\n", "").replace("  ", "");
   }
 
+  /**
+   * Fail string.
+   *
+   * @param msg the msg
+   * @return the string
+   */
+  public static String failResp(String msg) {
+    return generateXml(FAIL, msg);
+  }
+
+  /**
+   * Success string.
+   *
+   * @param msg the msg
+   * @return the string
+   */
+  public static String successResp(String msg) {
+    return generateXml(SUCCESS, msg);
+  }
+
+
+  /**
+   * 使用格式化字符串生成xml字符串
+   */
+  private static String generateXml(String code, String msg) {
+    return String.format("<xml><return_code><![CDATA[%s]]></return_code><return_msg><![CDATA[%s]]></return_msg></xml>", code, msg);
+  }
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponseTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponseTest.java
index 1baaa8eadd..60be34e357 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponseTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/bean/notify/WxPayNotifyResponseTest.java
@@ -20,4 +20,22 @@ public void testSuccess() {
       "<return_msg><![CDATA[OK]]></return_msg>" +
       "</xml>");
   }
+
+  @Test
+  public void testSuccessResp() {
+    final String result = WxPayNotifyResponse.successResp("OK");
+    assertThat(result).isEqualTo("<xml>" +
+      "<return_code><![CDATA[SUCCESS]]></return_code>" +
+      "<return_msg><![CDATA[OK]]></return_msg>" +
+      "</xml>");
+  }
+
+  @Test
+  public void testFailResp() {
+    final String result = WxPayNotifyResponse.failResp("500");
+    assertThat(result).isEqualTo("<xml>" +
+      "<return_code><![CDATA[FAIL]]></return_code>" +
+      "<return_msg><![CDATA[500]]></return_msg>" +
+      "</xml>");
+  }
 }

From 95b02d2b9549e7a12aaf3898eeda4cc9113c5092 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 11 May 2020 18:00:25 +0800
Subject: [PATCH 088/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/me/chanjar/weixin/common/enums/TicketType.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
index afbd1ec382..95bcffe857 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/enums/TicketType.java
@@ -21,7 +21,7 @@ public enum TicketType {
   /**
    * sdk
    */
-  SDK("2"),
+  SDK("sdk"),
   /**
    * 微信卡券
    */

From 92ea01e3712dcf846e8d915119a20c647426008c Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Mon, 11 May 2020 18:02:29 +0800
Subject: [PATCH 089/114] =?UTF-8?q?:art:=20#1550=20=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1TaskCardButton=E7=B1=BB=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A0=E5=8F=82=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

---
 .../me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java
index 0ffe49ce58..16182e2344 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/taskcard/TaskCardButton.java
@@ -1,7 +1,9 @@
 package me.chanjar.weixin.cp.bean.taskcard;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * <pre>
@@ -14,6 +16,8 @@
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class TaskCardButton {
   private String key;
   private String name;

From 609b38a9db160b565b985ba6b2f26d45ceb2c516 Mon Sep 17 00:00:00 2001
From: duanhongyi <duanhongyi@users.noreply.github.com>
Date: Tue, 12 May 2020 14:09:15 +0800
Subject: [PATCH 090/114] =?UTF-8?q?:art:=20#1558=20=E4=BF=AE=E5=A4=8DJava9?=
 =?UTF-8?q?=E5=8F=8A=E4=BB=A5=E4=B8=8A=E7=89=88=E6=9C=AC=E6=8A=A5=E9=9D=9E?=
 =?UTF-8?q?=E6=B3=95=E5=8F=8D=E5=B0=84=E8=AD=A6=E5=91=8A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: duanhongyi <duanhongyi@doopai.com>
---
 .../common/util/xml/XStreamInitializer.java   | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
index 639fcf08d1..5fd7ceb2cb 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/xml/XStreamInitializer.java
@@ -1,13 +1,18 @@
 package me.chanjar.weixin.common.util.xml;
 
-import java.io.Writer;
-
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.converters.basic.*;
+import com.thoughtworks.xstream.converters.collections.CollectionConverter;
 import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
+import com.thoughtworks.xstream.converters.reflection.ReflectionConverter;
 import com.thoughtworks.xstream.core.util.QuickWriter;
 import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
 import com.thoughtworks.xstream.io.xml.XppDriver;
+import com.thoughtworks.xstream.security.NoTypePermission;
+import com.thoughtworks.xstream.security.WildcardTypePermission;
+
+import java.io.Writer;
 
 public class XStreamInitializer {
   private static final XppDriver XPP_DRIVER = new XppDriver() {
@@ -41,14 +46,34 @@ public String encodeNode(String name) {
   };
 
   public static XStream getInstance() {
-    XStream xstream = new XStream(new PureJavaReflectionProvider(), XPP_DRIVER);
+    XStream xstream = new XStream(new PureJavaReflectionProvider(), XPP_DRIVER) {
+      // only register the converters we need; other converters generate a private access warning in the console on Java9+...
+      @Override
+      protected void setupConverters() {
+        registerConverter(new NullConverter(), PRIORITY_VERY_HIGH);
+        registerConverter(new IntConverter(), PRIORITY_NORMAL);
+        registerConverter(new FloatConverter(), PRIORITY_NORMAL);
+        registerConverter(new DoubleConverter(), PRIORITY_NORMAL);
+        registerConverter(new LongConverter(), PRIORITY_NORMAL);
+        registerConverter(new ShortConverter(), PRIORITY_NORMAL);
+        registerConverter(new BooleanConverter(), PRIORITY_NORMAL);
+        registerConverter(new ByteConverter(), PRIORITY_NORMAL);
+        registerConverter(new StringConverter(), PRIORITY_NORMAL);
+        registerConverter(new DateConverter(), PRIORITY_NORMAL);
+        registerConverter(new CollectionConverter(getMapper()), PRIORITY_NORMAL);
+        registerConverter(new ReflectionConverter(getMapper(), getReflectionProvider()), PRIORITY_VERY_LOW);
+      }
+    };
     xstream.ignoreUnknownElements();
     xstream.setMode(XStream.NO_REFERENCES);
     XStream.setupDefaultSecurity(xstream);
-    xstream.allowTypesByWildcard(new String[]{
-      "me.chanjar.weixin.**", "cn.binarywang.wx.**", "com.github.binarywang.**"
-    });
+    xstream.autodetectAnnotations(true);
 
+    // setup proper security by limiting which classes can be loaded by XStream
+    xstream.addPermission(NoTypePermission.NONE);
+    xstream.addPermission(new WildcardTypePermission(new String[]{
+      "me.chanjar.weixin.**", "cn.binarywang.wx.**", "com.github.binarywang.**"
+    }));
     xstream.setClassLoader(Thread.currentThread().getContextClassLoader());
     return xstream;
   }

From 058ce62a2b932633931e30762f44c561481dde5f Mon Sep 17 00:00:00 2001
From: Mario Luo <luokaiqiongmou@foxmail.com>
Date: Tue, 12 May 2020 18:17:17 +0800
Subject: [PATCH 091/114] =?UTF-8?q?:bug:=20#1546=20=20=E4=BF=AE=E5=A4=8DWx?=
 =?UTF-8?q?RedisOps=E9=97=AE=E9=A2=98=EF=BC=8C=20#1548=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DWxOpenInMemoryConfigStorage=E9=94=81=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C#1305=20=E5=A2=9E=E5=8A=A0=E5=95=86=E6=88=B7=E7=94=B5?=
 =?UTF-8?q?=E5=AD=90=E5=8F=91=E7=A5=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weixin/common/redis/JedisWxRedisOps.java  |   6 +-
 .../common/redis/RedisTemplateWxRedisOps.java |   6 +-
 .../common/redis/RedissonWxRedisOps.java      |  12 +-
 .../common/redis/CommonWxRedisOpsTest.java    |  51 +++++
 .../common/redis/JedisWxRedisOpsTest.java     |  21 ++
 .../redis/RedisTemplateWxRedisOpsTest.java    |  26 +++
 .../common/redis/RedissonWxRedisOpsTest.java  |  27 +++
 .../mp/api/WxMpMerchantInvoiceService.java    |  85 ++++++++
 .../mp/api/impl/BaseWxMpServiceImpl.java      |  14 +-
 .../impl/WxMpMerchantInvoiceServiceImpl.java  | 119 +++++++++++
 .../merchant/ClearOutInvoiceRequest.java      |  50 +++++
 .../merchant/InvoiceAuthDataRequest.java      |  23 ++
 .../merchant/InvoiceAuthDataResult.java       |  66 ++++++
 .../merchant/InvoiceAuthPageRequest.java      |  52 +++++
 .../merchant/InvoiceAuthPageResult.java       |  22 ++
 .../merchant/InvoiceAuthPageSetting.java      |  61 ++++++
 .../merchant/InvoiceRejectRequest.java        |  30 +++
 .../bean/invoice/merchant/InvoiceResult.java  |  52 +++++
 .../merchant/MakeOutInvoiceRequest.java       | 200 ++++++++++++++++++
 .../invoice/merchant/MerchantContactInfo.java |  22 ++
 .../merchant/MerchantContactInfoWrapper.java  |  16 ++
 .../merchant/MerchantInvoicePlatformInfo.java |  19 ++
 .../MerchantInvoicePlatformInfoWrapper.java   |  15 ++
 .../chanjar/weixin/mp/enums/WxMpApiUrl.java   |  74 +++++++
 .../api/impl/WxOpenInMemoryConfigStorage.java |  23 +-
 25 files changed, 1078 insertions(+), 14 deletions(-)
 create mode 100644 weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
 create mode 100644 weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/JedisWxRedisOpsTest.java
 create mode 100644 weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOpsTest.java
 create mode 100644 weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/RedissonWxRedisOpsTest.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMerchantInvoiceService.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMerchantInvoiceServiceImpl.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataRequest.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataResult.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageRequest.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageResult.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageSetting.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceRejectRequest.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceResult.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MakeOutInvoiceRequest.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantContactInfo.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantContactInfoWrapper.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfo.java
 create mode 100644 weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfoWrapper.java

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
index ede2fcd8bd..b42142943f 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/JedisWxRedisOps.java
@@ -23,7 +23,11 @@ public String getValue(String key) {
   @Override
   public void setValue(String key, String value, int expire, TimeUnit timeUnit) {
     try (Jedis jedis = this.jedisPool.getResource()) {
-      jedis.psetex(key, timeUnit.toMillis(expire), value);
+      if (expire <= 0) {
+        jedis.set(key, value);
+      } else {
+        jedis.psetex(key, timeUnit.toMillis(expire), value);
+      }
     }
   }
 
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
index 0687032871..652cec84a1 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOps.java
@@ -19,7 +19,11 @@ public String getValue(String key) {
 
   @Override
   public void setValue(String key, String value, int expire, TimeUnit timeUnit) {
-    redisTemplate.opsForValue().set(key, value, expire, timeUnit);
+    if (expire <= 0) {
+      redisTemplate.opsForValue().set(key, value);
+    } else {
+      redisTemplate.opsForValue().set(key, value, expire, timeUnit);
+    }
   }
 
   @Override
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedissonWxRedisOps.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedissonWxRedisOps.java
index e06db302e7..d51cd3e1ad 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedissonWxRedisOps.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/redis/RedissonWxRedisOps.java
@@ -19,12 +19,20 @@ public String getValue(String key) {
 
   @Override
   public void setValue(String key, String value, int expire, TimeUnit timeUnit) {
-    redissonClient.getBucket(key).set(value, expire, timeUnit);
+    if (expire <= 0) {
+      redissonClient.getBucket(key).set(value);
+    } else {
+      redissonClient.getBucket(key).set(value, expire, timeUnit);
+    }
   }
 
   @Override
   public Long getExpire(String key) {
-    return redissonClient.getBucket(key).remainTimeToLive();
+    long expire = redissonClient.getBucket(key).remainTimeToLive();
+    if (expire > 0) {
+      expire = expire / 1000;
+    }
+    return expire;
   }
 
   @Override
diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
new file mode 100644
index 0000000000..96ba20ba2b
--- /dev/null
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/CommonWxRedisOpsTest.java
@@ -0,0 +1,51 @@
+package me.chanjar.weixin.common.redis;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class CommonWxRedisOpsTest {
+
+  protected WxRedisOps wxRedisOps;
+  private String key = "access_token";
+  private String value = String.valueOf(System.currentTimeMillis());
+
+  @Test
+  public void testGetValue() {
+    wxRedisOps.setValue(key, value, 3, TimeUnit.SECONDS);
+    Assert.assertEquals(wxRedisOps.getValue(key), value);
+  }
+
+  @Test
+  public void testSetValue() {
+    String key = "access_token", value = String.valueOf(System.currentTimeMillis());
+    wxRedisOps.setValue(key, value, -1, TimeUnit.SECONDS);
+    wxRedisOps.setValue(key, value, 0, TimeUnit.SECONDS);
+    wxRedisOps.setValue(key, value, 1, TimeUnit.SECONDS);
+  }
+
+  @Test
+  public void testGetExpire() {
+    String key = "access_token", value = String.valueOf(System.currentTimeMillis());
+    wxRedisOps.setValue(key, value, -1, TimeUnit.SECONDS);
+    Assert.assertTrue(wxRedisOps.getExpire(key) < 0);
+    wxRedisOps.setValue(key, value, 4, TimeUnit.SECONDS);
+    Long expireSeconds = wxRedisOps.getExpire(key);
+    Assert.assertTrue(expireSeconds <= 4 && expireSeconds >= 0);
+  }
+
+  @Test
+  public void testExpire() {
+    String key = "access_token", value = String.valueOf(System.currentTimeMillis());
+    wxRedisOps.setValue(key, value, -1, TimeUnit.SECONDS);
+    wxRedisOps.expire(key, 4, TimeUnit.SECONDS);
+    Long expireSeconds = wxRedisOps.getExpire(key);
+    Assert.assertTrue(expireSeconds <= 4 && expireSeconds >= 0);
+  }
+
+  @Test
+  public void testGetLock() {
+    Assert.assertNotNull(wxRedisOps.getLock("access_token_lock"));
+  }
+}
diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/JedisWxRedisOpsTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/JedisWxRedisOpsTest.java
new file mode 100644
index 0000000000..2ff2c37b81
--- /dev/null
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/JedisWxRedisOpsTest.java
@@ -0,0 +1,21 @@
+package me.chanjar.weixin.common.redis;
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import redis.clients.jedis.JedisPool;
+
+public class JedisWxRedisOpsTest extends CommonWxRedisOpsTest {
+
+  JedisPool jedisPool;
+
+  @BeforeTest
+  public void init() {
+    this.jedisPool = new JedisPool("127.0.0.1", 6379);
+    this.wxRedisOps = new JedisWxRedisOps(jedisPool);
+  }
+
+  @AfterTest
+  public void destroy() {
+    this.jedisPool.close();
+  }
+}
diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOpsTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOpsTest.java
new file mode 100644
index 0000000000..bf3b35a7cc
--- /dev/null
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/RedisTemplateWxRedisOpsTest.java
@@ -0,0 +1,26 @@
+package me.chanjar.weixin.common.redis;
+
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+
+public class RedisTemplateWxRedisOpsTest extends CommonWxRedisOpsTest {
+
+  StringRedisTemplate redisTemplate;
+
+  @BeforeTest
+  public void init() {
+    JedisConnectionFactory connectionFactory = new JedisConnectionFactory();
+    connectionFactory.setHostName("127.0.0.1");
+    connectionFactory.setPort(6379);
+    connectionFactory.afterPropertiesSet();
+    StringRedisTemplate redisTemplate = new StringRedisTemplate(connectionFactory);
+    this.redisTemplate = redisTemplate;
+    this.wxRedisOps = new RedisTemplateWxRedisOps(this.redisTemplate);
+  }
+
+  @AfterTest
+  public void destroy() {
+  }
+}
diff --git a/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/RedissonWxRedisOpsTest.java b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/RedissonWxRedisOpsTest.java
new file mode 100644
index 0000000000..48cf7b29be
--- /dev/null
+++ b/weixin-java-common/src/test/java/me/chanjar/weixin/common/redis/RedissonWxRedisOpsTest.java
@@ -0,0 +1,27 @@
+package me.chanjar.weixin.common.redis;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.redisson.config.TransportMode;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+
+public class RedissonWxRedisOpsTest extends CommonWxRedisOpsTest {
+
+  RedissonClient redissonClient;
+
+  @BeforeTest
+  public void init() {
+    Config config = new Config();
+    config.useSingleServer().setAddress("redis://127.0.0.1:6379");
+    config.setTransportMode(TransportMode.NIO);
+    this.redissonClient = Redisson.create(config);
+    this.wxRedisOps = new RedissonWxRedisOps(this.redissonClient);
+  }
+
+  @AfterTest
+  public void destroy() {
+    this.redissonClient.shutdown();
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMerchantInvoiceService.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMerchantInvoiceService.java
new file mode 100644
index 0000000000..294fba85bc
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMerchantInvoiceService.java
@@ -0,0 +1,85 @@
+package me.chanjar.weixin.mp.api;
+
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.bean.invoice.merchant.*;
+
+/**
+ * 商户电子发票相关的接口
+ * <p>
+ * 重要!!!, 根据不同开票平台, 以下错误码可能开票成功(开票,冲红), 内部暂时未处理:
+ * 73105: 开票平台开票中，请使用相同的发票请求流水号重试开票
+ * 73107: 发票请求流水正在被处理，请通过查询接口获取结果
+ * 73100: 开票平台错误
+ * <p>
+ * 流程文档: https://developers.weixin.qq.com/doc/offiaccount/WeChat_Invoice/E_Invoice/Vendor_and_Invoicing_Platform_Mode_Instruction.html
+ * 接口文档: https://developers.weixin.qq.com/doc/offiaccount/WeChat_Invoice/E_Invoice/Vendor_API_List.html
+ */
+public interface WxMpMerchantInvoiceService {
+
+  /**
+   * 获取开票授权页链接
+   */
+  InvoiceAuthPageResult getAuthPageUrl(InvoiceAuthPageRequest params) throws WxErrorException;
+
+  /**
+   * 获得用户授权数据
+   */
+  InvoiceAuthDataResult getAuthData(InvoiceAuthDataRequest params) throws WxErrorException;
+
+  /**
+   * 拒绝开票
+   * <p>
+   * 场景: 用户授权填写数据无效
+   * 结果: 用户会收到一条开票失败提示
+   */
+  void rejectInvoice(InvoiceRejectRequest params) throws WxErrorException;
+
+  /**
+   * 开具电子发票
+   */
+  void makeOutInvoice(MakeOutInvoiceRequest params) throws WxErrorException;
+
+  /**
+   * 发票冲红
+   */
+  void clearOutInvoice(ClearOutInvoiceRequest params) throws WxErrorException;
+
+  /**
+   * 查询发票信息
+   *
+   * @param fpqqlsh 发票请求流水号
+   * @param nsrsbh  纳税人识别号
+   */
+  InvoiceResult queryInvoiceInfo(String fpqqlsh, String nsrsbh) throws WxErrorException;
+
+  /**
+   * 设置商户联系方式, 获取授权链接前需要设置商户联系信息
+   */
+  void setMerchantContactInfo(MerchantContactInfo contact) throws WxErrorException;
+
+  /**
+   * 获取商户联系方式
+   */
+  MerchantContactInfo getMerchantContactInfo() throws WxErrorException;
+
+  /**
+   * 配置授权页面字段
+   */
+  void setAuthPageSetting(InvoiceAuthPageSetting authPageSetting) throws WxErrorException;
+
+  /**
+   * 获取授权页面配置
+   */
+  InvoiceAuthPageSetting getAuthPageSetting() throws WxErrorException;
+
+  /**
+   * 设置商户开票平台信息
+   */
+  void setMerchantInvoicePlatform(MerchantInvoicePlatformInfo merchantInvoicePlatformInfo) throws WxErrorException;
+
+  /**
+   * 获取商户开票平台信息
+   */
+  MerchantInvoicePlatformInfo getMerchantInvoicePlatform(MerchantInvoicePlatformInfo merchantInvoicePlatformInfo) throws WxErrorException;
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
index fb4ae5d0dd..d6a625c9b8 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -6,10 +6,13 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.WxType;
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
 import me.chanjar.weixin.common.bean.WxNetCheckResult;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.StandardSessionManager;
@@ -26,7 +29,6 @@
 import me.chanjar.weixin.mp.bean.result.WxMpSemanticQueryResult;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.mp.enums.WxMpApiUrl;
 import me.chanjar.weixin.mp.util.WxMpConfigStorageHolder;
 import org.apache.commons.lang3.StringUtils;
@@ -70,6 +72,10 @@ public abstract class BaseWxMpServiceImpl<H, P> implements WxMpService, RequestH
   private WxMpOcrService ocrService = new WxMpOcrServiceImpl(this);
   private WxMpImgProcService imgProcService = new WxMpImgProcServiceImpl(this);
 
+  @Getter
+  @Setter
+  private WxMpMerchantInvoiceService merchantInvoiceService = new WxMpMerchantInvoiceServiceImpl(this, this.cardService);
+
   private Map<String, WxMpConfigStorage> configStorageMap;
 
   private int retrySleepMillis = 1000;
@@ -359,11 +365,11 @@ protected <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E
         // 强制设置wxMpConfigStorage它的access token过期了，这样在下一次请求里就会刷新access token
         Lock lock = this.getWxMpConfigStorage().getAccessTokenLock();
         lock.lock();
-        try{
-          if(StringUtils.equals(this.getWxMpConfigStorage().getAccessToken(), accessToken)){
+        try {
+          if (StringUtils.equals(this.getWxMpConfigStorage().getAccessToken(), accessToken)) {
             this.getWxMpConfigStorage().expireAccessToken();
           }
-        } catch (Exception ex){
+        } catch (Exception ex) {
           this.getWxMpConfigStorage().expireAccessToken();
         } finally {
           lock.unlock();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMerchantInvoiceServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMerchantInvoiceServiceImpl.java
new file mode 100644
index 0000000000..ffae3ddf12
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMerchantInvoiceServiceImpl.java
@@ -0,0 +1,119 @@
+package me.chanjar.weixin.mp.api.impl;
+
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import lombok.AllArgsConstructor;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpCardService;
+import me.chanjar.weixin.mp.api.WxMpMerchantInvoiceService;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.invoice.merchant.*;
+import me.chanjar.weixin.mp.enums.WxMpApiUrl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Invoice.*;
+
+
+@AllArgsConstructor
+public class WxMpMerchantInvoiceServiceImpl implements WxMpMerchantInvoiceService {
+
+  private WxMpService wxMpService;
+  private WxMpCardService wxMpCardService;
+
+  private final static Gson gson;
+
+  static {
+    gson = new GsonBuilder()
+      .disableHtmlEscaping()
+      .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+      .create();
+  }
+
+  @Override
+  public InvoiceAuthPageResult getAuthPageUrl(InvoiceAuthPageRequest params) throws WxErrorException {
+    String ticket = wxMpCardService.getCardApiTicket();
+    params.setTicket(ticket);
+    return doCommonInvoiceHttpPost(GET_AUTH_URL, params, InvoiceAuthPageResult.class);
+  }
+
+  @Override
+  public InvoiceAuthDataResult getAuthData(InvoiceAuthDataRequest params) throws WxErrorException {
+    return doCommonInvoiceHttpPost(GET_AUTH_DATA, params, InvoiceAuthDataResult.class);
+  }
+
+  @Override
+  public void rejectInvoice(InvoiceRejectRequest params) throws WxErrorException {
+    doCommonInvoiceHttpPost(REJECT_INSERT, params, null);
+  }
+
+  @Override
+  public void makeOutInvoice(MakeOutInvoiceRequest params) throws WxErrorException {
+    doCommonInvoiceHttpPost(MAKE_OUT_INVOICE, params, null);
+  }
+
+  @Override
+  public void clearOutInvoice(ClearOutInvoiceRequest params) throws WxErrorException {
+    doCommonInvoiceHttpPost(CLEAR_OUT_INVOICE, params, null);
+  }
+
+  @Override
+  public InvoiceResult queryInvoiceInfo(String fpqqlsh, String nsrsbh) throws WxErrorException {
+    Map data = new HashMap();
+    data.put("fpqqlsh", fpqqlsh);
+    data.put("nsrsbh", nsrsbh);
+    return doCommonInvoiceHttpPost(QUERY_INVOICE_INFO, data, InvoiceResult.class);
+  }
+
+  @Override
+  public void setMerchantContactInfo(MerchantContactInfo contact) throws WxErrorException {
+    MerchantContactInfoWrapper data = new MerchantContactInfoWrapper();
+    data.setContact(contact);
+    doCommonInvoiceHttpPost(SET_CONTACT_SET_BIZ_ATTR, data, null);
+  }
+
+  @Override
+  public MerchantContactInfo getMerchantContactInfo() throws WxErrorException {
+    MerchantContactInfoWrapper merchantContactInfoWrapper = doCommonInvoiceHttpPost(GET_CONTACT_SET_BIZ_ATTR, null, MerchantContactInfoWrapper.class);
+    return merchantContactInfoWrapper == null ? null : merchantContactInfoWrapper.getContact();
+  }
+
+  @Override
+  public void setAuthPageSetting(InvoiceAuthPageSetting authPageSetting) throws WxErrorException {
+    doCommonInvoiceHttpPost(SET_AUTH_FIELD_SET_BIZ_ATTR, authPageSetting, null);
+  }
+
+  @Override
+  public InvoiceAuthPageSetting getAuthPageSetting() throws WxErrorException {
+    return doCommonInvoiceHttpPost(GET_AUTH_FIELD_SET_BIZ_ATTR, new JsonObject(), InvoiceAuthPageSetting.class);
+  }
+
+  @Override
+  public void setMerchantInvoicePlatform(MerchantInvoicePlatformInfo paymchInfo) throws WxErrorException {
+    MerchantInvoicePlatformInfoWrapper data = new MerchantInvoicePlatformInfoWrapper();
+    data.setPaymchInfo(paymchInfo);
+    doCommonInvoiceHttpPost(SET_PAY_MCH_SET_BIZ_ATTR, data, null);
+  }
+
+  @Override
+  public MerchantInvoicePlatformInfo getMerchantInvoicePlatform(MerchantInvoicePlatformInfo merchantInvoicePlatformInfo) throws WxErrorException {
+    MerchantInvoicePlatformInfoWrapper result = doCommonInvoiceHttpPost(GET_PAY_MCH_SET_BIZ_ATTR, new JsonObject(), MerchantInvoicePlatformInfoWrapper.class);
+    return result == null ? null : result.getPaymchInfo();
+  }
+
+  /**
+   * 电子发票公用post请求方法
+   */
+  private <T> T doCommonInvoiceHttpPost(WxMpApiUrl url, Object data, Class<T> resultClass) throws WxErrorException {
+    String json = "";
+    if (data != null) {
+      json = gson.toJson(data);
+    }
+    String responseText = wxMpService.post(url, json);
+    if (resultClass == null) return null;
+    return gson.fromJson(responseText, resultClass);
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java
new file mode 100644
index 0000000000..108e76ca23
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/ClearOutInvoiceRequest.java
@@ -0,0 +1,50 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 发票充红请求参数
+ */
+@Data
+public class ClearOutInvoiceRequest implements Serializable {
+
+
+  private ClearOutInvoiceInfo invoiceinfo;
+
+  @Data
+  public static class ClearOutInvoiceInfo implements Serializable {
+
+    /**
+     * 用户的openid 用户知道是谁在开票
+     */
+    private String wxopenid;
+
+    /**
+     * 发票请求流水号，唯一查询发票的流水号
+     */
+    private String fpqqlsh;
+
+    /**
+     * 纳税人识别码
+     */
+    private String nsrsbh;
+
+    /**
+     * 纳税人名称
+     */
+    private String nsrmc;
+
+    /**
+     * 原发票代码，即要冲红的蓝票的发票代码
+     */
+    private String yfpdm;
+
+    /**
+     * 原发票号码，即要冲红的蓝票的发票号码
+     */
+    private String yfphm;
+
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataRequest.java
new file mode 100644
index 0000000000..092e16410a
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataRequest.java
@@ -0,0 +1,23 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 获取电子开票用户授权数据
+ */
+@Data
+public class InvoiceAuthDataRequest implements Serializable {
+
+  /**
+   * 开票平台在微信的标识号，商户需要找开票平台提供
+   */
+  private String sPappid;
+
+  /**
+   * 订单id，在商户内单笔开票请求的唯一识别号
+   */
+  private String orderId;
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataResult.java
new file mode 100644
index 0000000000..99d8f57cc6
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthDataResult.java
@@ -0,0 +1,66 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 用户开票认证信息返回结果DTO
+ */
+@Data
+public class InvoiceAuthDataResult implements Serializable {
+
+  /**
+   * 订单授权状态，当errcode为0时会出现
+   */
+  private String invoiceStatus;
+
+  /**
+   * 授权时间，为十位时间戳（utc+8），当errcode为0时会出现
+   */
+  private Long authTime;
+
+  /**
+   * 用户授权信息
+   */
+  private UserAuthInfo userAuthInfo;
+
+  @Data
+  public static class UserAuthInfo implements Serializable {
+    /**
+     * 个人抬头
+     */
+    private UserField userField;
+
+    /**
+     * 单位抬头
+     */
+    private BizField bizField;
+  }
+
+  @Data
+  public static class UserField implements Serializable {
+    private String title;
+    private String phone;
+    private String email;
+    private List<KeyValuePair> customField;
+  }
+
+  @Data
+  public static class BizField implements Serializable {
+    private String title;
+    private String taxNo;
+    private String addr;
+    private String phone;
+    private String bankType;
+    private String bankNo;
+    private List<KeyValuePair> customField;
+  }
+
+  @Data
+  public static class KeyValuePair implements Serializable {
+    private String key;
+    private String value;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageRequest.java
new file mode 100644
index 0000000000..07a8a24e55
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageRequest.java
@@ -0,0 +1,52 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 获取授权地址的输入参数
+ */
+@Data
+public class InvoiceAuthPageRequest implements Serializable {
+
+  /**
+   * 开票平台在微信的标识号，商户需要找开票平台提供
+   */
+  private String sPappid;
+
+  /**
+   * 订单id，在商户内单笔开票请求的唯一识别号
+   */
+  private String orderId;
+
+  /**
+   * 订单金额，以分为单位
+   */
+  private Long money;
+
+  /**
+   * 开票来源
+   */
+  private String source;
+
+  /**
+   * 授权成功后跳转页面。本字段只有在source为H5的时候需要填写，引导用户在微信中进行下一步流程。app开票因为从外部app拉起微信授权页，授权完成后自动回到原来的app，故无需填写。
+   */
+  private String redirectUrl;
+
+  /**
+   * 授权类型，0：开票授权，1：填写字段开票授权，2：领票授权
+   */
+  private Integer type;
+
+  /**
+   * 时间戳单位s
+   */
+  private Long timestamp;
+
+  /**
+   * 内部填充(请务设置)
+   */
+  private String ticket;
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageResult.java
new file mode 100644
index 0000000000..d137adb49a
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageResult.java
@@ -0,0 +1,22 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 获取授权链接返回结果DTO
+ */
+@Data
+public class InvoiceAuthPageResult implements Serializable {
+
+  /**
+   * 授权页地址
+   */
+  private String authUrl;
+
+  /**
+   * 当发起端为小程序时, 返回
+   */
+  private String appid;
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageSetting.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageSetting.java
new file mode 100644
index 0000000000..dbc04816ec
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceAuthPageSetting.java
@@ -0,0 +1,61 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class InvoiceAuthPageSetting implements Serializable {
+
+  private AuthField authField;
+
+  @Data
+  public static class AuthField implements Serializable {
+    private UserField userField;
+    private BizField bizField;
+  }
+
+  @Data
+  public static class UserField implements Serializable {
+    private Integer showTitle;
+    private Integer showPhone;
+    private Integer showEmail;
+    private Integer requirePhone;
+    private Integer requireEmail;
+    private List<InvoiceAuthDataResult.KeyValuePair> customField;
+  }
+
+  @Data
+  public static class BizField implements Serializable {
+    private Integer showTitle;
+    private Integer showTaxNo;
+    private Integer showAddr;
+    private Integer showPhone;
+    private Integer showBankType;
+    private Integer showBankNo;
+
+    private Integer requireTaxNo;
+    private Integer requireAddr;
+    private Integer requirePhone;
+    private Integer requireBankType;
+    private Integer requireBankNo;
+    private List<InvoiceAuthDataResult.KeyValuePair> customField;
+  }
+
+  @Data
+  public static class CustomField implements Serializable {
+    /**
+     * 字段名
+     */
+    private String key;
+    /**
+     * 0：否，1：是， 默认为0
+     */
+    private Integer isRequire;
+    /**
+     * 提示文案
+     */
+    private String notice;
+  }
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceRejectRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceRejectRequest.java
new file mode 100644
index 0000000000..9048ceb059
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceRejectRequest.java
@@ -0,0 +1,30 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import java.io.Serializable;
+
+/**
+ * 拒绝开票请求参数
+ */
+public class InvoiceRejectRequest implements Serializable {
+
+  /**
+   * 开票平台标示
+   */
+  private String sPappid;
+
+  /**
+   * 订单id
+   */
+  private String orderId;
+
+  /**
+   * 拒绝原因
+   */
+  private String reason;
+
+  /**
+   * 引导用户跳转url
+   */
+  private String url;
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceResult.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceResult.java
new file mode 100644
index 0000000000..6f4da63a20
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/InvoiceResult.java
@@ -0,0 +1,52 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 电子发票信息查询结果
+ */
+@Data
+public class InvoiceResult implements Serializable {
+
+  /**
+   * 发票相关信息
+   */
+  private InvoiceDetail invoicedetail;
+
+  @Data
+  public static class InvoiceDetail implements Serializable {
+    /**
+     * 发票流水号
+     */
+    private String fpqqlsh;
+
+    /**
+     * 检验码
+     */
+    private String jym;
+
+    /**
+     * 校验码
+     */
+    private String kprq;
+
+    /**
+     * 发票代码
+     */
+    private String fpdm;
+
+    /**
+     * 发票号码
+     */
+    private String fphm;
+
+    /**
+     * 发票url
+     */
+    private String pdfurl;
+
+  }
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MakeOutInvoiceRequest.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MakeOutInvoiceRequest.java
new file mode 100644
index 0000000000..d9336eac12
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MakeOutInvoiceRequest.java
@@ -0,0 +1,200 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 开票信息请求参数
+ */
+@Data
+public class MakeOutInvoiceRequest implements Serializable {
+
+  private InvoiceInfo invoiceinfo;
+
+  /**
+   * 发票信息
+   */
+  @Data
+  public static class InvoiceInfo implements Serializable {
+    /**
+     * 维修openid
+     */
+    private String wxopenid;
+
+    /**
+     * 订单号
+     */
+    private String ddh;
+
+    /**
+     * 发票请求流水号，唯一识别开票请求的流水号
+     */
+    private String fpqqlsh;
+
+    /**
+     * 纳税人识别码
+     */
+    private String nsrsbh;
+
+    /**
+     * 纳税人名称
+     */
+    private String nsrmc;
+
+    /**
+     * 纳税人地址
+     */
+    private String nsrdz;
+
+    /**
+     * 纳税人电话
+     */
+    private String nsrdh;
+
+    /**
+     * 纳税人开户行
+     */
+    private String nsrbank;
+
+    /**
+     * 纳税人银行账号
+     */
+    private String nsrbankid;
+
+    /**
+     * 购货方名称
+     */
+    private String ghfnsrsbh;
+
+    /**
+     * 购货方识别号
+     */
+    private String ghfmc;
+
+    /**
+     * 购货方地址
+     */
+    private String ghfdz;
+
+    /**
+     * 购货方电话
+     */
+    private String ghfdh;
+
+    /**
+     * 购货方开户行
+     */
+    private String ghfbank;
+
+    /**
+     * 购货方银行帐号
+     */
+    private String ghfbankid;
+
+    /**
+     * 开票人
+     */
+    private String kpr;
+
+    /**
+     * 收款人
+     */
+    private String skr;
+
+    /**
+     * 复核人
+     */
+    private String fhr;
+
+    /**
+     * 价税合计
+     */
+    private String jshj;
+
+    /**
+     * 合计金额
+     */
+    private String hjje;
+
+    /**
+     * 合计税额
+     */
+    private String hjse;
+
+    /**
+     * 备注
+     */
+    private String bz;
+
+    /**
+     * 行业类型 0 商业 1其它
+     */
+    private String hylx;
+
+    /**
+     * 发票商品条目
+     */
+    private List<InvoiceDetailItem> invoicedetailList;
+
+  }
+
+  /**
+   * 发票条目
+   */
+  @Data
+  public static class InvoiceDetailItem implements Serializable {
+    /**
+     * 发票性质
+     */
+    private String fphxz;
+
+    /**
+     * 19位税收分类编码
+     */
+    private String spbm;
+
+    /**
+     * 项目名称
+     */
+    private String xmmc;
+
+    /**
+     * 计量单位
+     */
+    private String dw;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 项目数量
+     */
+    private String xmsl;
+
+    /**
+     * 项目单价
+     */
+    private String xmdj;
+
+    /**
+     * 项目金额 不含税，单位元 两位小数
+     */
+    private String xmje;
+
+    /**
+     * 税率 精确到两位小数 如0.01
+     */
+    private String sl;
+
+    /**
+     * 税额 单位元 两位小数
+     */
+    private String se;
+
+  }
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantContactInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantContactInfo.java
new file mode 100644
index 0000000000..569fffa6b6
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantContactInfo.java
@@ -0,0 +1,22 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 商户联系信息
+ */
+@Data
+public class MerchantContactInfo implements Serializable {
+  /**
+   * 联系电话
+   */
+  private String phone;
+
+  /**
+   * 开票超时时间
+   */
+  private Integer timeout;
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantContactInfoWrapper.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantContactInfoWrapper.java
new file mode 100644
index 0000000000..3ceed2b6d0
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantContactInfoWrapper.java
@@ -0,0 +1,16 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设置商户联系信息和发票过时时间参数
+ */
+@Data
+public class MerchantContactInfoWrapper implements Serializable {
+
+  private MerchantContactInfo contact;
+
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfo.java
new file mode 100644
index 0000000000..f7a64edfc3
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfo.java
@@ -0,0 +1,19 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import java.io.Serializable;
+
+/**
+ * 商户的开票平台信息
+ */
+public class MerchantInvoicePlatformInfo implements Serializable {
+
+  /**
+   * 微信支付商户号
+   */
+  private String mchid;
+
+  /**
+   * 为该商户提供开票服务的开票平台 id ，由开票平台提供给商户
+   */
+  private String sPappid;
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfoWrapper.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfoWrapper.java
new file mode 100644
index 0000000000..0351466164
--- /dev/null
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/invoice/merchant/MerchantInvoicePlatformInfoWrapper.java
@@ -0,0 +1,15 @@
+package me.chanjar.weixin.mp.bean.invoice.merchant;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设置商户联系信息和发票过时时间参数
+ */
+@Data
+public class MerchantInvoicePlatformInfoWrapper implements Serializable {
+
+  private MerchantInvoicePlatformInfo paymchInfo;
+
+}
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java
index cbe3d4df92..9bc0e1de03 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/enums/WxMpApiUrl.java
@@ -1082,4 +1082,78 @@ public String getUrl(WxMpConfigStorage config) {
     }
   }
 
+  @AllArgsConstructor
+  enum Invoice implements WxMpApiUrl {
+
+    /**
+     * 获取用户开票授权地址
+     */
+    GET_AUTH_URL(API_DEFAULT_HOST_URL, "/card/invoice/getauthurl"),
+
+    /**
+     * 获取用户开票授权信息
+     */
+    GET_AUTH_DATA(API_DEFAULT_HOST_URL, "/card/invoice/getauthdata"),
+
+    /**
+     * 拒绝为用户开票
+     */
+    REJECT_INSERT(API_DEFAULT_HOST_URL, "/card/invoice/rejectinsert"),
+
+    /**
+     * 开票
+     */
+    MAKE_OUT_INVOICE(API_DEFAULT_HOST_URL, "/card/invoice/makeoutinvoice"),
+
+    /**
+     * 发票冲红
+     */
+    CLEAR_OUT_INVOICE(API_DEFAULT_HOST_URL, "/card/invoice/clearoutinvoice"),
+
+    /**
+     * 查询发票信息
+     */
+    QUERY_INVOICE_INFO(API_DEFAULT_HOST_URL, "/card/invoice/queryinvoceinfo"),
+
+    /**
+     * 设置商户信息联系
+     */
+    SET_CONTACT_SET_BIZ_ATTR(API_DEFAULT_HOST_URL, "/card/invoice/setbizattr?action=set_contact"),
+
+    /**
+     * 获取商户联系信息
+     */
+    GET_CONTACT_SET_BIZ_ATTR(API_DEFAULT_HOST_URL, "/card/invoice/setbizattr?action=get_contact"),
+
+    /**
+     * 设置授权页面字段
+     */
+    SET_AUTH_FIELD_SET_BIZ_ATTR(API_DEFAULT_HOST_URL, "/card/invoice/setbizattr?action=set_auth_field"),
+
+    /**
+     * 获取授权页面字段
+     */
+    GET_AUTH_FIELD_SET_BIZ_ATTR(API_DEFAULT_HOST_URL, "/card/invoice/setbizattr?action=get_auth_field"),
+
+    /**
+     * 设置关联商户
+     */
+    SET_PAY_MCH_SET_BIZ_ATTR(API_DEFAULT_HOST_URL, "/card/invoice/setbizattr?action=set_pay_mch"),
+
+    /**
+     * 获取关联商户
+     */
+    GET_PAY_MCH_SET_BIZ_ATTR(API_DEFAULT_HOST_URL, "/card/invoice/setbizattr?action=get_pay_mch"),
+    ;
+    private String prefix;
+    private String path;
+
+    @Override
+    public String getUrl(WxMpConfigStorage config) {
+      if (null == config) {
+        return buildUrl(null, prefix, path);
+      }
+      return buildUrl(config.getHostConfig(), prefix, path);
+    }
+  }
 }
diff --git a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
index bcd6001e5c..723ec3806e 100644
--- a/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
+++ b/weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
@@ -4,10 +4,10 @@
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import lombok.Data;
 import me.chanjar.weixin.common.bean.WxAccessToken;
+import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 import me.chanjar.weixin.mp.bean.WxMpHostConfig;
 import me.chanjar.weixin.mp.config.WxMpConfigStorage;
-import me.chanjar.weixin.common.enums.TicketType;
 import me.chanjar.weixin.open.api.WxOpenConfigStorage;
 import me.chanjar.weixin.open.bean.WxOpenAuthorizerAccessToken;
 import me.chanjar.weixin.open.bean.WxOpenComponentAccessToken;
@@ -46,9 +46,6 @@ public class WxOpenInMemoryConfigStorage implements WxOpenConfigStorage {
   private Map<String, Token> cardApiTickets = new ConcurrentHashMap<>();
   private Map<String, Lock> locks = new ConcurrentHashMap<>();
 
-  private Lock componentAccessTokenLock = getLockByKey("componentAccessTokenLock");
-
-
   @Override
   public boolean isComponentAccessTokenExpired() {
     return System.currentTimeMillis() > componentExpiresTime;
@@ -64,11 +61,25 @@ public void updateComponentAccessToken(WxOpenComponentAccessToken componentAcces
     updateComponentAccessToken(componentAccessToken.getComponentAccessToken(), componentAccessToken.getExpiresIn());
   }
 
+  private Lock accessTokenLockInstance;
+
+  @Override
+  public Lock getComponentAccessTokenLock() {
+    if (this.accessTokenLockInstance == null) {
+      synchronized (this) {
+        if (this.accessTokenLockInstance == null) {
+          this.accessTokenLockInstance = getLockByKey("componentAccessTokenLock");
+        }
+      }
+    }
+    return this.accessTokenLockInstance;
+  }
+
   @Override
-  public Lock getLockByKey(String key){
+  public Lock getLockByKey(String key) {
     Lock lock = locks.get(key);
     if (lock == null) {
-      synchronized (WxOpenInMemoryConfigStorage.class){
+      synchronized (this) {
         lock = locks.get(key);
         if (lock == null) {
           lock = new ReentrantLock();

From 189669c20c63151f5e08ed2097372c94b166a477 Mon Sep 17 00:00:00 2001
From: Mario Luo <luokaiqiongmou@foxmail.com>
Date: Tue, 12 May 2020 19:21:54 +0800
Subject: [PATCH 092/114] =?UTF-8?q?:new:=20#1305=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E5=BC=80=E7=94=B5=E5=AD=90=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/bean/message/WxMpXmlMessage.java       | 53 ++++++++++++++++---
 .../mp/constant/WxMpEventConstants.java       | 15 ++++++
 2 files changed, 60 insertions(+), 8 deletions(-)

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 bb93976f31..f6b54a20b2 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
@@ -1,13 +1,5 @@
 package me.chanjar.weixin.mp.bean.message;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-
-import org.apache.commons.io.IOUtils;
-
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamConverter;
 import lombok.Data;
@@ -19,6 +11,13 @@
 import me.chanjar.weixin.mp.util.crypto.WxMpCryptUtil;
 import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
 import me.chanjar.weixin.mp.util.xml.XStreamTransformer;
+import org.apache.commons.io.IOUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 
 /**
  * <pre>
@@ -645,6 +644,44 @@ public class WxMpXmlMessage implements Serializable {
   @XStreamAlias("bizmsgmenuid")
   private String bizMsgMenuId;
 
+  /*------------------ 电子发票 ------------------*/
+  /**
+   * 授权成功的订单号，与失败订单号两者必显示其一
+   */
+  @XStreamAlias("SuccOrderId")
+  private String succOrderId;
+
+  /**
+   * 授权失败的订单号，与成功订单号两者必显示其一
+   */
+  @XStreamAlias("FailOrderId")
+  private String failOrderId;
+
+  /**
+   * 获取授权页链接的AppId
+   */
+  @XStreamAlias("AuthorizeAppId")
+  private String authorizeAppId;
+
+  /**
+   * 授权来源，web：公众号开票，app：app开票，wxa：小程序开票，wap：h5开票
+   */
+  @XStreamAlias("source")
+  private String source;
+
+  /**
+   * 发票请求流水号，唯一识别发票请求的流水号
+   */
+  @XStreamAlias("fpqqlsh")
+  private String fpqqlsh;
+
+  /**
+   * 纳税人识别码
+   */
+  @XStreamAlias("nsrsbh")
+  private String nsrsbh;
+
+
   public static WxMpXmlMessage fromXml(String xml) {
     //修改微信变态的消息内容格式，方便解析
     xml = xml.replace("</PicList><PicList>", "");
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/constant/WxMpEventConstants.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/constant/WxMpEventConstants.java
index 0019816a20..4d7ef4beb5 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/constant/WxMpEventConstants.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/constant/WxMpEventConstants.java
@@ -126,4 +126,19 @@ public static class Qualification {
     public static final String VERIFY_EXPIRED = "verify_expired";
   }
 
+  /**
+   * 电子发票.
+   */
+  public static class Invoice {
+    /**
+     * 用户授权事件.
+     */
+    public static final String USER_AUTHORIZE_INVOICE = "user_authorize_invoice";
+
+    /**
+     * 统一开票接口-异步通知开票结果.
+     */
+    public static final String CLOUD_INVOICE_INVOICERESULT_EVENT = "cloud_invoice_invoiceresult_event";
+  }
+
 }

From 7ee277219e9b3dfbd903a166c40ec5656ce95027 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 12 May 2020 19:42:33 +0800
Subject: [PATCH 093/114] =?UTF-8?q?:art:=20#1549=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AF=81=E4=B9=A6=E8=AF=BB=E5=8F=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C=E6=94=AF=E6=8C=81=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E6=89=93=E8=BF=9Bjar=E5=8C=85=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 c0ca2cf552..c5b6ecf698 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
@@ -145,7 +145,7 @@ public SSLContext initSSLContext() throws WxPayException {
         if (!path.startsWith("/")) {
           path = "/" + path;
         }
-        inputStream = WxPayConfig.class.getResourceAsStream(path);
+        inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
         if (inputStream == null) {
           throw new WxPayException(fileNotFoundMsg);
         }

From a219035bfa766a8249c0c93c2928ab391e5da174 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 12 May 2020 19:43:27 +0800
Subject: [PATCH 094/114] =?UTF-8?q?:art:=20#1559=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=8D=A1=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B8=E5=85=B3=E7=9A=84?=
 =?UTF-8?q?=E5=87=A0=E4=B8=AA=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chanjar/weixin/mp/bean/card/BaseInfo.java | 15 ++++---
 .../weixin/mp/bean/card/BaseInfoUpdate.java   | 43 +++++++++++++++++++
 2 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
index f7ed2ed95c..8d73460d00 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfo.java
@@ -192,13 +192,8 @@ public class BaseInfo implements Serializable {
   @SerializedName("need_push_on_view")
   private boolean needPushOnView;
 
-
   /**
    * 微信小程序开放功能 小程序&卡券打通部分新增8个字段 https://mp.weixin.qq.com/cgi-bin/announce?action=getannouncement&key=1490190158&version=1&lang=zh_CN&platform=2
-   * @return
-   */
-
-  /**
    * 自定义使用入口跳转小程序的user_name，格式为原始id+@app
    */
   @SerializedName("custom_app_brand_user_name")
@@ -229,6 +224,16 @@ public class BaseInfo implements Serializable {
   @SerializedName("promotion_app_brand_pass")
   private String promotionAppBrandPass;
 
+  /**
+   * 小程序的user_name,
+   */
+  @SerializedName("activate_app_brand_user_name")
+  private String activateAppBrandUserName;
+  /**
+   * 激活小程序页面地址
+   */
+  @SerializedName("activate_app_brand_pass")
+  private String activateAppBrandPass;
 
   /**
    *
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java
index 44b92eff4d..b0ec28082d 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/BaseInfoUpdate.java
@@ -160,6 +160,49 @@ public class BaseInfoUpdate implements Serializable {
   @SerializedName("date_info")
   private DateInfo dateInfo;
 
+  /**
+   * 微信小程序开放功能 小程序&卡券打通部分新增8个字段 https://mp.weixin.qq.com/cgi-bin/announce?action=getannouncement&key=1490190158&version=1&lang=zh_CN&platform=2
+   * 自定义使用入口跳转小程序的user_name，格式为原始id+@app
+   */
+  @SerializedName("custom_app_brand_user_name")
+  private String customAppBrandUserName;
+  /**
+   * 自定义使用入口小程序页面地址
+   */
+  @SerializedName("custom_app_brand_pass")
+  private String customAppBrandPass;
+  /**
+   * 小程序的user_name
+   */
+  @SerializedName("center_app_brand_user_name")
+  private String centerAppBrandUserName;
+  /**
+   * 自定义居中使用入口小程序页面地址
+   */
+  @SerializedName("center_app_brand_pass")
+  private String centerAppBrandPass;
+  /**
+   * 小程序的user_name
+   */
+  @SerializedName("promotion_app_brand_user_name")
+  private String promotionAppBrandUserName;
+  /**
+   * 自定义营销入口小程序页面地址
+   */
+  @SerializedName("promotion_app_brand_pass")
+  private String promotionAppBrandPass;
+
+  /**
+   * 小程序的user_name,
+   */
+  @SerializedName("activate_app_brand_user_name")
+  private String activateAppBrandUserName;
+  /**
+   * 激活小程序页面地址
+   */
+  @SerializedName("activate_app_brand_pass")
+  private String activateAppBrandPass;
+
   @Override
   public String toString() {
     return WxMpGsonBuilder.create().toJson(this);

From b87ec9a574e4ec806e878d22172865d0e631d4e1 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 13 May 2020 18:28:18 +0800
Subject: [PATCH 095/114] =?UTF-8?q?:art:=20#1554=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7=E5=8F=96token=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=87=8F=E5=B0=91=E5=88=B7=E6=96=B0=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/binarywang/wx/miniapp/api/impl/WxMaServiceImpl.java    | 4 ++++
 1 file changed, 4 insertions(+)

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 e7608eef0f..dd134d9256 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
@@ -116,6 +116,10 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
     Lock lock = this.getWxMaConfig().getAccessTokenLock();
     lock.lock();
     try {
+      if (!this.getWxMaConfig().isAccessTokenExpired() && !forceRefresh) {
+        return this.getWxMaConfig().getAccessToken();
+      }
+      
       String url = String.format(WxMaService.GET_ACCESS_TOKEN_URL, this.getWxMaConfig().getAppid(),
         this.getWxMaConfig().getSecret());
       try {

From 6186d256970aa58d2a11c96d00f50336a8715d8a Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Wed, 13 May 2020 21:41:52 +0800
Subject: [PATCH 096/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.7.9?=
 =?UTF-8?q?.B=20=E6=B5=8B=E8=AF=95=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7cb82aa06..ce958c390d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.8.B</version>
+  <version>3.7.9.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 34d3c68784..e2bd97aa8d 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index c745342091..722f070abe 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index ac86bf534e..004a709ed1 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 1be01e9433..d6724121e4 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 266a45b871..49bf98e0c4 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index 312850f584..0cd232ea50 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 5fe026ecb0..20cd942369 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 67c821b157..d7d69f48c0 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index 8180d67c94..fd910127a3 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index ad839d35cd..df701ef8cf 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index 0bcfb8ee35..f45b674cb0 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 2dbe39c2b7..946aabe78e 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.8.B</version>
+    <version>3.7.9.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

From cb3f1051219ebd3d177d414efe4e0fb260f998e2 Mon Sep 17 00:00:00 2001
From: yuanqixun <yuanqixun@163.com>
Date: Thu, 14 May 2020 14:14:31 +0800
Subject: [PATCH 097/114] =?UTF-8?q?:new:=20#1562=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=87=AA=E7=A0=94=E5=BA=94=E7=94=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0Redisson=E7=9A=84=E5=AD=98=E5=82=A8=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E5=88=86=E5=B8=83=E5=BC=8F=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 企业微信自研应用，增加Redisson的存储实现，支持分布式锁

* 增加redisson的依赖。

Co-authored-by: 袁启勋 <xun.yuan@infoship.cn>
---
 weixin-java-cp/pom.xml                        |   6 +-
 .../weixin/cp/api/impl/WxCpServiceImpl.java   | 113 +++++++++++++
 .../weixin/cp/config/WxCpConfigStorage.java   |   7 +
 .../cp/config/impl/WxCpDefaultConfigImpl.java |  20 +++
 .../cp/config/impl/WxCpRedisConfigImpl.java   |  17 ++
 .../config/impl/WxCpRedissonConfigImpl.java   | 154 ++++++++++++++++++
 .../config/impl/WxMaRedissonConfigImpl.java   |   3 -
 7 files changed, 316 insertions(+), 4 deletions(-)
 create mode 100644 weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java

diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index d7d69f48c0..3f5a0742ec 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -38,7 +38,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
+    <!--分布式锁支持-->
+    <dependency>
+      <groupId>org.redisson</groupId>
+      <artifactId>redisson</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceImpl.java
index a7538c6ead..016c880fd1 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpServiceImpl.java
@@ -1,12 +1,125 @@
 package me.chanjar.weixin.cp.api.impl;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import me.chanjar.weixin.common.WxType;
+import me.chanjar.weixin.common.bean.WxAccessToken;
+import me.chanjar.weixin.common.error.WxError;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.BasicResponseHandler;
+import org.apache.http.impl.client.CloseableHttpClient;
+
+import java.io.IOException;
+import java.util.concurrent.locks.Lock;
+
+import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.GET_AGENT_CONFIG_TICKET;
+import static me.chanjar.weixin.cp.constant.WxCpApiPathConsts.GET_JSAPI_TICKET;
+
 /**
  * <pre>
  *  默认接口实现类，使用apache httpclient实现
  * Created by Binary Wang on 2017-5-27.
  * </pre>
+ * <pre>
+ * 增加分布式锁（基于WxCpConfigStorage实现）的支持
+ * Updated by yuanqixun on 2020-05-13
+ * </pre>
+ *
  *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public class WxCpServiceImpl extends WxCpServiceApacheHttpClientImpl {
+  @Override
+  public String getAccessToken(boolean forceRefresh) throws WxErrorException {
+    if (!getWxCpConfigStorage().isAccessTokenExpired() && !forceRefresh) {
+      return getWxCpConfigStorage().getAccessToken();
+    }
+    Lock lock = getWxCpConfigStorage().getAccessTokenLock();
+    lock.lock();
+    try {
+      // 拿到锁之后，再次判断一下最新的token是否过期，避免重刷
+      if (!getWxCpConfigStorage().isAccessTokenExpired() && !forceRefresh) {
+        return getWxCpConfigStorage().getAccessToken();
+      }
+      String url = String.format(getWxCpConfigStorage().getApiUrl(WxCpApiPathConsts.GET_TOKEN), this.configStorage.getCorpId(), this.configStorage.getCorpSecret());
+      try {
+        HttpGet httpGet = new HttpGet(url);
+        if (getRequestHttpProxy() != null) {
+          RequestConfig config = RequestConfig.custom()
+            .setProxy(getRequestHttpProxy()).build();
+          httpGet.setConfig(config);
+        }
+        String resultContent;
+        try (CloseableHttpClient httpClient = getRequestHttpClient();
+             CloseableHttpResponse response = httpClient.execute(httpGet)) {
+          resultContent = new BasicResponseHandler().handleResponse(response);
+        } finally {
+          httpGet.releaseConnection();
+        }
+        WxError error = WxError.fromJson(resultContent, WxType.CP);
+        if (error.getErrorCode() != 0) {
+          throw new WxErrorException(error);
+        }
+
+        WxAccessToken accessToken = WxAccessToken.fromJson(resultContent);
+        getWxCpConfigStorage().updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    } finally {
+      lock.unlock();
+    }
+    return getWxCpConfigStorage().getAccessToken();
+  }
+
+  @Override
+  public String getAgentJsapiTicket(boolean forceRefresh) throws WxErrorException {
+    if (forceRefresh) {
+      getWxCpConfigStorage().expireAgentJsapiTicket();
+    }
+    if (getWxCpConfigStorage().isAgentJsapiTicketExpired()) {
+      Lock lock = getWxCpConfigStorage().getAgentJsapiTicketLock();
+      lock.lock();
+      try {
+        // 拿到锁之后，再次判断一下最新的token是否过期，避免重刷
+        if (getWxCpConfigStorage().isAgentJsapiTicketExpired()) {
+          String responseContent = this.get(getWxCpConfigStorage().getApiUrl(GET_AGENT_CONFIG_TICKET), null);
+          JsonObject jsonObject = new JsonParser().parse(responseContent).getAsJsonObject();
+          getWxCpConfigStorage().updateAgentJsapiTicket(jsonObject.get("ticket").getAsString(),
+            jsonObject.get("expires_in").getAsInt());
+        }
+      } finally {
+        lock.unlock();
+      }
+    }
+    return getWxCpConfigStorage().getAgentJsapiTicket();
+  }
+
+  @Override
+  public String getJsapiTicket(boolean forceRefresh) throws WxErrorException {
+    if (forceRefresh) {
+      getWxCpConfigStorage().expireJsapiTicket();
+    }
+
+    if (getWxCpConfigStorage().isJsapiTicketExpired()) {
+      Lock lock = getWxCpConfigStorage().getJsapiTicketLock();
+      lock.lock();
+      try {
+        // 拿到锁之后，再次判断一下最新的token是否过期，避免重刷
+        if (getWxCpConfigStorage().isJsapiTicketExpired()) {
+          String responseContent = this.get(getWxCpConfigStorage().getApiUrl(GET_JSAPI_TICKET), null);
+          JsonObject tmpJsonObject = new JsonParser().parse(responseContent).getAsJsonObject();
+          getWxCpConfigStorage().updateJsapiTicket(tmpJsonObject.get("ticket").getAsString(),
+            tmpJsonObject.get("expires_in").getAsInt());
+        }
+      } finally {
+        lock.unlock();
+      }
+    }
+    return getWxCpConfigStorage().getJsapiTicket();
+  }
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
index c6ccf893b4..19c04f4be1 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/WxCpConfigStorage.java
@@ -4,6 +4,7 @@
 import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientBuilder;
 
 import java.io.File;
+import java.util.concurrent.locks.Lock;
 
 /**
  * 微信客户端配置存储.
@@ -28,6 +29,8 @@ public interface WxCpConfigStorage {
 
   String getAccessToken();
 
+  Lock getAccessTokenLock();
+
   boolean isAccessTokenExpired();
 
   /**
@@ -41,6 +44,8 @@ public interface WxCpConfigStorage {
 
   String getJsapiTicket();
 
+  Lock getJsapiTicketLock();
+
   boolean isJsapiTicketExpired();
 
   /**
@@ -55,6 +60,8 @@ public interface WxCpConfigStorage {
 
   String getAgentJsapiTicket();
 
+  Lock getAgentJsapiTicketLock();
+
   boolean isAgentJsapiTicketExpired();
 
   /**
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
index 9f182180a3..bd407af6db 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpDefaultConfigImpl.java
@@ -8,6 +8,8 @@
 
 import java.io.File;
 import java.io.Serializable;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化.
@@ -22,6 +24,7 @@ public class WxCpDefaultConfigImpl implements WxCpConfigStorage, Serializable {
 
   private volatile String token;
   protected volatile String accessToken;
+  protected Lock accessTokenLock = new ReentrantLock();
   private volatile String aesKey;
   protected volatile Integer agentId;
   private volatile long expiresTime;
@@ -34,9 +37,11 @@ public class WxCpDefaultConfigImpl implements WxCpConfigStorage, Serializable {
   private volatile String httpProxyPassword;
 
   private volatile String jsapiTicket;
+  protected Lock jsapiTicketLock = new ReentrantLock();
   private volatile long jsapiTicketExpiresTime;
 
   private volatile String agentJsapiTicket;
+  protected Lock agentJsapiTicketLock = new ReentrantLock();
   private volatile long agentJsapiTicketExpiresTime;
 
   private volatile File tmpDirFile;
@@ -63,6 +68,11 @@ public String getAccessToken() {
     return this.accessToken;
   }
 
+  @Override
+  public Lock getAccessTokenLock() {
+    return this.accessTokenLock;
+  }
+
   public void setAccessToken(String accessToken) {
     this.accessToken = accessToken;
   }
@@ -93,6 +103,11 @@ public String getJsapiTicket() {
     return this.jsapiTicket;
   }
 
+  @Override
+  public Lock getJsapiTicketLock() {
+    return this.jsapiTicketLock;
+  }
+
   public void setJsapiTicket(String jsapiTicket) {
     this.jsapiTicket = jsapiTicket;
   }
@@ -122,6 +137,11 @@ public String getAgentJsapiTicket() {
     return this.agentJsapiTicket;
   }
 
+  @Override
+  public Lock getAgentJsapiTicketLock() {
+    return this.agentJsapiTicketLock;
+  }
+
   @Override
   public boolean isAgentJsapiTicketExpired() {
     return System.currentTimeMillis() > this.agentJsapiTicketExpiresTime;
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
index 5b48f547fa..eb22bc4c79 100644
--- a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedisConfigImpl.java
@@ -9,6 +9,8 @@
 import redis.clients.jedis.JedisPoolConfig;
 
 import java.io.File;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * <pre>
@@ -89,6 +91,11 @@ public String getAccessToken() {
     }
   }
 
+  @Override
+  public Lock getAccessTokenLock() {
+    return new ReentrantLock();
+  }
+
   @Override
   public boolean isAccessTokenExpired() {
     try (Jedis jedis = this.jedisPool.getResource()) {
@@ -132,6 +139,11 @@ public String getJsapiTicket() {
     }
   }
 
+  @Override
+  public Lock getJsapiTicketLock() {
+    return new ReentrantLock();
+  }
+
   @Override
   public boolean isJsapiTicketExpired() {
     try (Jedis jedis = this.jedisPool.getResource()) {
@@ -170,6 +182,11 @@ public String getAgentJsapiTicket() {
     }
   }
 
+  @Override
+  public Lock getAgentJsapiTicketLock() {
+    return new ReentrantLock();
+  }
+
   @Override
   public boolean isAgentJsapiTicketExpired() {
     try (Jedis jedis = this.jedisPool.getResource()) {
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java
new file mode 100644
index 0000000000..b178578592
--- /dev/null
+++ b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/config/impl/WxCpRedissonConfigImpl.java
@@ -0,0 +1,154 @@
+package me.chanjar.weixin.cp.config.impl;
+
+import lombok.NonNull;
+import me.chanjar.weixin.common.bean.WxAccessToken;
+import me.chanjar.weixin.common.redis.RedissonWxRedisOps;
+import me.chanjar.weixin.common.redis.WxRedisOps;
+import org.apache.commons.lang3.StringUtils;
+import org.redisson.api.RedissonClient;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Lock;
+
+/**
+ * 基于Redisson的实现
+ *
+ * @author yuanqixun
+ * @date 2020/5/13
+ */
+public class WxCpRedissonConfigImpl extends WxCpDefaultConfigImpl {
+  protected final static String LOCK_KEY = "wechat_cp_lock:";
+  protected final static String CP_ACCESS_TOKEN_KEY = "wechat_cp_access_token_key:";
+  protected final static String CP_JSAPI_TICKET_KEY = "wechat_cp_jsapi_ticket_key:";
+  protected final static String CP_AGENT_JSAPI_TICKET_KEY = "wechat_cp_agent_jsapi_ticket_key:";
+
+  /**
+   * redis 存储的 key 的前缀，可为空
+   */
+  protected String keyPrefix;
+  protected String accessTokenKey;
+  protected String jsapiTicketKey;
+  protected String agentJsapiTicketKey;
+  protected String lockKey;
+
+  private final WxRedisOps redisOps;
+
+  public WxCpRedissonConfigImpl(@NonNull RedissonClient redissonClient, String keyPrefix) {
+    this(new RedissonWxRedisOps(redissonClient), keyPrefix);
+  }
+
+  public WxCpRedissonConfigImpl(@NonNull RedissonClient redissonClient) {
+    this(redissonClient, null);
+  }
+
+  private WxCpRedissonConfigImpl(@NonNull WxRedisOps redisOps, String keyPrefix) {
+    this.redisOps = redisOps;
+    this.keyPrefix = keyPrefix;
+  }
+
+  /**
+   * 设置企业微信自研应用ID（整数）,同时初始化相关的redis key，注意要先调用setCorpId，再调用setAgentId
+   *
+   * @param agentId
+   */
+  @Override
+  public void setAgentId(Integer agentId) {
+    super.setAgentId(agentId);
+    String ukey = getCorpId().concat(":").concat(String.valueOf(agentId));
+    String prefix = StringUtils.isBlank(keyPrefix) ? "" :
+      (StringUtils.endsWith(keyPrefix, ":") ? keyPrefix : (keyPrefix + ":"));
+    lockKey = prefix + LOCK_KEY.concat(ukey);
+    accessTokenKey = prefix + CP_ACCESS_TOKEN_KEY.concat(ukey);
+    jsapiTicketKey = prefix + CP_JSAPI_TICKET_KEY.concat(ukey);
+    agentJsapiTicketKey = prefix + CP_AGENT_JSAPI_TICKET_KEY.concat(ukey);
+  }
+
+  protected Lock getLockByKey(String key) {
+    return redisOps.getLock(key);
+  }
+
+  @Override
+  public Lock getAccessTokenLock() {
+    return getLockByKey(this.lockKey.concat(":").concat("accessToken"));
+  }
+
+  @Override
+  public Lock getAgentJsapiTicketLock() {
+    return getLockByKey(this.lockKey.concat(":").concat("agentJsapiTicket"));
+
+  }
+
+  @Override
+  public Lock getJsapiTicketLock() {
+    return getLockByKey(this.lockKey.concat(":").concat("jsapiTicket"));
+  }
+
+  @Override
+  public String getAccessToken() {
+    return redisOps.getValue(this.accessTokenKey);
+  }
+
+  @Override
+  public boolean isAccessTokenExpired() {
+    Long expire = redisOps.getExpire(this.accessTokenKey);
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void updateAccessToken(WxAccessToken accessToken) {
+    redisOps.setValue(this.accessTokenKey, accessToken.getAccessToken(), accessToken.getExpiresIn(), TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateAccessToken(String accessToken, int expiresInSeconds) {
+    redisOps.setValue(this.accessTokenKey, accessToken, expiresInSeconds, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void expireAccessToken() {
+    redisOps.expire(this.accessTokenKey, 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public String getJsapiTicket() {
+    return redisOps.getValue(this.jsapiTicketKey);
+  }
+
+  @Override
+  public boolean isJsapiTicketExpired() {
+    Long expire = redisOps.getExpire(this.jsapiTicketKey);
+    return expire == null || expire < 2;
+  }
+
+  @Override
+  public void expireJsapiTicket() {
+    redisOps.expire(this.jsapiTicketKey, 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateJsapiTicket(String jsapiTicket, int expiresInSeconds) {
+    redisOps.setValue(this.jsapiTicketKey, jsapiTicket, expiresInSeconds, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void expireAgentJsapiTicket() {
+    redisOps.expire(this.agentJsapiTicketKey, 0, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public void updateAgentJsapiTicket(String agentJsapiTicket, int expiresInSeconds) {
+    redisOps.setValue(this.agentJsapiTicketKey, agentJsapiTicket, expiresInSeconds, TimeUnit.SECONDS);
+  }
+
+  @Override
+  public String getAgentJsapiTicket() {
+    return redisOps.getValue(this.agentJsapiTicketKey);
+  }
+
+  @Override
+  public boolean isAgentJsapiTicketExpired() {
+    Long expire = redisOps.getExpire(this.agentJsapiTicketKey);
+    return expire == null || expire < 2;
+  }
+
+}
diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
index ef5facb82a..c45ad50946 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/config/impl/WxMaRedissonConfigImpl.java
@@ -23,9 +23,6 @@ public class WxMaRedissonConfigImpl extends WxMaDefaultConfigImpl {
   protected final static String MA_JSAPI_TICKET_KEY = "wechat_ma_jsapi_ticket_key:";
   protected final static String MA_CARD_API_TICKET_KEY = "wechat_ma_card_api_ticket_key:";
 
-  /**
-   * redis 存储的 key 的前缀，可为空
-   */
   /**
    * redis 存储的 key 的前缀，可为空
    */

From 0bc2cf9adee0b52074b339bac7dd2db0cd0ef422 Mon Sep 17 00:00:00 2001
From: S <sshzh90@gmail.com>
Date: Mon, 18 May 2020 22:15:47 +0800
Subject: [PATCH 098/114] =?UTF-8?q?:bug:=20#1564=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=8D=A1=E5=8C=85=E6=9B=B4=E6=96=B0=E6=8E=A5=E5=8F=A3=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=A4=9A=E4=BD=99=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mp/bean/membercard/WxMpMemberCardUpdateMessage.java    | 7 -------
 1 file changed, 7 deletions(-)

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 bc7d866163..526055b760 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
@@ -39,13 +39,6 @@ public class WxMpMemberCardUpdateMessage implements Serializable {
    * 需要设置的积分全量值，传入的数值会直接显示
    */
   private Integer bonus;
-  /**
-   * 本次积分变动值，传负数代表减少，错误单词，只是为了保持兼容
-   */
-  @Deprecated
-  @SerializedName("add_bonus")
-  private Integer addBounus;
-
 
   /**
    * 本次积分变动值，传负数代表减少

From 8709a9c5a75597022741552faa541abc68f8bbb8 Mon Sep 17 00:00:00 2001
From: spvycf <545997765@qq.com>
Date: Tue, 19 May 2020 16:25:18 +0800
Subject: [PATCH 099/114] =?UTF-8?q?:new:=20#1090=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=88=86=E5=92=8C=E5=85=8D?=
 =?UTF-8?q?=E6=8A=BC=E7=A7=9F=E5=80=9F=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/config/WxPayAutoConfiguration.java    |   7 +
 .../pay/properties/WxPayProperties.java       |  31 +++
 weixin-java-pay/pom.xml                       |  25 +++
 .../wxpay/bean/payscore/NotifyData.java       |  45 ++++
 .../bean/payscore/WxPayScoreRequest.java      | 130 ++++++++++++
 .../wxpay/bean/payscore/WxPayScoreResult.java | 163 +++++++++++++++
 .../binarywang/wxpay/config/WxPayConfig.java  | 119 ++++++++++-
 .../wxpay/service/PayScoreService.java        | 164 +++++++++++++++
 .../wxpay/service/WxPayService.java           |  31 +++
 .../service/impl/BaseWxPayServiceImpl.java    |  11 +-
 .../service/impl/PayScoreServiceImpl.java     | 193 ++++++++++++++++++
 .../impl/WxPayServiceApacheHttpImpl.java      |  88 +++++++-
 .../impl/WxPayServiceJoddHttpImpl.java        |  11 +
 .../binarywang/wxpay/v3/Credentials.java      |  11 +
 .../binarywang/wxpay/v3/SignatureExec.java    |  88 ++++++++
 .../github/binarywang/wxpay/v3/Validator.java |   8 +
 .../wxpay/v3/WechatPayHttpClientBuilder.java  |  75 +++++++
 .../auth/AutoUpdateCertificatesVerifier.java  | 161 +++++++++++++++
 .../wxpay/v3/auth/CertificatesVerifier.java   |  43 ++++
 .../wxpay/v3/auth/PrivateKeySigner.java       |  37 ++++
 .../binarywang/wxpay/v3/auth/Signer.java      |  15 ++
 .../binarywang/wxpay/v3/auth/Verifier.java    |   5 +
 .../wxpay/v3/auth/WechatPay2Credentials.java  |  91 +++++++++
 .../wxpay/v3/auth/WechatPay2Validator.java    |  55 +++++
 .../binarywang/wxpay/v3/util/AesUtils.java    | 107 ++++++++++
 .../binarywang/wxpay/v3/util/PemUtils.java    |  60 ++++++
 26 files changed, 1762 insertions(+), 12 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/NotifyData.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreResult.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/Credentials.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/SignatureExec.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/Validator.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WechatPayHttpClientBuilder.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/CertificatesVerifier.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/PrivateKeySigner.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/Signer.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/Verifier.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Credentials.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Validator.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/AesUtils.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/PemUtils.java

diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
index 43b2114e6e..ed5da834a8 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
@@ -49,6 +49,13 @@ public WxPayService wxPayService() {
     payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
     payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
     payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
+    //以下是apiv3以及支付分相关
+    payConfig.setServiceId(StringUtils.trimToNull(this.properties.getServiceId()));
+    payConfig.setPayScoreNotifyUrl(StringUtils.trimToNull(this.properties.getPayScoreNotifyUrl()));
+    payConfig.setPrivateKeyPath(StringUtils.trimToNull(this.properties.getPrivateKeyPath()));
+    payConfig.setPrivateCertPath(StringUtils.trimToNull(this.properties.getPrivateCertPath()));
+    payConfig.setCertSerialNo(StringUtils.trimToNull(this.properties.getCertSerialNo()));
+    payConfig.setApiv3Key(StringUtils.trimToNull(this.properties.getApiv3Key()));
 
     wxPayService.setConfig(payConfig);
     return wxPayService;
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPayProperties.java b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPayProperties.java
index fe8a215650..940cdf5916 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPayProperties.java
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/properties/WxPayProperties.java
@@ -43,4 +43,35 @@ public class WxPayProperties {
    * apiclient_cert.p12文件的绝对路径，或者如果放在项目中，请以classpath:开头指定.
    */
   private String keyPath;
+
+  /**
+   * 微信支付分serviceId
+   */
+  private String serviceId;
+
+  /**
+   * 证书序列号
+   */
+  private String certSerialNo;
+
+  /**
+   * apiV3秘钥
+   */
+  private String apiv3Key;
+
+  /**
+   * 微信支付分回调地址
+   */
+  private String payScoreNotifyUrl;
+
+  /**
+   * apiv3 商户apiclient_key.pem
+   */
+  private String privateKeyPath;
+
+  /**
+   * apiv3 商户apiclient_cert.pem
+   */
+  private String privateCertPath;
+
 }
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 946aabe78e..68e7a0576b 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -12,6 +12,18 @@
   <artifactId>weixin-java-pay</artifactId>
   <name>WxJava - PAY Java SDK</name>
   <description>微信支付 Java SDK</description>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
   <dependencies>
     <dependency>
@@ -70,6 +82,19 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.7</version>
+    </dependency>
+    <dependency>
+      <groupId>com.alibaba</groupId>
+      <artifactId>fastjson</artifactId>
+      <version>1.2.58</version>
+    </dependency>
+
+
   </dependencies>
 
   <profiles>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/NotifyData.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/NotifyData.java
new file mode 100644
index 0000000000..b46de1f11b
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/NotifyData.java
@@ -0,0 +1,45 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 微信支付分确认订单跟支付回调对象
+ * @author doger.wang
+ * @date 2020/5/14 12:18
+ */
+@NoArgsConstructor
+@Data
+public class NotifyData {
+
+
+  /**
+   * id : EV-2018022511223320873
+   * create_time : 20180225112233
+   * resource_type : encrypt-resource
+   * event_type : PAYSCORE.USER_CONFIRM
+   * resource : {"algorithm":"AEAD_AES_256_GCM","ciphertext":"...","nonce":"...","associated_data":""}
+   */
+
+  private String id;
+  private String create_time;
+  private String resource_type;
+  private String event_type;
+  private Resource resource;
+
+  @NoArgsConstructor
+  @Data
+  public static class Resource {
+    /**
+     * algorithm : AEAD_AES_256_GCM
+     * ciphertext : ...
+     * nonce : ...
+     * associated_data :
+     */
+
+    private String algorithm;
+    private String ciphertext;
+    private String nonce;
+    private String associated_data;
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
new file mode 100644
index 0000000000..7166a31c2f
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
@@ -0,0 +1,130 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author doger.wang
+ * @date 2020/5/12 16:36
+ */
+@NoArgsConstructor
+@Data
+public class WxPayScoreRequest implements Serializable {
+
+
+  private static final long serialVersionUID = 364764508076146082L;
+  /**
+     * out_order_no : 1234323JKHDFE1243252
+     * appid : wxd678efh567hg6787
+     * service_id : 500001
+     * service_introduction : 某某酒店
+     * post_payments : [{"name":"就餐费用服务费","amount":4000,"description":"就餐人均100元服务费：100/小时","count":1}]
+     * post_discounts : [{"name":"满20减1元","description":"不与其他优惠叠加"}]
+     * time_range : {"start_time":"20091225091010","end_time":"20091225121010"}
+     * location : {"start_location":"嗨客时尚主题展餐厅","end_location":"嗨客时尚主题展餐厅"}
+     * risk_fund : {"name":"ESTIMATE_ORDER_COST","amount":10000,"description":"就餐的预估费用"}
+     * attach : Easdfowealsdkjfnlaksjdlfkwqoi&wl3l2sald
+     * notify_url : https://api.test.com
+     * openid : oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+     * need_user_confirm : true
+     */
+
+    private String out_order_no;
+    private String appid;
+    private String service_id;
+    private String service_introduction;
+    private TimeRange time_range;
+    private Location location;
+    private RiskFund risk_fund;
+    private String attach;
+    private String notify_url;
+    private String openid;
+    private boolean need_user_confirm;
+    private boolean profit_sharing;
+    private List<PostPayments> post_payments;
+    private List<PostDiscounts> post_discounts;
+    private int total_amount;
+    private String reason;
+    private String goods_tag;
+    private String type;
+    private Detail detail;
+
+  @NoArgsConstructor
+  @Data
+  public static class Detail {
+    private String paid_time;
+  }
+
+
+
+    @NoArgsConstructor
+    @Data
+    public static class TimeRange {
+        /**
+         * start_time : 20091225091010
+         * end_time : 20091225121010
+         */
+
+        private String start_time;
+        private String end_time;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class Location {
+        /**
+         * start_location : 嗨客时尚主题展餐厅
+         * end_location : 嗨客时尚主题展餐厅
+         */
+
+        private String start_location;
+        private String end_location;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class RiskFund {
+        /**
+         * name : ESTIMATE_ORDER_COST
+         * amount : 10000
+         * description : 就餐的预估费用
+         */
+
+        private String name;
+        private int amount;
+        private String description;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class PostPayments {
+        /**
+         * name : 就餐费用服务费
+         * amount : 4000
+         * description : 就餐人均100元服务费：100/小时
+         * count : 1
+         */
+
+        private String name;
+        private int amount;
+        private String description;
+        private int count;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class PostDiscounts {
+        /**
+         * name : 满20减1元
+         * description : 不与其他优惠叠加
+         */
+
+        private String name;
+        private String description;
+        private int count;
+        private int amount;
+    }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreResult.java
new file mode 100644
index 0000000000..6f72039bc2
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreResult.java
@@ -0,0 +1,163 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author doger.wang
+ * @date 2020/5/12 17:05
+ */
+@NoArgsConstructor
+@Data
+public class WxPayScoreResult implements Serializable {
+
+
+  private static final long serialVersionUID = 8809250065540275770L;
+  /**
+     * appid : wxd678efh567hg6787
+     * mchid : 1230000109
+     * out_order_no : 1234323JKHDFE1243252
+     * service_id : 500001
+     * service_introduction : 某某酒店
+     * state : CREATED
+     * state_description : MCH_COMPLETE
+     * post_payments : [{"name":"就餐费用服务费","amount":4000,"description":"就餐人均100元服务费：100/小时","count":1}]
+     * post_discounts : [{"name":"满20减1元","description":"不与其他优惠叠加"}]
+     * risk_fund : {"name":" ESTIMATE_ORDER_COST","amount":10000,"description":"就餐的预估费用"}
+     * time_range : {"start_time":"20091225091010","end_time":"20091225121010"}
+     * location : {"start_location":"嗨客时尚主题展餐厅","end_location":"嗨客时尚主题展餐厅"}
+     * attach : Easdfowealsdkjfnlaksjdlfkwqoi&wl3l2sald
+     * notify_url : https://api.test.com
+     * order_id : 15646546545165651651
+     * package :  DJIOSQPYWDxsjdldeuwhdodwxasd_dDiodnwjh9we
+     */
+
+    private String appid;
+    private String mchid;
+    private String out_order_no;
+    private String service_id;
+    private String service_introduction;
+    private String state;
+    private String state_description;
+    private RiskFund risk_fund;
+    private TimeRange time_range;
+    private Location location;
+    private String attach;
+    private String notify_url;
+    private String order_id;
+    @JSONField(name = "package")
+    private String packageX;
+    private List<PostPayments> post_payments;
+    private List<PostDiscounts> post_discounts;
+  private boolean need_collection;
+  private Collection collection;
+  //用于跳转的sign注意区分需确认模式和无需确认模式的数据差别。创单接口会返回，查询请自行组装
+  private Map<String, String> payScoreSignInfo;
+
+    @NoArgsConstructor
+    @Data
+    public static class RiskFund {
+        /**
+         * name :  ESTIMATE_ORDER_COST
+         * amount : 10000
+         * description : 就餐的预估费用
+         */
+
+        private String name;
+        private int amount;
+        private String description;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class TimeRange {
+        /**
+         * start_time : 20091225091010
+         * end_time : 20091225121010
+         */
+
+        private String start_time;
+        private String end_time;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class Location {
+        /**
+         * start_location : 嗨客时尚主题展餐厅
+         * end_location : 嗨客时尚主题展餐厅
+         */
+
+        private String start_location;
+        private String end_location;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class PostPayments {
+        /**
+         * name : 就餐费用服务费
+         * amount : 4000
+         * description : 就餐人均100元服务费：100/小时
+         * count : 1
+         */
+
+        private String name;
+        private int amount;
+        private String description;
+        private int count;
+    }
+
+    @NoArgsConstructor
+    @Data
+    public static class PostDiscounts {
+        /**
+         * name : 满20减1元
+         * description : 不与其他优惠叠加
+         */
+
+        private String name;
+        private String description;
+    }
+
+  @NoArgsConstructor
+  @Data
+  public static class Collection {
+    /**
+     * state : USER_PAID
+     * total_amount : 3900
+     * paying_amount : 3000
+     * paid_amount : 900
+     * details : [{"seq":1,"amount":900,"paid_type":"NEWTON","paid_time":"20091225091210","transaction_id":"15646546545165651651"}]
+     */
+
+    private String state;
+    private int total_amount;
+    private int paying_amount;
+    private int paid_amount;
+    private List<Details> details;
+
+    @NoArgsConstructor
+    @Data
+    public static class Details {
+      /**
+       * seq : 1
+       * amount : 900
+       * paid_type : NEWTON
+       * paid_time : 20091225091210
+       * transaction_id : 15646546545165651651
+       */
+
+      private int seq;
+      private int amount;
+      private String paid_type;
+      private String paid_time;
+      private String transaction_id;
+    }
+  }
+}
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 c5b6ecf698..4371afe10b 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
@@ -1,15 +1,25 @@
 package com.github.binarywang.wxpay.config;
 
 import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.v3.WechatPayHttpClientBuilder;
+import com.github.binarywang.wxpay.v3.auth.AutoUpdateCertificatesVerifier;
+import com.github.binarywang.wxpay.v3.auth.PrivateKeySigner;
+import com.github.binarywang.wxpay.v3.auth.WechatPay2Credentials;
+import com.github.binarywang.wxpay.v3.auth.WechatPay2Validator;
+import com.github.binarywang.wxpay.v3.util.PemUtils;
 import lombok.Data;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.ssl.SSLContexts;
 
 import javax.net.ssl.SSLContext;
 import java.io.*;
 import java.net.URL;
 import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
 
 /**
  * 微信支付配置
@@ -85,6 +95,39 @@ public class WxPayConfig {
    */
   private String keyPath;
 
+  /**
+   * apiclient_key.pem证书文件的绝对路径或者以classpath:开头的类路径.
+   */
+  private String privateKeyPath;
+  /**
+   * apiclient_cert.pem证书文件的绝对路径或者以classpath:开头的类路径.
+   */
+  private String privateCertPath;
+
+  /**
+   * apiV3 秘钥值.
+   */
+  private String  apiv3Key;
+
+  /**
+   * apiV3 证书序列号值
+   */
+  private String certSerialNo;
+
+
+  /**
+   * 微信支付分serviceId
+   */
+  private String serviceId;
+
+  /**
+   * 微信支付分回调地址
+   */
+  private String payScoreNotifyUrl;
+
+  private CloseableHttpClient apiv3HttpClient;
+
+
   /**
    * p12证书文件内容的字节数组.
    */
@@ -185,4 +228,78 @@ public SSLContext initSSLContext() throws WxPayException {
     }
   }
 
-}
+
+  /**
+   * @Author doger.wang
+   * @Description 初始化api v3请求头 自动签名验签
+   * 方法参照微信官方https://github.com/wechatpay-apiv3/wechatpay-apache-httpclient
+   * @Date  2020/5/14 10:10
+   * @Param []
+   * @return org.apache.http.impl.client.CloseableHttpClient
+   **/
+  public CloseableHttpClient initApiV3HttpClient()throws WxPayException {
+    String privateKeyPath = this.getPrivateKeyPath();
+    String privateCertPath = this.getPrivateCertPath();
+    String certSerialNo = this.getCertSerialNo();
+    String apiv3Key = this.getApiv3Key();
+    if (StringUtils.isBlank(privateKeyPath)) {
+      throw new WxPayException("请确保privateKeyPath已设置");
+    }
+    if (StringUtils.isBlank(privateCertPath)) {
+      throw new WxPayException("请确保privateCertPath已设置");
+    }
+    if (StringUtils.isBlank(certSerialNo)) {
+      throw new WxPayException("请确保certSerialNo证书序列号已设置");
+    }
+    if (StringUtils.isBlank(apiv3Key)) {
+      throw new WxPayException("请确保apiv3Key值已设置");
+    }
+
+
+    InputStream keyinputStream=null;
+    InputStream certinputStream=null;
+    final String prefix = "classpath:";
+    if (privateKeyPath.startsWith(prefix)) {
+      String keypath = StringUtils.removeFirst(privateKeyPath, prefix);
+      if (!keypath.startsWith("/")) {
+        keypath = "/" + keypath;
+      }
+      keyinputStream = WxPayConfig.class.getResourceAsStream(keypath);
+      if (keyinputStream == null) {
+        throw new WxPayException("证书文件【" + this.getPrivateKeyPath() + "】不存在，请核实！");
+      }
+    }
+
+      if (privateCertPath.startsWith(prefix)) {
+        String certpath = StringUtils.removeFirst(privateCertPath, prefix);
+        if (!certpath.startsWith("/")) {
+          certpath = "/" + certpath;
+        }
+        certinputStream = WxPayConfig.class.getResourceAsStream(certpath);
+        if (certinputStream == null) {
+          throw new WxPayException("证书文件【" + this.getPrivateCertPath() + "】不存在，请核实！");
+        }
+      }
+        CloseableHttpClient httpClient = null;
+        try {
+          WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create();
+          PrivateKey merchantPrivateKey = PemUtils.loadPrivateKey(keyinputStream);
+          X509Certificate x509Certificate = PemUtils.loadCertificate(certinputStream);
+          ArrayList<X509Certificate> certificates = new ArrayList<>();
+          certificates.add(x509Certificate);
+          builder.withMerchant(mchId, certSerialNo, merchantPrivateKey);
+          builder.withWechatpay(certificates);
+          AutoUpdateCertificatesVerifier verifier = new AutoUpdateCertificatesVerifier(
+            new WechatPay2Credentials(mchId, new PrivateKeySigner(certSerialNo, merchantPrivateKey)),
+            apiv3Key.getBytes("utf-8"));
+          builder.withValidator(new WechatPay2Validator(verifier));
+          httpClient = builder.build();
+          this.apiv3HttpClient =httpClient;
+        } catch (Exception e) {
+          throw new WxPayException("v3请求构造异常", e);
+        }
+        return httpClient;
+
+
+    }
+  }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
new file mode 100644
index 0000000000..e85df7f88d
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
@@ -0,0 +1,164 @@
+package com.github.binarywang.wxpay.service;
+
+import com.github.binarywang.wxpay.bean.payscore.NotifyData;
+import com.github.binarywang.wxpay.bean.payscore.WxPayScoreRequest;
+import com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult;
+import com.github.binarywang.wxpay.exception.WxPayException;
+
+import java.net.URISyntaxException;
+
+/**
+ * <pre>
+ *  支付分相关服务类.
+ *   微信支付分是对个人的身份特质、支付行为、使用历史等情况的综合计算分值，旨在为用户提供更简单便捷的生活方式。
+ *   微信用户可以在具体应用场景中，开通微信支付分。开通后，用户可以在【微信—>钱包—>支付分】中查看分数和使用记录。（即需在应用场景中使用过一次，钱包才会出现支付分入口）
+ *
+ *  Created by doger.wang on 2020/05/12.
+ * </pre>
+ *
+ *
+ */
+public interface PayScoreService {
+
+
+
+  /**
+   * <pre>
+   * 支付分创建订单API.
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter1_1.shtml
+   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_1.shtml
+   * </pre>
+   *
+   * @param request 请求对象
+   * @return WxPayScoreResult
+   * @throws WxPayException the wx pay exception
+   */
+  WxPayScoreResult createServiceOrder(WxPayScoreRequest request) throws WxPayException;
+
+
+
+  /**
+   * <pre>
+   * 支付分查询订单API.
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_2.shtml
+   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_2.shtml
+   * </pre>
+   *
+   * @Author doger.wang
+   * @Description
+   * @Date  2020/5/14 15:40
+   * @Param out_order_no, query_id选填一个
+   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
+   **/
+  WxPayScoreResult queryServiceOrder( String out_order_no,String query_id ) throws WxPayException, URISyntaxException;
+
+
+  /**
+   * <pre>
+   * 支付分取消订单API.
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_3.shtml
+   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_3.shtml
+   * </pre>
+   *
+   * @Author doger.wang
+   * @Description
+   * @Date  2020/5/14 15:40
+   * @Param out_order_no reason
+   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
+   **/
+  WxPayScoreResult cancelServiceOrder(String out_order_no,  String reason) throws WxPayException;
+
+  /**
+   * <pre>
+   * 支付分修改订单金额API.
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_4.shtml
+   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_4.shtml
+   * </pre>
+   *
+   * @Author doger.wang
+   * @Description
+   * @Date  2020/5/14 15:40
+   * @Param WxPayScoreRequest
+   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
+   **/
+  WxPayScoreResult modifyServiceOrder(WxPayScoreRequest request) throws WxPayException;
+
+
+  /**
+   * <pre>
+   * 支付分完结订单API.
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_5.shtml
+   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_5.shtml
+   * </pre>
+   *
+   * @Author doger.wang
+   * @Description
+   * @Date  2020/5/14 15:40
+   * @Param WxPayScoreRequest
+   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
+   **/
+  WxPayScoreResult completeServiceOrder(WxPayScoreRequest request) throws WxPayException;
+
+
+  /**
+   * <pre>
+   * 支付分订单收款API.
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_6.shtml
+   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_6.shtml
+   * </pre>
+   *
+   * @Author doger.wang
+   * @Description
+   * @Date  2020/5/14 15:40
+   * @Param out_order_no
+   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
+   **/
+  WxPayScoreResult payServiceOrder(String out_order_no) throws WxPayException;
+
+
+  /**
+   * <pre>
+   * 支付分订单收款API.
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_7.shtml
+   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_7.shtml
+   * </pre>
+   *
+   * @Author doger.wang
+   * @Description
+   * @Date  2020/5/14 15:40
+   * @Param WxPayScoreRequest
+   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
+   **/
+  WxPayScoreResult syncServiceOrder(WxPayScoreRequest request) throws WxPayException;
+
+
+  /**
+   * <pre>
+   * 支付分回调内容解密方法
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter5_2.shtml
+   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter5_2.shtml
+   * </pre>
+   *
+   * @param NotifyData 请求对象
+   * @return WxPayScoreResult
+   */
+  WxPayScoreResult decryptNotifyData(NotifyData data) throws WxPayException;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
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 109ce34b98..ba9de0ffdf 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
@@ -12,6 +12,7 @@
 import com.github.binarywang.wxpay.exception.WxPayException;
 
 import java.io.File;
+import java.net.URI;
 import java.util.Date;
 import java.util.Map;
 
@@ -54,6 +55,27 @@ public interface WxPayService {
    */
   String post(String url, String requestStr, boolean useKey) throws WxPayException;
 
+  /**
+   * 发送post请求，得到响应字符串.
+   *
+   * @param url        请求地址
+   * @param requestStr 请求信息
+   * @return 返回请求结果字符串 string
+   * @throws WxPayException the wx pay exception
+   */
+  String postV3(String url, String requestStr) throws WxPayException;
+
+
+  /**
+   * 发送get V3请求，得到响应字符串.
+   *
+   * @param url        请求地址
+   * @param param 请求信息
+   * @return 返回请求结果字符串 string
+   * @throws WxPayException the wx pay exception
+   */
+  String getV3(URI url) throws WxPayException;
+
   /**
    * 获取企业付款服务类.
    *
@@ -75,6 +97,14 @@ public interface WxPayService {
    */
   ProfitSharingService getProfitSharingService();
 
+
+  /**
+   * 获取支付分服务类.
+   *
+   * @return the ent pay service
+   */
+  PayScoreService getPayScoreService();
+
   /**
    * 设置企业付款服务类，允许开发者自定义实现类.
    *
@@ -729,4 +759,5 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
    */
   WxPayFacepayResult facepay(WxPayFacepayRequest request) throws WxPayException;
 
+
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index 1f0e52838c..6d6dc748c5 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -17,10 +17,7 @@
 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.EntPayService;
-import com.github.binarywang.wxpay.service.ProfitSharingService;
-import com.github.binarywang.wxpay.service.RedpackService;
-import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.service.*;
 import com.github.binarywang.wxpay.util.SignUtils;
 import com.github.binarywang.wxpay.util.XmlConfig;
 import com.google.common.base.Joiner;
@@ -64,6 +61,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
   private EntPayService entPayService = new EntPayServiceImpl(this);
   private ProfitSharingService profitSharingService = new ProfitSharingServiceImpl(this);
   private RedpackService redpackService = new RedpackServiceImpl(this);
+  private PayScoreService payScoreService = new PayScoreServiceImpl(this);
 
   /**
    * The Config.
@@ -80,6 +78,11 @@ public ProfitSharingService getProfitSharingService() {
     return profitSharingService;
   }
 
+  @Override
+  public PayScoreService getPayScoreService() {
+    return payScoreService;
+  }
+
   @Override
   public RedpackService getRedpackService() {
     return this.redpackService;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
new file mode 100644
index 0000000000..2756a712c7
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
@@ -0,0 +1,193 @@
+package com.github.binarywang.wxpay.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.binarywang.wxpay.bean.payscore.NotifyData;
+import com.github.binarywang.wxpay.bean.payscore.WxPayScoreRequest;
+import com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.PayScoreService;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.v3.util.AesUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.GeneralSecurityException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author doger.wang
+ * @date 2020/5/14 9:43
+ */
+
+public class PayScoreServiceImpl implements PayScoreService {
+  private WxPayService payService;
+
+  public PayScoreServiceImpl(WxPayService payService) {
+    this.payService = payService;
+  }
+
+
+  @Override
+  public WxPayScoreResult createServiceOrder(WxPayScoreRequest request) throws WxPayException {
+    boolean need_user_confirm = request.isNeed_user_confirm();
+    WxPayConfig config = this.payService.getConfig();
+    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder";
+    request.setAppid(config.getAppId());
+    request.setService_id(config.getServiceId());
+    request.setNotify_url(config.getPayScoreNotifyUrl());
+    String result = payService.postV3(url, JSONObject.toJSONString(request));
+    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
+
+    //补充算一下签名给小程序跳转用
+    String currentTimeMillis = System.currentTimeMillis() + "";
+    Map<String, String> signMap = new HashMap<>();
+    signMap.put("mch_id", config.getMchId());
+    if (need_user_confirm){
+      signMap.put("package", wxPayScoreCreateResult.getPackageX());
+    }else {
+      signMap.put("service_id", config.getServiceId());
+      signMap.put("out_order_no", request.getOut_order_no());
+    }
+    signMap.put("timestamp", currentTimeMillis);
+    signMap.put("nonce_str", currentTimeMillis);
+    signMap.put("sign_type", "HMAC-SHA256");
+    String sign = AesUtils.createSign(signMap, config.getMchKey());
+    signMap.put("sign", sign);
+    wxPayScoreCreateResult.setPayScoreSignInfo(signMap);
+    return wxPayScoreCreateResult;
+  }
+
+  @Override
+  public WxPayScoreResult queryServiceOrder(String out_order_no, String query_id) throws WxPayException, URISyntaxException {
+    WxPayConfig config = this.payService.getConfig();
+    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder";
+    URIBuilder uriBuilder =   new URIBuilder(url);
+    if (StringUtils.isAllEmpty(out_order_no,query_id) || !StringUtils.isAnyEmpty(out_order_no,query_id)){
+      throw new WxPayException("out_order_no,query_id不允许都填写或都不填写");
+    }
+    if (StringUtils.isNotEmpty(out_order_no)){
+      uriBuilder.setParameter("out_order_no", out_order_no);
+    }
+    if (StringUtils.isNotEmpty(query_id)){
+      uriBuilder.setParameter("query_id", query_id);
+    }
+    uriBuilder.setParameter("service_id", config.getServiceId());
+    uriBuilder.setParameter("appid", config.getAppId());
+    URI build = uriBuilder.build();
+    String result = payService.getV3(build);
+    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
+    //补充一下加密跳转信息
+/*    String currentTimeMillis = System.currentTimeMillis() + "";
+    Map<String, String> signMap = new HashMap();
+    signMap.put("mch_id", config.getMchId());
+    signMap.put("service_id", config.getServiceId());
+    signMap.put("out_order_no", out_order_no);
+    signMap.put("timestamp", currentTimeMillis);
+    signMap.put("nonce_str", currentTimeMillis);
+    signMap.put("sign_type", "HMAC-SHA256");
+    String sign = AesUtil.createSign(signMap, config.getMchKey());
+    signMap.put("sign", sign);
+    wxPayScoreCreateResult.setPayScoreSignInfo(signMap);*/
+    return wxPayScoreCreateResult;
+
+  }
+
+
+
+  @Override
+  public WxPayScoreResult cancelServiceOrder(String out_order_no, String reason) throws WxPayException {
+    WxPayConfig config = this.payService.getConfig();
+    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/cancel";
+    HashMap<String, Object> map = new HashMap<>();
+    map.put("appid",config.getAppId());
+    map.put("service_id",config.getServiceId());
+    map.put("reason",reason);
+    String result = payService.postV3(url, JSONObject.toJSONString(map));
+    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
+    return wxPayScoreCreateResult;
+
+  }
+
+  @Override
+  public WxPayScoreResult modifyServiceOrder(WxPayScoreRequest request) throws WxPayException {
+    WxPayConfig config = this.payService.getConfig();
+    String out_order_no = request.getOut_order_no();
+    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/modify";
+    request.setAppid(config.getAppId());
+    request.setService_id(config.getServiceId());
+    request.setOut_order_no(null);
+    //request.setNotify_url(config.getPayScoreNotifyUrl());
+    String result = payService.postV3(url, JSONObject.toJSONString(request));
+    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
+    return wxPayScoreCreateResult;
+
+
+  }
+
+  @Override
+  public WxPayScoreResult completeServiceOrder(WxPayScoreRequest request) throws WxPayException {
+    WxPayConfig config = this.payService.getConfig();
+    String out_order_no = request.getOut_order_no();
+    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/complete";
+    request.setAppid(config.getAppId());
+    request.setService_id(config.getServiceId());
+    //request.setNotify_url(config.getPayScoreNotifyUrl());
+    request.setOut_order_no(null);
+    String result = payService.postV3(url, JSONObject.toJSONString(request));
+    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
+    return wxPayScoreCreateResult;
+
+  }
+
+  @Override
+  public WxPayScoreResult payServiceOrder(String out_order_no) throws WxPayException {
+    WxPayConfig config = this.payService.getConfig();
+    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/pay";
+    HashMap<String, Object> map = new HashMap<>();
+    map.put("appid",config.getAppId());
+    map.put("service_id",config.getServiceId());
+    String result = payService.postV3(url, JSONObject.toJSONString(map));
+    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
+    return wxPayScoreCreateResult;
+
+  }
+
+  @Override
+  public WxPayScoreResult syncServiceOrder(WxPayScoreRequest request) throws WxPayException {
+    WxPayConfig config = this.payService.getConfig();
+    String out_order_no = request.getOut_order_no();
+    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/sync";
+    request.setAppid(config.getAppId());
+    request.setService_id(config.getServiceId());
+    request.setOut_order_no(null);
+    //request.setNotify_url(config.getPayScoreNotifyUrl());
+    String result = payService.postV3(url, JSONObject.toJSONString(request));
+    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
+    return wxPayScoreCreateResult;
+
+  }
+
+  @Override
+  public WxPayScoreResult decryptNotifyData(NotifyData data) throws WxPayException{
+    NotifyData.Resource resource = data.getResource();
+    String ciphertext = resource.getCiphertext();
+    String associated_data = resource.getAssociated_data();
+    String nonce = resource.getNonce();
+    String apiv3Key = this.payService.getConfig().getApiv3Key();
+    try {
+      String s = AesUtils.decryptToString(associated_data, nonce, ciphertext, apiv3Key);
+      WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(s, WxPayScoreResult.class);
+      return wxPayScoreCreateResult;
+    } catch (GeneralSecurityException e) {
+      throw new WxPayException("解析报文异常",e);
+    } catch (IOException e) {
+      throw new WxPayException("解析报文异常",e);
+    }
+
+  }
+}
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 1703c200f5..065a3fc08a 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,26 +1,33 @@
 package com.github.binarywang.wxpay.service.impl;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import javax.net.ssl.SSLContext;
 
+import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.bean.WxPayApiData;
 import com.github.binarywang.wxpay.bean.request.WxPayQueryCommentRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayRedpackQueryRequest;
 import com.github.binarywang.wxpay.bean.result.WxPayCommonResult;
 import com.github.binarywang.wxpay.bean.result.WxPayRedpackQueryResult;
+import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import jodd.util.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
+import org.apache.http.HttpStatus;
 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.HttpGet;
 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.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -90,14 +97,81 @@ public String post(String url, String requestStr, boolean useKey) throws WxPayEx
     }
   }
 
-  private StringEntity createEntry(String requestStr) {
-    try {
-      return new StringEntity(new String(requestStr.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
-    } catch (UnsupportedEncodingException e) {
-      //cannot happen
-      this.log.error(e.getMessage(), e);
-      return null;
+  @Override
+  public String postV3(String url, String requestStr) throws WxPayException {
+    CloseableHttpClient httpClient = this.createApiV3HttpClient();
+    HttpPost httpPost = this.createHttpPost(url, requestStr);
+    httpPost.addHeader("Accept", "application/json");
+    httpPost.addHeader("Content-Type", "application/json");
+    try (CloseableHttpResponse response = httpClient.execute(httpPost)){
+      //v3已经改为通过状态码判断200 204 成功
+      int statusCode = response.getStatusLine().getStatusCode();
+      String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+      if (HttpStatus.SC_OK==statusCode || HttpStatus.SC_NO_CONTENT==statusCode){
+        this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, responseString);
+        return responseString;
+      }else {
+        //有错误提示信息返回
+        JSONObject jsonObject = JSONObject.parseObject(responseString);
+        String message = jsonObject.getString("message");
+        throw new WxPayException(message);
+      }
+    } catch (Exception e) {
+      this.log.error("\n【请求地址】：{}\n【请求数据】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
+      throw new WxPayException(e.getMessage(), e);
+    } finally {
+      httpPost.releaseConnection();
+    }
+
+
+
+
+  }
+
+  @Override
+  public String getV3(URI url) throws WxPayException {
+    CloseableHttpClient httpClient = this.createApiV3HttpClient();
+    HttpGet httpGet = new HttpGet(url);
+    httpGet.addHeader("Accept", "application/json");
+    httpGet.addHeader("Content-Type", "application/json");
+    try (CloseableHttpResponse response = httpClient.execute(httpGet)){
+      //v3已经改为通过状态码判断200 204 成功
+      int statusCode = response.getStatusLine().getStatusCode();
+      String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+      if (HttpStatus.SC_OK==statusCode || HttpStatus.SC_NO_CONTENT==statusCode){
+        this.log.info("\n【请求地址】：{}\n【响应数据】：{}", url , responseString);
+        return responseString;
+      }else {
+        //有错误提示信息返回
+        JSONObject jsonObject = JSONObject.parseObject(responseString);
+        String message = jsonObject.getString("message");
+        throw new WxPayException(message);
+      }
+    } catch (Exception e) {
+      this.log.error("\n【请求地址】：{}\n【异常信息】：{}", url, e.getMessage());
+      throw new WxPayException(e.getMessage(), e);
+    } finally {
+      httpGet.releaseConnection();
+    }
+
+
+  }
+
+  private CloseableHttpClient createApiV3HttpClient() throws WxPayException {
+    CloseableHttpClient apiv3HttpClient = this.getConfig().getApiv3HttpClient();
+    if (null==apiv3HttpClient){
+      return this.getConfig().initApiV3HttpClient();
     }
+    return apiv3HttpClient;
+  }
+
+
+  private StringEntity createEntry(String requestStr) {
+
+      return new StringEntity(requestStr, ContentType.create("application/json", "utf-8"));
+      //return new StringEntity(new String(requestStr.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
+
+
   }
 
   private HttpClientBuilder createHttpClientBuilder(boolean useKey) throws WxPayException {
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 81d35614d5..72dac0171b 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 java.net.URI;
 import java.nio.charset.StandardCharsets;
 import javax.net.ssl.SSLContext;
 
@@ -67,6 +68,16 @@ public String post(String url, String requestStr, boolean useKey) throws WxPayEx
     }
   }
 
+  @Override
+  public String postV3(String url, String requestStr) throws WxPayException {
+    return null;
+  }
+
+  @Override
+  public String getV3(URI url) throws WxPayException {
+    return null;
+  }
+
   private HttpRequest buildHttpRequest(String url, String requestStr, boolean useKey) throws WxPayException {
     HttpRequest request = HttpRequest
       .post(url)
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/Credentials.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/Credentials.java
new file mode 100644
index 0000000000..d5102d1fa9
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/Credentials.java
@@ -0,0 +1,11 @@
+package com.github.binarywang.wxpay.v3;
+
+import java.io.IOException;
+import org.apache.http.client.methods.HttpUriRequest;
+
+public interface Credentials {
+
+  String getSchema();
+
+  String getToken(HttpUriRequest request) throws IOException;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/SignatureExec.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/SignatureExec.java
new file mode 100644
index 0000000000..a28dfdcd63
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/SignatureExec.java
@@ -0,0 +1,88 @@
+package com.github.binarywang.wxpay.v3;
+
+import java.io.IOException;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpException;
+import org.apache.http.StatusLine;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpExecutionAware;
+import org.apache.http.client.methods.HttpRequestWrapper;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.conn.routing.HttpRoute;
+import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.impl.execchain.ClientExecChain;
+import org.apache.http.util.EntityUtils;
+
+public class SignatureExec implements ClientExecChain {
+  final ClientExecChain mainExec;
+  final Credentials credentials;
+  final Validator validator;
+
+  SignatureExec(Credentials credentials, Validator validator, ClientExecChain mainExec) {
+    this.credentials = credentials;
+    this.validator = validator;
+    this.mainExec = mainExec;
+  }
+
+  protected HttpEntity newRepeatableEntity(HttpEntity entity) throws IOException {
+    byte[] content = EntityUtils.toByteArray(entity);
+    ByteArrayEntity newEntity = new ByteArrayEntity(content);
+    newEntity.setContentEncoding(entity.getContentEncoding());
+    newEntity.setContentType(entity.getContentType());
+
+    return newEntity;
+  }
+
+  protected void convertToRepeatableResponseEntity(CloseableHttpResponse response) throws IOException {
+    HttpEntity entity = response.getEntity();
+    if (entity != null && !entity.isRepeatable()) {
+      response.setEntity(newRepeatableEntity(entity));
+    }
+  }
+
+  protected void convertToRepeatableRequestEntity(HttpUriRequest request) throws IOException {
+    if (request instanceof HttpEntityEnclosingRequestBase) {
+      HttpEntity entity = ((HttpEntityEnclosingRequestBase) request).getEntity();
+      if (entity != null && !entity.isRepeatable()) {
+        ((HttpEntityEnclosingRequestBase) request).setEntity(newRepeatableEntity(entity));
+      }
+    }
+  }
+
+  @Override
+  public CloseableHttpResponse execute(HttpRoute route, HttpRequestWrapper request,
+      HttpClientContext context, HttpExecutionAware execAware) throws IOException, HttpException {
+    if (request.getURI().getHost().endsWith(".mch.weixin.qq.com")) {
+      return executeWithSignature(route, request, context, execAware);
+    } else {
+      return mainExec.execute(route, request, context, execAware);
+    }
+  }
+
+  private CloseableHttpResponse executeWithSignature(HttpRoute route, HttpRequestWrapper request,
+      HttpClientContext context, HttpExecutionAware execAware) throws IOException, HttpException {
+    HttpUriRequest newRequest = RequestBuilder.copy(request.getOriginal()).build();
+    convertToRepeatableRequestEntity(newRequest);
+    // 添加认证信息
+    newRequest.addHeader("Authorization",
+        credentials.getSchema() + " " + credentials.getToken(newRequest));
+
+    // 执行
+    CloseableHttpResponse response = mainExec.execute(
+        route, HttpRequestWrapper.wrap(newRequest), context, execAware);
+
+    // 对成功应答验签
+    StatusLine statusLine = response.getStatusLine();
+    if (statusLine.getStatusCode() >= 200 && statusLine.getStatusCode() < 300) {
+      convertToRepeatableResponseEntity(response);
+      if (!validator.validate(response)) {
+        throw new HttpException("应答的微信支付签名验证失败");
+      }
+    }
+    return response;
+  }
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/Validator.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/Validator.java
new file mode 100644
index 0000000000..cdeb8ac279
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/Validator.java
@@ -0,0 +1,8 @@
+package com.github.binarywang.wxpay.v3;
+
+import java.io.IOException;
+import org.apache.http.client.methods.CloseableHttpResponse;
+
+public interface Validator {
+  boolean validate(CloseableHttpResponse response) throws IOException;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WechatPayHttpClientBuilder.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WechatPayHttpClientBuilder.java
new file mode 100644
index 0000000000..0f2732ce9b
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WechatPayHttpClientBuilder.java
@@ -0,0 +1,75 @@
+package com.github.binarywang.wxpay.v3;
+
+
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
+import java.util.List;
+
+import com.github.binarywang.wxpay.v3.auth.CertificatesVerifier;
+import com.github.binarywang.wxpay.v3.auth.PrivateKeySigner;
+import com.github.binarywang.wxpay.v3.auth.WechatPay2Credentials;
+import com.github.binarywang.wxpay.v3.auth.WechatPay2Validator;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.execchain.ClientExecChain;
+
+public class WechatPayHttpClientBuilder extends HttpClientBuilder {
+  private Credentials credentials;
+  private Validator validator;
+
+  static final String os = System.getProperty("os.name") + "/" + System.getProperty("os.version");
+  static final String version = System.getProperty("java.version");
+
+  private WechatPayHttpClientBuilder() {
+    super();
+
+    String userAgent = String.format(
+        "WechatPay-Apache-HttpClient/%s (%s) Java/%s",
+        getClass().getPackage().getImplementationVersion(),
+        os,
+        version == null ? "Unknown" : version);
+    setUserAgent(userAgent);
+  }
+
+  public static WechatPayHttpClientBuilder create() {
+    return new WechatPayHttpClientBuilder();
+  }
+
+  public WechatPayHttpClientBuilder withMerchant(String merchantId, String serialNo, PrivateKey privateKey) {
+    this.credentials =
+        new WechatPay2Credentials(merchantId, new PrivateKeySigner(serialNo, privateKey));
+    return this;
+  }
+
+  public WechatPayHttpClientBuilder withCredentials(Credentials credentials) {
+    this.credentials = credentials;
+    return this;
+  }
+
+  public WechatPayHttpClientBuilder withWechatpay(List<X509Certificate> certificates) {
+    this.validator = new WechatPay2Validator(new CertificatesVerifier(certificates));
+    return this;
+  }
+
+  public WechatPayHttpClientBuilder withValidator(Validator validator) {
+    this.validator = validator;
+    return this;
+  }
+
+  @Override
+  public CloseableHttpClient build() {
+    if (credentials == null) {
+      throw new IllegalArgumentException("缺少身份认证信息");
+    }
+    if (validator == null) {
+      throw new IllegalArgumentException("缺少签名验证信息");
+    }
+
+    return super.build();
+  }
+
+  @Override
+  protected ClientExecChain decorateProtocolExec(final ClientExecChain requestExecutor) {
+    return new SignatureExec(this.credentials, this.validator, requestExecutor);
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
new file mode 100644
index 0000000000..3c382181bb
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
@@ -0,0 +1,161 @@
+package com.github.binarywang.wxpay.v3.auth;
+
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.binarywang.wxpay.v3.Credentials;
+import com.github.binarywang.wxpay.v3.WechatPayHttpClientBuilder;
+import com.github.binarywang.wxpay.v3.util.AesUtils;
+import com.github.binarywang.wxpay.v3.util.PemUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.util.EntityUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 在原有CertificatesVerifier基础上，增加自动更新证书功能
+ */
+public class AutoUpdateCertificatesVerifier implements Verifier {
+
+  private static final Logger log = LoggerFactory.getLogger(AutoUpdateCertificatesVerifier.class);
+
+  //证书下载地址
+  private static final String CertDownloadPath = "https://api.mch.weixin.qq.com/v3/certificates";
+
+  //上次更新时间
+  private volatile Instant instant;
+
+  //证书更新间隔时间，单位为分钟
+  private int minutesInterval;
+
+  private CertificatesVerifier verifier;
+
+  private Credentials credentials;
+
+  private byte[] apiV3Key;
+
+  private ReentrantLock lock = new ReentrantLock();
+
+  //时间间隔枚举，支持一小时、六小时以及十二小时
+  public enum TimeInterval {
+    OneHour(60), SixHours(60 * 6), TwelveHours(60 * 12);
+
+    private int minutes;
+
+    TimeInterval(int minutes) {
+      this.minutes = minutes;
+    }
+
+    public int getMinutes() {
+      return minutes;
+    }
+  }
+
+  public AutoUpdateCertificatesVerifier(Credentials credentials, byte[] apiV3Key) {
+    this(credentials, apiV3Key, TimeInterval.OneHour.getMinutes());
+  }
+
+  public AutoUpdateCertificatesVerifier(Credentials credentials, byte[] apiV3Key, int minutesInterval) {
+    this.credentials = credentials;
+    this.apiV3Key = apiV3Key;
+    this.minutesInterval = minutesInterval;
+    //构造时更新证书
+    try {
+      autoUpdateCert();
+      instant = Instant.now();
+    } catch (IOException | GeneralSecurityException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Override
+  public boolean verify(String serialNumber, byte[] message, String signature) {
+    if (instant == null || Duration.between(instant, Instant.now()).toMinutes() >= minutesInterval) {
+      if (lock.tryLock()) {
+        try {
+          autoUpdateCert();
+          //更新时间
+          instant = Instant.now();
+        } catch (GeneralSecurityException | IOException e) {
+          log.warn("Auto update cert failed, exception = " + e);
+        } finally {
+          lock.unlock();
+        }
+      }
+    }
+    return verifier.verify(serialNumber, message, signature);
+  }
+
+  private void autoUpdateCert() throws IOException, GeneralSecurityException {
+    CloseableHttpClient httpClient = WechatPayHttpClientBuilder.create()
+        .withCredentials(credentials)
+        .withValidator(verifier == null ? (response) -> true : new WechatPay2Validator(verifier))
+        .build();
+
+    HttpGet httpGet = new HttpGet(CertDownloadPath);
+    httpGet.addHeader("Accept", "application/json");
+
+    CloseableHttpResponse response = httpClient.execute(httpGet);
+    int statusCode = response.getStatusLine().getStatusCode();
+    String body = EntityUtils.toString(response.getEntity());
+    if (statusCode == 200) {
+      List<X509Certificate> newCertList = deserializeToCerts(apiV3Key, body);
+      if (newCertList.isEmpty()) {
+        log.warn("Cert list is empty");
+        return;
+      }
+      this.verifier = new CertificatesVerifier(newCertList);
+    } else {
+      log.warn("Auto update cert failed, statusCode = " + statusCode + ",body = " + body);
+    }
+  }
+
+
+  /**
+   * 反序列化证书并解密
+   */
+  private List<X509Certificate> deserializeToCerts(byte[] apiV3Key, String body)
+      throws GeneralSecurityException, IOException {
+    AesUtils decryptor = new AesUtils(apiV3Key);
+    ObjectMapper mapper = new ObjectMapper();
+    JsonNode dataNode = mapper.readTree(body).get("data");
+    List<X509Certificate> newCertList = new ArrayList<>();
+    if (dataNode != null) {
+      for (int i = 0, count = dataNode.size(); i < count; i++) {
+        JsonNode encryptCertificateNode = dataNode.get(i).get("encrypt_certificate");
+        //解密
+        String cert = decryptor.decryptToString(
+            encryptCertificateNode.get("associated_data").toString().replaceAll("\"", "")
+                .getBytes("utf-8"),
+            encryptCertificateNode.get("nonce").toString().replaceAll("\"", "")
+                .getBytes("utf-8"),
+            encryptCertificateNode.get("ciphertext").toString().replaceAll("\"", ""));
+
+        X509Certificate x509Cert = PemUtils
+            .loadCertificate(new ByteArrayInputStream(cert.getBytes("utf-8")));
+        try {
+          x509Cert.checkValidity();
+        } catch (CertificateExpiredException | CertificateNotYetValidException e) {
+          continue;
+        }
+        newCertList.add(x509Cert);
+      }
+    }
+    return newCertList;
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/CertificatesVerifier.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/CertificatesVerifier.java
new file mode 100644
index 0000000000..9853cf2eef
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/CertificatesVerifier.java
@@ -0,0 +1,43 @@
+package com.github.binarywang.wxpay.v3.auth;
+
+import java.math.BigInteger;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.security.cert.X509Certificate;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.List;
+
+public class CertificatesVerifier implements Verifier {
+  private final HashMap<BigInteger, X509Certificate> certificates = new HashMap<>();
+
+  public CertificatesVerifier(List<X509Certificate> list) {
+
+    for (X509Certificate item : list) {
+      certificates.put(item.getSerialNumber(), item);
+    }
+  }
+
+  private boolean verify(X509Certificate certificate, byte[] message, String signature) {
+    try {
+      Signature sign = Signature.getInstance("SHA256withRSA");
+      sign.initVerify(certificate);
+      sign.update(message);
+      return sign.verify(Base64.getDecoder().decode(signature));
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException("当前Java环境不支持SHA256withRSA", e);
+    } catch (SignatureException e) {
+      throw new RuntimeException("签名验证过程发生了错误", e);
+    } catch (InvalidKeyException e) {
+      throw new RuntimeException("无效的证书", e);
+    }
+  }
+
+  @Override
+  public boolean verify(String serialNumber, byte[] message, String signature) {
+    BigInteger val = new BigInteger(serialNumber, 16);
+    return certificates.containsKey(val) && verify(certificates.get(val), message, signature);
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/PrivateKeySigner.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/PrivateKeySigner.java
new file mode 100644
index 0000000000..37ec51cf58
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/PrivateKeySigner.java
@@ -0,0 +1,37 @@
+package com.github.binarywang.wxpay.v3.auth;
+
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Signature;
+import java.security.SignatureException;
+import java.util.Base64;
+
+public class PrivateKeySigner implements Signer {
+  private String certificateSerialNumber;
+
+  private PrivateKey privateKey;
+
+  public PrivateKeySigner(String serialNumber, PrivateKey privateKey) {
+    this.certificateSerialNumber = serialNumber;
+    this.privateKey = privateKey;
+  }
+
+  @Override
+  public SignatureResult sign(byte[] message) {
+    try {
+      Signature sign = Signature.getInstance("SHA256withRSA");
+      sign.initSign(privateKey);
+      sign.update(message);
+
+      return new SignatureResult(
+          Base64.getEncoder().encodeToString(sign.sign()), certificateSerialNumber);
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException("当前Java环境不支持SHA256withRSA", e);
+    } catch (SignatureException e) {
+      throw new RuntimeException("签名计算失败", e);
+    } catch (InvalidKeyException e) {
+      throw new RuntimeException("无效的私钥", e);
+    }
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/Signer.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/Signer.java
new file mode 100644
index 0000000000..7255a1b433
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/Signer.java
@@ -0,0 +1,15 @@
+package com.github.binarywang.wxpay.v3.auth;
+
+public interface Signer {
+  SignatureResult sign(byte[] message);
+
+  class SignatureResult {
+    String sign;
+    String certificateSerialNumber;
+
+    public SignatureResult(String sign, String serialNumber) {
+      this.sign = sign;
+      this.certificateSerialNumber = serialNumber;
+    }
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/Verifier.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/Verifier.java
new file mode 100644
index 0000000000..ed591a4ef2
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/Verifier.java
@@ -0,0 +1,5 @@
+package com.github.binarywang.wxpay.v3.auth;
+
+public interface Verifier {
+  boolean verify(String serialNumber, byte[] message, String signature);
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Credentials.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Credentials.java
new file mode 100644
index 0000000000..a0730bddae
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Credentials.java
@@ -0,0 +1,91 @@
+package com.github.binarywang.wxpay.v3.auth;
+
+
+import java.io.IOException;
+import java.net.URI;
+import java.security.SecureRandom;
+
+import com.github.binarywang.wxpay.v3.Credentials;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WechatPay2Credentials implements Credentials {
+  private static final Logger log = LoggerFactory.getLogger(WechatPay2Credentials.class);
+
+  private static final String SYMBOLS =
+      "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+  private static final SecureRandom RANDOM = new SecureRandom();
+  protected String merchantId;
+  protected Signer signer;
+
+  public WechatPay2Credentials(String merchantId, Signer signer) {
+    this.merchantId = merchantId;
+    this.signer = signer;
+  }
+
+  public String getMerchantId() {
+    return merchantId;
+  }
+
+  protected long generateTimestamp() {
+    return System.currentTimeMillis() / 1000;
+  }
+
+  protected String generateNonceStr() {
+    char[] nonceChars = new char[32];
+    for (int index = 0; index < nonceChars.length; ++index) {
+      nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
+    }
+    return new String(nonceChars);
+  }
+
+  @Override
+  public final String getSchema() {
+    return "WECHATPAY2-SHA256-RSA2048";
+  }
+
+  @Override
+  public final String getToken(HttpUriRequest request) throws IOException {
+    String nonceStr = generateNonceStr();
+    long timestamp = generateTimestamp();
+
+    String message = buildMessage(nonceStr, timestamp, request);
+    log.debug("authorization message=[{}]", message);
+
+    Signer.SignatureResult signature = signer.sign(message.getBytes("utf-8"));
+
+    String token = "mchid=\"" + getMerchantId() + "\","
+        + "nonce_str=\"" + nonceStr + "\","
+        + "timestamp=\"" + timestamp + "\","
+        + "serial_no=\"" + signature.certificateSerialNumber + "\","
+        + "signature=\"" + signature.sign + "\"";
+    log.debug("authorization token=[{}]", token);
+
+    return token;
+  }
+
+  protected final String buildMessage(String nonce, long timestamp, HttpUriRequest request)
+      throws IOException {
+    URI uri = request.getURI();
+    String canonicalUrl = uri.getRawPath();
+    if (uri.getQuery() != null) {
+      canonicalUrl += "?" + uri.getRawQuery();
+    }
+
+    String body = "";
+    // PATCH,POST,PUT
+    if (request instanceof HttpEntityEnclosingRequestBase) {
+      body = EntityUtils.toString(((HttpEntityEnclosingRequestBase) request).getEntity());
+    }
+
+    return request.getRequestLine().getMethod() + "\n"
+        + canonicalUrl + "\n"
+        + timestamp + "\n"
+        + nonce + "\n"
+        + body + "\n";
+  }
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Validator.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Validator.java
new file mode 100644
index 0000000000..38735c61c9
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Validator.java
@@ -0,0 +1,55 @@
+package com.github.binarywang.wxpay.v3.auth;
+
+
+import java.io.IOException;
+
+import com.github.binarywang.wxpay.v3.Validator;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class WechatPay2Validator implements Validator {
+
+  private static final Logger log = LoggerFactory.getLogger(WechatPay2Validator.class);
+
+  private Verifier verifier;
+
+  public WechatPay2Validator(Verifier verifier) {
+    this.verifier = verifier;
+  }
+
+  @Override
+  public final boolean validate(CloseableHttpResponse response) throws IOException {
+    Header serialNo = response.getFirstHeader("Wechatpay-Serial");
+    Header sign = response.getFirstHeader("Wechatpay-Signature");
+    Header timestamp = response.getFirstHeader("Wechatpay-TimeStamp");
+    Header nonce = response.getFirstHeader("Wechatpay-Nonce");
+
+    // todo: check timestamp
+    if (timestamp == null || nonce == null || serialNo == null || sign == null) {
+      return false;
+    }
+
+    String message = buildMessage(response);
+    return verifier.verify(serialNo.getValue(), message.getBytes("utf-8"), sign.getValue());
+  }
+
+  protected final String buildMessage(CloseableHttpResponse response) throws IOException {
+    String timestamp = response.getFirstHeader("Wechatpay-TimeStamp").getValue();
+    String nonce = response.getFirstHeader("Wechatpay-Nonce").getValue();
+
+    String body = getResponseBody(response);
+    return timestamp + "\n"
+          + nonce + "\n"
+          + body + "\n";
+  }
+
+  protected final String getResponseBody(CloseableHttpResponse response) throws IOException {
+    HttpEntity entity = response.getEntity();
+
+    return (entity != null && entity.isRepeatable()) ? EntityUtils.toString(entity) : "";
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/AesUtils.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/AesUtils.java
new file mode 100644
index 0000000000..bd68cac1a4
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/AesUtils.java
@@ -0,0 +1,107 @@
+package com.github.binarywang.wxpay.v3.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import javax.crypto.Cipher;
+import javax.crypto.Mac;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class AesUtils {
+
+  static final int KEY_LENGTH_BYTE = 32;
+  static final int TAG_LENGTH_BIT = 128;
+  private final byte[] aesKey;
+
+  public AesUtils(byte[] key) {
+    if (key.length != KEY_LENGTH_BYTE) {
+      throw new IllegalArgumentException("无效的ApiV3Key，长度必须为32个字节");
+    }
+    this.aesKey = key;
+  }
+
+  public String decryptToString(byte[] associatedData, byte[] nonce, String ciphertext)
+      throws GeneralSecurityException, IOException {
+    try {
+      Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+
+      SecretKeySpec key = new SecretKeySpec(aesKey, "AES");
+      GCMParameterSpec spec = new GCMParameterSpec(TAG_LENGTH_BIT, nonce);
+
+      cipher.init(Cipher.DECRYPT_MODE, key, spec);
+      cipher.updateAAD(associatedData);
+
+      return new String(cipher.doFinal(Base64.getDecoder().decode(ciphertext)), "utf-8");
+    } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+      throw new IllegalStateException(e);
+    } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
+      throw new IllegalArgumentException(e);
+    }
+  }
+
+  public static String decryptToString(String associatedData, String nonce, String ciphertext,String apiV3Key)
+    throws GeneralSecurityException, IOException {
+    try {
+      Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
+
+      SecretKeySpec key = new SecretKeySpec(apiV3Key.getBytes(), "AES");
+      GCMParameterSpec spec = new GCMParameterSpec(TAG_LENGTH_BIT, nonce.getBytes());
+
+      cipher.init(Cipher.DECRYPT_MODE, key, spec);
+      cipher.updateAAD(associatedData.getBytes());
+
+      return new String(cipher.doFinal(Base64.getDecoder().decode(ciphertext)), "utf-8");
+    } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+      throw new IllegalStateException(e);
+    } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
+      throw new IllegalArgumentException(e);
+    }
+  }
+
+
+  public static String createSign(Map<String, String> map, String mchKey) {
+    Map<String, String> params = map;
+    SortedMap<String, String> sortedMap = new TreeMap<>(params);
+
+    StringBuilder toSign = new StringBuilder();
+    for (String key : sortedMap.keySet()) {
+      String value = params.get(key);
+      if ("sign".equals(key) || StringUtils.isEmpty(value)) {
+        continue;
+      }
+      toSign.append(key).append("=").append(value).append("&");
+    }
+    toSign.append("key=" + mchKey);
+    return HMACSHA256(toSign.toString(), mchKey);
+
+  }
+
+  public static String HMACSHA256(String data, String key) {
+    try {
+      Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+      SecretKeySpec secret_key = new SecretKeySpec(key.getBytes("UTF-8"), "HmacSHA256");
+      sha256_HMAC.init(secret_key);
+      byte[] array = sha256_HMAC.doFinal(data.getBytes("UTF-8"));
+      StringBuilder sb = new StringBuilder();
+      for (byte item : array) {
+        sb.append(Integer.toHexString((item & 0xFF) | 0x100).substring(1, 3));
+      }
+      return sb.toString().toUpperCase();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    }
+  }
+
+
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/PemUtils.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/PemUtils.java
new file mode 100644
index 0000000000..bf4d2657b5
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/util/PemUtils.java
@@ -0,0 +1,60 @@
+package com.github.binarywang.wxpay.v3.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Base64;
+
+public class PemUtils {
+
+  public static PrivateKey loadPrivateKey(InputStream inputStream) {
+    try {
+      ByteArrayOutputStream array = new ByteArrayOutputStream();
+      byte[] buffer = new byte[1024];
+      int length;
+      while ((length = inputStream.read(buffer)) != -1) {
+        array.write(buffer, 0, length);
+      }
+
+      String privateKey = array.toString("utf-8")
+          .replace("-----BEGIN PRIVATE KEY-----", "")
+          .replace("-----END PRIVATE KEY-----", "")
+          .replaceAll("\\s+", "");
+
+      KeyFactory kf = KeyFactory.getInstance("RSA");
+      return kf.generatePrivate(
+          new PKCS8EncodedKeySpec(Base64.getDecoder().decode(privateKey)));
+    } catch (NoSuchAlgorithmException e) {
+      throw new RuntimeException("当前Java环境不支持RSA", e);
+    } catch (InvalidKeySpecException e) {
+      throw new RuntimeException("无效的密钥格式");
+    } catch (IOException e) {
+      throw new RuntimeException("无效的密钥");
+    }
+  }
+
+  public static X509Certificate loadCertificate(InputStream inputStream) {
+    try {
+      CertificateFactory cf = CertificateFactory.getInstance("X509");
+      X509Certificate cert = (X509Certificate) cf.generateCertificate(inputStream);
+      cert.checkValidity();
+      return cert;
+    } catch (CertificateExpiredException e) {
+      throw new RuntimeException("证书已过期", e);
+    } catch (CertificateNotYetValidException e) {
+      throw new RuntimeException("证书尚未生效", e);
+    } catch (CertificateException e) {
+      throw new RuntimeException("无效的证书", e);
+    }
+  }
+}

From 39cea92171147da6bf578553c4388c2b87e2a654 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 19 May 2020 21:28:26 +0800
Subject: [PATCH 100/114] =?UTF-8?q?:art:=20=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=88=86=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E9=87=8D=E6=9E=84=E8=A7=84=E8=8C=83=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/config/WxPayAutoConfiguration.java    |   2 +-
 weixin-java-pay/pom.xml                       |  13 +-
 .../wxpay/bean/payscore/Detail.java           |  36 +++
 .../wxpay/bean/payscore/Location.java         |  27 +++
 .../wxpay/bean/payscore/NotifyData.java       |  45 ----
 .../bean/payscore/PayScoreNotifyData.java     |  56 +++++
 .../wxpay/bean/payscore/PostDiscount.java     |  31 +++
 .../wxpay/bean/payscore/PostPayment.java      |  33 +++
 .../wxpay/bean/payscore/RiskFund.java         |  30 +++
 .../wxpay/bean/payscore/TimeRange.java        |  27 +++
 .../bean/payscore/WxPayScoreRequest.java      | 165 +++++---------
 .../wxpay/bean/payscore/WxPayScoreResult.java | 208 +++++++-----------
 .../binarywang/wxpay/config/WxPayConfig.java  |  95 ++++----
 .../wxpay/service/PayScoreService.java        | 132 +++++------
 .../service/impl/PayScoreServiceImpl.java     | 172 ++++++---------
 .../impl/WxPayServiceApacheHttpImpl.java      |  13 +-
 .../service/impl/PayScoreServiceImplTest.java |  46 ++++
 17 files changed, 586 insertions(+), 545 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/Detail.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/Location.java
 delete mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/NotifyData.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScoreNotifyData.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PostDiscount.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PostPayment.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/RiskFund.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/TimeRange.java
 create mode 100644 weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java

diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
index ed5da834a8..2dd44004a6 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/pay/config/WxPayAutoConfiguration.java
@@ -55,7 +55,7 @@ public WxPayService wxPayService() {
     payConfig.setPrivateKeyPath(StringUtils.trimToNull(this.properties.getPrivateKeyPath()));
     payConfig.setPrivateCertPath(StringUtils.trimToNull(this.properties.getPrivateCertPath()));
     payConfig.setCertSerialNo(StringUtils.trimToNull(this.properties.getCertSerialNo()));
-    payConfig.setApiv3Key(StringUtils.trimToNull(this.properties.getApiv3Key()));
+    payConfig.setApiV3Key(StringUtils.trimToNull(this.properties.getApiv3Key()));
 
     wxPayService.setConfig(payConfig);
     return wxPayService;
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 68e7a0576b..a742999681 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -82,19 +82,10 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
-    <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.9.7</version>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>fastjson</artifactId>
-      <version>1.2.58</version>
-    </dependency>
-
-
   </dependencies>
 
   <profiles>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/Detail.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/Detail.java
new file mode 100644
index 0000000000..b52c2abc1b
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/Detail.java
@@ -0,0 +1,36 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 明细.
+ *
+ * @author doger.wang
+ * @date 2020-05-19
+ */
+@Data
+@NoArgsConstructor
+public class Detail implements Serializable {
+  private static final long serialVersionUID = -3901373259400050385L;
+  /**
+   * seq : 1
+   * amount : 900
+   * paid_type : NEWTON
+   * paid_time : 20091225091210
+   * transaction_id : 15646546545165651651
+   */
+  @SerializedName("seq")
+  private int seq;
+  @SerializedName("amount")
+  private int amount;
+  @SerializedName("paid_type")
+  private String paidType;
+  @SerializedName("paid_time")
+  private String paidTime;
+  @SerializedName("transaction_id")
+  private String transactionId;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/Location.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/Location.java
new file mode 100644
index 0000000000..b3c82f7d96
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/Location.java
@@ -0,0 +1,27 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 服务位置信息.
+ *
+ * @author doger.wang
+ * @date 2020-05-19
+ */
+@Data
+@NoArgsConstructor
+public class Location implements Serializable {
+  private static final long serialVersionUID = -4510224826631515344L;
+  /**
+   * start_location : 嗨客时尚主题展餐厅
+   * end_location : 嗨客时尚主题展餐厅
+   */
+  @SerializedName("start_location")
+  private String startLocation;
+  @SerializedName("end_location")
+  private String endLocation;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/NotifyData.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/NotifyData.java
deleted file mode 100644
index b46de1f11b..0000000000
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/NotifyData.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.binarywang.wxpay.bean.payscore;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 微信支付分确认订单跟支付回调对象
- * @author doger.wang
- * @date 2020/5/14 12:18
- */
-@NoArgsConstructor
-@Data
-public class NotifyData {
-
-
-  /**
-   * id : EV-2018022511223320873
-   * create_time : 20180225112233
-   * resource_type : encrypt-resource
-   * event_type : PAYSCORE.USER_CONFIRM
-   * resource : {"algorithm":"AEAD_AES_256_GCM","ciphertext":"...","nonce":"...","associated_data":""}
-   */
-
-  private String id;
-  private String create_time;
-  private String resource_type;
-  private String event_type;
-  private Resource resource;
-
-  @NoArgsConstructor
-  @Data
-  public static class Resource {
-    /**
-     * algorithm : AEAD_AES_256_GCM
-     * ciphertext : ...
-     * nonce : ...
-     * associated_data :
-     */
-
-    private String algorithm;
-    private String ciphertext;
-    private String nonce;
-    private String associated_data;
-  }
-}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScoreNotifyData.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScoreNotifyData.java
new file mode 100644
index 0000000000..81d5568bcd
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PayScoreNotifyData.java
@@ -0,0 +1,56 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 微信支付分确认订单跟支付回调对象
+ *
+ * @author doger.wang
+ * @date 2020/5/14 12:18
+ */
+@NoArgsConstructor
+@Data
+public class PayScoreNotifyData implements Serializable {
+  private static final long serialVersionUID = -8538014389773390989L;
+
+  /**
+   * id : EV-2018022511223320873
+   * create_time : 20180225112233
+   * resource_type : encrypt-resource
+   * event_type : PAYSCORE.USER_CONFIRM
+   * resource : {"algorithm":"AEAD_AES_256_GCM","ciphertext":"...","nonce":"...","associated_data":""}
+   */
+  @SerializedName("id")
+  private String id;
+  @SerializedName("create_time")
+  private String createTime;
+  @SerializedName("resource_type")
+  private String resourceType;
+  @SerializedName("event_type")
+  private String eventType;
+  @SerializedName("resource")
+  private Resource resource;
+
+  @Data
+  public static class Resource implements Serializable {
+    private static final long serialVersionUID = 8530711804335261449L;
+    /**
+     * algorithm : AEAD_AES_256_GCM
+     * ciphertext : ...
+     * nonce : ...
+     * associated_data :
+     */
+    @SerializedName("algorithm")
+    private String algorithm;
+    @SerializedName("ciphertext")
+    private String cipherText;
+    @SerializedName("nonce")
+    private String nonce;
+    @SerializedName("associated_data")
+    private String associatedData;
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PostDiscount.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PostDiscount.java
new file mode 100644
index 0000000000..ebd2cf2b39
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PostDiscount.java
@@ -0,0 +1,31 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 后付费商户优惠.
+ *
+ * @author doger.wang
+ * @date 2020-05-19
+ */
+@Data
+@NoArgsConstructor
+public class PostDiscount implements Serializable {
+  private static final long serialVersionUID = 2764537888242763379L;
+  /**
+   * name : 满20减1元
+   * description : 不与其他优惠叠加
+   */
+  @SerializedName("name")
+  private String name;
+  @SerializedName("description")
+  private String description;
+  @SerializedName("count")
+  private int count;
+  @SerializedName("amount")
+  private int amount;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PostPayment.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PostPayment.java
new file mode 100644
index 0000000000..fef0b5ab8b
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/PostPayment.java
@@ -0,0 +1,33 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 后付费项目.
+ *
+ * @author doger.wang
+ * @date 2020-05-19
+ */
+@Data
+@NoArgsConstructor
+public class PostPayment implements Serializable {
+  private static final long serialVersionUID = 2007722927556382895L;
+  /**
+   * name : 就餐费用服务费
+   * amount : 4000
+   * description : 就餐人均100元服务费：100/小时
+   * count : 1
+   */
+  @SerializedName("name")
+  private String name;
+  @SerializedName("amount")
+  private int amount;
+  @SerializedName("description")
+  private String description;
+  @SerializedName("count")
+  private int count;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/RiskFund.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/RiskFund.java
new file mode 100644
index 0000000000..c6bd840186
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/RiskFund.java
@@ -0,0 +1,30 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 订单风险金信息.
+ *
+ * @author doger.wang
+ * @date 2020-05-19
+ */
+@Data
+@NoArgsConstructor
+public class RiskFund implements Serializable {
+  private static final long serialVersionUID = -3583406084396059152L;
+  /**
+   * name :  ESTIMATE_ORDER_COST
+   * amount : 10000
+   * description : 就餐的预估费用
+   */
+  @SerializedName("name")
+  private String name;
+  @SerializedName("amount")
+  private int amount;
+  @SerializedName("description")
+  private String description;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/TimeRange.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/TimeRange.java
new file mode 100644
index 0000000000..08b86d6eda
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/TimeRange.java
@@ -0,0 +1,27 @@
+package com.github.binarywang.wxpay.bean.payscore;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 服务时间范围.
+ *
+ * @author doger.wang
+ * @date 2020-05-19
+ */
+@Data
+@NoArgsConstructor
+public class TimeRange implements Serializable {
+  private static final long serialVersionUID = 8169562173656314930L;
+  /**
+   * start_time : 20091225091010
+   * end_time : 20091225121010
+   */
+  @SerializedName("start_time")
+  private String startTime;
+  @SerializedName("end_time")
+  private String endTime;
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
index 7166a31c2f..81fd04b8e9 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
@@ -1,5 +1,6 @@
 package com.github.binarywang.wxpay.bean.payscore;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -13,118 +14,60 @@
 @NoArgsConstructor
 @Data
 public class WxPayScoreRequest implements Serializable {
-
-
   private static final long serialVersionUID = 364764508076146082L;
-  /**
-     * out_order_no : 1234323JKHDFE1243252
-     * appid : wxd678efh567hg6787
-     * service_id : 500001
-     * service_introduction : 某某酒店
-     * post_payments : [{"name":"就餐费用服务费","amount":4000,"description":"就餐人均100元服务费：100/小时","count":1}]
-     * post_discounts : [{"name":"满20减1元","description":"不与其他优惠叠加"}]
-     * time_range : {"start_time":"20091225091010","end_time":"20091225121010"}
-     * location : {"start_location":"嗨客时尚主题展餐厅","end_location":"嗨客时尚主题展餐厅"}
-     * risk_fund : {"name":"ESTIMATE_ORDER_COST","amount":10000,"description":"就餐的预估费用"}
-     * attach : Easdfowealsdkjfnlaksjdlfkwqoi&wl3l2sald
-     * notify_url : https://api.test.com
-     * openid : oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
-     * need_user_confirm : true
-     */
-
-    private String out_order_no;
-    private String appid;
-    private String service_id;
-    private String service_introduction;
-    private TimeRange time_range;
-    private Location location;
-    private RiskFund risk_fund;
-    private String attach;
-    private String notify_url;
-    private String openid;
-    private boolean need_user_confirm;
-    private boolean profit_sharing;
-    private List<PostPayments> post_payments;
-    private List<PostDiscounts> post_discounts;
-    private int total_amount;
-    private String reason;
-    private String goods_tag;
-    private String type;
-    private Detail detail;
-
-  @NoArgsConstructor
-  @Data
-  public static class Detail {
-    private String paid_time;
-  }
-
-
-
-    @NoArgsConstructor
-    @Data
-    public static class TimeRange {
-        /**
-         * start_time : 20091225091010
-         * end_time : 20091225121010
-         */
 
-        private String start_time;
-        private String end_time;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class Location {
-        /**
-         * start_location : 嗨客时尚主题展餐厅
-         * end_location : 嗨客时尚主题展餐厅
-         */
-
-        private String start_location;
-        private String end_location;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class RiskFund {
-        /**
-         * name : ESTIMATE_ORDER_COST
-         * amount : 10000
-         * description : 就餐的预估费用
-         */
-
-        private String name;
-        private int amount;
-        private String description;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class PostPayments {
-        /**
-         * name : 就餐费用服务费
-         * amount : 4000
-         * description : 就餐人均100元服务费：100/小时
-         * count : 1
-         */
-
-        private String name;
-        private int amount;
-        private String description;
-        private int count;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class PostDiscounts {
-        /**
-         * name : 满20减1元
-         * description : 不与其他优惠叠加
-         */
+  /**
+   * out_order_no : 1234323JKHDFE1243252
+   * appid : wxd678efh567hg6787
+   * service_id : 500001
+   * service_introduction : 某某酒店
+   * post_payments : [{"name":"就餐费用服务费","amount":4000,"description":"就餐人均100元服务费：100/小时","count":1}]
+   * post_discounts : [{"name":"满20减1元","description":"不与其他优惠叠加"}]
+   * time_range : {"start_time":"20091225091010","end_time":"20091225121010"}
+   * location : {"start_location":"嗨客时尚主题展餐厅","end_location":"嗨客时尚主题展餐厅"}
+   * risk_fund : {"name":"ESTIMATE_ORDER_COST","amount":10000,"description":"就餐的预估费用"}
+   * attach : Easdfowealsdkjfnlaksjdlfkwqoi&wl3l2sald
+   * notify_url : https://api.test.com
+   * openid : oUpF8uMuAJO_M2pxb1Q9zNjWeS6o
+   * need_user_confirm : true
+   */
+  @SerializedName("out_order_no")
+  private String outOrderNo;
+  @SerializedName("appid")
+  private String appid;
+  @SerializedName("service_id")
+  private String serviceId;
+  @SerializedName("service_introduction")
+  private String serviceIntroduction;
+  @SerializedName("time_range")
+  private TimeRange timeRange;
+  @SerializedName("location")
+  private Location location;
+  @SerializedName("risk_fund")
+  private RiskFund riskFund;
+  @SerializedName("attach")
+  private String attach;
+  @SerializedName("notify_url")
+  private String notifyUrl;
+  @SerializedName("openid")
+  private String openid;
+  @SerializedName("need_user_confirm")
+  private boolean needUserConfirm;
+  @SerializedName("profit_sharing")
+  private boolean profitSharing;
+  @SerializedName("post_payments")
+  private List<PostPayment> postPayments;
+  @SerializedName("post_discounts")
+  private List<PostDiscount> postDiscounts;
+  @SerializedName("total_amount")
+  private int totalAmount;
+  @SerializedName("reason")
+  private String reason;
+  @SerializedName("goods_tag")
+  private String goodsTag;
+  @SerializedName("type")
+  private String type;
+  @SerializedName("detail")
+  private Detail detail;
 
-        private String name;
-        private String description;
-        private int count;
-        private int amount;
-    }
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreResult.java
index 6f72039bc2..506148ad96 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreResult.java
@@ -1,6 +1,6 @@
 package com.github.binarywang.wxpay.bean.payscore;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -15,119 +15,78 @@
 @NoArgsConstructor
 @Data
 public class WxPayScoreResult implements Serializable {
-
-
   private static final long serialVersionUID = 8809250065540275770L;
-  /**
-     * appid : wxd678efh567hg6787
-     * mchid : 1230000109
-     * out_order_no : 1234323JKHDFE1243252
-     * service_id : 500001
-     * service_introduction : 某某酒店
-     * state : CREATED
-     * state_description : MCH_COMPLETE
-     * post_payments : [{"name":"就餐费用服务费","amount":4000,"description":"就餐人均100元服务费：100/小时","count":1}]
-     * post_discounts : [{"name":"满20减1元","description":"不与其他优惠叠加"}]
-     * risk_fund : {"name":" ESTIMATE_ORDER_COST","amount":10000,"description":"就餐的预估费用"}
-     * time_range : {"start_time":"20091225091010","end_time":"20091225121010"}
-     * location : {"start_location":"嗨客时尚主题展餐厅","end_location":"嗨客时尚主题展餐厅"}
-     * attach : Easdfowealsdkjfnlaksjdlfkwqoi&wl3l2sald
-     * notify_url : https://api.test.com
-     * order_id : 15646546545165651651
-     * package :  DJIOSQPYWDxsjdldeuwhdodwxasd_dDiodnwjh9we
-     */
 
-    private String appid;
-    private String mchid;
-    private String out_order_no;
-    private String service_id;
-    private String service_introduction;
-    private String state;
-    private String state_description;
-    private RiskFund risk_fund;
-    private TimeRange time_range;
-    private Location location;
-    private String attach;
-    private String notify_url;
-    private String order_id;
-    @JSONField(name = "package")
-    private String packageX;
-    private List<PostPayments> post_payments;
-    private List<PostDiscounts> post_discounts;
-  private boolean need_collection;
+  /**
+   * appid : wxd678efh567hg6787
+   * mchid : 1230000109
+   * out_order_no : 1234323JKHDFE1243252
+   * service_id : 500001
+   * service_introduction : 某某酒店
+   * state : CREATED
+   * state_description : MCH_COMPLETE
+   * post_payments : [{"name":"就餐费用服务费","amount":4000,"description":"就餐人均100元服务费：100/小时","count":1}]
+   * post_discounts : [{"name":"满20减1元","description":"不与其他优惠叠加"}]
+   * risk_fund : {"name":" ESTIMATE_ORDER_COST","amount":10000,"description":"就餐的预估费用"}
+   * time_range : {"start_time":"20091225091010","end_time":"20091225121010"}
+   * location : {"start_location":"嗨客时尚主题展餐厅","end_location":"嗨客时尚主题展餐厅"}
+   * attach : Easdfowealsdkjfnlaksjdlfkwqoi&wl3l2sald
+   * notify_url : https://api.test.com
+   * order_id : 15646546545165651651
+   * package :  DJIOSQPYWDxsjdldeuwhdodwxasd_dDiodnwjh9we
+   */
+  @SerializedName("appid")
+  private String appid;
+  @SerializedName("mchid")
+  private String mchid;
+  @SerializedName("out_order_no")
+  private String outOrderNo;
+  @SerializedName("service_id")
+  private String serviceId;
+  @SerializedName("service_introduction")
+  private String serviceIntroduction;
+  @SerializedName("state")
+  private String state;
+  @SerializedName("state_description")
+  private String stateDescription;
+  @SerializedName("risk_fund")
+  private RiskFund riskFund;
+  @SerializedName("time_range")
+  private TimeRange timeRange;
+  @SerializedName("location")
+  private Location location;
+  @SerializedName("attach")
+  private String attach;
+  @SerializedName("notify_url")
+  private String notifyUrl;
+  @SerializedName("order_id")
+  private String orderId;
+  @SerializedName("package")
+  private String packageX;
+  @SerializedName("post_payments")
+  private List<PostPayment> postPayments;
+  @SerializedName("post_discounts")
+  private List<PostDiscount> postDiscounts;
+  @SerializedName("need_collection")
+  private boolean needCollection;
+  /**
+   * 收款信息
+   */
+  @SerializedName("collection")
   private Collection collection;
-  //用于跳转的sign注意区分需确认模式和无需确认模式的数据差别。创单接口会返回，查询请自行组装
+  /**
+   * 用于跳转的sign注意区分需确认模式和无需确认模式的数据差别。创单接口会返回，查询请自行组装
+   */
+  @SerializedName("payScoreSignInfo")
   private Map<String, String> payScoreSignInfo;
 
-    @NoArgsConstructor
-    @Data
-    public static class RiskFund {
-        /**
-         * name :  ESTIMATE_ORDER_COST
-         * amount : 10000
-         * description : 就餐的预估费用
-         */
-
-        private String name;
-        private int amount;
-        private String description;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class TimeRange {
-        /**
-         * start_time : 20091225091010
-         * end_time : 20091225121010
-         */
-
-        private String start_time;
-        private String end_time;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class Location {
-        /**
-         * start_location : 嗨客时尚主题展餐厅
-         * end_location : 嗨客时尚主题展餐厅
-         */
-
-        private String start_location;
-        private String end_location;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class PostPayments {
-        /**
-         * name : 就餐费用服务费
-         * amount : 4000
-         * description : 就餐人均100元服务费：100/小时
-         * count : 1
-         */
-
-        private String name;
-        private int amount;
-        private String description;
-        private int count;
-    }
-
-    @NoArgsConstructor
-    @Data
-    public static class PostDiscounts {
-        /**
-         * name : 满20减1元
-         * description : 不与其他优惠叠加
-         */
-
-        private String name;
-        private String description;
-    }
-
-  @NoArgsConstructor
+  /**
+   * 收款信息
+   */
   @Data
-  public static class Collection {
+  @NoArgsConstructor
+  public static class Collection implements Serializable {
+    private static final long serialVersionUID = 2279516555276133086L;
     /**
      * state : USER_PAID
      * total_amount : 3900
@@ -135,29 +94,16 @@ public static class Collection {
      * paid_amount : 900
      * details : [{"seq":1,"amount":900,"paid_type":"NEWTON","paid_time":"20091225091210","transaction_id":"15646546545165651651"}]
      */
-
+    @SerializedName("state")
     private String state;
-    private int total_amount;
-    private int paying_amount;
-    private int paid_amount;
-    private List<Details> details;
-
-    @NoArgsConstructor
-    @Data
-    public static class Details {
-      /**
-       * seq : 1
-       * amount : 900
-       * paid_type : NEWTON
-       * paid_time : 20091225091210
-       * transaction_id : 15646546545165651651
-       */
-
-      private int seq;
-      private int amount;
-      private String paid_type;
-      private String paid_time;
-      private String transaction_id;
-    }
+    @SerializedName("total_amount")
+    private int totalAmount;
+    @SerializedName("paying_amount")
+    private int payingAmount;
+    @SerializedName("paid_amount")
+    private int paidAmount;
+    @SerializedName("details")
+    private List<Detail> details;
   }
+
 }
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 4371afe10b..7b23ea485f 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
@@ -9,6 +9,7 @@
 import com.github.binarywang.wxpay.v3.util.PemUtils;
 import lombok.Data;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.ssl.SSLContexts;
@@ -16,6 +17,7 @@
 import javax.net.ssl.SSLContext;
 import java.io.*;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.security.KeyStore;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
@@ -107,7 +109,7 @@ public class WxPayConfig {
   /**
    * apiV3 秘钥值.
    */
-  private String  apiv3Key;
+  private String apiV3Key;
 
   /**
    * apiV3 证书序列号值
@@ -125,7 +127,7 @@ public class WxPayConfig {
    */
   private String payScoreNotifyUrl;
 
-  private CloseableHttpClient apiv3HttpClient;
+  private CloseableHttpClient apiV3HttpClient;
 
 
   /**
@@ -151,6 +153,7 @@ public class WxPayConfig {
 
   /**
    * 返回所设置的微信支付接口请求地址域名.
+   *
    * @return 微信支付接口请求地址域名
    */
   public String getPayBaseUrl() {
@@ -184,10 +187,11 @@ public SSLContext initSSLContext() throws WxPayException {
       String fileHasProblemMsg = "证书文件【" + this.getKeyPath() + "】有问题，请核实！";
       String fileNotFoundMsg = "证书文件【" + this.getKeyPath() + "】不存在，请核实！";
       if (this.getKeyPath().startsWith(prefix)) {
-        String path = StringUtils.removeFirst(this.getKeyPath(), prefix);
+        String path = RegExUtils.removeFirst(this.getKeyPath(), prefix);
         if (!path.startsWith("/")) {
           path = "/" + path;
         }
+
         inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
         if (inputStream == null) {
           throw new WxPayException(fileNotFoundMsg);
@@ -230,18 +234,17 @@ public SSLContext initSSLContext() throws WxPayException {
 
 
   /**
-   * @Author doger.wang
-   * @Description 初始化api v3请求头 自动签名验签
+   * 初始化api v3请求头 自动签名验签
    * 方法参照微信官方https://github.com/wechatpay-apiv3/wechatpay-apache-httpclient
-   * @Date  2020/5/14 10:10
-   * @Param []
+   *
    * @return org.apache.http.impl.client.CloseableHttpClient
+   * @author doger.wang
    **/
-  public CloseableHttpClient initApiV3HttpClient()throws WxPayException {
+  public CloseableHttpClient initApiV3HttpClient() throws WxPayException {
     String privateKeyPath = this.getPrivateKeyPath();
     String privateCertPath = this.getPrivateCertPath();
     String certSerialNo = this.getCertSerialNo();
-    String apiv3Key = this.getApiv3Key();
+    String apiV3Key = this.getApiV3Key();
     if (StringUtils.isBlank(privateKeyPath)) {
       throw new WxPayException("请确保privateKeyPath已设置");
     }
@@ -251,55 +254,55 @@ public CloseableHttpClient initApiV3HttpClient()throws WxPayException {
     if (StringUtils.isBlank(certSerialNo)) {
       throw new WxPayException("请确保certSerialNo证书序列号已设置");
     }
-    if (StringUtils.isBlank(apiv3Key)) {
-      throw new WxPayException("请确保apiv3Key值已设置");
+    if (StringUtils.isBlank(apiV3Key)) {
+      throw new WxPayException("请确保apiV3Key值已设置");
     }
 
-
-    InputStream keyinputStream=null;
-    InputStream certinputStream=null;
+    InputStream keyInputStream = null;
+    InputStream certInputStream = null;
     final String prefix = "classpath:";
     if (privateKeyPath.startsWith(prefix)) {
-      String keypath = StringUtils.removeFirst(privateKeyPath, prefix);
+      String keypath = RegExUtils.removeFirst(privateKeyPath, prefix);
       if (!keypath.startsWith("/")) {
         keypath = "/" + keypath;
       }
-      keyinputStream = WxPayConfig.class.getResourceAsStream(keypath);
-      if (keyinputStream == null) {
+      keyInputStream = WxPayConfig.class.getResourceAsStream(keypath);
+      if (keyInputStream == null) {
         throw new WxPayException("证书文件【" + this.getPrivateKeyPath() + "】不存在，请核实！");
       }
     }
 
-      if (privateCertPath.startsWith(prefix)) {
-        String certpath = StringUtils.removeFirst(privateCertPath, prefix);
-        if (!certpath.startsWith("/")) {
-          certpath = "/" + certpath;
-        }
-        certinputStream = WxPayConfig.class.getResourceAsStream(certpath);
-        if (certinputStream == null) {
-          throw new WxPayException("证书文件【" + this.getPrivateCertPath() + "】不存在，请核实！");
-        }
+    if (privateCertPath.startsWith(prefix)) {
+      String certpath = RegExUtils.removeFirst(privateCertPath, prefix);
+      if (!certpath.startsWith("/")) {
+        certpath = "/" + certpath;
       }
-        CloseableHttpClient httpClient = null;
-        try {
-          WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create();
-          PrivateKey merchantPrivateKey = PemUtils.loadPrivateKey(keyinputStream);
-          X509Certificate x509Certificate = PemUtils.loadCertificate(certinputStream);
-          ArrayList<X509Certificate> certificates = new ArrayList<>();
-          certificates.add(x509Certificate);
-          builder.withMerchant(mchId, certSerialNo, merchantPrivateKey);
-          builder.withWechatpay(certificates);
-          AutoUpdateCertificatesVerifier verifier = new AutoUpdateCertificatesVerifier(
-            new WechatPay2Credentials(mchId, new PrivateKeySigner(certSerialNo, merchantPrivateKey)),
-            apiv3Key.getBytes("utf-8"));
-          builder.withValidator(new WechatPay2Validator(verifier));
-          httpClient = builder.build();
-          this.apiv3HttpClient =httpClient;
-        } catch (Exception e) {
-          throw new WxPayException("v3请求构造异常", e);
-        }
-        return httpClient;
-
+      certInputStream = WxPayConfig.class.getResourceAsStream(certpath);
+      if (certInputStream == null) {
+        throw new WxPayException("证书文件【" + this.getPrivateCertPath() + "】不存在，请核实！");
+      }
+    }
 
+    CloseableHttpClient httpClient;
+    try {
+      WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create();
+      PrivateKey merchantPrivateKey = PemUtils.loadPrivateKey(keyInputStream);
+      X509Certificate x509Certificate = PemUtils.loadCertificate(certInputStream);
+      ArrayList<X509Certificate> certificates = new ArrayList<>();
+      certificates.add(x509Certificate);
+      builder.withMerchant(mchId, certSerialNo, merchantPrivateKey);
+      builder.withWechatpay(certificates);
+      AutoUpdateCertificatesVerifier verifier = new AutoUpdateCertificatesVerifier(
+        new WechatPay2Credentials(mchId, new PrivateKeySigner(certSerialNo, merchantPrivateKey)),
+        apiV3Key.getBytes(StandardCharsets.UTF_8));
+      builder.withValidator(new WechatPay2Validator(verifier));
+      httpClient = builder.build();
+      this.apiV3HttpClient = httpClient;
+    } catch (Exception e) {
+      throw new WxPayException("v3请求构造异常！", e);
     }
+
+    return httpClient;
+
   }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
index e85df7f88d..dafa474bee 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
@@ -1,6 +1,6 @@
 package com.github.binarywang.wxpay.service;
 
-import com.github.binarywang.wxpay.bean.payscore.NotifyData;
+import com.github.binarywang.wxpay.bean.payscore.PayScoreNotifyData;
 import com.github.binarywang.wxpay.bean.payscore.WxPayScoreRequest;
 import com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult;
 import com.github.binarywang.wxpay.exception.WxPayException;
@@ -11,154 +11,120 @@
  * <pre>
  *  支付分相关服务类.
  *   微信支付分是对个人的身份特质、支付行为、使用历史等情况的综合计算分值，旨在为用户提供更简单便捷的生活方式。
- *   微信用户可以在具体应用场景中，开通微信支付分。开通后，用户可以在【微信—>钱包—>支付分】中查看分数和使用记录。（即需在应用场景中使用过一次，钱包才会出现支付分入口）
+ *   微信用户可以在具体应用场景中，开通微信支付分。开通后，用户可以在【微信—>钱包—>支付分】中查看分数和使用记录。
+ *   （即需在应用场景中使用过一次，钱包才会出现支付分入口）
  *
  *  Created by doger.wang on 2020/05/12.
  * </pre>
  *
- *
+ * @author doger.wang
  */
 public interface PayScoreService {
-
-
-
   /**
    * <pre>
    * 支付分创建订单API.
-   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter1_1.shtml
-   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_1.shtml
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_1.shtml
+   * 接口链接：https://api.mch.weixin.qq.com/v3/payscore/serviceorder
    * </pre>
    *
    * @param request 请求对象
-   * @return WxPayScoreResult
+   * @return WxPayScoreResult wx pay score result
    * @throws WxPayException the wx pay exception
    */
   WxPayScoreResult createServiceOrder(WxPayScoreRequest request) throws WxPayException;
 
-
-
   /**
    * <pre>
    * 支付分查询订单API.
    * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_2.shtml
-   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_2.shtml
+   * 接口链接：https://api.mch.weixin.qq.com/v3/payscore/serviceorder
    * </pre>
    *
-   * @Author doger.wang
-   * @Description
-   * @Date  2020/5/14 15:40
-   * @Param out_order_no, query_id选填一个
-   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
-   **/
-  WxPayScoreResult queryServiceOrder( String out_order_no,String query_id ) throws WxPayException, URISyntaxException;
-
+   * @param outOrderNo the out order no
+   * @param queryId    the query id
+   * @return the wx pay score result
+   * @throws WxPayException     the wx pay exception
+   * @throws URISyntaxException the uri syntax exception
+   */
+  WxPayScoreResult queryServiceOrder(String outOrderNo, String queryId) throws WxPayException, URISyntaxException;
 
   /**
    * <pre>
    * 支付分取消订单API.
    * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_3.shtml
-   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_3.shtml
+   * 接口链接：https://api.mch.weixin.qq.com/v3/payscore/serviceorder/{out_order_no}/cancel
    * </pre>
    *
-   * @Author doger.wang
-   * @Description
-   * @Date  2020/5/14 15:40
-   * @Param out_order_no reason
-   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
-   **/
-  WxPayScoreResult cancelServiceOrder(String out_order_no,  String reason) throws WxPayException;
+   * @param outOrderNo the out order no
+   * @param reason     the reason
+   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult wx pay score result
+   * @throws WxPayException the wx pay exception
+   */
+  WxPayScoreResult cancelServiceOrder(String outOrderNo, String reason) throws WxPayException;
 
   /**
    * <pre>
    * 支付分修改订单金额API.
    * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_4.shtml
-   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_4.shtml
+   * 接口链接：https://api.mch.weixin.qq.com/v3/payscore/serviceorder/{out_order_no}/modify
    * </pre>
    *
-   * @Author doger.wang
-   * @Description
-   * @Date  2020/5/14 15:40
-   * @Param WxPayScoreRequest
-   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
-   **/
+   * @param request the request
+   * @return the wx pay score result
+   * @throws WxPayException the wx pay exception
+   */
   WxPayScoreResult modifyServiceOrder(WxPayScoreRequest request) throws WxPayException;
 
-
   /**
    * <pre>
    * 支付分完结订单API.
    * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_5.shtml
-   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_5.shtml
+   * 请求URL：https://api.mch.weixin.qq.com/v3/payscore/serviceorder/{out_order_no}/complete
    * </pre>
    *
-   * @Author doger.wang
-   * @Description
-   * @Date  2020/5/14 15:40
-   * @Param WxPayScoreRequest
-   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
-   **/
+   * @param request the request
+   * @return the wx pay score result
+   * @throws WxPayException the wx pay exception
+   */
   WxPayScoreResult completeServiceOrder(WxPayScoreRequest request) throws WxPayException;
 
-
   /**
    * <pre>
    * 支付分订单收款API.
    * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_6.shtml
-   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_6.shtml
+   * 请求URL：https://api.mch.weixin.qq.com/v3/payscore/serviceorder/{out_order_no}/pay
+   *
    * </pre>
    *
-   * @Author doger.wang
-   * @Description
-   * @Date  2020/5/14 15:40
-   * @Param out_order_no
-   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
-   **/
-  WxPayScoreResult payServiceOrder(String out_order_no) throws WxPayException;
-
+   * @param outOrderNo the out order no
+   * @return the wx pay score result
+   * @throws WxPayException the wx pay exception
+   */
+  WxPayScoreResult payServiceOrder(String outOrderNo) throws WxPayException;
 
   /**
    * <pre>
    * 支付分订单收款API.
    * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_7.shtml
-   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter3_7.shtml
+   * 请求URL： https://api.mch.weixin.qq.com/v3/payscore/serviceorder/{out_order_no}/sync
    * </pre>
    *
-   * @Author doger.wang
-   * @Description
-   * @Date  2020/5/14 15:40
-   * @Param WxPayScoreRequest
-   * @return com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult
-   **/
+   * @param request the request
+   * @return the wx pay score result
+   * @throws WxPayException the wx pay exception
+   */
   WxPayScoreResult syncServiceOrder(WxPayScoreRequest request) throws WxPayException;
 
-
   /**
    * <pre>
-   * 支付分回调内容解密方法
+   * 支付分回调内容解析方法
    * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter5_2.shtml
-   * 接口链接：https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter5_2.shtml
    * </pre>
    *
-   * @param NotifyData 请求对象
-   * @return WxPayScoreResult
+   * @param data the data
+   * @return the wx pay score result
+   * @throws WxPayException the wx pay exception
    */
-  WxPayScoreResult decryptNotifyData(NotifyData data) throws WxPayException;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  WxPayScoreResult parseNotifyData(PayScoreNotifyData data) throws WxPayException;
 
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
index 2756a712c7..79b64fb3fb 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
@@ -1,7 +1,6 @@
 package com.github.binarywang.wxpay.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
-import com.github.binarywang.wxpay.bean.payscore.NotifyData;
+import com.github.binarywang.wxpay.bean.payscore.PayScoreNotifyData;
 import com.github.binarywang.wxpay.bean.payscore.WxPayScoreRequest;
 import com.github.binarywang.wxpay.bean.payscore.WxPayScoreResult;
 import com.github.binarywang.wxpay.config.WxPayConfig;
@@ -9,11 +8,13 @@
 import com.github.binarywang.wxpay.service.PayScoreService;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.v3.util.AesUtils;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
 
 import java.io.IOException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.GeneralSecurityException;
 import java.util.HashMap;
@@ -23,35 +24,31 @@
  * @author doger.wang
  * @date 2020/5/14 9:43
  */
-
+@RequiredArgsConstructor
 public class PayScoreServiceImpl implements PayScoreService {
-  private WxPayService payService;
-
-  public PayScoreServiceImpl(WxPayService payService) {
-    this.payService = payService;
-  }
-
+  private static final Gson GSON = new GsonBuilder().create();
+  private final WxPayService payService;
 
   @Override
   public WxPayScoreResult createServiceOrder(WxPayScoreRequest request) throws WxPayException {
-    boolean need_user_confirm = request.isNeed_user_confirm();
+    boolean needUserConfirm = request.isNeedUserConfirm();
     WxPayConfig config = this.payService.getConfig();
     String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder";
     request.setAppid(config.getAppId());
-    request.setService_id(config.getServiceId());
-    request.setNotify_url(config.getPayScoreNotifyUrl());
-    String result = payService.postV3(url, JSONObject.toJSONString(request));
-    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
+    request.setServiceId(config.getServiceId());
+    request.setNotifyUrl(config.getPayScoreNotifyUrl());
+    String result = payService.postV3(url, GSON.toJson(request));
+    WxPayScoreResult wxPayScoreCreateResult = GSON.fromJson(result, WxPayScoreResult.class);
 
     //补充算一下签名给小程序跳转用
     String currentTimeMillis = System.currentTimeMillis() + "";
-    Map<String, String> signMap = new HashMap<>();
+    Map<String, String> signMap = new HashMap<>(8);
     signMap.put("mch_id", config.getMchId());
-    if (need_user_confirm){
+    if (needUserConfirm) {
       signMap.put("package", wxPayScoreCreateResult.getPackageX());
-    }else {
+    } else {
       signMap.put("service_id", config.getServiceId());
-      signMap.put("out_order_no", request.getOut_order_no());
+      signMap.put("out_order_no", request.getOutOrderNo());
     }
     signMap.put("timestamp", currentTimeMillis);
     signMap.put("nonce_str", currentTimeMillis);
@@ -63,131 +60,96 @@ public WxPayScoreResult createServiceOrder(WxPayScoreRequest request) throws WxP
   }
 
   @Override
-  public WxPayScoreResult queryServiceOrder(String out_order_no, String query_id) throws WxPayException, URISyntaxException {
+  public WxPayScoreResult queryServiceOrder(String outOrderNo, String queryId) throws WxPayException, URISyntaxException {
     WxPayConfig config = this.payService.getConfig();
     String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder";
-    URIBuilder uriBuilder =   new URIBuilder(url);
-    if (StringUtils.isAllEmpty(out_order_no,query_id) || !StringUtils.isAnyEmpty(out_order_no,query_id)){
+    URIBuilder uriBuilder = new URIBuilder(url);
+    if (StringUtils.isAllEmpty(outOrderNo, queryId) || !StringUtils.isAnyEmpty(outOrderNo, queryId)) {
       throw new WxPayException("out_order_no,query_id不允许都填写或都不填写");
     }
-    if (StringUtils.isNotEmpty(out_order_no)){
-      uriBuilder.setParameter("out_order_no", out_order_no);
+    if (StringUtils.isNotEmpty(outOrderNo)) {
+      uriBuilder.setParameter("out_order_no", outOrderNo);
     }
-    if (StringUtils.isNotEmpty(query_id)){
-      uriBuilder.setParameter("query_id", query_id);
+    if (StringUtils.isNotEmpty(queryId)) {
+      uriBuilder.setParameter("query_id", queryId);
     }
     uriBuilder.setParameter("service_id", config.getServiceId());
     uriBuilder.setParameter("appid", config.getAppId());
-    URI build = uriBuilder.build();
-    String result = payService.getV3(build);
-    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
-    //补充一下加密跳转信息
-/*    String currentTimeMillis = System.currentTimeMillis() + "";
-    Map<String, String> signMap = new HashMap();
-    signMap.put("mch_id", config.getMchId());
-    signMap.put("service_id", config.getServiceId());
-    signMap.put("out_order_no", out_order_no);
-    signMap.put("timestamp", currentTimeMillis);
-    signMap.put("nonce_str", currentTimeMillis);
-    signMap.put("sign_type", "HMAC-SHA256");
-    String sign = AesUtil.createSign(signMap, config.getMchKey());
-    signMap.put("sign", sign);
-    wxPayScoreCreateResult.setPayScoreSignInfo(signMap);*/
-    return wxPayScoreCreateResult;
-
+    String result = payService.getV3(uriBuilder.build());
+    return GSON.fromJson(result, WxPayScoreResult.class);
   }
 
-
-
   @Override
-  public WxPayScoreResult cancelServiceOrder(String out_order_no, String reason) throws WxPayException {
+  public WxPayScoreResult cancelServiceOrder(String outOrderNo, String reason) throws WxPayException {
     WxPayConfig config = this.payService.getConfig();
-    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/cancel";
-    HashMap<String, Object> map = new HashMap<>();
-    map.put("appid",config.getAppId());
-    map.put("service_id",config.getServiceId());
-    map.put("reason",reason);
-    String result = payService.postV3(url, JSONObject.toJSONString(map));
-    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
-    return wxPayScoreCreateResult;
-
+    String url = String.format("%s/v3/payscore/serviceorder/%s/cancel", this.payService.getPayBaseUrl(), outOrderNo);
+    HashMap<String, Object> map = new HashMap<>(4);
+    map.put("appid", config.getAppId());
+    map.put("service_id", config.getServiceId());
+    map.put("reason", reason);
+    String result = payService.postV3(url, GSON.toJson(map));
+    return GSON.fromJson(result, WxPayScoreResult.class);
   }
 
   @Override
   public WxPayScoreResult modifyServiceOrder(WxPayScoreRequest request) throws WxPayException {
     WxPayConfig config = this.payService.getConfig();
-    String out_order_no = request.getOut_order_no();
-    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/modify";
+    String outOrderNo = request.getOutOrderNo();
+    String url = String.format("%s/v3/payscore/serviceorder/%s/modify", this.payService.getPayBaseUrl(), outOrderNo);
     request.setAppid(config.getAppId());
-    request.setService_id(config.getServiceId());
-    request.setOut_order_no(null);
-    //request.setNotify_url(config.getPayScoreNotifyUrl());
-    String result = payService.postV3(url, JSONObject.toJSONString(request));
-    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
-    return wxPayScoreCreateResult;
-
-
+    request.setServiceId(config.getServiceId());
+    request.setOutOrderNo(null);
+    String result = payService.postV3(url, GSON.toJson(request));
+    return GSON.fromJson(result, WxPayScoreResult.class);
   }
 
   @Override
   public WxPayScoreResult completeServiceOrder(WxPayScoreRequest request) throws WxPayException {
     WxPayConfig config = this.payService.getConfig();
-    String out_order_no = request.getOut_order_no();
-    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/complete";
+    String outOrderNo = request.getOutOrderNo();
+    String url = String.format("%s/v3/payscore/serviceorder/%s/complete", this.payService.getPayBaseUrl(), outOrderNo);
     request.setAppid(config.getAppId());
-    request.setService_id(config.getServiceId());
-    //request.setNotify_url(config.getPayScoreNotifyUrl());
-    request.setOut_order_no(null);
-    String result = payService.postV3(url, JSONObject.toJSONString(request));
-    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
-    return wxPayScoreCreateResult;
-
+    request.setServiceId(config.getServiceId());
+    request.setOutOrderNo(null);
+    String result = payService.postV3(url, GSON.toJson(request));
+    return GSON.fromJson(result, WxPayScoreResult.class);
   }
 
   @Override
-  public WxPayScoreResult payServiceOrder(String out_order_no) throws WxPayException {
+  public WxPayScoreResult payServiceOrder(String outOrderNo) throws WxPayException {
     WxPayConfig config = this.payService.getConfig();
-    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/pay";
-    HashMap<String, Object> map = new HashMap<>();
-    map.put("appid",config.getAppId());
-    map.put("service_id",config.getServiceId());
-    String result = payService.postV3(url, JSONObject.toJSONString(map));
-    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
-    return wxPayScoreCreateResult;
-
+    String url = String.format("%s/v3/payscore/serviceorder/%s/pay", this.payService.getPayBaseUrl(), outOrderNo);
+    HashMap<String, Object> map = new HashMap<>(2);
+    map.put("appid", config.getAppId());
+    map.put("service_id", config.getServiceId());
+    String result = payService.postV3(url, GSON.toJson(map));
+    return GSON.fromJson(result, WxPayScoreResult.class);
   }
 
   @Override
   public WxPayScoreResult syncServiceOrder(WxPayScoreRequest request) throws WxPayException {
     WxPayConfig config = this.payService.getConfig();
-    String out_order_no = request.getOut_order_no();
-    String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder/"+out_order_no+"/sync";
+    String outOrderNo = request.getOutOrderNo();
+    String url = String.format("%s/v3/payscore/serviceorder/%s/sync", this.payService.getPayBaseUrl(), outOrderNo);
     request.setAppid(config.getAppId());
-    request.setService_id(config.getServiceId());
-    request.setOut_order_no(null);
-    //request.setNotify_url(config.getPayScoreNotifyUrl());
-    String result = payService.postV3(url, JSONObject.toJSONString(request));
-    WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(result, WxPayScoreResult.class);
-    return wxPayScoreCreateResult;
-
+    request.setServiceId(config.getServiceId());
+    request.setOutOrderNo(null);
+    String result = payService.postV3(url, GSON.toJson(request));
+    return GSON.fromJson(result, WxPayScoreResult.class);
   }
 
   @Override
-  public WxPayScoreResult decryptNotifyData(NotifyData data) throws WxPayException{
-    NotifyData.Resource resource = data.getResource();
-    String ciphertext = resource.getCiphertext();
-    String associated_data = resource.getAssociated_data();
+  public WxPayScoreResult parseNotifyData(PayScoreNotifyData data) throws WxPayException {
+    PayScoreNotifyData.Resource resource = data.getResource();
+    String cipherText = resource.getCipherText();
+    String associatedData = resource.getAssociatedData();
     String nonce = resource.getNonce();
-    String apiv3Key = this.payService.getConfig().getApiv3Key();
+    String apiV3Key = this.payService.getConfig().getApiV3Key();
     try {
-      String s = AesUtils.decryptToString(associated_data, nonce, ciphertext, apiv3Key);
-      WxPayScoreResult wxPayScoreCreateResult = JSONObject.parseObject(s, WxPayScoreResult.class);
-      return wxPayScoreCreateResult;
-    } catch (GeneralSecurityException e) {
-      throw new WxPayException("解析报文异常",e);
-    } catch (IOException e) {
-      throw new WxPayException("解析报文异常",e);
+      String s = AesUtils.decryptToString(associatedData, nonce, cipherText, apiV3Key);
+      return GSON.fromJson(s, WxPayScoreResult.class);
+    } catch (GeneralSecurityException | IOException e) {
+      throw new WxPayException("解析报文异常！", e);
     }
-
   }
 }
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 065a3fc08a..af74f06e34 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,18 +1,11 @@
 package com.github.binarywang.wxpay.service.impl;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import javax.net.ssl.SSLContext;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.bean.WxPayApiData;
-import com.github.binarywang.wxpay.bean.request.WxPayQueryCommentRequest;
-import com.github.binarywang.wxpay.bean.request.WxPayRedpackQueryRequest;
-import com.github.binarywang.wxpay.bean.result.WxPayCommonResult;
-import com.github.binarywang.wxpay.bean.result.WxPayRedpackQueryResult;
-import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import jodd.util.Base64;
 import org.apache.commons.lang3.StringUtils;
@@ -35,10 +28,6 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 
-import com.github.binarywang.wxpay.bean.WxPayApiData;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import jodd.util.Base64;
-
 /**
  * <pre>
  * 微信支付请求实现类，apache httpclient实现.
@@ -158,7 +147,7 @@ public String getV3(URI url) throws WxPayException {
   }
 
   private CloseableHttpClient createApiV3HttpClient() throws WxPayException {
-    CloseableHttpClient apiv3HttpClient = this.getConfig().getApiv3HttpClient();
+    CloseableHttpClient apiv3HttpClient = this.getConfig().getApiV3HttpClient();
     if (null==apiv3HttpClient){
       return this.getConfig().initApiV3HttpClient();
     }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
new file mode 100644
index 0000000000..fa0c7b9444
--- /dev/null
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
@@ -0,0 +1,46 @@
+package com.github.binarywang.wxpay.service.impl;
+
+import org.testng.annotations.Test;
+
+import static org.testng.Assert.*;
+
+/**
+ * 测试代码，待补充完善.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2020-05-19
+ */
+public class PayScoreServiceImplTest {
+
+    @Test
+    public void testCreateServiceOrder() {
+    }
+
+    @Test
+    public void testQueryServiceOrder() {
+    }
+
+    @Test
+    public void testCancelServiceOrder() {
+    }
+
+    @Test
+    public void testModifyServiceOrder() {
+    }
+
+    @Test
+    public void testCompleteServiceOrder() {
+    }
+
+    @Test
+    public void testPayServiceOrder() {
+    }
+
+    @Test
+    public void testSyncServiceOrder() {
+    }
+
+    @Test
+    public void testDecryptNotifyData() {
+    }
+}

From 40ab5dd4029893435eb4e9422749f2f70262dcdb Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 19 May 2020 21:48:46 +0800
Subject: [PATCH 101/114] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E5=90=8E=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weixin-java-pay/pom.xml                       |   5 +
 .../impl/WxPayServiceApacheHttpImpl.java      |  51 ++++----
 .../auth/AutoUpdateCertificatesVerifier.java  | 112 ++++++++++--------
 3 files changed, 89 insertions(+), 79 deletions(-)

diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index a742999681..6b89031f9b 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -82,6 +82,11 @@
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.9.7</version>
+    </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
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 af74f06e34..0e0d8e79df 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,9 @@
 package com.github.binarywang.wxpay.service.impl;
 
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import javax.net.ssl.SSLContext;
-
-import com.alibaba.fastjson.JSONObject;
 import com.github.binarywang.wxpay.bean.WxPayApiData;
 import com.github.binarywang.wxpay.exception.WxPayException;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import jodd.util.Base64;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
@@ -28,6 +25,10 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 
+import javax.net.ssl.SSLContext;
+import java.net.URI;
+import java.nio.charset.StandardCharsets;
+
 /**
  * <pre>
  * 微信支付请求实现类，apache httpclient实现.
@@ -37,6 +38,8 @@
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public class WxPayServiceApacheHttpImpl extends BaseWxPayServiceImpl {
+  private final static JsonParser JSON_PARSER = new JsonParser();
+
   @Override
   public byte[] postForBytes(String url, String requestStr, boolean useKey) throws WxPayException {
     try {
@@ -92,18 +95,17 @@ public String postV3(String url, String requestStr) throws WxPayException {
     HttpPost httpPost = this.createHttpPost(url, requestStr);
     httpPost.addHeader("Accept", "application/json");
     httpPost.addHeader("Content-Type", "application/json");
-    try (CloseableHttpResponse response = httpClient.execute(httpPost)){
+    try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
       //v3已经改为通过状态码判断200 204 成功
       int statusCode = response.getStatusLine().getStatusCode();
       String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-      if (HttpStatus.SC_OK==statusCode || HttpStatus.SC_NO_CONTENT==statusCode){
+      if (HttpStatus.SC_OK == statusCode || HttpStatus.SC_NO_CONTENT == statusCode) {
         this.log.info("\n【请求地址】：{}\n【请求数据】：{}\n【响应数据】：{}", url, requestStr, responseString);
         return responseString;
-      }else {
+      } else {
         //有错误提示信息返回
-        JSONObject jsonObject = JSONObject.parseObject(responseString);
-        String message = jsonObject.getString("message");
-        throw new WxPayException(message);
+        JsonObject jsonObject = JSON_PARSER.parse(responseString).getAsJsonObject();
+        throw new WxPayException(jsonObject.get("message").getAsString());
       }
     } catch (Exception e) {
       this.log.error("\n【请求地址】：{}\n【请求数据】：{}\n【异常信息】：{}", url, requestStr, e.getMessage());
@@ -113,8 +115,6 @@ public String postV3(String url, String requestStr) throws WxPayException {
     }
 
 
-
-
   }
 
   @Override
@@ -123,18 +123,17 @@ public String getV3(URI url) throws WxPayException {
     HttpGet httpGet = new HttpGet(url);
     httpGet.addHeader("Accept", "application/json");
     httpGet.addHeader("Content-Type", "application/json");
-    try (CloseableHttpResponse response = httpClient.execute(httpGet)){
+    try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
       //v3已经改为通过状态码判断200 204 成功
       int statusCode = response.getStatusLine().getStatusCode();
       String responseString = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-      if (HttpStatus.SC_OK==statusCode || HttpStatus.SC_NO_CONTENT==statusCode){
-        this.log.info("\n【请求地址】：{}\n【响应数据】：{}", url , responseString);
+      if (HttpStatus.SC_OK == statusCode || HttpStatus.SC_NO_CONTENT == statusCode) {
+        this.log.info("\n【请求地址】：{}\n【响应数据】：{}", url, responseString);
         return responseString;
-      }else {
+      } else {
         //有错误提示信息返回
-        JSONObject jsonObject = JSONObject.parseObject(responseString);
-        String message = jsonObject.getString("message");
-        throw new WxPayException(message);
+        JsonObject jsonObject = JSON_PARSER.parse(responseString).getAsJsonObject();
+        throw new WxPayException(jsonObject.get("message").getAsString());
       }
     } catch (Exception e) {
       this.log.error("\n【请求地址】：{}\n【异常信息】：{}", url, e.getMessage());
@@ -142,25 +141,19 @@ public String getV3(URI url) throws WxPayException {
     } finally {
       httpGet.releaseConnection();
     }
-
-
   }
 
   private CloseableHttpClient createApiV3HttpClient() throws WxPayException {
     CloseableHttpClient apiv3HttpClient = this.getConfig().getApiV3HttpClient();
-    if (null==apiv3HttpClient){
+    if (null == apiv3HttpClient) {
       return this.getConfig().initApiV3HttpClient();
     }
     return apiv3HttpClient;
   }
 
-
   private StringEntity createEntry(String requestStr) {
-
-      return new StringEntity(requestStr, ContentType.create("application/json", "utf-8"));
-      //return new StringEntity(new String(requestStr.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
-
-
+    return new StringEntity(requestStr, ContentType.create("application/json", "utf-8"));
+    //return new StringEntity(new String(requestStr.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1));
   }
 
   private HttpClientBuilder createHttpClientBuilder(boolean useKey) throws WxPayException {
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
index 3c382181bb..0a63cc4a4a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
@@ -1,8 +1,22 @@
 package com.github.binarywang.wxpay.v3.auth;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.binarywang.wxpay.v3.Credentials;
+import com.github.binarywang.wxpay.v3.WechatPayHttpClientBuilder;
+import com.github.binarywang.wxpay.v3.util.AesUtils;
+import com.github.binarywang.wxpay.v3.util.PemUtils;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.util.EntityUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.security.GeneralSecurityException;
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
@@ -13,57 +27,56 @@
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.binarywang.wxpay.v3.Credentials;
-import com.github.binarywang.wxpay.v3.WechatPayHttpClientBuilder;
-import com.github.binarywang.wxpay.v3.util.AesUtils;
-import com.github.binarywang.wxpay.v3.util.PemUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * 在原有CertificatesVerifier基础上，增加自动更新证书功能
+ *
+ * @author doger.wang
  */
+@Slf4j
 public class AutoUpdateCertificatesVerifier implements Verifier {
+  /**
+   * 证书下载地址
+   */
+  private static final String CERT_DOWNLOAD_PATH = "https://api.mch.weixin.qq.com/v3/certificates";
 
-  private static final Logger log = LoggerFactory.getLogger(AutoUpdateCertificatesVerifier.class);
-
-  //证书下载地址
-  private static final String CertDownloadPath = "https://api.mch.weixin.qq.com/v3/certificates";
-
-  //上次更新时间
+  /**
+   * 上次更新时间
+   */
   private volatile Instant instant;
 
-  //证书更新间隔时间，单位为分钟
-  private int minutesInterval;
+  /**
+   * 证书更新间隔时间，单位为分钟
+   */
+  private final int minutesInterval;
 
   private CertificatesVerifier verifier;
 
-  private Credentials credentials;
+  private final Credentials credentials;
 
-  private byte[] apiV3Key;
+  private final byte[] apiV3Key;
 
-  private ReentrantLock lock = new ReentrantLock();
+  private final ReentrantLock lock = new ReentrantLock();
 
-  //时间间隔枚举，支持一小时、六小时以及十二小时
+  /**
+   * 时间间隔枚举，支持一小时、六小时以及十二小时
+   */
+  @Getter
+  @RequiredArgsConstructor
   public enum TimeInterval {
-    OneHour(60), SixHours(60 * 6), TwelveHours(60 * 12);
-
-    private int minutes;
-
-    TimeInterval(int minutes) {
-      this.minutes = minutes;
-    }
-
-    public int getMinutes() {
-      return minutes;
-    }
+    /**
+     * 一小时
+     */
+    OneHour(60),
+    /**
+     * 六小时
+     */
+    SixHours(60 * 6),
+    /**
+     * 十二小时
+     */
+    TwelveHours(60 * 12);
+
+    private final int minutes;
   }
 
   public AutoUpdateCertificatesVerifier(Credentials credentials, byte[] apiV3Key) {
@@ -103,11 +116,11 @@ public boolean verify(String serialNumber, byte[] message, String signature) {
 
   private void autoUpdateCert() throws IOException, GeneralSecurityException {
     CloseableHttpClient httpClient = WechatPayHttpClientBuilder.create()
-        .withCredentials(credentials)
-        .withValidator(verifier == null ? (response) -> true : new WechatPay2Validator(verifier))
-        .build();
+      .withCredentials(credentials)
+      .withValidator(verifier == null ? (response) -> true : new WechatPay2Validator(verifier))
+      .build();
 
-    HttpGet httpGet = new HttpGet(CertDownloadPath);
+    HttpGet httpGet = new HttpGet(CERT_DOWNLOAD_PATH);
     httpGet.addHeader("Accept", "application/json");
 
     CloseableHttpResponse response = httpClient.execute(httpGet);
@@ -125,12 +138,10 @@ private void autoUpdateCert() throws IOException, GeneralSecurityException {
     }
   }
 
-
   /**
    * 反序列化证书并解密
    */
-  private List<X509Certificate> deserializeToCerts(byte[] apiV3Key, String body)
-      throws GeneralSecurityException, IOException {
+  private List<X509Certificate> deserializeToCerts(byte[] apiV3Key, String body) throws GeneralSecurityException, IOException {
     AesUtils decryptor = new AesUtils(apiV3Key);
     ObjectMapper mapper = new ObjectMapper();
     JsonNode dataNode = mapper.readTree(body).get("data");
@@ -140,14 +151,14 @@ private List<X509Certificate> deserializeToCerts(byte[] apiV3Key, String body)
         JsonNode encryptCertificateNode = dataNode.get(i).get("encrypt_certificate");
         //解密
         String cert = decryptor.decryptToString(
-            encryptCertificateNode.get("associated_data").toString().replaceAll("\"", "")
-                .getBytes("utf-8"),
-            encryptCertificateNode.get("nonce").toString().replaceAll("\"", "")
-                .getBytes("utf-8"),
-            encryptCertificateNode.get("ciphertext").toString().replaceAll("\"", ""));
+          encryptCertificateNode.get("associated_data").toString().replaceAll("\"", "")
+            .getBytes(StandardCharsets.UTF_8),
+          encryptCertificateNode.get("nonce").toString().replaceAll("\"", "")
+            .getBytes(StandardCharsets.UTF_8),
+          encryptCertificateNode.get("ciphertext").toString().replaceAll("\"", ""));
 
         X509Certificate x509Cert = PemUtils
-            .loadCertificate(new ByteArrayInputStream(cert.getBytes("utf-8")));
+          .loadCertificate(new ByteArrayInputStream(cert.getBytes(StandardCharsets.UTF_8)));
         try {
           x509Cert.checkValidity();
         } catch (CertificateExpiredException | CertificateNotYetValidException e) {
@@ -156,6 +167,7 @@ private List<X509Certificate> deserializeToCerts(byte[] apiV3Key, String body)
         newCertList.add(x509Cert);
       }
     }
+
     return newCertList;
   }
 }

From 4929e4e03e1c339fab26946384e74414159b2378 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Tue, 19 May 2020 22:01:12 +0800
Subject: [PATCH 102/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weixin-java-pay/pom.xml                       | 17 ++----
 .../bean/payscore/WxPayScoreRequest.java      |  8 ++-
 .../impl/WxPayServiceApacheHttpImpl.java      |  6 +-
 .../service/impl/PayScoreServiceImplTest.java | 61 +++++++++++--------
 4 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 6b89031f9b..e9df87aa02 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -12,18 +12,11 @@
   <artifactId>weixin-java-pay</artifactId>
   <name>WxJava - PAY Java SDK</name>
   <description>微信支付 Java SDK</description>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>8</source>
-          <target>8</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
 
   <dependencies>
     <dependency>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
index 81fd04b8e9..e76801b907 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/payscore/WxPayScoreRequest.java
@@ -1,8 +1,11 @@
 package com.github.binarywang.wxpay.bean.payscore;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.List;
@@ -11,8 +14,11 @@
  * @author doger.wang
  * @date 2020/5/12 16:36
  */
-@NoArgsConstructor
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
 public class WxPayScoreRequest implements Serializable {
   private static final long serialVersionUID = 364764508076146082L;
 
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 0e0d8e79df..1b2d08984a 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
@@ -144,11 +144,11 @@ public String getV3(URI url) throws WxPayException {
   }
 
   private CloseableHttpClient createApiV3HttpClient() throws WxPayException {
-    CloseableHttpClient apiv3HttpClient = this.getConfig().getApiV3HttpClient();
-    if (null == apiv3HttpClient) {
+    CloseableHttpClient apiV3HttpClient = this.getConfig().getApiV3HttpClient();
+    if (null == apiV3HttpClient) {
       return this.getConfig().initApiV3HttpClient();
     }
-    return apiv3HttpClient;
+    return apiV3HttpClient;
   }
 
   private StringEntity createEntry(String requestStr) {
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
index fa0c7b9444..b10871b879 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
@@ -1,46 +1,55 @@
 package com.github.binarywang.wxpay.service.impl;
 
+import com.github.binarywang.wxpay.bean.payscore.WxPayScoreRequest;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.testbase.ApiTestModule;
+import com.google.inject.Inject;
+import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
-import static org.testng.Assert.*;
-
 /**
  * 测试代码，待补充完善.
  *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  * @date 2020-05-19
  */
+@Test
+@Guice(modules = ApiTestModule.class)
 public class PayScoreServiceImplTest {
+  @Inject
+  private WxPayService payService;
 
-    @Test
-    public void testCreateServiceOrder() {
-    }
+  @Test
+  public void testCreateServiceOrder() throws WxPayException {
+    this.payService.getPayScoreService().createServiceOrder(WxPayScoreRequest.builder().build());
+  }
 
-    @Test
-    public void testQueryServiceOrder() {
-    }
+  @Test
+  public void testQueryServiceOrder() {
+  }
 
-    @Test
-    public void testCancelServiceOrder() {
-    }
+  @Test
+  public void testCancelServiceOrder() {
+  }
 
-    @Test
-    public void testModifyServiceOrder() {
-    }
+  @Test
+  public void testModifyServiceOrder() {
+  }
 
-    @Test
-    public void testCompleteServiceOrder() {
-    }
+  @Test
+  public void testCompleteServiceOrder() {
+  }
 
-    @Test
-    public void testPayServiceOrder() {
-    }
+  @Test
+  public void testPayServiceOrder() {
+  }
 
-    @Test
-    public void testSyncServiceOrder() {
-    }
+  @Test
+  public void testSyncServiceOrder() {
+  }
 
-    @Test
-    public void testDecryptNotifyData() {
-    }
+  @Test
+  public void testDecryptNotifyData() {
+  }
 }

From 50e50c13c4bd8972c4cc23b67e3b8bece722794d Mon Sep 17 00:00:00 2001
From: spvycf <545997765@qq.com>
Date: Thu, 21 May 2020 21:18:59 +0800
Subject: [PATCH 103/114] =?UTF-8?q?:art:=20=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=88=86=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96=E4=BB=A5=E5=8F=8A=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/service/PayScoreService.java        | 15 ++++-
 .../service/impl/PayScoreServiceImpl.java     |  8 ++-
 .../service/impl/PayScoreServiceImplTest.java | 62 ++++++++++++++++++-
 3 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
index dafa474bee..079f1e7cac 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
@@ -125,6 +125,19 @@ public interface PayScoreService {
    * @return the wx pay score result
    * @throws WxPayException the wx pay exception
    */
-  WxPayScoreResult parseNotifyData(PayScoreNotifyData data) throws WxPayException;
+  PayScoreNotifyData parseNotifyData(String data);
+
+
+  /**
+   * <pre>
+   * 支付分回调NotifyData解密resource
+   * 文档详见: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore/chapter5_2.shtml
+   * </pre>
+   *
+   * @param data the data
+   * @return the wx pay score result
+   * @throws WxPayException the wx pay exception
+   */
+  WxPayScoreResult decryptNotifyDataResource(PayScoreNotifyData data) throws WxPayException;
 
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
index 79b64fb3fb..299e8f87db 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
@@ -139,7 +139,13 @@ public WxPayScoreResult syncServiceOrder(WxPayScoreRequest request) throws WxPay
   }
 
   @Override
-  public WxPayScoreResult parseNotifyData(PayScoreNotifyData data) throws WxPayException {
+  public PayScoreNotifyData parseNotifyData(String data){
+    return GSON.fromJson(data, PayScoreNotifyData.class);
+
+  }
+
+  @Override
+  public WxPayScoreResult decryptNotifyDataResource(PayScoreNotifyData data) throws WxPayException {
     PayScoreNotifyData.Resource resource = data.getResource();
     String cipherText = resource.getCipherText();
     String associatedData = resource.getAssociatedData();
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
index b10871b879..fd805b6fcb 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
@@ -21,16 +21,55 @@ public class PayScoreServiceImplTest {
   private WxPayService payService;
 
   @Test
+
   public void testCreateServiceOrder() throws WxPayException {
+    //测试数据
+/*    {
+      "out_order_no":"QLS202005201058000201",
+      "appid":"",
+      "service_id":"",
+      "service_introduction":"租借服务",
+      "time_range":{
+      "start_time":"OnAccept",
+        "end_time":"20200520225840"
+    },
+      "location":{
+      "start_location":"山",
+        "end_location":"山"
+    },
+      "risk_fund":{
+      "name":"DEPOSIT",
+        "amount":200,
+        "description":"丢失偿还费用2元/台"
+    },
+      "attach":"",
+      "notify_url":"/pay/notify/payScore",
+      "openid":"",
+      "need_user_confirm":true,
+      "profit_sharing":false,
+      "post_payments":[
+      {
+        "name":"租借服务",
+        "amount":100,
+        "description":"服务费：1元/台",
+        "count":1
+      }
+    ],
+      "total_amount":0
+    }*/
+
     this.payService.getPayScoreService().createServiceOrder(WxPayScoreRequest.builder().build());
   }
 
   @Test
   public void testQueryServiceOrder() {
+    //两个参数选填一个
+    this.payService.getPayScoreService().queryServiceOrder("11","");
   }
 
   @Test
   public void testCancelServiceOrder() {
+    this.payService.getPayScoreService().cancelServiceOrder("11","测试取消");
   }
 
   @Test
@@ -38,8 +77,27 @@ public void testModifyServiceOrder() {
   }
 
   @Test
-  public void testCompleteServiceOrder() {
-  }
+  public void testCompleteServiceOrder()  throws WxPayException{
+/*    {
+      "appid":"",
+      "service_id":"",
+      "time_range":{
+      "end_time":"20200520111702"
+    },
+      "need_user_confirm":false,
+      "profit_sharing":false,
+      "post_payments":[
+      {
+        "name":"租借服务",
+        "amount":100,
+        "description":"服务费：1.0000元/台",
+        "count":1
+      }
+    ],
+      "total_amount":100
+    }
+  }*/
+    this.payService.getPayScoreService().completeServiceOrder(WxPayScoreRequest.builder().build());
 
   @Test
   public void testPayServiceOrder() {

From 5c7b6d2af41fb24443c3674df3290dc4b8893d97 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 21 May 2020 21:10:43 +0800
Subject: [PATCH 104/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wx/graal/GraalProcessor.java   | 33 +++++++++----------
 .../session/StandardSessionManager.java       | 22 +++++--------
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/weixin-graal/src/main/java/cn/binarywang/wx/graal/GraalProcessor.java b/weixin-graal/src/main/java/cn/binarywang/wx/graal/GraalProcessor.java
index 2cf569187e..4eaddadf2e 100644
--- a/weixin-graal/src/main/java/cn/binarywang/wx/graal/GraalProcessor.java
+++ b/weixin-graal/src/main/java/cn/binarywang/wx/graal/GraalProcessor.java
@@ -1,6 +1,7 @@
 package cn.binarywang.wx.graal;
 
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
@@ -25,7 +26,6 @@
  *
  * @author outersky
  */
-
 @SupportedAnnotationTypes("lombok.Data")
 @SupportedSourceVersion(SourceVersion.RELEASE_7)
 public class GraalProcessor extends AbstractProcessor {
@@ -38,7 +38,6 @@ public class GraalProcessor extends AbstractProcessor {
   @Override
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
     for (TypeElement annotatedClass : ElementFilter.typesIn(roundEnv.getElementsAnnotatedWith(Data.class))) {
-
       registerClass(annotatedClass.getQualifiedName().toString());
       handleSuperClass(annotatedClass);
     }
@@ -108,29 +107,29 @@ private void writeFiles() {
     String propsFile = path + NATIVE_IMAGE_PROPERTIES;
     try {
       FileObject fileObject = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", propsFile);
-      Writer writer = fileObject.openWriter();
-      writer.append("Args = -H:ReflectionConfigurationResources=${.}/" + REFLECTION_CONFIG_JSON);
-      writer.close();
+      try (Writer writer = fileObject.openWriter();) {
+        writer.append("Args = -H:ReflectionConfigurationResources=${.}/" + REFLECTION_CONFIG_JSON);
+      }
     } catch (IOException e) {
       e.printStackTrace();
     }
 
     try {
       FileObject fileObject = processingEnv.getFiler().createResource(StandardLocation.CLASS_OUTPUT, "", reflectFile);
-      Writer writer = fileObject.openWriter();
-      writer.write("[\n");
-      boolean first = true;
-      for (String name : classSet) {
-        if (first) {
-          first = false;
-        } else {
-          writer.write(",");
+      try (Writer writer = fileObject.openWriter();) {
+        writer.write("[\n");
+        boolean first = true;
+        for (String name : classSet) {
+          if (first) {
+            first = false;
+          } else {
+            writer.write(",");
+          }
+          writer.write(assetGraalJsonElement(name));
+          writer.append('\n');
         }
-        writer.write(assetGraalJsonElement(name));
-        writer.append('\n');
+        writer.write("]");
       }
-      writer.write("]");
-      writer.close();
     } catch (IOException e) {
       e.printStackTrace();
     }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java
index 2472cb44b8..591b7025dd 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/session/StandardSessionManager.java
@@ -1,13 +1,12 @@
 package me.chanjar.weixin.common.session;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
+import me.chanjar.weixin.common.util.res.StringManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import me.chanjar.weixin.common.util.res.StringManager;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * 基于内存的session manager.
@@ -15,7 +14,6 @@
  * @author Daniel Qian
  */
 public class StandardSessionManager implements WxSessionManager, InternalSessionManager {
-
   protected static final StringManager SM = StringManager.getManager(Constants.PACKAGE);
   /**
    * The descriptive name of this Manager implementation (for logging).
@@ -51,7 +49,9 @@ public class StandardSessionManager implements WxSessionManager, InternalSession
    */
   protected int maxInactiveInterval = 30 * 60;
 
-  // Number of sessions created by this manager
+  /**
+   * Number of sessions created by this manager
+   */
   protected long sessionCounter = 0;
 
   protected volatile int maxActive = 0;
@@ -154,12 +154,10 @@ public InternalSession createSession(String sessionId) {
     session.setValid(true);
     session.setCreationTime(System.currentTimeMillis());
     session.setMaxInactiveInterval(this.maxInactiveInterval);
-    String id = sessionId;
-    session.setId(id);
+    session.setId(sessionId);
     this.sessionCounter++;
 
-    return (session);
-
+    return session;
   }
 
 
@@ -181,10 +179,8 @@ protected InternalSession getNewSession() {
     return new StandardSession(this);
   }
 
-
   @Override
   public void add(InternalSession session) {
-
     // 当第一次有session创建的时候，开启session清理线程
     if (!this.backgroundProcessStarted.getAndSet(true)) {
       Thread t = new Thread(new Runnable() {

From 11e81d83186a2f1439483d643de061bb9246ae8e Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 21 May 2020 21:23:53 +0800
Subject: [PATCH 105/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=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/PayScoreService.java        |  3 +--
 .../service/impl/PayScoreServiceImpl.java     | 22 ++++++++++++++-----
 .../service/impl/PayScoreServiceImplTest.java | 17 ++++++++------
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
index 079f1e7cac..e9b71d2cc9 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
@@ -44,9 +44,8 @@ public interface PayScoreService {
    * @param queryId    the query id
    * @return the wx pay score result
    * @throws WxPayException     the wx pay exception
-   * @throws URISyntaxException the uri syntax exception
    */
-  WxPayScoreResult queryServiceOrder(String outOrderNo, String queryId) throws WxPayException, URISyntaxException;
+  WxPayScoreResult queryServiceOrder(String outOrderNo, String queryId) throws WxPayException;
 
   /**
    * <pre>
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
index 299e8f87db..f99d5c91bd 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
@@ -60,10 +60,17 @@ public WxPayScoreResult createServiceOrder(WxPayScoreRequest request) throws WxP
   }
 
   @Override
-  public WxPayScoreResult queryServiceOrder(String outOrderNo, String queryId) throws WxPayException, URISyntaxException {
+  public WxPayScoreResult queryServiceOrder(String outOrderNo, String queryId) throws WxPayException {
     WxPayConfig config = this.payService.getConfig();
     String url = this.payService.getPayBaseUrl() + "/v3/payscore/serviceorder";
-    URIBuilder uriBuilder = new URIBuilder(url);
+
+    URIBuilder uriBuilder;
+    try {
+      uriBuilder = new URIBuilder(url);
+    } catch (URISyntaxException e) {
+      throw new WxPayException("未知异常！", e);
+    }
+
     if (StringUtils.isAllEmpty(outOrderNo, queryId) || !StringUtils.isAnyEmpty(outOrderNo, queryId)) {
       throw new WxPayException("out_order_no,query_id不允许都填写或都不填写");
     }
@@ -75,8 +82,13 @@ public WxPayScoreResult queryServiceOrder(String outOrderNo, String queryId) thr
     }
     uriBuilder.setParameter("service_id", config.getServiceId());
     uriBuilder.setParameter("appid", config.getAppId());
-    String result = payService.getV3(uriBuilder.build());
-    return GSON.fromJson(result, WxPayScoreResult.class);
+    try {
+      String result = payService.getV3(uriBuilder.build());
+      return GSON.fromJson(result, WxPayScoreResult.class);
+    } catch (URISyntaxException e) {
+      throw new WxPayException("未知异常！", e);
+    }
+
   }
 
   @Override
@@ -139,7 +151,7 @@ public WxPayScoreResult syncServiceOrder(WxPayScoreRequest request) throws WxPay
   }
 
   @Override
-  public PayScoreNotifyData parseNotifyData(String data){
+  public PayScoreNotifyData parseNotifyData(String data) {
     return GSON.fromJson(data, PayScoreNotifyData.class);
 
   }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
index fd805b6fcb..67483268c7 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
@@ -8,6 +8,8 @@
 import org.testng.annotations.Guice;
 import org.testng.annotations.Test;
 
+import java.net.URISyntaxException;
+
 /**
  * 测试代码，待补充完善.
  *
@@ -62,14 +64,14 @@ public void testCreateServiceOrder() throws WxPayException {
   }
 
   @Test
-  public void testQueryServiceOrder() {
+  public void testQueryServiceOrder() throws URISyntaxException, WxPayException {
     //两个参数选填一个
-    this.payService.getPayScoreService().queryServiceOrder("11","");
+    this.payService.getPayScoreService().queryServiceOrder("11", "");
   }
 
   @Test
-  public void testCancelServiceOrder() {
-    this.payService.getPayScoreService().cancelServiceOrder("11","测试取消");
+  public void testCancelServiceOrder() throws WxPayException {
+    this.payService.getPayScoreService().cancelServiceOrder("11", "测试取消");
   }
 
   @Test
@@ -77,7 +79,7 @@ public void testModifyServiceOrder() {
   }
 
   @Test
-  public void testCompleteServiceOrder()  throws WxPayException{
+  public void testCompleteServiceOrder() throws WxPayException {
 /*    {
       "appid":"",
       "service_id":"",
@@ -96,9 +98,10 @@ public void testCompleteServiceOrder()  throws WxPayException{
     ],
       "total_amount":100
     }
-  }*/
+*/
     this.payService.getPayScoreService().completeServiceOrder(WxPayScoreRequest.builder().build());
-
+  }
+  
   @Test
   public void testPayServiceOrder() {
   }

From 69ac4ec4a7201e060197932a02de873802ad1cc3 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Thu, 21 May 2020 21:25:30 +0800
Subject: [PATCH 106/114] =?UTF-8?q?:art:=20#1572=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=B0=83=E8=B5=B7=E6=94=AF=E4=BB=98=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84nonceStr=E5=8F=82=E6=95=B0=E4=BD=BF=E7=94=A8=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8B=E5=8D=95=E6=97=B6=E7=9A=84=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index 6d6dc748c5..826af6f39a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -281,7 +281,7 @@ public <T> T createOrder(WxPayUnifiedOrderRequest request) throws WxPayException
     }
 
     String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
-    String nonceStr = String.valueOf(System.currentTimeMillis());
+    String nonceStr = unifiedOrderResult.getNonceStr();
     switch (request.getTradeType()) {
       case TradeType.MWEB: {
         return (T) new WxPayMwebOrderResult(unifiedOrderResult.getMwebUrl());
@@ -387,7 +387,7 @@ 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());
+    String nonceStr = unifiedOrderResult.getNonceStr();
     if (TradeType.NATIVE.equals(request.getTradeType())) {
       payInfo.put("codeUrl", unifiedOrderResult.getCodeURL());
     } else if (TradeType.APP.equals(request.getTradeType())) {

From ae1b14f37efc3e3a043a8907b633e2ba452e28c3 Mon Sep 17 00:00:00 2001
From: Guan Guan <gguan@users.noreply.github.com>
Date: Fri, 22 May 2020 17:11:13 +0800
Subject: [PATCH 107/114] =?UTF-8?q?:art:=20#1575=20=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=8E=B7=E5=8F=96=E7=9B=B4=E6=92=AD=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0share=5Fi?=
 =?UTF-8?q?mg=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
index 5d8ad4e301..77817d3cec 100644
--- a/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
+++ b/weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/WxMaGetLiveInfo.java
@@ -44,6 +44,8 @@ public static class RoomInfo implements Serializable {
     private Integer roomid;
     @SerializedName("cover_img")
     private String coverImg;
+    @SerializedName("share_img")
+    private String shareImg;
     @SerializedName("live_status")
     private Integer liveStatus;
     @SerializedName("start_time")

From bcefec0f4bf1f89b4655acb136469a6d4b315290 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 23 May 2020 20:58:35 +0800
Subject: [PATCH 108/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/github/binarywang/wxpay/service/PayScoreService.java    | 2 --
 .../binarywang/wxpay/service/impl/PayScoreServiceImpl.java      | 1 -
 .../binarywang/wxpay/service/impl/PayScoreServiceImplTest.java  | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
index e9b71d2cc9..d4d3b245e3 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/PayScoreService.java
@@ -122,11 +122,9 @@ public interface PayScoreService {
    *
    * @param data the data
    * @return the wx pay score result
-   * @throws WxPayException the wx pay exception
    */
   PayScoreNotifyData parseNotifyData(String data);
 
-
   /**
    * <pre>
    * 支付分回调NotifyData解密resource
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
index f99d5c91bd..14950a5b2d 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImpl.java
@@ -153,7 +153,6 @@ public WxPayScoreResult syncServiceOrder(WxPayScoreRequest request) throws WxPay
   @Override
   public PayScoreNotifyData parseNotifyData(String data) {
     return GSON.fromJson(data, PayScoreNotifyData.class);
-
   }
 
   @Override
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
index 67483268c7..0aa6cafb2d 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/PayScoreServiceImplTest.java
@@ -101,7 +101,7 @@ public void testCompleteServiceOrder() throws WxPayException {
 */
     this.payService.getPayScoreService().completeServiceOrder(WxPayScoreRequest.builder().build());
   }
-  
+
   @Test
   public void testPayServiceOrder() {
   }

From 4eb1d1d71a1e83ae5a9560fbd86e7e24fc112477 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 23 May 2020 21:09:58 +0800
Subject: [PATCH 109/114] =?UTF-8?q?:art:=20#1571=20=E5=AF=B9=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=A8=A1=E7=89=88=E6=B6=88=E6=81=AF=E8=A1=8C=E4=B8=9A?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E5=8F=98?=
 =?UTF-8?q?=E6=80=81=E9=97=AE=E9=A2=98=E5=B0=BD=E5=8F=AF=E8=83=BD=E7=9A=84?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/WxMpTemplateIndustryEnum.java    | 14 +++++------
 .../mp/util/json/WxMpIndustryGsonAdapter.java |  5 ++++
 .../impl/WxMpTemplateMsgServiceImplTest.java  |  4 +--
 .../template/WxMpTemplateIndustryTest.java    | 25 +++++++++++++------
 4 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java
index b3bfcba1be..022551d64e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryEnum.java
@@ -41,9 +41,9 @@ public enum WxMpTemplateIndustryEnum {
    */
   BANK("金融业", "银行", 7),
   /**
-   * 金融业 - 基金|理财|信托
+   * 金融业 - 证券|基金|理财|信托（实际是这个）
    */
-  FUND("金融业", "基金|理财|信托", 8),
+  FUND("金融业", "证券基金理财信托", 8),
   /**
    * 金融业 - 保险
    */
@@ -93,9 +93,9 @@ public enum WxMpTemplateIndustryEnum {
    */
   MUSEUM("政府与公共事业", "博物馆", 20),
   /**
-   * 政府与公共事业 - 公共事业|非盈利机构
+   * 政府与公共事业 - 公共事业非盈利机构
    */
-  PUBLIC_WORKS_NONPROFIT("政府与公共事业", "公共事业|非盈利机构", 21),
+  PUBLIC_WORKS_NONPROFIT("政府与公共事业", "公共事业非盈利机构", 21),
   /**
    * 医药护理 - 医药医疗
    */
@@ -125,7 +125,7 @@ public enum WxMpTemplateIndustryEnum {
    */
   THE_PLANE_RELATED("交通工具", "飞机相关", 28),
   /**
-   * 房地产 - 建筑
+   * 房地产 - 房地产|建筑（实际上是这个）
    */
   ARCHITECTURE("房地产", "建筑", 29),
   /**
@@ -153,9 +153,9 @@ public enum WxMpTemplateIndustryEnum {
    */
   AUTHENTICATION("商业服务", "认证", 35),
   /**
-   * 商业服务 - 会计|审计
+   * 商业服务 - 审计
    */
-  AUDIT("商业服务", "会计|审计", 36),
+  AUDIT("商业服务", "审计", 36),
   /**
    * 文体娱乐 - 传媒
    */
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java
index 04d9d7dadd..9c418c2a68 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/json/WxMpIndustryGsonAdapter.java
@@ -29,6 +29,11 @@ public WxMpTemplateIndustry deserialize(JsonElement jsonElement, Type type, Json
 
   private WxMpTemplateIndustryEnum convertFromJson(JsonObject json) {
     String secondClass = GsonHelper.getString(json, "second_class");
+    final WxMpTemplateIndustryEnum industryEnum = WxMpTemplateIndustryEnum.findBySecondary(secondClass);
+    if (industryEnum != null) {
+      return industryEnum;
+    }
+
     if (secondClass.contains("|")) {
       secondClass = secondClass.split("\\|")[1];
     }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpTemplateMsgServiceImplTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpTemplateMsgServiceImplTest.java
index 181411df41..884e41b59d 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpTemplateMsgServiceImplTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpTemplateMsgServiceImplTest.java
@@ -53,8 +53,8 @@ public void testGetIndustry() throws Exception {
 
   @Test
   public void testSetIndustry() throws Exception {
-    WxMpTemplateIndustry industry = new WxMpTemplateIndustry(WxMpTemplateIndustryEnum.findByCode(1),
-      WxMpTemplateIndustryEnum.findByCode(4));
+    WxMpTemplateIndustry industry = new WxMpTemplateIndustry(WxMpTemplateIndustryEnum.findByCode(29),
+      WxMpTemplateIndustryEnum.findByCode(8));
     boolean result = this.wxService.getTemplateMsgService().setIndustry(industry);
     Assert.assertTrue(result);
   }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
index eddcfd31bc..c2ae722977 100644
--- a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
+++ b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/template/WxMpTemplateIndustryTest.java
@@ -3,7 +3,6 @@
 import org.testng.annotations.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.testng.Assert.*;
 
 /**
  * 测试类.
@@ -13,11 +12,21 @@
  */
 public class WxMpTemplateIndustryTest {
 
-    @Test
-    public void testFromJson() {
-      String json="{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"互联网|电子商务\"},\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}";
-      final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json);
-      assertThat(industry).isNotNull();
-      System.out.println(industry);
-    }
+  @Test
+  public void testFromJson() {
+    String json = "{\"primary_industry\":{\"first_class\":\"IT科技\",\"second_class\":\"互联网|电子商务\"}," +
+      "\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"房地产|建筑\"}}";
+    final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json);
+    assertThat(industry).isNotNull();
+    System.out.println(industry);
+  }
+
+  @Test
+  public void testFromJson_another_example() {
+    String json = "{\"primary_industry\":{\"first_class\":\"金融业\",\"second_class\":\"基金理财信托\"}," +
+      "\"secondary_industry\":{\"first_class\":\"房地产\",\"second_class\":\"建筑\"}}";
+    final WxMpTemplateIndustry industry = WxMpTemplateIndustry.fromJson(json);
+    assertThat(industry).isNotNull();
+    System.out.println(industry);
+  }
 }

From 06c8ae81d24e352de9ca58a76287d7c7fb658617 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 23 May 2020 21:42:37 +0800
Subject: [PATCH 110/114] =?UTF-8?q?:new:=20#1532=20=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=8A=A0=E6=B1=87?=
 =?UTF-8?q?=E7=8E=87=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxpay/bean/request/BaseWxPayRequest.java  |  9 ++-
 .../WxPayQueryExchangeRateRequest.java        | 61 +++++++++++++++++++
 .../result/WxPayQueryExchangeRateResult.java  | 58 ++++++++++++++++++
 .../wxpay/service/WxPayService.java           | 23 +++++--
 .../service/impl/BaseWxPayServiceImpl.java    | 14 +++++
 .../impl/BaseWxPayServiceImplTest.java        | 15 ++++-
 6 files changed, 172 insertions(+), 8 deletions(-)
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryExchangeRateRequest.java
 create mode 100644 weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayQueryExchangeRateResult.java

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
index 4619e52d4f..f19935e7e1 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/BaseWxPayRequest.java
@@ -170,6 +170,13 @@ private void checkFields() throws WxPayException {
    */
   protected abstract void checkConstraints() throws WxPayException;
 
+  /**
+   * 是否需要nonce_str
+   */
+  protected boolean needNonceStr() {
+    return true;
+  }
+
   /**
    * 如果配置中已经设置，可以不设置值.
    *
@@ -363,7 +370,7 @@ public void checkAndSign(WxPayConfig config) throws WxPayException {
       }
     }
 
-    if (StringUtils.isBlank(getNonceStr())) {
+    if (needNonceStr() && StringUtils.isBlank(getNonceStr())) {
       this.setNonceStr(String.valueOf(System.currentTimeMillis()));
     }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryExchangeRateRequest.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryExchangeRateRequest.java
new file mode 100644
index 0000000000..c4b453b9bd
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/request/WxPayQueryExchangeRateRequest.java
@@ -0,0 +1,61 @@
+package com.github.binarywang.wxpay.bean.request;
+
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.util.Map;
+
+/**
+ * 查询汇率请求.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2020-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@Accessors(chain = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@XStreamAlias("xml")
+public class WxPayQueryExchangeRateRequest extends BaseWxPayRequest {
+  private static final long serialVersionUID = -8796516942563060554L;
+  /**
+   * 币种
+   * fee_type
+   * 是
+   * String(10)
+   * USD
+   * 外币币种
+   */
+  @XStreamAlias("fee_type")
+  private String feeType;
+
+  /**
+   * 日期
+   * date
+   * 是
+   * String(14)
+   * 20150807
+   * 格式为yyyyMMdd，如2009年12月25日表示为20091225。时区为GMT+8 beijing
+   */
+  @XStreamAlias("date")
+  private String date;
+
+  @Override
+  protected void checkConstraints() throws WxPayException {
+
+  }
+
+  @Override
+  protected void storeMap(Map<String, String> map) {
+
+  }
+
+  @Override
+  protected boolean needNonceStr() {
+    return false;
+  }
+}
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayQueryExchangeRateResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayQueryExchangeRateResult.java
new file mode 100644
index 0000000000..d44d282e0f
--- /dev/null
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayQueryExchangeRateResult.java
@@ -0,0 +1,58 @@
+package com.github.binarywang.wxpay.bean.result;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.w3c.dom.Document;
+
+/**
+ * 汇率查询响应.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2020-05-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@XStreamAlias("xml")
+public class WxPayQueryExchangeRateResult extends BaseWxPayResult {
+  private static final long serialVersionUID = 2269734222658532364L;
+
+  /**
+   * 币种
+   * fee_type
+   * 是
+   * String(10)
+   * SUCCESS	外币币种，详细请见参数规定
+   */
+  @XStreamAlias("fee_type")
+  private String feeType;
+
+  /**
+   * 汇率时间
+   * rate_time
+   * 是
+   * String(14)
+   * 20150807131545
+   * 格式：yyyyMMddhhmmss
+   */
+  @XStreamAlias("rate_time")
+  private String rateTime;
+
+  /**
+   * 现汇卖出价
+   * rate
+   * 是
+   * String(15)
+   * 系统错误
+   * 外币标准单位乘以100折算为人民币的金额，保留4位小数(如：100美元按当时汇率折算返回的先汇卖出价是628.2100)
+   */
+  @XStreamAlias("rate")
+  private String rate;
+
+  @Override
+  protected void loadXML(Document d) {
+
+  }
+}
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 ba9de0ffdf..74958c1f91 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
@@ -65,12 +65,10 @@ public interface WxPayService {
    */
   String postV3(String url, String requestStr) throws WxPayException;
 
-
   /**
    * 发送get V3请求，得到响应字符串.
    *
-   * @param url        请求地址
-   * @param param 请求信息
+   * @param url 请求地址
    * @return 返回请求结果字符串 string
    * @throws WxPayException the wx pay exception
    */
@@ -200,11 +198,11 @@ public interface WxPayService {
   /**
    * 调用统一下单接口，并组装生成支付所需参数对象.
    *
-   * @see WxPayService#createOrder(WxPayUnifiedOrderRequest)
    * @param specificTradeType 将使用的交易方式，不能为 null
-   * @param request 统一下单请求参数，设定的 tradeType 及配置里的 tradeType 将被忽略，转而使用 specificTradeType
+   * @param request           统一下单请求参数，设定的 tradeType 及配置里的 tradeType 将被忽略，转而使用 specificTradeType
    * @return 返回 {@link WxPayConstants.TradeType.Specific} 指定的类
    * @throws WxPayException the wx pay exception
+   * @see WxPayService#createOrder(WxPayUnifiedOrderRequest)
    */
   <T> T createOrder(WxPayConstants.TradeType.Specific<T> specificTradeType, WxPayUnifiedOrderRequest request) throws WxPayException;
 
@@ -759,5 +757,18 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
    */
   WxPayFacepayResult facepay(WxPayFacepayRequest request) throws WxPayException;
 
-
+  /**
+   * 查询汇率
+   * <pre>
+   * 应用场景：商户网站的商品以外币标价时，通过该接口可以实时查询到微信使用的转换汇率。汇率更新时间为北京时间上午10:00，一天更新一次。
+   * 文档地址：https://pay.weixin.qq.com/wiki/doc/api/app/app_jw.php?chapter=9_15&index=12
+   * 接口链接：https://api.mch.weixin.qq.com/pay/queryexchagerate
+   * </pre>
+   *
+   * @param feeType 外币币种
+   * @param date    日期，格式为yyyyMMdd，如2009年12月25日表示为20091225。时区为GMT+8 beijing
+   * @return .
+   * @throws WxPayException .
+   */
+  WxPayQueryExchangeRateResult queryExchangeRate(String feeType, String date) throws WxPayException;
 }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
index 826af6f39a..4d61522f58 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
@@ -831,4 +831,18 @@ public WxPayFacepayResult facepay(WxPayFacepayRequest request) throws WxPayExcep
     return result;
   }
 
+  @Override
+  public WxPayQueryExchangeRateResult queryExchangeRate(String feeType, String date) throws WxPayException {
+    WxPayQueryExchangeRateRequest request = new WxPayQueryExchangeRateRequest();
+    request.setFeeType(feeType);
+    request.setDate(date);
+
+    request.checkAndSign(this.getConfig());
+
+    String url = this.getPayBaseUrl() + "/pay/queryexchagerate";
+    String responseContent = this.post(url, request.toXML(), false);
+    WxPayQueryExchangeRateResult result = BaseWxPayResult.fromXML(responseContent, WxPayQueryExchangeRateResult.class);
+    result.checkResult(this, request.getSignType(), true);
+    return result;
+  }
 }
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
index 6350828f6b..9e129bcbeb 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImplTest.java
@@ -626,7 +626,8 @@ public void testGetWxPayFaceAuthInfo() throws WxPayException {
   }
 
   @Test
-  public void testFacepay() {
+  public void testFacepay() throws WxPayException {
+    final WxPayFacepayResult result = this.payService.facepay(WxPayFacepayRequest.newBuilder().build());
   }
 
   @Test
@@ -673,4 +674,16 @@ public void testQueryRedpack() {
   @Test
   public void testTestQueryRedpack() {
   }
+
+  @Test
+  public void testGetPayScoreService() {
+    // no need to test
+  }
+
+  @Test
+  public void testQueryExchangeRate() throws WxPayException {
+    final WxPayQueryExchangeRateResult result = this.payService.queryExchangeRate("USD", "20200425");
+    assertThat(result).isNotNull();
+    System.out.println(result);
+  }
 }

From ebc8f0e346c46af22db3ce7cf87586b5b47c5084 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sat, 23 May 2020 23:04:13 +0800
Subject: [PATCH 111/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=8A=BD=E5=8F=96=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E5=87=8F=E5=B0=91=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/http/SimpleGetRequestExecutor.java   |  13 +-
 .../util/http/SimplePostRequestExecutor.java  |  19 +++
 ...va => ApacheSimpleGetRequestExecutor.java} |  10 +-
 .../ApacheSimplePostRequestExecutor.java      |  17 +--
 .../DefaultApacheHttpClientBuilder.java       | 135 ++++++------------
 .../JoddHttpSimpleGetRequestExecutor.java     |   8 +-
 .../JoddHttpSimplePostRequestExecutor.java    |  17 +--
 .../OkHttpSimpleGetRequestExecutor.java       |   7 +-
 .../OkHttpSimplePostRequestExecutor.java      |  12 +-
 .../mp/api/impl/BaseWxMpServiceImpl.java      |  12 ++
 .../api/impl/WxMpServiceHttpClientImpl.java   |  10 +-
 .../mp/api/impl/WxMpServiceJoddHttpImpl.java  |  11 +-
 .../mp/api/impl/WxMpServiceOkHttpImpl.java    |  11 +-
 13 files changed, 104 insertions(+), 178 deletions(-)
 rename weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/{ApacheHttpClientSimpleGetRequestExecutor.java => ApacheSimpleGetRequestExecutor.java} (79%)

diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java
index 05c396e029..f221cdcbbe 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimpleGetRequestExecutor.java
@@ -3,8 +3,9 @@
 import java.io.IOException;
 
 import me.chanjar.weixin.common.WxType;
+import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
-import me.chanjar.weixin.common.util.http.apache.ApacheHttpClientSimpleGetRequestExecutor;
+import me.chanjar.weixin.common.util.http.apache.ApacheSimpleGetRequestExecutor;
 import me.chanjar.weixin.common.util.http.jodd.JoddHttpSimpleGetRequestExecutor;
 import me.chanjar.weixin.common.util.http.okhttp.OkHttpSimpleGetRequestExecutor;
 
@@ -29,7 +30,7 @@ public void execute(String uri, String data, ResponseHandler<String> handler, Wx
   public static RequestExecutor<String, String> create(RequestHttp requestHttp) {
     switch (requestHttp.getRequestType()) {
       case APACHE_HTTP:
-        return new ApacheHttpClientSimpleGetRequestExecutor(requestHttp);
+        return new ApacheSimpleGetRequestExecutor(requestHttp);
       case JODD_HTTP:
         return new JoddHttpSimpleGetRequestExecutor(requestHttp);
       case OK_HTTP:
@@ -39,4 +40,12 @@ public static RequestExecutor<String, String> create(RequestHttp requestHttp) {
     }
   }
 
+  protected String handleResponse(WxType wxType, String responseContent) throws WxErrorException {
+    WxError error = WxError.fromJson(responseContent, wxType);
+    if (error.getErrorCode() != 0) {
+      throw new WxErrorException(error);
+    }
+
+    return responseContent;
+  }
 }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java
index 1209790b65..804f13fe54 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/SimplePostRequestExecutor.java
@@ -1,10 +1,12 @@
 package me.chanjar.weixin.common.util.http;
 
 import me.chanjar.weixin.common.WxType;
+import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.http.apache.ApacheSimplePostRequestExecutor;
 import me.chanjar.weixin.common.util.http.jodd.JoddHttpSimplePostRequestExecutor;
 import me.chanjar.weixin.common.util.http.okhttp.OkHttpSimplePostRequestExecutor;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
@@ -39,4 +41,21 @@ public static RequestExecutor<String, String> create(RequestHttp requestHttp) {
     }
   }
 
+  @NotNull
+  public String handleResponse(WxType wxType, String responseContent) throws WxErrorException {
+    if (responseContent.isEmpty()) {
+      throw new WxErrorException(WxError.builder().errorCode(9999).errorMsg("无响应内容").build());
+    }
+
+    if (responseContent.startsWith("<xml>")) {
+      //xml格式输出直接返回
+      return responseContent;
+    }
+
+    WxError error = WxError.fromJson(responseContent, wxType);
+    if (error.getErrorCode() != 0) {
+      throw new WxErrorException(error);
+    }
+    return responseContent;
+  }
 }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpClientSimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java
similarity index 79%
rename from weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpClientSimpleGetRequestExecutor.java
rename to weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java
index cc830013d2..32299f56fe 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheHttpClientSimpleGetRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimpleGetRequestExecutor.java
@@ -19,8 +19,8 @@
  * @author ecoolper
  * @date 2017/5/4
  */
-public class ApacheHttpClientSimpleGetRequestExecutor extends SimpleGetRequestExecutor<CloseableHttpClient, HttpHost> {
-  public ApacheHttpClientSimpleGetRequestExecutor(RequestHttp requestHttp) {
+public class ApacheSimpleGetRequestExecutor extends SimpleGetRequestExecutor<CloseableHttpClient, HttpHost> {
+  public ApacheSimpleGetRequestExecutor(RequestHttp requestHttp) {
     super(requestHttp);
   }
 
@@ -40,11 +40,7 @@ public String execute(String uri, String queryParam, WxType wxType) throws WxErr
 
     try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpGet)) {
       String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-      WxError error = WxError.fromJson(responseContent, wxType);
-      if (error.getErrorCode() != 0) {
-        throw new WxErrorException(error);
-      }
-      return responseContent;
+      return handleResponse(wxType, responseContent);
     } finally {
       httpGet.releaseConnection();
     }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java
index 960ea865af..598278c78c 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/apache/ApacheSimplePostRequestExecutor.java
@@ -12,6 +12,7 @@
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
@@ -42,22 +43,10 @@ public String execute(String uri, String postEntity, WxType wxType) throws WxErr
 
     try (CloseableHttpResponse response = requestHttp.getRequestHttpClient().execute(httpPost)) {
       String responseContent = Utf8ResponseHandler.INSTANCE.handleResponse(response);
-      if (responseContent.isEmpty()) {
-        throw new WxErrorException(WxError.builder().errorCode(9999).errorMsg("无响应内容").build());
-      }
-
-      if (responseContent.startsWith("<xml>")) {
-        //xml格式输出直接返回
-        return responseContent;
-      }
-
-      WxError error = WxError.fromJson(responseContent, wxType);
-      if (error.getErrorCode() != 0) {
-        throw new WxErrorException(error);
-      }
-      return responseContent;
+      return this.handleResponse(wxType, responseContent);
     } finally {
       httpPost.releaseConnection();
     }
   }
+
 }
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 8dfb90239a..3fb08ab2c6 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
@@ -1,5 +1,7 @@
 package me.chanjar.weixin.common.util.http.apache;
 
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpHost;
 import org.apache.http.annotation.NotThreadSafe;
@@ -23,8 +25,6 @@
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.ssl.SSLContexts;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -41,26 +41,65 @@
  *
  * @author kakotor
  */
+@Slf4j
+@Data
 @NotThreadSafe
 public class DefaultApacheHttpClientBuilder implements ApacheHttpClientBuilder {
-  protected final Logger log = LoggerFactory.getLogger(DefaultApacheHttpClientBuilder.class);
   private final AtomicBoolean prepared = new AtomicBoolean(false);
+
+  /**
+   * 获取链接的超时时间设置
+   * <p>
+   * 设置为零时不超时,一直等待.
+   * 设置为负数是使用系统默认设置(非3000ms的默认值,而是httpClient的默认设置).
+   * </p>
+   */
   private int connectionRequestTimeout = -1;
+
+  /**
+   * 建立链接的超时时间,默认为5000ms.由于是在链接池获取链接,此设置应该并不起什么作用
+   * <p>
+   * 设置为零时不超时,一直等待.
+   * 设置为负数是使用系统默认设置(非上述的5000ms的默认值,而是httpclient的默认设置).
+   * </p>
+   */
   private int connectionTimeout = 5000;
+  /**
+   * 默认NIO的socket超时设置,默认5000ms.
+   */
   private int soTimeout = 5000;
+  /**
+   * 空闲链接的超时时间,默认60000ms.
+   * <p>
+   * 超时的链接将在下一次空闲链接检查是被销毁
+   * </p>
+   */
   private int idleConnTimeout = 60000;
+  /**
+   * 检查空间链接的间隔周期,默认60000ms.
+   */
   private int checkWaitTime = 60000;
+  /**
+   * 每路的最大链接数,默认10
+   */
   private int maxConnPerHost = 10;
+  /**
+   * 最大总连接数,默认50
+   */
   private int maxTotalConn = 50;
+  /**
+   * 自定义httpclient的User Agent
+   */
   private String userAgent;
-  private HttpRequestRetryHandler httpRequestRetryHandler = new HttpRequestRetryHandler() {
+
+  private final HttpRequestRetryHandler httpRequestRetryHandler = new HttpRequestRetryHandler() {
     @Override
     public boolean retryRequest(IOException exception, int executionCount, HttpContext context) {
       return false;
     }
   };
   private SSLConnectionSocketFactory sslConnectionSocketFactory = SSLConnectionSocketFactory.getSocketFactory();
-  private PlainConnectionSocketFactory plainConnectionSocketFactory = PlainConnectionSocketFactory.getSocketFactory();
+  private final PlainConnectionSocketFactory plainConnectionSocketFactory = PlainConnectionSocketFactory.getSocketFactory();
   private String httpProxyHost;
   private int httpProxyPort;
   private String httpProxyUsername;
@@ -111,90 +150,6 @@ public ApacheHttpClientBuilder sslConnectionSocketFactory(SSLConnectionSocketFac
     return this;
   }
 
-  /**
-   * 获取链接的超时时间设置,默认3000ms
-   * <p>
-   * 设置为零时不超时,一直等待.
-   * 设置为负数是使用系统默认设置(非上述的3000ms的默认值,而是httpclient的默认设置).
-   * </p>
-   *
-   * @param connectionRequestTimeout 获取链接的超时时间设置(单位毫秒),默认3000ms
-   */
-  public void setConnectionRequestTimeout(int connectionRequestTimeout) {
-    this.connectionRequestTimeout = connectionRequestTimeout;
-  }
-
-  /**
-   * 建立链接的超时时间,默认为5000ms.由于是在链接池获取链接,此设置应该并不起什么作用
-   * <p>
-   * 设置为零时不超时,一直等待.
-   * 设置为负数是使用系统默认设置(非上述的5000ms的默认值,而是httpclient的默认设置).
-   * </p>
-   *
-   * @param connectionTimeout 建立链接的超时时间设置(单位毫秒),默认5000ms
-   */
-  public void setConnectionTimeout(int connectionTimeout) {
-    this.connectionTimeout = connectionTimeout;
-  }
-
-  /**
-   * 默认NIO的socket超时设置,默认5000ms.
-   *
-   * @param soTimeout 默认NIO的socket超时设置,默认5000ms.
-   * @see java.net.SocketOptions#SO_TIMEOUT
-   */
-  public void setSoTimeout(int soTimeout) {
-    this.soTimeout = soTimeout;
-  }
-
-  /**
-   * 空闲链接的超时时间,默认60000ms.
-   * <p>
-   * 超时的链接将在下一次空闲链接检查是被销毁
-   * </p>
-   *
-   * @param idleConnTimeout 空闲链接的超时时间,默认60000ms.
-   */
-  public void setIdleConnTimeout(int idleConnTimeout) {
-    this.idleConnTimeout = idleConnTimeout;
-  }
-
-  /**
-   * 检查空间链接的间隔周期,默认60000ms.
-   *
-   * @param checkWaitTime 检查空间链接的间隔周期,默认60000ms.
-   */
-  public void setCheckWaitTime(int checkWaitTime) {
-    this.checkWaitTime = checkWaitTime;
-  }
-
-  /**
-   * 每路的最大链接数,默认10
-   *
-   * @param maxConnPerHost 每路的最大链接数,默认10
-   */
-  public void setMaxConnPerHost(int maxConnPerHost) {
-    this.maxConnPerHost = maxConnPerHost;
-  }
-
-  /**
-   * 最大总连接数,默认50
-   *
-   * @param maxTotalConn 最大总连接数,默认50
-   */
-  public void setMaxTotalConn(int maxTotalConn) {
-    this.maxTotalConn = maxTotalConn;
-  }
-
-  /**
-   * 自定义httpclient的User Agent
-   *
-   * @param userAgent User Agent
-   */
-  public void setUserAgent(String userAgent) {
-    this.userAgent = userAgent;
-  }
-
   public IdleConnectionMonitorThread getIdleConnectionMonitorThread() {
     return this.idleConnectionMonitorThread;
   }
@@ -268,7 +223,7 @@ public boolean isTrusted(X509Certificate[] chain, String authType) throws Certif
         null,
         SSLConnectionSocketFactory.getDefaultHostnameVerifier());
     } catch (NoSuchAlgorithmException | KeyManagementException | KeyStoreException e) {
-      this.log.error(e.getMessage(), e);
+      log.error("构建SSL连接工厂时发生异常！", e);
     }
 
     return null;
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java
index c93bd4b180..193787a6bc 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimpleGetRequestExecutor.java
@@ -41,13 +41,7 @@ public String execute(String uri, String queryParam, WxType wxType) throws WxErr
     HttpResponse response = request.send();
     response.charset(StringPool.UTF_8);
 
-    String responseContent = response.bodyText();
-
-    WxError error = WxError.fromJson(responseContent, wxType);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
-    }
-    return responseContent;
+    return handleResponse(wxType, response.bodyText());
   }
 
 }
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java
index 75114d6a7d..08dd9792ed 100644
--- a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java
+++ b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/http/jodd/JoddHttpSimplePostRequestExecutor.java
@@ -6,7 +6,6 @@
 import jodd.http.ProxyInfo;
 import jodd.util.StringPool;
 import me.chanjar.weixin.common.WxType;
-import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
@@ -40,21 +39,7 @@ public String execute(String uri, String postEntity, WxType wxType) throws WxErr
     HttpResponse response = request.send();
     response.charset(StringPool.UTF_8);
 
-    String responseContent = response.bodyText();
-    if (responseContent.isEmpty()) {
-      throw new WxErrorException(WxError.builder().errorCode(9999).errorMsg("无响应内容").build());
-    }
-
-    if (responseContent.startsWith("<xml>")) {
-      //xml格式输出直接返回
-      return responseContent;
-    }
-
-    WxError error = WxError.fromJson(responseContent, wxType);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
-    }
-    return responseContent;
+    return this.handleResponse(wxType, response.bodyText());
   }
 
 }
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 dbaa27c544..09012692f5 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
@@ -35,12 +35,7 @@ public String execute(String uri, String queryParam, WxType wxType) throws WxErr
     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, wxType);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
-    }
-    return responseContent;
+    return this.handleResponse(wxType, response.body().string());
   }
 
 }
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 3be6152055..d4351b87ac 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
@@ -2,13 +2,13 @@
 
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.WxType;
-import me.chanjar.weixin.common.error.WxError;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.util.http.RequestHttp;
 import me.chanjar.weixin.common.util.http.SimplePostRequestExecutor;
 import okhttp3.*;
 
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * .
@@ -24,16 +24,10 @@ public OkHttpSimplePostRequestExecutor(RequestHttp requestHttp) {
 
   @Override
   public String execute(String uri, String postEntity, WxType wxType) throws WxErrorException, IOException {
-    RequestBody body = RequestBody.create(MediaType.parse("text/plain; charset=utf-8"), postEntity);
+    RequestBody body = RequestBody.Companion.create(postEntity, MediaType.parse("text/plain; charset=utf-8"));
     Request request = new Request.Builder().url(uri).post(body).build();
     Response response = requestHttp.getRequestHttpClient().newCall(request).execute();
-    String responseContent = response.body().string();
-    WxError error = WxError.fromJson(responseContent, wxType);
-    if (error.getErrorCode() != 0) {
-      throw new WxErrorException(error);
-    }
-
-    return responseContent;
+    return this.handleResponse(wxType, Objects.requireNonNull(response.body()).string());
   }
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
index d6a625c9b8..e3d7e7ad39 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
@@ -10,6 +10,7 @@
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.WxType;
+import me.chanjar.weixin.common.bean.WxAccessToken;
 import me.chanjar.weixin.common.bean.WxJsapiSignature;
 import me.chanjar.weixin.common.bean.WxNetCheckResult;
 import me.chanjar.weixin.common.enums.TicketType;
@@ -400,6 +401,17 @@ public WxMpConfigStorage getWxMpConfigStorage() {
     return this.configStorageMap.get(WxMpConfigStorageHolder.get());
   }
 
+  protected String extractAccessToken(String resultContent) throws WxErrorException {
+    WxMpConfigStorage config = this.getWxMpConfigStorage();
+    WxError error = WxError.fromJson(resultContent, WxType.MP);
+    if (error.getErrorCode() != 0) {
+      throw new WxErrorException(error);
+    }
+    WxAccessToken accessToken = WxAccessToken.fromJson(resultContent);
+    config.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
+    return config.getAccessToken();
+  }
+
   @Override
   public void setWxMpConfigStorage(WxMpConfigStorage wxConfigProvider) {
     final String defaultMpId = WxMpConfigStorageHolder.get();
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java
index a25a910ef8..8c0849b76e 100644
--- a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java
+++ b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpServiceHttpClientImpl.java
@@ -85,14 +85,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
           httpGet.setConfig(requestConfig);
         }
         try (CloseableHttpResponse response = getRequestHttpClient().execute(httpGet)) {
-          String resultContent = new BasicResponseHandler().handleResponse(response);
-          WxError error = WxError.fromJson(resultContent, WxType.MP);
-          if (error.getErrorCode() != 0) {
-            throw new WxErrorException(error);
-          }
-          WxAccessToken accessToken = WxAccessToken.fromJson(resultContent);
-          config.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
-          return config.getAccessToken();
+          return this.extractAccessToken(new BasicResponseHandler().handleResponse(response));
         } finally {
           httpGet.releaseConnection();
         }
@@ -103,4 +96,5 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
       lock.unlock();
     }
   }
+
 }
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 c57d478776..595a257f9e 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
@@ -65,23 +65,14 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
       String url = String.format(GET_ACCESS_TOKEN_URL.getUrl(config), config.getAppId(), config.getSecret());
 
       HttpRequest request = HttpRequest.get(url);
-
       if (this.getRequestHttpProxy() != null) {
         SocketHttpConnectionProvider provider = new SocketHttpConnectionProvider();
         provider.useProxy(getRequestHttpProxy());
 
         request.withConnectionProvider(provider);
       }
-      HttpResponse response = request.send();
-      String resultContent = response.bodyText();
-      WxError error = WxError.fromJson(resultContent, WxType.MP);
-      if (error.getErrorCode() != 0) {
-        throw new WxErrorException(error);
-      }
-      WxAccessToken accessToken = WxAccessToken.fromJson(resultContent);
-      config.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
 
-      return config.getAccessToken();
+      return this.extractAccessToken(request.send().bodyText());
     } finally {
       lock.unlock();
     }
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 d9497b4796..1c5c92bc96 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
@@ -10,6 +10,7 @@
 import okhttp3.*;
 
 import java.io.IOException;
+import java.util.Objects;
 import java.util.concurrent.locks.Lock;
 
 import static me.chanjar.weixin.mp.enums.WxMpApiUrl.Other.GET_ACCESS_TOKEN_URL;
@@ -55,15 +56,7 @@ public String getAccessToken(boolean forceRefresh) throws WxErrorException {
 
       Request request = new Request.Builder().url(url).get().build();
       Response response = getRequestHttpClient().newCall(request).execute();
-      String resultContent = response.body().string();
-      WxError error = WxError.fromJson(resultContent, WxType.MP);
-      if (error.getErrorCode() != 0) {
-        throw new WxErrorException(error);
-      }
-      WxAccessToken accessToken = WxAccessToken.fromJson(resultContent);
-      config.updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());
-
-      return config.getAccessToken();
+      return this.extractAccessToken(Objects.requireNonNull(response.body()).string());
     } catch (IOException e) {
       throw new RuntimeException(e);
     } finally {

From 9d2f90ec4f871be80395c96a34266d3324404890 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 24 May 2020 12:28:39 +0800
Subject: [PATCH 112/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bean/result/WxPayFaceAuthInfoResult.java  |  1 -
 .../binarywang/wxpay/config/WxPayConfig.java  | 67 ++++++++++---------
 .../impl/WxPayServiceJoddHttpImpl.java        |  8 ---
 ...der.java => WxPayV3HttpClientBuilder.java} | 24 +++----
 .../auth/AutoUpdateCertificatesVerifier.java  |  4 +-
 .../wxpay/config/WxPayConfigTest.java         | 11 +--
 6 files changed, 57 insertions(+), 58 deletions(-)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/{WechatPayHttpClientBuilder.java => WxPayV3HttpClientBuilder.java} (69%)

diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java
index 5c357c560f..53adb40d7a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/result/WxPayFaceAuthInfoResult.java
@@ -21,7 +21,6 @@
 @NoArgsConstructor
 @XStreamAlias("xml")
 public class WxPayFaceAuthInfoResult extends BaseWxPayResult implements Serializable {
-
   private static final long serialVersionUID = -65138145275211272L;
 
   /**
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 7b23ea485f..fe4b22805d 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
@@ -1,12 +1,13 @@
 package com.github.binarywang.wxpay.config;
 
 import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.v3.WechatPayHttpClientBuilder;
+import com.github.binarywang.wxpay.v3.WxPayV3HttpClientBuilder;
 import com.github.binarywang.wxpay.v3.auth.AutoUpdateCertificatesVerifier;
 import com.github.binarywang.wxpay.v3.auth.PrivateKeySigner;
 import com.github.binarywang.wxpay.v3.auth.WechatPay2Credentials;
 import com.github.binarywang.wxpay.v3.auth.WechatPay2Validator;
 import com.github.binarywang.wxpay.v3.util.PemUtils;
+import jodd.util.ResourcesUtil;
 import lombok.Data;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RegExUtils;
@@ -20,8 +21,7 @@
 import java.nio.charset.StandardCharsets;
 import java.security.KeyStore;
 import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
+import java.util.Collections;
 
 /**
  * 微信支付配置
@@ -31,6 +31,8 @@
 @Data
 public class WxPayConfig {
   private static final String DEFAULT_PAY_BASE_URL = "https://api.mch.weixin.qq.com";
+  private static final String PROBLEM_MSG = "证书文件【%s】有问题，请核实！";
+  private static final String NOT_FOUND_MSG = "证书文件【%s】不存在，请核实！";
 
   /**
    * 微信支付接口请求地址域名部分.
@@ -184,17 +186,20 @@ public SSLContext initSSLContext() throws WxPayException {
       }
 
       final String prefix = "classpath:";
-      String fileHasProblemMsg = "证书文件【" + this.getKeyPath() + "】有问题，请核实！";
-      String fileNotFoundMsg = "证书文件【" + this.getKeyPath() + "】不存在，请核实！";
+      String fileHasProblemMsg = String.format(PROBLEM_MSG, this.getKeyPath());
+      String fileNotFoundMsg = String.format(NOT_FOUND_MSG, this.getKeyPath());
       if (this.getKeyPath().startsWith(prefix)) {
         String path = RegExUtils.removeFirst(this.getKeyPath(), prefix);
         if (!path.startsWith("/")) {
           path = "/" + path;
         }
-
-        inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
-        if (inputStream == null) {
-          throw new WxPayException(fileNotFoundMsg);
+        try {
+          inputStream = ResourcesUtil.getResourceAsStream(path);
+          if (inputStream == null) {
+            throw new WxPayException(fileNotFoundMsg);
+          }
+        } catch (Exception e) {
+          throw new WxPayException(fileNotFoundMsg, e);
         }
       } else if (this.getKeyPath().startsWith("http://") || this.getKeyPath().startsWith("https://")) {
         try {
@@ -232,7 +237,6 @@ public SSLContext initSSLContext() throws WxPayException {
     }
   }
 
-
   /**
    * 初始化api v3请求头 自动签名验签
    * 方法参照微信官方https://github.com/wechatpay-apiv3/wechatpay-apache-httpclient
@@ -266,9 +270,13 @@ public CloseableHttpClient initApiV3HttpClient() throws WxPayException {
       if (!keypath.startsWith("/")) {
         keypath = "/" + keypath;
       }
-      keyInputStream = WxPayConfig.class.getResourceAsStream(keypath);
-      if (keyInputStream == null) {
-        throw new WxPayException("证书文件【" + this.getPrivateKeyPath() + "】不存在，请核实！");
+      try {
+        keyInputStream = ResourcesUtil.getResourceAsStream(keypath);
+        if (keyInputStream == null) {
+          throw new WxPayException(String.format(NOT_FOUND_MSG, this.getPrivateKeyPath()));
+        }
+      } catch (Exception e) {
+        throw new WxPayException(String.format(NOT_FOUND_MSG, this.getPrivateKeyPath()), e);
       }
     }
 
@@ -277,32 +285,29 @@ public CloseableHttpClient initApiV3HttpClient() throws WxPayException {
       if (!certpath.startsWith("/")) {
         certpath = "/" + certpath;
       }
-      certInputStream = WxPayConfig.class.getResourceAsStream(certpath);
-      if (certInputStream == null) {
-        throw new WxPayException("证书文件【" + this.getPrivateCertPath() + "】不存在，请核实！");
+      try {
+        certInputStream = ResourcesUtil.getResourceAsStream(certpath);
+        if (certInputStream == null) {
+          throw new WxPayException(String.format(NOT_FOUND_MSG, this.getPrivateCertPath()));
+        }
+      } catch (Exception e) {
+        throw new WxPayException(String.format(NOT_FOUND_MSG, this.getPrivateCertPath()), e);
       }
     }
 
-    CloseableHttpClient httpClient;
     try {
-      WechatPayHttpClientBuilder builder = WechatPayHttpClientBuilder.create();
       PrivateKey merchantPrivateKey = PemUtils.loadPrivateKey(keyInputStream);
-      X509Certificate x509Certificate = PemUtils.loadCertificate(certInputStream);
-      ArrayList<X509Certificate> certificates = new ArrayList<>();
-      certificates.add(x509Certificate);
-      builder.withMerchant(mchId, certSerialNo, merchantPrivateKey);
-      builder.withWechatpay(certificates);
-      AutoUpdateCertificatesVerifier verifier = new AutoUpdateCertificatesVerifier(
-        new WechatPay2Credentials(mchId, new PrivateKeySigner(certSerialNo, merchantPrivateKey)),
-        apiV3Key.getBytes(StandardCharsets.UTF_8));
-      builder.withValidator(new WechatPay2Validator(verifier));
-      httpClient = builder.build();
+      CloseableHttpClient httpClient = WxPayV3HttpClientBuilder.create()
+        .withMerchant(mchId, certSerialNo, merchantPrivateKey)
+        .withWechatpay(Collections.singletonList(PemUtils.loadCertificate(certInputStream)))
+        .withValidator(new WechatPay2Validator(new AutoUpdateCertificatesVerifier(
+          new WechatPay2Credentials(mchId, new PrivateKeySigner(certSerialNo, merchantPrivateKey)),
+          apiV3Key.getBytes(StandardCharsets.UTF_8))))
+        .build();
       this.apiV3HttpClient = httpClient;
+      return httpClient;
     } catch (Exception e) {
       throw new WxPayException("v3请求构造异常！", e);
     }
-
-    return httpClient;
-
   }
 }
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 72dac0171b..b37160f90f 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
@@ -4,10 +4,6 @@
 import java.nio.charset.StandardCharsets;
 import javax.net.ssl.SSLContext;
 
-import com.github.binarywang.wxpay.bean.request.WxPayQueryCommentRequest;
-import com.github.binarywang.wxpay.bean.request.WxPayRedpackQueryRequest;
-import com.github.binarywang.wxpay.bean.result.WxPayCommonResult;
-import com.github.binarywang.wxpay.bean.result.WxPayRedpackQueryResult;
 import org.apache.commons.lang3.StringUtils;
 
 import com.github.binarywang.wxpay.bean.WxPayApiData;
@@ -20,10 +16,6 @@
 import jodd.http.net.SSLSocketHttpConnectionProvider;
 import jodd.http.net.SocketHttpConnectionProvider;
 import jodd.util.Base64;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.net.ssl.SSLContext;
-import java.nio.charset.StandardCharsets;
 
 /**
  * 微信支付请求实现类，jodd-http实现.
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WechatPayHttpClientBuilder.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WxPayV3HttpClientBuilder.java
similarity index 69%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WechatPayHttpClientBuilder.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WxPayV3HttpClientBuilder.java
index 0f2732ce9b..87f4b0558a 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WechatPayHttpClientBuilder.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WxPayV3HttpClientBuilder.java
@@ -13,45 +13,45 @@
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.execchain.ClientExecChain;
 
-public class WechatPayHttpClientBuilder extends HttpClientBuilder {
+public class WxPayV3HttpClientBuilder extends HttpClientBuilder {
   private Credentials credentials;
   private Validator validator;
 
-  static final String os = System.getProperty("os.name") + "/" + System.getProperty("os.version");
-  static final String version = System.getProperty("java.version");
+  static final String OS = System.getProperty("os.name") + "/" + System.getProperty("os.version");
+  static final String VERSION = System.getProperty("java.version");
 
-  private WechatPayHttpClientBuilder() {
+  private WxPayV3HttpClientBuilder() {
     super();
 
     String userAgent = String.format(
         "WechatPay-Apache-HttpClient/%s (%s) Java/%s",
         getClass().getPackage().getImplementationVersion(),
-        os,
-        version == null ? "Unknown" : version);
+      OS,
+        VERSION == null ? "Unknown" : VERSION);
     setUserAgent(userAgent);
   }
 
-  public static WechatPayHttpClientBuilder create() {
-    return new WechatPayHttpClientBuilder();
+  public static WxPayV3HttpClientBuilder create() {
+    return new WxPayV3HttpClientBuilder();
   }
 
-  public WechatPayHttpClientBuilder withMerchant(String merchantId, String serialNo, PrivateKey privateKey) {
+  public WxPayV3HttpClientBuilder withMerchant(String merchantId, String serialNo, PrivateKey privateKey) {
     this.credentials =
         new WechatPay2Credentials(merchantId, new PrivateKeySigner(serialNo, privateKey));
     return this;
   }
 
-  public WechatPayHttpClientBuilder withCredentials(Credentials credentials) {
+  public WxPayV3HttpClientBuilder withCredentials(Credentials credentials) {
     this.credentials = credentials;
     return this;
   }
 
-  public WechatPayHttpClientBuilder withWechatpay(List<X509Certificate> certificates) {
+  public WxPayV3HttpClientBuilder withWechatpay(List<X509Certificate> certificates) {
     this.validator = new WechatPay2Validator(new CertificatesVerifier(certificates));
     return this;
   }
 
-  public WechatPayHttpClientBuilder withValidator(Validator validator) {
+  public WxPayV3HttpClientBuilder withValidator(Validator validator) {
     this.validator = validator;
     return this;
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
index 0a63cc4a4a..2110b2d7e1 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
@@ -3,7 +3,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.binarywang.wxpay.v3.Credentials;
-import com.github.binarywang.wxpay.v3.WechatPayHttpClientBuilder;
+import com.github.binarywang.wxpay.v3.WxPayV3HttpClientBuilder;
 import com.github.binarywang.wxpay.v3.util.AesUtils;
 import com.github.binarywang.wxpay.v3.util.PemUtils;
 import lombok.Getter;
@@ -115,7 +115,7 @@ public boolean verify(String serialNumber, byte[] message, String signature) {
   }
 
   private void autoUpdateCert() throws IOException, GeneralSecurityException {
-    CloseableHttpClient httpClient = WechatPayHttpClientBuilder.create()
+    CloseableHttpClient httpClient = WxPayV3HttpClientBuilder.create()
       .withCredentials(credentials)
       .withValidator(verifier == null ? (response) -> true : new WechatPay2Validator(verifier))
       .build();
diff --git a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/config/WxPayConfigTest.java b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/config/WxPayConfigTest.java
index 9d3c13da42..fb46c58a4d 100644
--- a/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/config/WxPayConfigTest.java
+++ b/weixin-java-pay/src/test/java/com/github/binarywang/wxpay/config/WxPayConfigTest.java
@@ -2,8 +2,6 @@
 
 import org.testng.annotations.Test;
 
-import static org.testng.Assert.*;
-
 /**
  * <pre>
  *  Created by BinaryWang on 2017/6/18.
@@ -12,12 +10,12 @@
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
 public class WxPayConfigTest {
-  private WxPayConfig payConfig = new WxPayConfig();
+  private final WxPayConfig payConfig = new WxPayConfig();
 
   @Test
   public void testInitSSLContext_classpath() throws Exception {
     payConfig.setMchId("123");
-    payConfig.setKeyPath("classpath:/abc.p12");
+    payConfig.setKeyPath("classpath:/dlt.p12");
     payConfig.initSSLContext();
   }
 
@@ -28,4 +26,9 @@ public void testInitSSLContext_http() throws Exception {
     payConfig.initSSLContext();
   }
 
+  @Test
+  public void testInitSSLContext() throws Exception {
+    this.testInitSSLContext_classpath();
+    this.testInitSSLContext_http();
+  }
 }

From 3b46faeb89f1e259c27516735e16c85ad2d91c77 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 24 May 2020 18:22:27 +0800
Subject: [PATCH 113/114] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98v3=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9java7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weixin-java-pay/pom.xml                            | 10 +++++-----
 .../binarywang/wxpay/config/WxPayConfig.java       |  8 ++++----
 .../wxpay/v3/WxPayV3HttpClientBuilder.java         |  8 ++++----
 .../v3/auth/AutoUpdateCertificatesVerifier.java    | 14 ++++++++++----
 ...tPay2Credentials.java => WxPayCredentials.java} |  8 ++++----
 ...echatPay2Validator.java => WxPayValidator.java} | 10 ++++------
 6 files changed, 31 insertions(+), 27 deletions(-)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/{WechatPay2Credentials.java => WxPayCredentials.java} (92%)
 rename weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/{WechatPay2Validator.java => WxPayValidator.java} (89%)

diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index e9df87aa02..01517f738a 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -13,11 +13,6 @@
   <name>WxJava - PAY Java SDK</name>
   <description>微信支付 Java SDK</description>
 
-  <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>com.github.binarywang</groupId>
@@ -84,6 +79,11 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
   <profiles>
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 fe4b22805d..6d9bebdc6d 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
@@ -4,8 +4,8 @@
 import com.github.binarywang.wxpay.v3.WxPayV3HttpClientBuilder;
 import com.github.binarywang.wxpay.v3.auth.AutoUpdateCertificatesVerifier;
 import com.github.binarywang.wxpay.v3.auth.PrivateKeySigner;
-import com.github.binarywang.wxpay.v3.auth.WechatPay2Credentials;
-import com.github.binarywang.wxpay.v3.auth.WechatPay2Validator;
+import com.github.binarywang.wxpay.v3.auth.WxPayCredentials;
+import com.github.binarywang.wxpay.v3.auth.WxPayValidator;
 import com.github.binarywang.wxpay.v3.util.PemUtils;
 import jodd.util.ResourcesUtil;
 import lombok.Data;
@@ -300,8 +300,8 @@ public CloseableHttpClient initApiV3HttpClient() throws WxPayException {
       CloseableHttpClient httpClient = WxPayV3HttpClientBuilder.create()
         .withMerchant(mchId, certSerialNo, merchantPrivateKey)
         .withWechatpay(Collections.singletonList(PemUtils.loadCertificate(certInputStream)))
-        .withValidator(new WechatPay2Validator(new AutoUpdateCertificatesVerifier(
-          new WechatPay2Credentials(mchId, new PrivateKeySigner(certSerialNo, merchantPrivateKey)),
+        .withValidator(new WxPayValidator(new AutoUpdateCertificatesVerifier(
+          new WxPayCredentials(mchId, new PrivateKeySigner(certSerialNo, merchantPrivateKey)),
           apiV3Key.getBytes(StandardCharsets.UTF_8))))
         .build();
       this.apiV3HttpClient = httpClient;
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WxPayV3HttpClientBuilder.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WxPayV3HttpClientBuilder.java
index 87f4b0558a..986a8f4cb1 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WxPayV3HttpClientBuilder.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/WxPayV3HttpClientBuilder.java
@@ -7,8 +7,8 @@
 
 import com.github.binarywang.wxpay.v3.auth.CertificatesVerifier;
 import com.github.binarywang.wxpay.v3.auth.PrivateKeySigner;
-import com.github.binarywang.wxpay.v3.auth.WechatPay2Credentials;
-import com.github.binarywang.wxpay.v3.auth.WechatPay2Validator;
+import com.github.binarywang.wxpay.v3.auth.WxPayCredentials;
+import com.github.binarywang.wxpay.v3.auth.WxPayValidator;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.execchain.ClientExecChain;
@@ -37,7 +37,7 @@ public static WxPayV3HttpClientBuilder create() {
 
   public WxPayV3HttpClientBuilder withMerchant(String merchantId, String serialNo, PrivateKey privateKey) {
     this.credentials =
-        new WechatPay2Credentials(merchantId, new PrivateKeySigner(serialNo, privateKey));
+        new WxPayCredentials(merchantId, new PrivateKeySigner(serialNo, privateKey));
     return this;
   }
 
@@ -47,7 +47,7 @@ public WxPayV3HttpClientBuilder withCredentials(Credentials credentials) {
   }
 
   public WxPayV3HttpClientBuilder withWechatpay(List<X509Certificate> certificates) {
-    this.validator = new WechatPay2Validator(new CertificatesVerifier(certificates));
+    this.validator = new WxPayValidator(new CertificatesVerifier(certificates));
     return this;
   }
 
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
index 2110b2d7e1..59ad93cb77 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.binarywang.wxpay.v3.Credentials;
+import com.github.binarywang.wxpay.v3.Validator;
 import com.github.binarywang.wxpay.v3.WxPayV3HttpClientBuilder;
 import com.github.binarywang.wxpay.v3.util.AesUtils;
 import com.github.binarywang.wxpay.v3.util.PemUtils;
@@ -13,6 +14,8 @@
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.util.EntityUtils;
+import org.joda.time.Instant;
+import org.joda.time.Minutes;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -21,8 +24,6 @@
 import java.security.cert.CertificateExpiredException;
 import java.security.cert.CertificateNotYetValidException;
 import java.security.cert.X509Certificate;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
@@ -98,7 +99,7 @@ public AutoUpdateCertificatesVerifier(Credentials credentials, byte[] apiV3Key,
 
   @Override
   public boolean verify(String serialNumber, byte[] message, String signature) {
-    if (instant == null || Duration.between(instant, Instant.now()).toMinutes() >= minutesInterval) {
+    if (instant == null || Minutes.minutesBetween(instant, Instant.now()).getMinutes() >= minutesInterval) {
       if (lock.tryLock()) {
         try {
           autoUpdateCert();
@@ -117,7 +118,12 @@ public boolean verify(String serialNumber, byte[] message, String signature) {
   private void autoUpdateCert() throws IOException, GeneralSecurityException {
     CloseableHttpClient httpClient = WxPayV3HttpClientBuilder.create()
       .withCredentials(credentials)
-      .withValidator(verifier == null ? (response) -> true : new WechatPay2Validator(verifier))
+      .withValidator(verifier == null ? new Validator() {
+        @Override
+        public boolean validate(CloseableHttpResponse response) throws IOException {
+          return true;
+        }
+      } : new WxPayValidator(verifier))
       .build();
 
     HttpGet httpGet = new HttpGet(CERT_DOWNLOAD_PATH);
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Credentials.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WxPayCredentials.java
similarity index 92%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Credentials.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WxPayCredentials.java
index a0730bddae..2654e8675c 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Credentials.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WxPayCredentials.java
@@ -6,22 +6,22 @@
 import java.security.SecureRandom;
 
 import com.github.binarywang.wxpay.v3.Credentials;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class WechatPay2Credentials implements Credentials {
-  private static final Logger log = LoggerFactory.getLogger(WechatPay2Credentials.class);
-
+@Slf4j
+public class WxPayCredentials implements Credentials {
   private static final String SYMBOLS =
       "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
   private static final SecureRandom RANDOM = new SecureRandom();
   protected String merchantId;
   protected Signer signer;
 
-  public WechatPay2Credentials(String merchantId, Signer signer) {
+  public WxPayCredentials(String merchantId, Signer signer) {
     this.merchantId = merchantId;
     this.signer = signer;
   }
diff --git a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Validator.java b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WxPayValidator.java
similarity index 89%
rename from weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Validator.java
rename to weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WxPayValidator.java
index 38735c61c9..c83f8853e3 100644
--- a/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WechatPay2Validator.java
+++ b/weixin-java-pay/src/main/java/com/github/binarywang/wxpay/v3/auth/WxPayValidator.java
@@ -4,20 +4,18 @@
 import java.io.IOException;
 
 import com.github.binarywang.wxpay.v3.Validator;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-public class WechatPay2Validator implements Validator {
-
-  private static final Logger log = LoggerFactory.getLogger(WechatPay2Validator.class);
-
+@Slf4j
+public class WxPayValidator implements Validator {
   private Verifier verifier;
 
-  public WechatPay2Validator(Verifier verifier) {
+  public WxPayValidator(Verifier verifier) {
     this.verifier = verifier;
   }
 

From d8a1fce9138db613e11f148c0b5434e2d51d5ff1 Mon Sep 17 00:00:00 2001
From: Binary Wang <binarywang@gmail.com>
Date: Sun, 24 May 2020 18:28:42 +0800
Subject: [PATCH 114/114] =?UTF-8?q?:bookmark:=20=E5=8F=91=E5=B8=83=203.8.0?=
 =?UTF-8?q?=20=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                         | 2 +-
 spring-boot-starters/pom.xml                                    | 2 +-
 .../wx-java-miniapp-spring-boot-starter/pom.xml                 | 2 +-
 spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml     | 2 +-
 spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml   | 2 +-
 spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml    | 2 +-
 weixin-graal/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-open/pom.xml                                        | 2 +-
 weixin-java-pay/pom.xml                                         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index ce958c390d..b24ce0b77f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.7.9.B</version>
+  <version>3.8.0</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index e2bd97aa8d..264c91d69d 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
index 722f070abe..f710eb1379 100644
--- a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
index 004a709ed1..e8d0e14832 100644
--- a/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index d6724121e4..265cef1efd 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
index 49bf98e0c4..f49b20bb99 100644
--- a/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>wx-java-spring-boot-starters</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/weixin-graal/pom.xml b/weixin-graal/pom.xml
index 0cd232ea50..104e4ffb45 100644
--- a/weixin-graal/pom.xml
+++ b/weixin-graal/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>
diff --git a/weixin-java-common/pom.xml b/weixin-java-common/pom.xml
index 20cd942369..4d05d5c3f7 100644
--- a/weixin-java-common/pom.xml
+++ b/weixin-java-common/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>
diff --git a/weixin-java-cp/pom.xml b/weixin-java-cp/pom.xml
index 3f5a0742ec..cbd9be4d40 100644
--- a/weixin-java-cp/pom.xml
+++ b/weixin-java-cp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>
diff --git a/weixin-java-miniapp/pom.xml b/weixin-java-miniapp/pom.xml
index fd910127a3..8efd3e5403 100644
--- a/weixin-java-miniapp/pom.xml
+++ b/weixin-java-miniapp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
 
   <artifactId>weixin-java-miniapp</artifactId>
diff --git a/weixin-java-mp/pom.xml b/weixin-java-mp/pom.xml
index df701ef8cf..a113e0bf87 100644
--- a/weixin-java-mp/pom.xml
+++ b/weixin-java-mp/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
 
   <artifactId>weixin-java-mp</artifactId>
diff --git a/weixin-java-open/pom.xml b/weixin-java-open/pom.xml
index f45b674cb0..b03d8b3307 100644
--- a/weixin-java-open/pom.xml
+++ b/weixin-java-open/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
 
   <artifactId>weixin-java-open</artifactId>
diff --git a/weixin-java-pay/pom.xml b/weixin-java-pay/pom.xml
index 01517f738a..db7da98eeb 100644
--- a/weixin-java-pay/pom.xml
+++ b/weixin-java-pay/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.7.9.B</version>
+    <version>3.8.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>