mirror of
https://gitee.com/mirrors/Spring-Cloud-Alibaba.git
synced 2021-06-26 13:25:11 +08:00
Fix code format error.
# Conflicts: # spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java # spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java # spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
This commit is contained in:
parent
e0c9ba3965
commit
a355443cb4
@ -49,6 +49,7 @@ public class AcmEndpointAutoConfiguration {
|
||||
}
|
||||
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
public AcmHealthIndicator acmHealthIndicator(AcmProperties acmProperties,
|
||||
AcmPropertySourceRepository acmPropertySourceRepository) {
|
||||
return new AcmHealthIndicator(acmProperties, acmPropertySourceRepository);
|
||||
|
@ -27,12 +27,13 @@ public class NacosParameterInitListener
|
||||
EdasChangeOrderConfiguration edasChangeOrderConfiguration = EdasChangeOrderConfigurationFactory
|
||||
.getEdasChangeOrderConfiguration();
|
||||
|
||||
log.info("Initialize Nacos Parameter from edas change order,is edas managed {}.",
|
||||
edasChangeOrderConfiguration.isEdasManaged());
|
||||
|
||||
if (!edasChangeOrderConfiguration.isEdasManaged()) {
|
||||
return;
|
||||
}
|
||||
|
||||
log.info("Initialize Nacos Parameter from edas change order,is edas managed {}.",
|
||||
edasChangeOrderConfiguration.isEdasManaged());
|
||||
|
||||
// initialize nacos configuration
|
||||
System.getProperties().setProperty("spring.cloud.nacos.config.server-addr", "");
|
||||
System.getProperties().setProperty("spring.cloud.nacos.config.endpoint",
|
||||
|
@ -39,7 +39,7 @@ public class OssStorageProtocolResolver
|
||||
|
||||
public static final String PROTOCOL = "oss://";
|
||||
|
||||
private static final Logger logger = LoggerFactory
|
||||
private static final Logger log = LoggerFactory
|
||||
.getLogger(OssStorageProtocolResolver.class);
|
||||
|
||||
private ConfigurableListableBeanFactory beanFactory;
|
||||
@ -49,8 +49,9 @@ public class OssStorageProtocolResolver
|
||||
private OSS getOSS() {
|
||||
if (this.oss == null) {
|
||||
if (this.beanFactory.getBeansOfType(OSS.class).size() > 1) {
|
||||
logger.warn(
|
||||
"There are multiple OSS instances, consider marking one of them as @Primary to resolve oss protocol.");
|
||||
log.warn(
|
||||
"There are multiple OSS instances, consider marking one of them as @Primary to resolve oss "
|
||||
+ "protocol.");
|
||||
}
|
||||
this.oss = this.beanFactory.getBean(OSS.class);
|
||||
}
|
||||
@ -71,7 +72,7 @@ public class OssStorageProtocolResolver
|
||||
((DefaultResourceLoader) resourceLoader).addProtocolResolver(this);
|
||||
}
|
||||
else {
|
||||
logger.warn("The provided delegate resource loader is not an implementation "
|
||||
log.warn("The provided delegate resource loader is not an implementation "
|
||||
+ "of DefaultResourceLoader. Custom Protocol using oss:// prefix will not be enabled.");
|
||||
}
|
||||
}
|
||||
|
@ -38,6 +38,12 @@
|
||||
<scope>provided</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-actuator-autoconfigure</artifactId>
|
||||
<scope>provided</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-actuator</artifactId>
|
||||
|
Loading…
x
Reference in New Issue
Block a user