diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java index 5c36ac42..1854a42a 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/actuate/health/NacosDiscoveryHealthIndicator.java @@ -16,7 +16,6 @@ */ package com.alibaba.cloud.nacos.discovery.actuate.health; -import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import com.alibaba.nacos.api.naming.NamingService; import org.springframework.boot.actuate.health.AbstractHealthIndicator; @@ -26,22 +25,20 @@ import org.springframework.boot.actuate.health.HealthIndicator; /** * The {@link HealthIndicator} for Nacos Discovery * + * @author Mercy * @since 2.2.0 - * * @see HealthIndicator */ public class NacosDiscoveryHealthIndicator extends AbstractHealthIndicator { - private final NacosDiscoveryProperties nacosDiscoveryProperties; + private final NamingService namingService; - public NacosDiscoveryHealthIndicator( - NacosDiscoveryProperties nacosDiscoveryProperties) { - this.nacosDiscoveryProperties = nacosDiscoveryProperties; + public NacosDiscoveryHealthIndicator(NamingService namingService) { + this.namingService = namingService; } @Override protected void doHealthCheck(Health.Builder builder) throws Exception { - NamingService namingService = nacosDiscoveryProperties.namingServiceInstance(); // Just return "UP" or "DOWN" String status = namingService.getServerStatus(); // Set the status to Builder diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java index 823c8e5d..78635ae1 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java @@ -30,7 +30,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** + * The AutoConfiguration class for Nacos Discovery's Endpoints + * * @author xiaojing + * @author Mercy */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Endpoint.class) @@ -49,6 +52,7 @@ public class NacosDiscoveryEndpointAutoConfiguration { @ConditionalOnEnabledHealthIndicator("nacos-discovery") public HealthIndicator nacosDiscoveryHealthIndicator( NacosDiscoveryProperties nacosDiscoveryProperties) { - return new NacosDiscoveryHealthIndicator(nacosDiscoveryProperties); + return new NacosDiscoveryHealthIndicator( + nacosDiscoveryProperties.namingServiceInstance()); } }