合并develop分支，发布最新正式版

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.9.1.B</version>
+  <version>3.9.2.B</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>

spring-boot-starters/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.9.1.B</version>
+    <version>3.9.2.B</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>

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.9.1.B</version>
+    <version>3.9.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

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.9.1.B</version>
+    <version>3.9.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

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.9.1.B</version>
+    <version>3.9.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java

@@ -133,6 +133,7 @@ private RedissonClient getRedissonClient() {
     Config config = new Config();
     config.useSingleServer()
       .setAddress("redis://" + redis.getHost() + ":" + redis.getPort())
+      .setDatabase(redis.getDatabase())
       .setPassword(redis.getPassword());
     config.setTransportMode(TransportMode.NIO);
     return Redisson.create(config);

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.9.1.B</version>
+    <version>3.9.2.B</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

weixin-graal/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.9.1.B</version>
+    <version>3.9.2.B</version>
   </parent>
 
   <artifactId>weixin-graal</artifactId>

weixin-java-common/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.9.1.B</version>
+    <version>3.9.2.B</version>
   </parent>
 
   <artifactId>weixin-java-common</artifactId>

weixin-java-cp/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.9.1.B</version>
+    <version>3.9.2.B</version>
   </parent>
 
   <artifactId>weixin-java-cp</artifactId>

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageService.java

@@ -4,6 +4,7 @@
 import me.chanjar.weixin.cp.bean.message.WxCpLinkedCorpMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpMessageSendResult;
+import me.chanjar.weixin.cp.bean.message.WxCpMessageSendStatistics;
 
 /**
  * 消息推送接口.
@@ -24,6 +25,21 @@ public interface WxCpMessageService {
    */
   WxCpMessageSendResult send(WxCpMessage message) throws WxErrorException;
 
+  /**
+   * <pre>
+   * 查询应用消息发送统计
+   * 请求方式：POST（HTTPS）
+   * 请求地址：https://qyapi.weixin.qq.com/cgi-bin/message/get_statistics?access_token=ACCESS_TOKEN
+   *
+   * 详情请见: https://work.weixin.qq.com/api/doc/90000/90135/92369
+   * </pre>
+   *
+   * @param timeType 查询哪天的数据，0：当天；1：昨天。默认为0。
+   * @return 统计结果
+   * @throws WxErrorException the wx error exception
+   */
+  WxCpMessageSendStatistics getStatistics(int timeType) throws WxErrorException;
+
   /**
    * <pre>
    * 互联企业的应用支持推送文本、图片、视频、文件、图文等类型。

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/impl/WxCpMessageServiceImpl.java

@@ -1,13 +1,16 @@
 package me.chanjar.weixin.cp.api.impl;
 
+import com.google.common.collect.ImmutableMap;
 import lombok.RequiredArgsConstructor;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.cp.api.WxCpMessageService;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.message.WxCpLinkedCorpMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpMessage;
 import me.chanjar.weixin.cp.bean.message.WxCpMessageSendResult;
-import me.chanjar.weixin.cp.constant.WxCpApiPathConsts;
+import me.chanjar.weixin.cp.bean.message.WxCpMessageSendStatistics;
+import me.chanjar.weixin.cp.constant.WxCpApiPathConsts.Message;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
 
 /**
  * 消息推送接口实现类.
@@ -27,7 +30,13 @@ public WxCpMessageSendResult send(WxCpMessage message) throws WxErrorException {
     }
 
     return WxCpMessageSendResult.fromJson(this.cpService.post(this.cpService.getWxCpConfigStorage()
-      .getApiUrl(WxCpApiPathConsts.Message.MESSAGE_SEND), message.toJson()));
+      .getApiUrl(Message.MESSAGE_SEND), message.toJson()));
+  }
+
+  @Override
+  public WxCpMessageSendStatistics getStatistics(int timeType) throws WxErrorException {
+    return WxCpMessageSendStatistics.fromJson(this.cpService.post(this.cpService.getWxCpConfigStorage().getApiUrl(Message.GET_STATISTICS),
+      WxCpGsonBuilder.create().toJson(ImmutableMap.of("time_type", timeType))));
   }
 
   @Override
@@ -38,6 +47,6 @@ public WxCpMessageSendResult sendLinkedCorpMessage(WxCpLinkedCorpMessage message
     }
 
     return WxCpMessageSendResult.fromJson(this.cpService.post(this.cpService.getWxCpConfigStorage()
-      .getApiUrl(WxCpApiPathConsts.Message.LINKEDCORP_MESSAGE_SEND), message.toJson()));
+      .getApiUrl(Message.LINKEDCORP_MESSAGE_SEND), message.toJson()));
   }
 }

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/bean/message/WxCpMessageSendStatistics.java

@@ -0,0 +1,43 @@
+package me.chanjar.weixin.cp.bean.message;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import me.chanjar.weixin.cp.util.json.WxCpGsonBuilder;
+
+import java.util.List;
+
+/**
+ * 应用消息发送统计信息.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2020-09-13
+ */
+@Data
+public class WxCpMessageSendStatistics {
+  public static WxCpMessageSendStatistics fromJson(String json) {
+    return WxCpGsonBuilder.create().fromJson(json, WxCpMessageSendStatistics.class);
+  }
+
+  private List<StatisticItem> statistics;
+
+  @Data
+  public static class StatisticItem {
+    /**
+     * 应用名
+     */
+    @SerializedName("app_name")
+    private String appName;
+
+    /**
+     * 应用id
+     */
+    @SerializedName("agentid")
+    private Integer agentId;
+
+    /**
+     * 发消息成功人次
+     */
+    @SerializedName("count")
+    private Integer count;
+  }
+}

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpApiPathConsts.java

@@ -1,6 +1,8 @@
 package me.chanjar.weixin.cp.constant;
 
 
+import lombok.experimental.UtilityClass;
+
 /**
  * <pre>
  *  企业微信api地址常量类
@@ -9,6 +11,7 @@
  *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
+@UtilityClass
 public final class WxCpApiPathConsts {
   public static final String DEFAULT_CP_BASE_URL = "https://qyapi.weixin.qq.com";
 
@@ -26,57 +29,70 @@ public final class WxCpApiPathConsts {
    * 消息推送相关接口
    * https://work.weixin.qq.com/api/doc/90000/90135/90235
    */
+  @UtilityClass
   public static class Message {
     /**
      * 发送应用消息
      */
     public static final String MESSAGE_SEND = "/cgi-bin/message/send";
 
+    /**
+     * 查询应用消息发送统计
+     */
+    public static final String GET_STATISTICS = "/cgi-bin/message/get_statistics";
+
     /**
      * 互联企业发送应用消息
      */
     public static final String LINKEDCORP_MESSAGE_SEND = "/cgi-bin/linkedcorp/message/send";
   }
 
+  @UtilityClass
   public static class Agent {
     public static final String AGENT_GET = "/cgi-bin/agent/get?agentid=%d";
     public static final String AGENT_SET = "/cgi-bin/agent/set";
     public static final String AGENT_LIST = "/cgi-bin/agent/list";
   }
 
+  @UtilityClass
   public static class OAuth2 {
     public static final String GET_USER_INFO = "/cgi-bin/user/getuserinfo?code=%s&agentid=%d";
     public static final String GET_USER_DETAIL = "/cgi-bin/user/getuserdetail";
     public static final String URL_OAUTH2_AUTHORIZE = "https://open.weixin.qq.com/connect/oauth2/authorize";
   }
 
+  @UtilityClass
   public static class Chat {
     public static final String APPCHAT_CREATE = "/cgi-bin/appchat/create";
     public static final String APPCHAT_UPDATE = "/cgi-bin/appchat/update";
     public static final String APPCHAT_GET_CHATID = "/cgi-bin/appchat/get?chatid=";
     public static final String APPCHAT_SEND = "/cgi-bin/appchat/send";
   }
 
+  @UtilityClass
   public static class Department {
     public static final String DEPARTMENT_CREATE = "/cgi-bin/department/create";
     public static final String DEPARTMENT_UPDATE = "/cgi-bin/department/update";
     public static final String DEPARTMENT_DELETE = "/cgi-bin/department/delete?id=%d";
     public static final String DEPARTMENT_LIST = "/cgi-bin/department/list";
   }
 
+  @UtilityClass
   public static class Media {
     public static final String MEDIA_GET = "/cgi-bin/media/get";
     public static final String MEDIA_UPLOAD = "/cgi-bin/media/upload?type=";
     public static final String IMG_UPLOAD = "/cgi-bin/media/uploadimg";
     public static final String JSSDK_MEDIA_GET = "/cgi-bin/media/get/jssdk";
   }
 
+  @UtilityClass
   public static class Menu {
     public static final String MENU_CREATE = "/cgi-bin/menu/create?agentid=%d";
     public static final String MENU_DELETE = "/cgi-bin/menu/delete?agentid=%d";
     public static final String MENU_GET = "/cgi-bin/menu/get?agentid=%d";
   }
 
+  @UtilityClass
   public static class Oa {
     public static final String GET_CHECKIN_DATA = "/cgi-bin/checkin/getcheckindata";
     public static final String GET_CHECKIN_OPTION = "/cgi-bin/checkin/getcheckinoption";
@@ -87,6 +103,7 @@ public static class Oa {
     public static final String APPLY_EVENT = "/cgi-bin/oa/applyevent";
   }
 
+  @UtilityClass
   public static class Tag {
     public static final String TAG_CREATE = "/cgi-bin/tag/create";
     public static final String TAG_UPDATE = "/cgi-bin/tag/update";
@@ -97,10 +114,12 @@ public static class Tag {
     public static final String TAG_DEL_TAG_USERS = "/cgi-bin/tag/deltagusers";
   }
 
+  @UtilityClass
   public static class TaskCard {
     public static final String UPDATE_TASK_CARD = "/cgi-bin/message/update_taskcard";
   }
 
+  @UtilityClass
   public static class Tp {
     public static final String JSCODE_TO_SESSION = "/cgi-bin/service/miniprogram/jscode2session";
     public static final String GET_CORP_TOKEN = "/cgi-bin/service/get_corp_token";
@@ -111,6 +130,7 @@ public static class Tp {
     public static final String GET_AUTH_INFO = "/cgi-bin/service/get_auth_info";
   }
 
+  @UtilityClass
   public static class User {
     public static final String USER_AUTHENTICATE = "/cgi-bin/user/authsucc?userid=";
     public static final String USER_CREATE = "/cgi-bin/user/create";
@@ -127,6 +147,7 @@ public static class User {
     public static final String GET_EXTERNAL_CONTACT = "/cgi-bin/crm/get_external_contact?external_userid=";
   }
 
+  @UtilityClass
   public static class ExternalContact {
     @Deprecated
     public static final String GET_EXTERNAL_CONTACT = "/cgi-bin/crm/get_external_contact?external_userid=";

weixin-java-cp/src/main/java/me/chanjar/weixin/cp/constant/WxCpConsts.java

@@ -1,5 +1,7 @@
 package me.chanjar.weixin.cp.constant;
 
+import lombok.experimental.UtilityClass;
+
 /**
  * <pre>
  * 企业微信常量
@@ -8,11 +10,13 @@
  *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
+@UtilityClass
 public class WxCpConsts {
   /**
    * 企业微信端推送过来的事件类型.
    * 参考文档：https://work.weixin.qq.com/api/doc#12974
    */
+  @UtilityClass
   public static class EventType {
     /**
      * 成员关注事件.
@@ -105,6 +109,7 @@ public static class EventType {
   /**
    * 企业外部联系人变更事件的CHANGE_TYPE
    */
+  @UtilityClass
   public static class ExternalContactChangeType {
     /**
      * 新增外部联系人
@@ -128,6 +133,7 @@ public static class ExternalContactChangeType {
   /**
    * 企业微信通讯录变更事件.
    */
+  @UtilityClass
   public static class ContactChangeType {
     /**
      * 新增成员事件.
@@ -169,6 +175,7 @@ public static class ContactChangeType {
   /**
    * 互联企业发送应用消息的消息类型.
    */
+  @UtilityClass
   public static class LinkedCorpMsgType {
     /**
      * 文本消息.
@@ -213,6 +220,7 @@ public static class LinkedCorpMsgType {
   /**
    * 群机器人的消息类型.
    */
+  @UtilityClass
   public static class GroupRobotMsgType {
     /**
      * 文本消息.
@@ -238,6 +246,7 @@ public static class GroupRobotMsgType {
   /**
    * 应用推送消息的消息类型.
    */
+  @UtilityClass
   public static class AppChatMsgType {
     /**
      * 文本消息.