diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index 7dc87d31..61c35ecc 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -21,7 +21,7 @@ 2.2.4-SNAPSHOT 1.8.0 1.3.0 - 1.3.3 + 1.4.0 0.8.0 1.0.10 diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java index 3ee047b4..632448db 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java @@ -183,17 +183,17 @@ public class NacosDiscoveryProperties { private String secretKey; /** - * Heart beat interval. Time unit: second. + * Heart beat interval. Time unit: millisecond. */ private Integer heartBeatInterval; /** - * Heart beat timeout. Time unit: second. + * Heart beat timeout. Time unit: millisecond. */ private Integer heartBeatTimeout; /** - * Ip delete timeout. Time unit: second. + * Ip delete timeout. Time unit: millisecond. */ private Integer ipDeleteTimeout; diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java index ad5f1a12..97ab7310 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java @@ -40,7 +40,11 @@ import static org.springframework.util.ReflectionUtils.rethrowRuntimeException; * @author eshun */ public class NacosServiceRegistry implements ServiceRegistry { - + + private static final String STATUS_UP = "UP"; + + private static final String STATUS_DOWN = "DOWN"; + private static final Logger log = LoggerFactory.getLogger(NacosServiceRegistry.class); private final NacosDiscoveryProperties nacosDiscoveryProperties; @@ -119,7 +123,7 @@ public class NacosServiceRegistry implements ServiceRegistry { @Override public void setStatus(Registration registration, String status) { - if (!"UP".equalsIgnoreCase(status) && !"DOWN".equalsIgnoreCase(status)) { + if (!STATUS_UP.equalsIgnoreCase(status) && !STATUS_DOWN.equalsIgnoreCase(status)) { log.warn("can't support status {},please choose UP or DOWN", status); return; } @@ -128,7 +132,7 @@ public class NacosServiceRegistry implements ServiceRegistry { Instance instance = getNacosInstanceFromRegistration(registration); - if ("DOWN".equalsIgnoreCase(status)) { + if (STATUS_DOWN.equalsIgnoreCase(status)) { instance.setEnabled(false); } else { @@ -138,7 +142,7 @@ public class NacosServiceRegistry implements ServiceRegistry { try { Properties nacosProperties = nacosDiscoveryProperties.getNacosProperties(); nacosServiceManager.getNamingMaintainService(nacosProperties) - .updateInstance(serviceId, instance); + .updateInstance(serviceId, nacosDiscoveryProperties.getGroup(), instance); } catch (Exception e) { throw new RuntimeException("update nacos instance status fail", e); diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java index 9ae2cff9..1fbac697 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java @@ -69,9 +69,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen "spring.cloud.nacos.discovery.accessKey=test-accessKey", "spring.cloud.nacos.discovery.ip=8.8.8.8", "spring.cloud.nacos.discovery.secretKey=test-secretKey", - "spring.cloud.nacos.discovery.heart-beat-interval=3", - "spring.cloud.nacos.discovery.heart-beat-timeout=6", - "spring.cloud.nacos.discovery.ip-delete-timeout=9" }, + "spring.cloud.nacos.discovery.heart-beat-interval=3000", + "spring.cloud.nacos.discovery.heart-beat-timeout=6000", + "spring.cloud.nacos.discovery.ip-delete-timeout=9000" }, webEnvironment = RANDOM_PORT) public class NacosAutoServiceRegistrationTests { @@ -186,15 +186,15 @@ public class NacosAutoServiceRegistrationTests { } private void checkoutNacosDiscoveryHeartBeatInterval() { - assertThat(properties.getHeartBeatInterval()).isEqualTo(Integer.valueOf(3)); + assertThat(properties.getHeartBeatInterval()).isEqualTo(Integer.valueOf(3000)); } private void checkoutNacosDiscoveryHeartBeatTimeout() { - assertThat(properties.getHeartBeatTimeout()).isEqualTo(Integer.valueOf(6)); + assertThat(properties.getHeartBeatTimeout()).isEqualTo(Integer.valueOf(6000)); } private void checkoutNacosDiscoveryIpDeleteTimeout() { - assertThat(properties.getIpDeleteTimeout()).isEqualTo(Integer.valueOf(9)); + assertThat(properties.getIpDeleteTimeout()).isEqualTo(Integer.valueOf(9000)); } private void checkoutNacosDiscoveryServiceName() {