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 from 2.2.4.RELEASE

Browse Source
This commit is contained in:
theonefx
2021-01-18 17:30:10 +08:00
parent 071256d56a 4190fbba61
commit 36bc0e5caf
134 changed files with 1467 additions and 1214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java
View File

@@ -79,6 +79,7 @@ public class SidecarHealthChecker {
"Health check failed. unregister this instance. applicationName = {}, ip = {}, port = {}, status = {}",
applicationName, ip, port, status);
this.sidecarDiscoveryClient.deregisterInstance(applicationName, ip, port);
sidecarInstanceCacheMap.put(applicationName,
buildCache(ip, port, status));
}

1
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryClient.java
View File

@@ -37,6 +37,7 @@ public class SidecarNacosDiscoveryClient implements SidecarDiscoveryClient {
public SidecarNacosDiscoveryClient(NacosServiceManager nacosServiceManager,
SidecarNacosDiscoveryProperties sidecarNacosDiscoveryProperties) {
this.nacosServiceManager = nacosServiceManager;
this.sidecarNacosDiscoveryProperties = sidecarNacosDiscoveryProperties;
}

1
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/nacos/SidecarNacosDiscoveryProperties.java
View File

@@ -22,7 +22,6 @@ import com.alibaba.cloud.sidecar.SidecarProperties;
import org.springframework.util.StringUtils;
/**
* @author itmuch.com
* @author yuhuangbin
*/
public class SidecarNacosDiscoveryProperties extends NacosDiscoveryProperties {