Merge pull request #2 from Wechat-Group/develop

从主库更新

Author: chutian0124

README.md

@@ -19,7 +19,7 @@
     <tr>
 			<td align="left" valign="middle">
         <a href="http://mp.weixin.qq.com/mp/homepage?__biz=MzI3MzAwMzk4OA==&hid=1&sn=f31af3bf562b116b061c9ab4edf70b61&scene=18#wechat_redirect" target="_blank">
-				  <img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/master/images/qrcodes/mp.png">
+				  <img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/develop/images/qrcodes/mp.png">
         </a>
 			</td>
       <td align="center" valign="middle" width="250">
@@ -30,23 +30,17 @@
       </td>
 			<td align="center" valign="middle">
 				<a href="https://promotion.aliyun.com/ntms/act/qwbk.html?userCode=7makzf5h" target="_blank">
-					<img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/master/images/banners/aliyun.jpg">
-				</a>
-			</td>
-			<td align="center" valign="middle">
-				<a href="https://cloud.tencent.com/redirect.php?redirect=1014&cps_key=a4c06ffe004dbcda44036daa1bf8f876&from=console" target="_blank">
-					<img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/master/images/banners/tcloud.jpg">
+					<img height="120" src="https://gitee.com/binary/weixin-java-tools/raw/develop/images/banners/aliyun.jpg">
 				</a>
 			</td>
 		</tr>
 	</tbody>
 </table>
 
 ### 重要信息
