mirror of
https://gitee.com/mirrors/Spring-Cloud-Alibaba.git
synced 2021-06-26 13:25:11 +08:00
Merge branch 'master' of github.com:alibaba/spring-cloud-alibaba
This commit is contained in:
commit
a60827d268
@ -21,7 +21,7 @@
|
|||||||
<revision>2.2.4-SNAPSHOT</revision>
|
<revision>2.2.4-SNAPSHOT</revision>
|
||||||
<sentinel.version>1.8.0</sentinel.version>
|
<sentinel.version>1.8.0</sentinel.version>
|
||||||
<seata.version>1.3.0</seata.version>
|
<seata.version>1.3.0</seata.version>
|
||||||
<nacos.client.version>1.3.3</nacos.client.version>
|
<nacos.client.version>1.4.0</nacos.client.version>
|
||||||
<nacos.config.version>0.8.0</nacos.config.version>
|
<nacos.config.version>0.8.0</nacos.config.version>
|
||||||
<spring.context.support.version>1.0.10</spring.context.support.version>
|
<spring.context.support.version>1.0.10</spring.context.support.version>
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
|
||||||
|
@ -41,6 +41,10 @@ import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
|
|||||||
*/
|
*/
|
||||||
public class NacosServiceRegistry implements ServiceRegistry<Registration> {
|
public class NacosServiceRegistry implements ServiceRegistry<Registration> {
|
||||||
|
|
||||||
|
private static final String STATUS_UP = "UP";
|
||||||
|
|
||||||
|
private static final String STATUS_DOWN = "DOWN";
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(NacosServiceRegistry.class);
|
private static final Logger log = LoggerFactory.getLogger(NacosServiceRegistry.class);
|
||||||
|
|
||||||
private final NacosDiscoveryProperties nacosDiscoveryProperties;
|
private final NacosDiscoveryProperties nacosDiscoveryProperties;
|
||||||
@ -119,7 +123,7 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
|
|||||||
@Override
|
@Override
|
||||||
public void setStatus(Registration registration, String status) {
|
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);
|
log.warn("can't support status {},please choose UP or DOWN", status);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -128,7 +132,7 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
|
|||||||
|
|
||||||
Instance instance = getNacosInstanceFromRegistration(registration);
|
Instance instance = getNacosInstanceFromRegistration(registration);
|
||||||
|
|
||||||
if ("DOWN".equalsIgnoreCase(status)) {
|
if (STATUS_DOWN.equalsIgnoreCase(status)) {
|
||||||
instance.setEnabled(false);
|
instance.setEnabled(false);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -138,7 +142,7 @@ public class NacosServiceRegistry implements ServiceRegistry<Registration> {
|
|||||||
try {
|
try {
|
||||||
Properties nacosProperties = nacosDiscoveryProperties.getNacosProperties();
|
Properties nacosProperties = nacosDiscoveryProperties.getNacosProperties();
|
||||||
nacosServiceManager.getNamingMaintainService(nacosProperties)
|
nacosServiceManager.getNamingMaintainService(nacosProperties)
|
||||||
.updateInstance(serviceId, instance);
|
.updateInstance(serviceId, nacosDiscoveryProperties.getGroup(), instance);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw new RuntimeException("update nacos instance status fail", e);
|
throw new RuntimeException("update nacos instance status fail", e);
|
||||||
|
@ -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() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user