diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
index 1508ed92..990af158 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/pom.xml
@@ -9,45 +9,44 @@
4.0.0
- wx-java-open-spring-boot-starter
- WxJava - Spring Boot Starter for WxOpen
- 微信开放平台开发的 Spring Boot Starter
+ wx-java-open-spring-boot-starter
+ WxJava - Spring Boot Starter for WxOpen
+ 微信开放平台开发的 Spring Boot Starter
-
+
+
+ com.github.binarywang
+ weixin-java-open
+ ${project.version}
+
+
+ redis.clients
+ jedis
+ compile
+
+
-
- com.github.binarywang
- weixin-java-open
- ${project.version}
-
-
- redis.clients
- jedis
- compile
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
- ${spring.boot.version}
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 2.2.1
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
-
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ ${spring.boot.version}
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+ 2.2.1
+
+
+ attach-sources
+
+ jar-no-fork
+
+
+
+
+
+
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenServiceAutoConfiguration.java b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenServiceAutoConfiguration.java
index b58bbccd..a2114868 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenServiceAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenServiceAutoConfiguration.java
@@ -17,23 +17,23 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class WxOpenServiceAutoConfiguration {
- @Bean
- @ConditionalOnMissingBean
- public WxOpenService wxOpenService(WxOpenConfigStorage configStorage) {
- WxOpenService wxOpenService = new WxOpenServiceImpl();
- wxOpenService.setWxOpenConfigStorage(configStorage);
- return wxOpenService;
- }
+ @Bean
+ @ConditionalOnMissingBean
+ public WxOpenService wxOpenService(WxOpenConfigStorage configStorage) {
+ WxOpenService wxOpenService = new WxOpenServiceImpl();
+ wxOpenService.setWxOpenConfigStorage(configStorage);
+ return wxOpenService;
+ }
- @Bean
- public WxOpenMessageRouter wxOpenMessageRouter(WxOpenService wxOpenService) {
- return new WxOpenMessageRouter(wxOpenService);
- }
+ @Bean
+ public WxOpenMessageRouter wxOpenMessageRouter(WxOpenService wxOpenService) {
+ return new WxOpenMessageRouter(wxOpenService);
+ }
- @Bean
- public WxOpenComponentService wxOpenComponentService(WxOpenService wxOpenService) {
- return wxOpenService.getWxOpenComponentService();
- }
+ @Bean
+ public WxOpenComponentService wxOpenComponentService(WxOpenService wxOpenService) {
+ return wxOpenService.getWxOpenComponentService();
+ }
}
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
index d34de5e6..5b575519 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/config/WxOpenStorageAutoConfiguration.java
@@ -23,71 +23,71 @@ import redis.clients.jedis.JedisPoolConfig;
@Configuration
@RequiredArgsConstructor
public class WxOpenStorageAutoConfiguration {
- private final WxOpenProperties properties;
+ private final WxOpenProperties properties;
- @Autowired(required = false)
- private JedisPool jedisPool;
+ @Autowired(required = false)
+ private JedisPool jedisPool;
- @Value("${wx.open.config-storage.redis.host:}")
- private String redisHost;
+ @Value("${wx.open.config-storage.redis.host:}")
+ private String redisHost;
- @Bean
- @ConditionalOnMissingBean(WxOpenConfigStorage.class)
- public WxOpenConfigStorage wxOpenConfigStorage() {
- WxOpenProperties.ConfigStorage storage = properties.getConfigStorage();
- WxOpenProperties.StorageType type = storage.getType();
+ @Bean
+ @ConditionalOnMissingBean(WxOpenConfigStorage.class)
+ public WxOpenConfigStorage wxOpenConfigStorage() {
+ WxOpenProperties.ConfigStorage storage = properties.getConfigStorage();
+ WxOpenProperties.StorageType type = storage.getType();
- if (type == WxOpenProperties.StorageType.redis) {
- return getWxOpenInRedisConfigStorage();
- }
- return getWxOpenInMemoryConfigStorage();
+ if (type == WxOpenProperties.StorageType.redis) {
+ return getWxOpenInRedisConfigStorage();
}
+ return getWxOpenInMemoryConfigStorage();
+ }
- private WxOpenInMemoryConfigStorage getWxOpenInMemoryConfigStorage() {
- WxOpenInMemoryConfigStorage config = new WxOpenInMemoryConfigStorage();
- setWxOpenInfo(config);
- return config;
- }
-
- private WxOpenInRedisConfigStorage getWxOpenInRedisConfigStorage() {
- JedisPool poolToUse = jedisPool;
- if (jedisPool == null || StringUtils.isNotEmpty(redisHost)) {
- poolToUse = getJedisPool();
- }
- WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(poolToUse);
- setWxOpenInfo(config);
- return config;
- }
+ private WxOpenInMemoryConfigStorage getWxOpenInMemoryConfigStorage() {
+ WxOpenInMemoryConfigStorage config = new WxOpenInMemoryConfigStorage();
+ setWxOpenInfo(config);
+ return config;
+ }
- private void setWxOpenInfo(WxOpenConfigStorage config) {
- config.setComponentAppId(properties.getAppId());
- config.setComponentAppSecret(properties.getSecret());
- config.setComponentToken(properties.getToken());
- config.setComponentAesKey(properties.getAesKey());
+ private WxOpenInRedisConfigStorage getWxOpenInRedisConfigStorage() {
+ JedisPool poolToUse = jedisPool;
+ if (jedisPool == null || StringUtils.isNotEmpty(redisHost)) {
+ poolToUse = getJedisPool();
}
+ WxOpenInRedisConfigStorage config = new WxOpenInRedisConfigStorage(poolToUse);
+ setWxOpenInfo(config);
+ return config;
+ }
- private JedisPool getJedisPool() {
- WxOpenProperties.ConfigStorage storage = properties.getConfigStorage();
- RedisProperties redis = storage.getRedis();
+ private void setWxOpenInfo(WxOpenConfigStorage config) {
+ config.setComponentAppId(properties.getAppId());
+ config.setComponentAppSecret(properties.getSecret());
+ config.setComponentToken(properties.getToken());
+ config.setComponentAesKey(properties.getAesKey());
+ }
- 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);
+ private JedisPool getJedisPool() {
+ WxOpenProperties.ConfigStorage storage = properties.getConfigStorage();
+ RedisProperties redis = storage.getRedis();
- JedisPool pool = new JedisPool(config, redis.getHost(), redis.getPort(),
- redis.getTimeout(), redis.getPassword(), redis.getDatabase());
- return pool;
+ 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;
+ }
}
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/RedisProperties.java b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/RedisProperties.java
index c72c9edb..565afa07 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/RedisProperties.java
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/RedisProperties.java
@@ -11,35 +11,35 @@ import java.io.Serializable;
*/
@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;
+ 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;
}
diff --git a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
index d2fe088f..64cc3d06 100644
--- a/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
+++ b/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/open/properties/WxOpenProperties.java
@@ -17,52 +17,52 @@ import static com.binarywang.spring.starter.wxjava.open.properties.WxOpenPropert
@Data
@ConfigurationProperties(PREFIX)
public class WxOpenProperties {
- public static final String PREFIX = "wx.open";
+ public static final String PREFIX = "wx.open";
- /**
- * 设置微信开放平台的appid.
- */
- private String appId;
+ /**
+ * 设置微信开放平台的appid.
+ */
+ private String appId;
- /**
- * 设置微信开放平台的app secret.
- */
- private String secret;
+ /**
+ * 设置微信开放平台的app secret.
+ */
+ private String secret;
- /**
- * 设置微信开放平台的token.
- */
- private String token;
+ /**
+ * 设置微信开放平台的token.
+ */
+ private String token;
- /**
- * 设置微信开放平台的EncodingAESKey.
- */
- private String aesKey;
+ /**
+ * 设置微信开放平台的EncodingAESKey.
+ */
+ private String aesKey;
- /**
- * 存储策略, memory, redis.
- */
- private ConfigStorage configStorage = new ConfigStorage();
+ /**
+ * 存储策略, memory, redis.
+ */
+ private ConfigStorage configStorage = new ConfigStorage();
- @Data
- public static class ConfigStorage implements Serializable {
- private static final long serialVersionUID = 4815731027000065434L;
+ @Data
+ public static class ConfigStorage implements Serializable {
+ private static final long serialVersionUID = 4815731027000065434L;
- private StorageType type = memory;
+ private StorageType type = memory;
- private RedisProperties redis = new RedisProperties();
+ private RedisProperties redis = new RedisProperties();
- }
+ }
- public enum StorageType {
- /**
- * 内存.
- */
- memory,
- /**
- * redis.
- */
- redis
- }
+ public enum StorageType {
+ /**
+ * 内存.
+ */
+ memory,
+ /**
+ * redis.
+ */
+ redis
+ }
}