|
@@ -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());
|