From 2fe28056ae5548dcc4b671d6d9310573895cf845 Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Tue, 27 Nov 2018 14:31:37 +0800
Subject: [PATCH] update nacos version to 0.5.0 , close #113

---
 spring-cloud-alibaba-dependencies/pom.xml                       | 2 +-
 .../cloud/alibaba/nacos/NacosDiscoveryClient.java               | 2 +-
 .../cloud/alibaba/nacos/registry/NacosServiceRegistry.java      | 2 +-
 .../springframework/cloud/alibaba/nacos/ribbon/NacosServer.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index 07dd56440..320cb5999 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <sentinel.version>1.3.0-GA</sentinel.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>
         <ans.version>0.1.1</ans.version>
         <aliyun.sdk.version>4.0.1</aliyun.sdk.version>
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java
index 4ad0e2e04..b8d0297ed 100644
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java
+++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java
@@ -68,7 +68,7 @@ public class NacosDiscoveryClient implements DiscoveryClient {
 		metadata.put("instanceId", instance.getInstanceId());
 		metadata.put("weight", instance.getWeight() + "");
 		metadata.put("healthy", instance.isHealthy() + "");
-		metadata.put("cluster", instance.getCluster() + "");
+		metadata.put("cluster", instance.getClusterName() + "");
 		metadata.putAll(instance.getMetadata());
 		nacosServiceInstance.setMetadata(metadata);
 		return nacosServiceInstance;
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java
index 88243cb3a..edf7548f1 100644
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java
+++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java
@@ -51,7 +51,7 @@ public class NacosServiceRegistry implements ServiceRegistry<NacosRegistration>
 		instance.setIp(registration.getHost());
 		instance.setPort(registration.getPort());
 		instance.setWeight(registration.getRegisterWeight());
-		instance.setCluster(new Cluster(registration.getCluster()));
+		instance.setClusterName(registration.getCluster());
 		instance.setMetadata(registration.getMetadata());
 
 		try {
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java
index 9fbaf231d..d4ae7f1de 100644
--- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java
+++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java
@@ -37,7 +37,7 @@ public class NacosServer extends Server {
 		this.metaInfo = new MetaInfo() {
 			@Override
 			public String getAppName() {
-				return instance.serviceName();
+				return instance.getServiceName();
 			}
 
 			@Override