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

.gitignore

@@ -50,3 +50,4 @@ sonar-project.properties
 
 # STS
 .factorypath
+*.zip

CONTRIBUTING.md

@@ -1,8 +1,8 @@
 # 代码贡献指南
-1. 首先非常欢迎和感谢对本项目发起Pull Request的同学。
-1. **特别提示：请务必在develop分支提交PR，master分支目前仅是正式版的代码，即发布正式版本后才会从develop分支进行合并。**
+1. 首先非常欢迎和感谢对本项目发起`Pull Request`的同学。
+1. **特别提示：请务必在 `develop` 分支提交 `PR`，`release` 分支目前仅是正式版的代码，即发布正式版本后才会从 `develop` 分支进行合并。**
 1. 本项目代码风格为使用2个空格代表一个Tab，因此在提交代码时请注意一下，否则很容易在IDE格式化代码后与原代码产生大量diff，这样会给其他人阅读代码带来极大的困扰。
-1. 为了便于设置，本项目引入editorconfig支持，请使用Eclipse的同学在贡献代码前安装相关插件，而IntelliJ IDEA新版本自带支持，如果没有可自行安装插件。
+1. 为了便于设置，本项目引入`editorconfig`支持，请使用Eclipse的同学在贡献代码前安装相关插件，而`IntelliJ IDEA`新版本自带支持，如果没有可自行安装插件。
 1. **提交代码前，请检查代码是否已经格式化，并且保证新增加或者修改的方法都有完整的参数说明，而public方法必须拥有相应的单元测试并通过测试。**
 1. 本项目可以采用两种方式接受代码贡献：
   -  第一种就是基于[Git Flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)开发流程，因此在发起Pull Request的时候请选择develop分支，详细步骤参考后文，推荐使用此种方式贡献代码。

README.md

@@ -122,6 +122,7 @@
 - 维沃吼吼
 - 王朝社区（比亚迪新能源社区）
 - 极吼吼手机上门回收换新
+- 未来信封 
 
 
 #### 公众号：
@@ -138,6 +139,7 @@
 - YshopMall
 - 好行景区直通车以及全国40多个公众号
 - 我奥篮球公众号
+- 未来信封官微
 
 #### 企业号/企业微信：
 - HTC企业微信

others/weixin-java-osgi/pom.xml

@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.4.10-java7</version>
+      <version>1.4.13-java7</version>
       <scope>provided</scope>
       <exclusions>
         <exclusion>

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.9.0</version>
+  <version>4.0.0</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
@@ -134,7 +134,7 @@
       <dependency>
         <groupId>org.jodd</groupId>
         <artifactId>jodd-http</artifactId>
-        <version>5.1.6</version>
+        <version>5.2.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -172,17 +172,17 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.7.24</version>
+        <version>1.7.30</version>
       </dependency>
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.11.1</version>
+        <version>1.4.14</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>29.0-android</version>
+        <version>29.0-jre</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
@@ -239,6 +239,12 @@
         <version>3.0.0</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>com.github.dreamhead</groupId>
+        <artifactId>moco-runner</artifactId>
+        <version>1.1.0</version>
+        <scope>test</scope>
+      </dependency>
 
       <dependency>
         <groupId>redis.clients</groupId>
@@ -262,7 +268,7 @@
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-redis</artifactId>
-        <version>1.8.23.RELEASE</version>
+        <version>2.3.3.RELEASE</version>
         <optional>true</optional>
         <scope>provided</scope>
       </dependency>

spring-boot-starters/pom.xml

@@ -6,15 +6,15 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.9.0</version>
+    <version>4.0.0</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>wx-java-spring-boot-starters</artifactId>
   <name>WxJava - Spring Boot Starters</name>
   <description>WxJava 各个模块的 Spring Boot Starter</description>
 
   <properties>
-    <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
+    <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
   </properties>
 
   <modules>

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.0</version>
+    <version>4.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/config/WxMaAutoConfiguration.java

@@ -9,6 +9,7 @@
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import cn.binarywang.wx.miniapp.config.impl.WxMaRedisBetterConfigImpl;
 import com.binarywang.spring.starter.wxjava.miniapp.enums.HttpClientType;
+import com.binarywang.spring.starter.wxjava.miniapp.properties.RedisProperties;
 import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.common.redis.JedisWxRedisOps;
