From 44b3680a3fd2060f9470b061dcaae5d05a2bcf53 Mon Sep 17 00:00:00 2001 From: Binary Wang Date: Sat, 10 Aug 2019 17:36:57 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E9=87=8D=E6=9E=84=E5=8C=85=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxjava/mp/{ => config}/WxMpAutoConfiguration.java | 3 ++- .../mp/{ => config}/WxMpServiceAutoConfiguration.java | 2 +- .../mp/{ => config}/WxMpStorageAutoConfiguration.java | 4 +++- .../starter/wxjava/mp/{ => properties}/RedisProperties.java | 4 ++-- .../starter/wxjava/mp/{ => properties}/WxMpProperties.java | 6 +++--- .../src/main/resources/META-INF/spring.factories | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) rename starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/{ => config}/WxMpAutoConfiguration.java (74%) rename starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/{ => config}/WxMpServiceAutoConfiguration.java (98%) rename starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/{ => config}/WxMpStorageAutoConfiguration.java (93%) rename starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/{ => properties}/RedisProperties.java (90%) rename starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/{ => properties}/WxMpProperties.java (78%) diff --git a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpAutoConfiguration.java b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpAutoConfiguration.java similarity index 74% rename from starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpAutoConfiguration.java rename to starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpAutoConfiguration.java index ba85d044..42fcaf3a 100644 --- a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpAutoConfiguration.java +++ b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpAutoConfiguration.java @@ -1,5 +1,6 @@ -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; diff --git a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpServiceAutoConfiguration.java b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpServiceAutoConfiguration.java similarity index 98% rename from starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpServiceAutoConfiguration.java rename to starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpServiceAutoConfiguration.java index a5234ed7..9d2b9476 100644 --- a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpServiceAutoConfiguration.java +++ b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpServiceAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.binarywang.spring.starter.wxjava.mp; +package com.binarywang.spring.starter.wxjava.mp.config; import me.chanjar.weixin.mp.config.WxMpConfigStorage; import me.chanjar.weixin.mp.api.WxMpService; diff --git a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpStorageAutoConfiguration.java b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java similarity index 93% rename from starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpStorageAutoConfiguration.java rename to starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java index d70d88c8..1c917162 100644 --- a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpStorageAutoConfiguration.java +++ b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java @@ -1,5 +1,7 @@ -package com.binarywang.spring.starter.wxjava.mp; +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 me.chanjar.weixin.mp.config.WxMpConfigStorage; import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl; diff --git a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/RedisProperties.java b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java similarity index 90% rename from starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/RedisProperties.java rename to starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java index d609cc88..0f0aeca9 100644 --- a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/RedisProperties.java +++ b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/RedisProperties.java @@ -1,4 +1,4 @@ -package com.binarywang.spring.starter.wxjava.mp; +package com.binarywang.spring.starter.wxjava.mp.properties; import lombok.Data; @@ -39,4 +39,4 @@ public class RedisProperties implements Serializable { private Integer maxIdle; private Integer maxWaitMillis; private Integer minIdle; -} \ No newline at end of file +} diff --git a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpProperties.java b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java similarity index 78% rename from starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpProperties.java rename to starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java index af74f430..085916cd 100644 --- a/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/WxMpProperties.java +++ b/starters/wx-java-mp-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java @@ -1,12 +1,12 @@ -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; /** diff --git a/starters/wx-java-mp-starter/src/main/resources/META-INF/spring.factories b/starters/wx-java-mp-starter/src/main/resources/META-INF/spring.factories index aaa17f76..6634593f 100644 --- a/starters/wx-java-mp-starter/src/main/resources/META-INF/spring.factories +++ b/starters/wx-java-mp-starter/src/main/resources/META-INF/spring.factories @@ -1 +1 @@ -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