Merge pull request #1151 from Wechat-Group/develop

合并 Develop 分支

.travis.yml

@@ -7,7 +7,7 @@ language: java
 #      secure: "834110c7191f97ecb226970c46dcaff8e681da5a"
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 script: "mvn clean package -DskipTests=true -Dcheckstyle.skip=true"
 
 #script:

.vscode/settings.json

-{
-    "java.configuration.updateBuildConfiguration": "interactive"
-}
\ No newline at end of file

pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>wx-java</artifactId>
-  <version>3.4.0</version>
+  <version>3.5.0</version>
   <packaging>pom</packaging>
   <name>WxJava - Weixin/Wechat Java SDK</name>
   <description>微信开发Java SDK</description>
@@ -105,8 +105,9 @@
     <module>weixin-java-pay</module>
     <module>weixin-java-miniapp</module>
     <module>weixin-java-open</module>
-    <module>starters/wx-java-pay-starter</module>
-    <module>starters/wx-java-mp-starter</module>
+    <module>spring-boot-starters/wx-java-pay-spring-boot-starter</module>
+    <module>spring-boot-starters/wx-java-mp-spring-boot-starter</module>
+    <module>spring-boot-starters/wx-java-miniapp-spring-boot-starter</module>
     <!--module>weixin-java-osgi</module-->
   </modules>
 
@@ -246,7 +247,7 @@
       <dependency>
         <groupId>org.projectlombok</groupId>
         <artifactId>lombok</artifactId>
-        <version>1.16.18</version>
+        <version>1.18.8</version>
         <scope>provided</scope>
       </dependency>
     </dependencies>
@@ -370,6 +371,7 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.17</version>
         <configuration>
+          <skip>true</skip>
           <configLocation>quality-checks/google_checks.xml</configLocation>
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <consoleOutput>true</consoleOutput>

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

+# 使用说明
+1. 在自己的Spring Boot项目里，引入maven依赖
+```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
+```
+
+
+
+
+
+
+

spring-boot-starters/wx-java-miniapp-spring-boot-starter/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>wx-java</artifactId>
+    <groupId>com.github.binarywang</groupId>
+    <version>3.5.0</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
+  <name>WxJava - Spring Boot Starter for MiniApp</name>
+  <description>微信小程序开发的 Spring Boot Starter</description>
+
+  <properties>
+    <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <version>${spring.boot.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-configuration-processor</artifactId>
+      <version>${spring.boot.version}</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.github.binarywang</groupId>
+      <artifactId>weixin-java-miniapp</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${spring.boot.version}</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.2.1</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

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

+package com.binarywang.spring.starter.wxjava.miniapp.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.config.WxMaConfig;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import com.binarywang.spring.starter.wxjava.miniapp.properties.WxMaProperties;
+import lombok.AllArgsConstructor;
+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.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 自动配置.
+ *
+ * @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)
+public class WxMaAutoConfiguration {
+  private WxMaProperties properties;
+
+  /**
+   * 小程序service.
+   *
+   * @return 小程序service
+   */
+  @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()));
+
+    final WxMaServiceImpl service = new WxMaServiceImpl();
+    service.setWxMaConfig(config);
+    return service;
+  }
+}

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

+package com.binarywang.spring.starter.wxjava.miniapp.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 属性配置类.
+ *
+ * @author <a href="https://github.com/binarywang">Binary Wang</a>
+ * @date 2019-08-10
+ */
+@Data
+@ConfigurationProperties(prefix = "wx.miniapp")
+public class WxMaProperties {
+  /**
+   * 设置微信小程序的appid.
+   */
+  private String appid;
+
+  /**
+   * 设置微信小程序的Secret.
+   */
+  private String secret;
+
+  /**
+   * 设置微信小程序消息服务器配置的token.
+   */
+  private String token;
+
+  /**
+   * 设置微信小程序消息服务器配置的EncodingAESKey.
+   */
+  private String aesKey;
+
+  /**
+   * 消息格式，XML或者JSON.
+   */
+  private String msgDataFormat;
+}

spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/resources/META-INF/spring.factories

+org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.binarywang.spring.starter.wxjava.miniapp.config.WxMaAutoConfiguration

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

@@ -4,7 +4,7 @@
     ```xml
     <dependency>
         <groupId>com.github.binarywang</groupId>
-        <artifactId>wx-java-mp-starter</artifactId>
+        <artifactId>wx-java-mp-spring-boot-starter</artifactId>
         <version>${version}</version>
     </dependency>
     ```

starters/wx-java-mp-starter/pom.xml → spring-boot-starters/wx-java-mp-spring-boot-starter/pom.xml

@@ -6,13 +6,13 @@
   <parent>
     <groupId>com.github.binarywang</groupId>
     <artifactId>wx-java</artifactId>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
     <relativePath>../../</relativePath>
   </parent>
 