@@ -52,14 +53,19 @@ public class WxMaAutoConfiguration {
   public WxMaService service(WxMaConfig wxMaConfig) {
     HttpClientType httpClientType = wxMaProperties.getConfigStorage().getHttpClientType();
     WxMaService wxMaService;
-    if (httpClientType == HttpClientType.OkHttp) {
-      wxMaService = new WxMaServiceOkHttpImpl();
-    } else if (httpClientType == HttpClientType.JoddHttp) {
-      wxMaService = new WxMaServiceJoddHttpImpl();
-    } else if (httpClientType == HttpClientType.HttpClient) {
-      wxMaService = new WxMaServiceHttpClientImpl();
-    } else {
-      wxMaService = new WxMaServiceImpl();
+    switch (httpClientType) {
+      case OkHttp:
+        wxMaService = new WxMaServiceOkHttpImpl();
+        break;
+      case JoddHttp:
+        wxMaService = new WxMaServiceJoddHttpImpl();
+        break;
+      case HttpClient:
+        wxMaService = new WxMaServiceHttpClientImpl();
+        break;
+      default:
+        wxMaService = new WxMaServiceImpl();
+        break;
     }
     wxMaService.setWxMaConfig(wxMaConfig);
     return wxMaService;
@@ -102,7 +108,7 @@ private WxMaDefaultConfigImpl wxMaDefaultConfigStorage() {
   }
 
   private WxMaDefaultConfigImpl wxMaJedisConfigStorage() {
-    WxMaProperties.RedisProperties redisProperties = wxMaProperties.getConfigStorage().getRedis();
+    RedisProperties redisProperties = wxMaProperties.getConfigStorage().getRedis();
     JedisPool jedisPool;
     if (StringUtils.isNotEmpty(redisProperties.getHost())) {
       JedisPoolConfig config = new JedisPoolConfig();

spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/RedisProperties.java

@@ -0,0 +1,43 @@
+package com.binarywang.spring.starter.wxjava.miniapp.properties;
+
+import lombok.Data;
+
+/**
+ * redis 配置.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2020-08-30
+ */
+@Data
+public class RedisProperties {
+
+  /**
+   * 主机地址.不填则从spring容器内获取JedisPool
+   */
+  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;
+}

spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java

@@ -88,37 +88,4 @@ public static class ConfigStorage {
     private String httpProxyPassword;
   }
 
-  @Data
-  public static class RedisProperties {
-
-    /**
-     * 主机地址.不填则从spring容器内获取JedisPool
-     */
-    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;
-  }
 }

spring-boot-starters/wx-java-mp-spring-boot-starter/README.md

@@ -16,16 +16,23 @@
     wx.mp.token = @token
     wx.mp.aesKey = @aesKey
     # 存储配置redis(可选)
-    wx.mp.config-storage.type = redis                     # 配置类型: memory(默认), redis, jedis, redistemplate
+    wx.mp.config-storage.type = Jedis                     # 配置类型: Memory(默认), 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
+	#单机和sentinel同时存在时，优先使用sentinel配置
+	#wx.mp.config-storage.redis.sentinel-ips=127.0.0.1:16379,127.0.0.1:26379
+	#wx.mp.config-storage.redis.sentinel-name=mymaster
     # http客户端配置
-    wx.mp.config-storage.http-client-type=httpclient      # http客户端类型: httpclient(默认), okhttp, joddhttp
+    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=
+	# 公众号地址host配置
+	#wx.mp.hosts.api-host=http://proxy.com/
+	#wx.mp.hosts.open-host=http://proxy.com/
+	#wx.mp.hosts.mp-host=http://proxy.com/
     ```
 3. 自动注入的类型
 - `WxMpService`

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.0</version>
+    <version>4.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -30,6 +30,16 @@
       <version>${spring.boot.version}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jodd</groupId>
+      <artifactId>jodd-http</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>okhttp</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>

spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpServiceAutoConfiguration.java

@@ -1,8 +1,8 @@
 package com.binarywang.spring.starter.wxjava.mp.config;
 
+import com.binarywang.spring.starter.wxjava.mp.enums.HttpClientType;
 import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
-import me.chanjar.weixin.common.api.WxOcrService;
-import me.chanjar.weixin.mp.api.*;
+import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceHttpClientImpl;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceJoddHttpImpl;
@@ -23,16 +23,21 @@ public class WxMpServiceAutoConfiguration {
   @Bean
   @ConditionalOnMissingBean
   public WxMpService wxMpService(WxMpConfigStorage configStorage, WxMpProperties wxMpProperties) {
-    WxMpProperties.HttpClientType httpClientType = wxMpProperties.getConfigStorage().getHttpClientType();
+    HttpClientType httpClientType = wxMpProperties.getConfigStorage().getHttpClientType();
     WxMpService wxMpService;
-    if (httpClientType == WxMpProperties.HttpClientType.okhttp) {
-      wxMpService = newWxMpServiceOkHttpImpl();
-    } else if (httpClientType == WxMpProperties.HttpClientType.joddhttp) {
-      wxMpService = newWxMpServiceJoddHttpImpl();
-    } else if (httpClientType == WxMpProperties.HttpClientType.httpclient) {
-      wxMpService = newWxMpServiceHttpClientImpl();
-    } else {
-      wxMpService = newWxMpServiceImpl();
+    switch (httpClientType) {
+      case OkHttp:
+        wxMpService = newWxMpServiceOkHttpImpl();
+        break;
+      case JoddHttp:
+        wxMpService = newWxMpServiceJoddHttpImpl();
+        break;
+      case HttpClient:
+        wxMpService = newWxMpServiceHttpClientImpl();
+        break;
+      default:
+        wxMpService = newWxMpServiceImpl();
+        break;
     }
 
     wxMpService.setWxMpConfigStorage(configStorage);