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

update nacos version to 0.5.0 , close #113

Browse Source
This commit is contained in:
flystar32 2018-11-27 14:31:45 +08:00
parent e59d921aea
commit 53e4e18ab2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-alibaba-dependencies/pom.xml
View File

@ -18,7 +18,7 @@
<properties> <properties>
<sentinel.version>1.3.0-GA</sentinel.version> <sentinel.version>1.3.0-GA</sentinel.version>
<oss.version>3.1.0</oss.version> <oss.version>3.1.0</oss.version>
<nacos.version>0.4.0</nacos.version> <nacos.version>0.5.0</nacos.version>
<acm.version>1.0.8</acm.version> <acm.version>1.0.8</acm.version>
<ans.version>0.1.1</ans.version> <ans.version>0.1.1</ans.version>
<aliyun.sdk.version>4.0.1</aliyun.sdk.version> <aliyun.sdk.version>4.0.1</aliyun.sdk.version>

2
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java
View File

@ -79,7 +79,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
metadata.put("instanceId", instance.getInstanceId()); metadata.put("instanceId", instance.getInstanceId());
metadata.put("weight", instance.getWeight() + ""); metadata.put("weight", instance.getWeight() + "");
metadata.put("healthy", instance.isHealthy() + ""); metadata.put("healthy", instance.isHealthy() + "");
metadata.put("cluster", instance.getCluster() + ""); metadata.put("cluster", instance.getClusterName() + "");
metadata.putAll(instance.getMetadata()); metadata.putAll(instance.getMetadata());
nacosServiceInstance.setMetadata(metadata); nacosServiceInstance.setMetadata(metadata);
return nacosServiceInstance; return nacosServiceInstance;

2
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java
View File

@ -51,7 +51,7 @@ public class NacosServiceRegistry implements ServiceRegistry<NacosRegistration>
instance.setIp(registration.getHost()); instance.setIp(registration.getHost());
instance.setPort(registration.getPort()); instance.setPort(registration.getPort());
instance.setWeight(registration.getRegisterWeight()); instance.setWeight(registration.getRegisterWeight());
instance.setCluster(new Cluster(registration.getCluster())); instance.setClusterName(registration.getCluster());
instance.setMetadata(registration.getMetadata()); instance.setMetadata(registration.getMetadata());
try { try {

2
spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java
View File

@ -37,7 +37,7 @@ public class NacosServer extends Server {
this.metaInfo = new MetaInfo() { this.metaInfo = new MetaInfo() {
@Override @Override
public String getAppName() { public String getAppName() {
return instance.serviceName(); return instance.getServiceName();
} }
@Override @Override