Young 2 роки тому
батько
коміт
0e408db52f

+ 1 - 1
wx-java-tools/wx-java-cp-start/src/main/java/cn/nosum/wx/cp/config/WxCpAppConfig.java

@@ -8,7 +8,7 @@ import lombok.Data;
  * @author Young
  */
 @Data
-public class WxCpAppConfig {
+public class WxCpAppProperties {
 
     /**
      * 设置企业微信应用的AgentId

+ 3 - 3
wx-java-tools/wx-java-cp-start/src/main/java/cn/nosum/wx/cp/config/WxCpConfiguration.java

@@ -23,11 +23,11 @@ import java.util.stream.Collectors;
  * @author Young
  */
 @Configuration
-@EnableConfigurationProperties(WxCpMultiAppConfig.class)
+@EnableConfigurationProperties({WxCpMultiAppProperties.class, WxCpHttpProperties.class, WxCpHttpProxyProperties.class})
 public class WxCpConfiguration {
 
     @Autowired
-    private WxCpMultiAppConfig properties;
+    private WxCpMultiAppProperties properties;
 
     private static Map<Integer, WxCpService> cpServices = new ConcurrentHashMap<>();
 
@@ -42,7 +42,7 @@ public class WxCpConfiguration {
             configStorage.setAesKey(agent.getAesKey());
 
             // 设置代理对象
-            WxCpHttpProxyConfig proxy = properties.getHttp().getProxy();
+            WxCpHttpProxyProperties proxy = properties.getHttp().getProxy();
             if (proxy.isEnabled()) {
                 configStorage.setHttpProxyHost(proxy.getHost());
                 configStorage.setHttpProxyPort(proxy.getPort());

+ 4 - 2
wx-java-tools/wx-java-cp-start/src/main/java/cn/nosum/wx/cp/config/WxCpHttpConfig.java

@@ -1,6 +1,7 @@
 package cn.nosum.wx.cp.config;
 
 import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * 企业微信 HTTP 请求配置.
@@ -8,7 +9,8 @@ import lombok.Data;
  * @author Young
  */
 @Data
-public class WxCpHttpConfig {
+@ConfigurationProperties(prefix = "wx.cp.http")
+public class WxCpHttpProperties {
 
     /**
      * 请求类型
@@ -18,5 +20,5 @@ public class WxCpHttpConfig {
     /**
      * 代理配置
      */
-    private WxCpHttpProxyConfig proxy;
+    private WxCpHttpProxyProperties proxy;
 }

+ 3 - 1
wx-java-tools/wx-java-cp-start/src/main/java/cn/nosum/wx/cp/config/WxCpHttpProxyConfig.java

@@ -1,6 +1,7 @@
 package cn.nosum.wx.cp.config;
 
 import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * 企微微信 HTTP 请求配置.
@@ -8,7 +9,8 @@ import lombok.Data;
  * @author Young
  */
 @Data
-public class WxCpHttpProxyConfig {
+@ConfigurationProperties(prefix = "wx.cp.http.proxy")
+public class WxCpHttpProxyProperties {
 
     /**
      * 是否启用

+ 3 - 3
wx-java-tools/wx-java-cp-start/src/main/java/cn/nosum/wx/cp/config/WxCpMultiAppConfig.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Getter
 @Setter
 @ConfigurationProperties(prefix = "wx.cp")
-public class WxCpMultiAppConfig {
+public class WxCpMultiAppProperties {
 
     /**
      * 设置企业微信的corpId
@@ -24,10 +24,10 @@ public class WxCpMultiAppConfig {
     /**
      * 企微微信 HTTP 接口请求配置
      */
-    private WxCpHttpConfig http;
+    private WxCpHttpProperties http;
 
     /**
      * 应用配置列表
      */
-    private List<WxCpAppConfig> appConfigs;
+    private List<WxCpAppProperties> appConfigs;
 }