-  <artifactId>wx-java-mp-starter</artifactId>
+  <artifactId>wx-java-mp-spring-boot-starter</artifactId>
   <name>WxJava - Spring Boot Starter for MP</name>
-  <description>微信公众号开发的Spring Boot Starter</description>
+  <description>微信公众号开发的 Spring Boot Starter</description>
 
   <properties>
     <spring.boot.version>2.1.4.RELEASE</spring.boot.version>

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

-package com.binarywang.spring.starter.wxjava.mp;
+package com.binarywang.spring.starter.wxjava.mp.config;
 
+import com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
+/**
+ * .
+ *
+ * @author someone
+ */
 @Configuration
 @EnableConfigurationProperties(WxMpProperties.class)
 @Import({WxMpStorageAutoConfiguration.class, WxMpServiceAutoConfiguration.class})

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

+package com.binarywang.spring.starter.wxjava.mp.config;
+
+import me.chanjar.weixin.mp.config.WxMpConfigStorage;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 微信公众号相关服务自动注册.
+ *
+ * @author someone
+ */
+@Configuration
+public class WxMpServiceAutoConfiguration {
+  @Autowired
+  private ApplicationContext ctx;
+
+  @Bean
+  @ConditionalOnMissingBean
+  public WxMpService wxMpService(WxMpConfigStorage configStorage) {
+    WxMpService wxMpService = new WxMpServiceImpl();
+    wxMpService.setWxMpConfigStorage(configStorage);
+    registerWxMpSubService(wxMpService);
+    return wxMpService;
+  }
+
+  @ConditionalOnBean(WxMpService.class)
+  public Object registerWxMpSubService(WxMpService wxMpService) {
+    ConfigurableListableBeanFactory factory = (ConfigurableListableBeanFactory) ctx.getAutowireCapableBeanFactory();
+    factory.registerSingleton("wxMpKefuService", wxMpService.getKefuService());
+    factory.registerSingleton("wxMpMaterialService", wxMpService.getMaterialService());
+    factory.registerSingleton("wxMpMenuService", wxMpService.getMenuService());
+    factory.registerSingleton("wxMpUserService", wxMpService.getUserService());
+    factory.registerSingleton("wxMpUserTagService", wxMpService.getUserTagService());
+    factory.registerSingleton("wxMpQrcodeService", wxMpService.getQrcodeService());
+    factory.registerSingleton("wxMpCardService", wxMpService.getCardService());
+    factory.registerSingleton("wxMpDataCubeService", wxMpService.getDataCubeService());
+    factory.registerSingleton("wxMpUserBlacklistService", wxMpService.getBlackListService());
+    factory.registerSingleton("wxMpStoreService", wxMpService.getStoreService());
+    factory.registerSingleton("wxMpTemplateMsgService", wxMpService.getTemplateMsgService());
+    factory.registerSingleton("wxMpSubscribeMsgService", wxMpService.getSubscribeMsgService());
+    factory.registerSingleton("wxMpDeviceService", wxMpService.getDeviceService());
+    factory.registerSingleton("wxMpShakeService", wxMpService.getShakeService());
+    factory.registerSingleton("wxMpMemberCardService", wxMpService.getMemberCardService());
+    factory.registerSingleton("wxMpMassMessageService", wxMpService.getMassMessageService());
+    return Boolean.TRUE;
+  }
+
+}

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

+package com.binarywang.spring.starter.wxjava.mp.config;
+
+import com.binarywang.spring.starter.wxjava.mp.properties.RedisProperties;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+
+/**
+ * 微信公众号存储策略自动配置.
+ *
+ * @author someone
+ */
+@Configuration
+@RequiredArgsConstructor
+public class WxMpStorageAutoConfiguration {
+  private final WxMpProperties properties;
+
+  @Autowired(required = false)
+  private JedisPool jedisPool;
+
+  @Bean
+  @ConditionalOnMissingBean(WxMpConfigStorage.class)
+  public WxMpConfigStorage wxMpInMemoryConfigStorage() {
+    WxMpProperties.ConfigStorage storage = properties.getConfigStorage();
+    WxMpProperties.StorageType type = storage.getType();
+
+    if (type == WxMpProperties.StorageType.redis) {
+      return getWxMpInRedisConfigStorage();
+    }
+    return getWxMpInMemoryConfigStorage();
+  }
+
+  private WxMpDefaultConfigImpl getWxMpInMemoryConfigStorage() {
+    WxMpDefaultConfigImpl config = new WxMpDefaultConfigImpl();
+    setWxMpInfo(config);
+    return config;
+  }
+
+  private WxMpRedisConfigImpl getWxMpInRedisConfigStorage() {
+    JedisPool poolToUse = jedisPool;
+    if (poolToUse == null) {
+      poolToUse = getJedisPool();
+    }
+    WxMpRedisConfigImpl config = new WxMpRedisConfigImpl(poolToUse);
+    setWxMpInfo(config);
+    return config;
+  }
+
+  private void setWxMpInfo(WxMpDefaultConfigImpl config) {
+    config.setAppId(properties.getAppId());
+    config.setSecret(properties.getSecret());
+    config.setToken(properties.getToken());
+    config.setAesKey(properties.getAesKey());
+  }
+
+  private JedisPool getJedisPool() {
+    WxMpProperties.ConfigStorage storage = properties.getConfigStorage();
+    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);
+
+    JedisPool pool = new JedisPool(config, redis.getHost(), redis.getPort(),
+      redis.getTimeout(), redis.getPassword(), redis.getDatabase());
+    return pool;
+  }
+}

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

