From f777bc30065861f78810e3967e018f37a649c1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=97=E5=B0=91?= <314226532@qq.com>
Date: Tue, 19 Feb 2019 16:53:37 +0800
Subject: [PATCH 1/2] remove alicloud context dependency

---
 .../nacos-discovery-consumer-example/pom.xml                  | 4 ----
 .../nacos-discovery-provider-example/pom.xml                  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml
index dcb32bea..aabf1ec1 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml
@@ -45,10 +45,6 @@
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-alicloud-context</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml
index d89a1d88..62415afc 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml
@@ -29,10 +29,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-alicloud-context</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

From 39341158636b68e30632a984fdb1b2be03caa2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=97=E5=B0=91?= <314226532@qq.com>
Date: Fri, 22 Feb 2019 20:45:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81change=20the=20nacos=20system=20p?=
 =?UTF-8?q?roperties=20named=202=E3=80=81upgrade=20nacos=20client=20depend?=
 =?UTF-8?q?ency=20with=200.8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spring-cloud-alibaba-dependencies/pom.xml                     | 2 +-
 .../context/nacos/NacosDiscoveryParameterInitListener.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index 7669a9ee..7918fc8d 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -20,7 +20,7 @@
         <sentinel.version>1.4.1</sentinel.version>
         <oss.version>3.1.0</oss.version>
         <fescar.version>0.1.3</fescar.version>
-        <nacos.client.version>0.8.1</nacos.client.version>
+        <nacos.client.version>0.8.2</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <acm.version>1.0.8</acm.version>
         <ans.version>1.0.1</ans.version>
diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
index 757f2b50..a6c63ed2 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
+++ b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
@@ -66,7 +66,7 @@ public class NacosDiscoveryParameterInitListener
 				edasChangeOrderConfiguration.getDauthSecretKey());
 
 		// step 2: set these properties for nacos client
-		properties.setProperty("webContext", "/vipserver");
-		properties.setProperty("serverPort", "80");
+		properties.setProperty("nacos.naming.web.context", "/vipserver");
+		properties.setProperty("nacos.naming.exposed.port", "80");
 	}
 }
\ No newline at end of file