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 #1878 from horizonzy/fix-nacos-heart-param

Browse Source 
[ISSUE-#1877] Fix nacos heart beat unit, second to millisecond.
This commit is contained in:
余黄彬 2021-01-06 17:44:38 +08:00 committed by GitHub
commit 0567f0f4e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
View File

@ -183,17 +183,17 @@ public class NacosDiscoveryProperties {
private String secretKey; private String secretKey;
/** /**
* Heart beat interval. Time unit: second. * Heart beat interval. Time unit: millisecond.
*/ */
private Integer heartBeatInterval; private Integer heartBeatInterval;
/** /**
* Heart beat timeout. Time unit: second. * Heart beat timeout. Time unit: millisecond.
*/ */
private Integer heartBeatTimeout; private Integer heartBeatTimeout;
/** /**
* Ip delete timeout. Time unit: second. * Ip delete timeout. Time unit: millisecond.
*/ */
private Integer ipDeleteTimeout; private Integer ipDeleteTimeout;

12
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java
View File

@ -69,9 +69,9 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
"spring.cloud.nacos.discovery.accessKey=test-accessKey", "spring.cloud.nacos.discovery.accessKey=test-accessKey",
"spring.cloud.nacos.discovery.ip=8.8.8.8", "spring.cloud.nacos.discovery.ip=8.8.8.8",
"spring.cloud.nacos.discovery.secretKey=test-secretKey", "spring.cloud.nacos.discovery.secretKey=test-secretKey",
"spring.cloud.nacos.discovery.heart-beat-interval=3", "spring.cloud.nacos.discovery.heart-beat-interval=3000",
"spring.cloud.nacos.discovery.heart-beat-timeout=6", "spring.cloud.nacos.discovery.heart-beat-timeout=6000",
"spring.cloud.nacos.discovery.ip-delete-timeout=9" }, "spring.cloud.nacos.discovery.ip-delete-timeout=9000" },
webEnvironment = RANDOM_PORT) webEnvironment = RANDOM_PORT)
public class NacosAutoServiceRegistrationTests { public class NacosAutoServiceRegistrationTests {
@ -186,15 +186,15 @@ public class NacosAutoServiceRegistrationTests {
} }
private void checkoutNacosDiscoveryHeartBeatInterval() { private void checkoutNacosDiscoveryHeartBeatInterval() {
assertThat(properties.getHeartBeatInterval()).isEqualTo(Integer.valueOf(3)); assertThat(properties.getHeartBeatInterval()).isEqualTo(Integer.valueOf(3000));
} }
private void checkoutNacosDiscoveryHeartBeatTimeout() { private void checkoutNacosDiscoveryHeartBeatTimeout() {
assertThat(properties.getHeartBeatTimeout()).isEqualTo(Integer.valueOf(6)); assertThat(properties.getHeartBeatTimeout()).isEqualTo(Integer.valueOf(6000));
} }
private void checkoutNacosDiscoveryIpDeleteTimeout() { private void checkoutNacosDiscoveryIpDeleteTimeout() {
assertThat(properties.getIpDeleteTimeout()).isEqualTo(Integer.valueOf(9)); assertThat(properties.getIpDeleteTimeout()).isEqualTo(Integer.valueOf(9000));
} }
private void checkoutNacosDiscoveryServiceName() { private void checkoutNacosDiscoveryServiceName() {