+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;
+
+  /**
+   * 主机地址.
+   */
+  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;
+}

starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpProperties.java → spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java

-package com.binarywang.spring.starter.wxjava.mp;
+package com.binarywang.spring.starter.wxjava.mp.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.io.Serializable;
 
-import static com.binarywang.spring.starter.wxjava.mp.WxMpProperties.PREFIX;
-import static com.binarywang.spring.starter.wxjava.mp.WxMpProperties.StorageType.memory;
+import static com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties.PREFIX;
+import static com.binarywang.spring.starter.wxjava.mp.properties.WxMpProperties.StorageType.memory;
 
 
 /**
- * 微信接入相关配置属性
+ * 微信接入相关配置属性.
+ *
+ * @author someone
  */
 @Data
 @ConfigurationProperties(PREFIX)
@@ -18,33 +20,34 @@ public class WxMpProperties {
   public static final String PREFIX = "wx.mp";
 
   /**
-   * 设置微信公众号的appid
+   * 设置微信公众号的appid.
    */
   private String appId;
 
   /**
-   * 设置微信公众号的app secret
+   * 设置微信公众号的app secret.
    */
   private String secret;
 
   /**
-   * 设置微信公众号的token
+   * 设置微信公众号的token.
    */
   private String token;
 
   /**
-   * 设置微信公众号的EncodingAESKey
+   * 设置微信公众号的EncodingAESKey.
    */
   private String aesKey;
 
   /**
-   * 存储策略, memory, redis
+   * 存储策略, memory, redis.
    */
   private ConfigStorage configStorage = new ConfigStorage();
 
 
   @Data
   public static class ConfigStorage implements Serializable {
+    private static final long serialVersionUID = 4815731027000065434L;
 
     private StorageType type = memory;
 
@@ -53,6 +56,13 @@ public class WxMpProperties {
   }
 
   public enum StorageType {
-    memory, redis
+    /**
+     * 内存.
+     */
+    memory,
+    /**
+     * redis.
+     */
+    redis
   }
 }

starters/wx-java-mp-starter/src/main/resources/META-INF/spring.factories → spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/resources/META-INF/spring.factories

-org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.binarywang.spring.starter.wxjava.mp.WxMpAutoConfiguration
\ No newline at end of file
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.binarywang.spring.starter.wxjava.mp.config.WxMpAutoConfiguration

starters/wx-java-pay-starter/README.md → spring-boot-starters/wx-java-pay-spring-boot-starter/README.md

@@ -3,7 +3,7 @@
 ```xml
     <dependency>
         <groupId>com.github.binarywang</groupId>
-        <artifactId>wx-java-pay-starter</artifactId>
+        <artifactId>wx-java-pay-spring-boot-starter</artifactId>
         <version>${version}</version>
     </dependency>
  ```
@@ -11,9 +11,9 @@
 ```yml
 wx:
   pay:
-    appId: wx5b69c56ac01ed858
-    mchId: 1462547202
-    mchKey: OGL9fvig9y2HrXrQ86tM4jTwyv4ja6G5
+    appId: 
+    mchId: 
+    mchKey: 
     subAppId:
     subMchId:
     keyPath:

starters/wx-java-pay-starter/pom.xml → spring-boot-starters/wx-java-pay-spring-boot-starter/pom.xml

@@ -5,14 +5,14 @@
   <parent>
     <artifactId>wx-java</artifactId>
     <groupId>com.github.binarywang</groupId>
-    <version>3.4.0</version>
+    <version>3.5.0</version>
     <relativePath>../../</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>wx-java-pay-starter</artifactId>
+  <artifactId>wx-java-pay-spring-boot-starter</artifactId>
   <name>WxJava - Spring Boot Starter for WxPay</name>
-  <description>微信支付开发的Spring Boot Starter</description>
+  <description>微信支付开发的 Spring Boot Starter</description>
 
   <properties>
     <spring.boot.version>2.1.4.RELEASE</spring.boot.version>