-1. **2020-11-29 发布 [【4.0.0正式版】](https://mp.weixin.qq.com/s/OPoICwLifOZGVN_ZX_BBhw)**！
+1. **2021-06-02 发布 [【4.1.0正式版】](https://mp.weixin.qq.com/s/nIk_xOf6dxkhKfqq830Cuw)**！
 1. 新手重要提示：本项目仅是一个SDK开发工具包，未提供Web实现，建议使用 `maven` 或 `gradle` 引用本项目即可使用本SDK提供的各种功能，详情可参考 **[【Demo项目】](demo.md)** 或本项目中的部分单元测试代码；另外微信开发新手请务必阅读[【开发文档 Wiki 首页】](https://github.com/Wechat-Group/WxJava/wiki)的常见问题部分，可以少走很多弯路，节省不少时间。
 1. 技术交流群：想获得QQ群/微信群/钉钉企业群等信息的同学，请使用微信扫描上面的微信公众号二维码关注 `WxJava` 后点击相关菜单即可获取加入方式，同时也可以在微信中搜索 `weixin-java-tools` 或 `WxJava` 后选择正确的公众号进行关注，该公众号会及时通知SDK相关更新信息，并不定期分享微信Java开发相关技术知识；
-1. 付费QQ群：（**注意：刚入群会有5分钟禁言，稍等片刻即可正常发言**） [![加入QQ群](https://img.shields.io/badge/QQ群-343954419-blue.svg)](http://shang.qq.com/wpa/qunwpa?idkey=731dc3e7ea31ebe25376cc1a791445468612c63fd0e9e05399b088ec81fd9e15) 或 [![加入QQ群](https://img.shields.io/badge/QQ群-343954419-blue.svg)](http://jq.qq.com/?_wv=1027&k=40lRskK)，或者请自行搜索群号`343954419`进行添加；当然由于某种原因无法入群的，可关注公众号后获取其他群的加入方式；
 1. 钉钉技术交流群： `30294972`（技术交流群），`35724728`（通知群，实时通知Github项目变更记录）。
 1. 微信开发新手或者Java开发新手在群内提问或新开Issue提问前，请先阅读[【提问的智慧】](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md)，并确保已查阅过 [【开发文档Wiki】](https://github.com/wechat-group/WxJava/wiki) ，避免浪费大家的宝贵时间；
 1. 寻求帮助时需贴代码或大长串异常信息的，请利用 http://paste.ubuntu.com 
@@ -73,7 +67,7 @@
 <dependency>
   <groupId>com.github.binarywang</groupId>
   <artifactId>（不同模块参考下文）</artifactId>
-  <version>4.0.0</version>
+  <version>4.1.0</version>
 </dependency>
 ```
 
@@ -105,14 +99,15 @@
 
 #### 开源项目：
 - 基于微信公众号的签到、抽奖、发送弹幕程序：https://github.com/workcheng/weiya
-- XxPay聚合支付：https://github.com/jmdhappy/xxpay-master
+- Jeepay 支付系统：https://gitee.com/jeequan/jeepay
 - 微同商城：https://gitee.com/fuyang_lipengjun/platform
 - 微信点餐系统：https://github.com/sqmax/springboot-project
 - 专注批量推送的小而美的工具：https://github.com/rememberber/WePush
 - yshop意象商城系统：https://gitee.com/guchengwuyue/yshopmall
 - wx-manage（微信公众号管理项目）：https://github.com/niefy/wx-manage
 - 基于若依开发的微信公众号管理系统：https://gitee.com/joolun/JooLun-wx
 - SAAS微信小程序电商：https://gitee.com/wei-it/weiit-saas
+- mall4j 电商商城系统：https://gitee.com/gz-yami/mall4j
 
 #### 小程序：
 - （京东）友家铺子，友家铺子店长版，京粉精选
@@ -129,6 +124,8 @@
 - 王朝社区（比亚迪新能源社区）
 - 极吼吼手机上门回收换新
 - 未来信封 
+- 5G惠享
+- 生菜wordpress转小程序
 
 #### 公众号：
 - 中国电信上海网厅（sh_189）
@@ -145,10 +142,13 @@
 - 好行景区直通车以及全国40多个公众号
 - 我奥篮球公众号
 - 未来信封官微
+- 银川智云问诊
+- 5G惠享
 
-#### 企业号/企业微信：
+#### 企业微信：
 - HTC企业微信
 - 掌上史丹利
+- 药店益
 
 #### 其他：
 - 高善人力资源

others/weixin-java-osgi/pom.xml

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

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>4.0.6.B</version>
+  <version>4.1.0</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
@@ -118,7 +118,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <httpclient.version>4.5</httpclient.version>
+    <httpclient.version>4.5.13</httpclient.version>
     <jetty.version>9.4.38.v20210224</jetty.version>
   </properties>
 
@@ -160,7 +160,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.5</version>
+        <version>2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
@@ -175,12 +175,12 @@
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.16</version>
+        <version>1.4.17</version>
       </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>29.0-jre</version>
+        <version>30.0-jre</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>

spring-boot-starters/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>4.0.6.B</version>
+    <version>4.1.0</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>4.0.6.B</version>
+    <version>4.1.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -22,11 +22,18 @@
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.redisson</groupId>
+      <artifactId>redisson</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>
 

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

@@ -1,148 +1,21 @@
 package com.binarywang.spring.starter.wxjava.miniapp.config;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.api.impl.WxMaServiceHttpClientImpl;
-import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.api.impl.WxMaServiceJoddHttpImpl;
-import cn.binarywang.wx.miniapp.api.impl.WxMaServiceOkHttpImpl;
-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.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;
-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;
+import org.springframework.context.annotation.Import;
 
 /**
  * 自动配置.
  *
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  * @date 2019-08-10
  */
-@AllArgsConstructor
 @Configuration
-@ConditionalOnClass(WxMaService.class)
 @EnableConfigurationProperties(WxMaProperties.class)
-@ConditionalOnProperty(prefix = "wx.miniapp", value = "enabled", matchIfMissing = true)
+@Import({
+  WxMaStorageAutoConfiguration.class,
+  WxMaServiceAutoConfiguration.class
+})
 public class WxMaAutoConfiguration {
-
-  private final WxMaProperties wxMaProperties;
-  private final ApplicationContext applicationContext;
-
-  /**
-   * 小程序service.
-   *
-   * @return 小程序service
-   */
-  @Bean
-  @ConditionalOnMissingBean(WxMaService.class)
-  public WxMaService service(WxMaConfig wxMaConfig) {
-    HttpClientType httpClientType = wxMaProperties.getConfigStorage().getHttpClientType();
-    WxMaService wxMaService;
-    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;
-  }
-
-  @Bean
-  @ConditionalOnMissingBean(WxMaConfig.class)
-  public WxMaConfig wxMaConfig() {
-    WxMaDefaultConfigImpl config;
-    switch (wxMaProperties.getConfigStorage().getType()) {
-      case Jedis:
-        config = WxMaRedisBetterConfig.config(wxMaProperties, applicationContext);
-        break;
-      case RedisTemplate:
-        config = wxMaRedisTemplateConfigStorage();
-        break;
-      default:
-        config = wxMaDefaultConfigStorage();
-        break;
-    }
-
-    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 wxMaDefaultConfigStorage() {
-    return new WxMaDefaultConfigImpl();
-  }
-
-  private static class WxMaRedisBetterConfig {
-
-    private static WxMaDefaultConfigImpl config(WxMaProperties wxMaProperties, ApplicationContext context) {
-      RedisProperties redisProperties = wxMaProperties.getConfigStorage().getRedis();
-      JedisPool jedisPool;
-      if (StringUtils.isNotEmpty(redisProperties.getHost())) {
-        JedisPoolConfig config = new JedisPoolConfig();
-        if (redisProperties.getMaxActive() != null) {
-          config.setMaxTotal(redisProperties.getMaxActive());
-        }
-        if (redisProperties.getMaxIdle() != null) {
-          config.setMaxIdle(redisProperties.getMaxIdle());
-        }
-        if (redisProperties.getMaxWaitMillis() != null) {
-          config.setMaxWaitMillis(redisProperties.getMaxWaitMillis());
-        }
-        if (redisProperties.getMinIdle() != null) {
-          config.setMinIdle(redisProperties.getMinIdle());
-        }
-        config.setTestOnBorrow(true);
-        config.setTestWhileIdle(true);
-
-        jedisPool = new JedisPool(config, redisProperties.getHost(), redisProperties.getPort(),
-          redisProperties.getTimeout(), redisProperties.getPassword(), redisProperties.getDatabase());
-      } else {
-        jedisPool = context.getBean(JedisPool.class);
-      }
-      WxRedisOps redisOps = new JedisWxRedisOps(jedisPool);
-      return new WxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
-    }
-  }
-
-
-  private WxMaDefaultConfigImpl wxMaRedisTemplateConfigStorage() {
-    StringRedisTemplate redisTemplate = applicationContext.getBean(StringRedisTemplate.class);
-    WxRedisOps redisOps = new RedisTemplateWxRedisOps(redisTemplate);
-    return new WxMaRedisBetterConfigImpl(redisOps, wxMaProperties.getConfigStorage().getKeyPrefix());
-  }
 }

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

@@ -0,0 +1,56 @@
+package com.binarywang.spring.starter.wxjava.miniapp.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceHttpClientImpl;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceJoddHttpImpl;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceOkHttpImpl;
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import com.binarywang.spring.starter.wxjava.miniapp.enums.HttpClientType;
+import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
+import lombok.AllArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 微信小程序平台相关服务自动注册.
+ *
+ * @author someone TaoYu
+ */
+@Configuration
+@AllArgsConstructor
+public class WxMaServiceAutoConfiguration {
+
+  private final WxMaProperties wxMaProperties;
+
+  /**
+   * 小程序service.
+   *
+   * @return 小程序service
+   */
+  @Bean
+  @ConditionalOnMissingBean(WxMaService.class)
+  @ConditionalOnBean(WxMaConfig.class)
+  public WxMaService wxMaService(WxMaConfig wxMaConfig) {
+    HttpClientType httpClientType = wxMaProperties.getConfigStorage().getHttpClientType();
+    WxMaService wxMaService;
+    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;
+  }
+}