wechat/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-11-02 21:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 优化yml代码提示功能

Browse Source
This commit is contained in:
miemieYaho
2020-12-29 09:51:30 +08:00
committed by GitHub
parent b235a779f3
commit e946ce0642
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@ import com.binarywang.spring.starter.wxjava.miniapp.enums.HttpClientType;
import com.binarywang.spring.starter.wxjava.miniapp.enums.StorageType; import com.binarywang.spring.starter.wxjava.miniapp.enums.StorageType;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
/** /**
* 属性配置类. * 属性配置类.
@ -60,6 +61,7 @@ public class WxMaProperties {
/** /**
* redis连接配置. * redis连接配置.
*/ */
@NestedConfigurationProperty
private final RedisProperties redis = new RedisProperties(); private final RedisProperties redis = new RedisProperties();
/** /**

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

@ -137,8 +137,7 @@ public class WxMpStorageAutoConfiguration {
} }
private JedisPoolAbstract getJedisPool() { private JedisPoolAbstract getJedisPool() {
WxMpProperties.ConfigStorage storage = wxMpProperties.getConfigStorage(); RedisProperties redis = wxMpProperties.getConfigStorage().getRedis();
RedisProperties redis = storage.getRedis();
JedisPoolConfig config = new JedisPoolConfig(); JedisPoolConfig config = new JedisPoolConfig();
if (redis.getMaxActive() != null) { if (redis.getMaxActive() != null) {

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

@ -4,6 +4,7 @@ import com.binarywang.spring.starter.wxjava.mp.enums.HttpClientType;
import com.binarywang.spring.starter.wxjava.mp.enums.StorageType; import com.binarywang.spring.starter.wxjava.mp.enums.StorageType;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
import java.io.Serializable; import java.io.Serializable;
@ -49,7 +50,7 @@ public class WxMpProperties {
/** /**
* 存储策略 * 存储策略
*/ */
private ConfigStorage configStorage = new ConfigStorage(); private final ConfigStorage configStorage = new ConfigStorage();
@Data @Data
public static class ConfigStorage implements Serializable { public static class ConfigStorage implements Serializable {
@ -68,7 +69,8 @@ public class WxMpProperties {
/** /**
* redis连接配置. * redis连接配置.
*/ */
private RedisProperties redis = new RedisProperties(); @NestedConfigurationProperty
private final RedisProperties redis = new RedisProperties();
/** /**
* http客户端类型. * http客户端类型.