study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1240 from theonefx/fix/temp01

Browse Source 
remove force dependency code of spring-cloud in AliCloudContextAutoCo…
This commit is contained in:
Mercy Ma 2020-03-11 15:39:02 +08:00 committed by GitHub
commit aec251469f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-cloud-starter-alicloud/spring-cloud-alicloud-context/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java
View File

@ -16,6 +16,7 @@
package com.alibaba.alicloud.context; package com.alibaba.alicloud.context;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.commons.util.InetUtils;
@ -25,15 +26,28 @@ import org.springframework.context.annotation.Configuration;
/** /**
* @author xiaolongzuo * @author xiaolongzuo
* @author <a href="mailto:chenxilzx1@gmail.com">theonefx</a>
*/ */
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties({ AliCloudProperties.class, InetUtilsProperties.class })
public class AliCloudContextAutoConfiguration { public class AliCloudContextAutoConfiguration {
@Bean @Configuration(proxyBeanMethods = false)
@ConditionalOnMissingBean @EnableConfigurationProperties(AliCloudProperties.class)
public InetUtils inetUtils(InetUtilsProperties inetUtilsProperties) { static class AliCloudPropertiesConfiguration {
return new InetUtils(inetUtilsProperties);
}
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(InetUtilsProperties.class)
@ConditionalOnClass(InetUtilsProperties.class)
static class InetUtilsConfiguration {
@Bean
@ConditionalOnMissingBean
public InetUtils inetUtils(InetUtilsProperties inetUtilsProperties) {
return new InetUtils(inetUtilsProperties);
}
} }
} }