From 5986556b6b735c7657fcaa46a45131a311276b23 Mon Sep 17 00:00:00 2001
From: galaxy <469753862@qq.com>
Date: Tue, 25 Jan 2022 17:11:34 +0800
Subject: [PATCH] NacosServiceInstance.getInstanceId() is null

---
 .../alibaba/cloud/nacos/NacosServiceInstance.java    | 12 ++++++++++++
 .../cloud/nacos/discovery/NacosServiceDiscovery.java |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java
index 1db224499..e6e31a829 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosServiceInstance.java
@@ -24,11 +24,14 @@ import org.springframework.cloud.client.ServiceInstance;
 
 /**
  * @author xiaojing
+ * @author changjin wei(魏昌进)
  */
 public class NacosServiceInstance implements ServiceInstance {
 
 	private String serviceId;
 
+	private String instanceId;
+
 	private String host;
 
 	private int port;
@@ -42,6 +45,11 @@ public class NacosServiceInstance implements ServiceInstance {
 		return serviceId;
 	}
 
+	@Override
+	public String getInstanceId() {
+		return instanceId;
+	}
+
 	@Override
 	public String getHost() {
 		return host;
@@ -71,6 +79,10 @@ public class NacosServiceInstance implements ServiceInstance {
 		this.serviceId = serviceId;
 	}
 
+	public void setInstanceId(String instanceId) {
+		this.instanceId = instanceId;
+	}
+
 	public void setHost(String host) {
 		this.host = host;
 	}
diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
index a58f46124..e266b31a7 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
@@ -33,6 +33,7 @@ import org.springframework.cloud.client.ServiceInstance;
 
 /**
  * @author <a href="mailto:echooy.mxq@gmail.com">echooymxq</a>
+ * @author changjin wei(魏昌进)
  **/
 public class NacosServiceDiscovery {
 
@@ -92,6 +93,7 @@ public class NacosServiceDiscovery {
 		nacosServiceInstance.setHost(instance.getIp());
 		nacosServiceInstance.setPort(instance.getPort());
 		nacosServiceInstance.setServiceId(serviceId);
+		nacosServiceInstance.setInstanceId(instance.getInstanceId());
 
 		Map<String, String> metadata = new HashMap<>();
 		metadata.put("nacos.instanceId", instance.getInstanceId());