Merge pull request #1577 from Wechat-Group/develop

合并Develop分支，发布正式版本
Wechat-Group · May 24, 2020 · 9ab2cfb · 9ab2cfb
2 parents 23c1b0b + d8a1fce
commit 9ab2cfb
Show file tree

Hide file tree

Showing 284 changed files with 10,153 additions and 1,545 deletions.
diff --git 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.8.0</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
@@ -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>
@@ -243,10 +243,24 @@
         <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>
         <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/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.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/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-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.8.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -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/.../main/java/com/binarywang/spring/starter/wxjava/miniapp/config/WxMaAutoConfiguration.java b/.../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());
+  }
 }