🎨 优化yml代码提示功能

miemieYaho · web-flow · commit e946ce064269 · 2020-12-29T09:51:30.000+08:00
diff --git a/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java b/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/miniapp/properties/WxMaProperties.java
@@ -4,6 +4,7 @@
 import com.binarywang.spring.starter.wxjava.miniapp.enums.StorageType;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 /**
  * 属性配置类.
@@ -60,6 +61,7 @@ public static class ConfigStorage {
     /**
      * redis连接配置.
      */
+    @NestedConfigurationProperty
     private final RedisProperties redis = new RedisProperties();
 
     /**
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/config/WxMpStorageAutoConfiguration.java
@@ -137,8 +137,7 @@ private void setWxMpInfo(WxMpDefaultConfigImpl config) {
   }
 
   private JedisPoolAbstract getJedisPool() {
-    WxMpProperties.ConfigStorage storage = wxMpProperties.getConfigStorage();
-    RedisProperties redis = storage.getRedis();
+    RedisProperties redis = wxMpProperties.getConfigStorage().getRedis();
 
     JedisPoolConfig config = new JedisPoolConfig();
     if (redis.getMaxActive() != null) {
diff --git a/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java b/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/mp/properties/WxMpProperties.java
@@ -4,6 +4,7 @@
 import com.binarywang.spring.starter.wxjava.mp.enums.StorageType;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
 import java.io.Serializable;
 
@@ -49,7 +50,7 @@ public class WxMpProperties {
   /**
    * 存储策略
    */
-  private ConfigStorage configStorage = new ConfigStorage();
+  private final ConfigStorage configStorage = new ConfigStorage();
 
   @Data
   public static class ConfigStorage implements Serializable {
@@ -68,7 +69,8 @@ public static class ConfigStorage implements Serializable {
     /**
      * redis连接配置.
      */
-    private RedisProperties redis = new RedisProperties();
+    @NestedConfigurationProperty
+    private final RedisProperties redis = new RedisProperties();
 
     /**
      * http客户端类型.

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,7 @@ private void setWxMpInfo(WxMpDefaultConfigImpl config) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`private JedisPoolAbstract getJedisPool() {`
`140`		`- WxMpProperties.ConfigStorage storage = wxMpProperties.getConfigStorage();`
`141`		`- RedisProperties redis = storage.getRedis();`
	`140`	`+ RedisProperties redis = wxMpProperties.getConfigStorage().getRedis();`
`142`	`141`
`143`	`142`	`JedisPoolConfig config = new JedisPoolConfig();`
`144`	`143`	`if (redis.getMaxActive() != null) {`