diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
index 86c7fa18..a2f7d312 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
+++ b/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
@@ -51,6 +51,7 @@ public class AcmEndpointAutoConfiguration {
}
@Bean
+ @ConditionalOnMissingBean
public AcmHealthIndicator acmHealthIndicator(AcmProperties acmProperties,
AcmPropertySourceRepository acmPropertySourceRepository) {
return new AcmHealthIndicator(acmProperties, acmPropertySourceRepository);
diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosParameterInitListener.java b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosParameterInitListener.java
index 73dcc75d..496dd5a5 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosParameterInitListener.java
+++ b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosParameterInitListener.java
@@ -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",
diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java b/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java
index 23120e38..fa0473d6 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java
+++ b/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java
@@ -26,22 +26,23 @@ import org.springframework.context.event.ContextClosedEvent;
import com.aliyun.oss.OSS;
/**
- * Shutdown All OSS Clients when {@code ApplicationContext} gets closed {@link ApplicationListener}
+ * Shutdown All OSS Clients when {@code ApplicationContext} gets closed
+ * {@link ApplicationListener}
*
* @author Jim
*/
public class OssApplicationListener implements ApplicationListener {
- private static final Logger logger = LoggerFactory
+ private static final Logger log = LoggerFactory
.getLogger(OssApplicationListener.class);
@Override
public void onApplicationEvent(ContextClosedEvent event) {
Map ossClientMap = event.getApplicationContext()
.getBeansOfType(OSS.class);
- logger.info("{} OSSClients will be shutdown soon", ossClientMap.size());
+ log.info("{} OSSClients will be shutdown soon", ossClientMap.size());
ossClientMap.keySet().forEach(beanName -> {
- logger.info("shutdown ossClient: {}", beanName);
+ log.info("shutdown ossClient: {}", beanName);
ossClientMap.get(beanName).shutdown();
});
}
diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java b/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
index 0378dd4f..aec1cae9 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
+++ b/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
@@ -34,7 +34,7 @@ public class OssEndpointAutoConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnEnabledEndpoint
- public OssEndpoint sentinelEndPoint() {
+ public OssEndpoint ossEndpoint() {
return new OssEndpoint();
}
diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java b/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java
index 681f3e88..b062e644 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java
+++ b/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java
@@ -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.");
}
}
diff --git a/spring-cloud-alicloud-schedulerx/pom.xml b/spring-cloud-alicloud-schedulerx/pom.xml
index e3c1b8e8..04b948a5 100644
--- a/spring-cloud-alicloud-schedulerx/pom.xml
+++ b/spring-cloud-alicloud-schedulerx/pom.xml
@@ -38,6 +38,12 @@
provided
true
+
+ org.springframework.boot
+ spring-boot-actuator-autoconfigure
+ provided
+ true
+
org.springframework.boot
spring-boot-actuator
diff --git a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java b/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
index 9ca280b5..46d749d2 100644
--- a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
+++ b/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
@@ -16,8 +16,10 @@
package org.springframework.cloud.alicloud.scx.endpoint;
+import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.cloud.alicloud.context.edas.EdasProperties;
import org.springframework.cloud.alicloud.context.scx.ScxProperties;
@@ -30,8 +32,12 @@ import org.springframework.context.annotation.Bean;
@ConditionalOnClass(Endpoint.class)
public class ScxEndpointAutoConfiguration {
- @Bean
- public ScxEndpoint scxEndpoint(EdasProperties edasProperties, ScxProperties scxProperties) {
- return new ScxEndpoint(edasProperties, scxProperties);
- }
+ @Bean
+ @ConditionalOnMissingBean
+ @ConditionalOnEnabledEndpoint
+ public ScxEndpoint scxEndpoint(EdasProperties edasProperties,
+ ScxProperties scxProperties) {
+ return new ScxEndpoint(edasProperties, scxProperties);
+ }
+
}