From 1aa10bfac0a2ee69bc842162e07a15f243c24660 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Wed, 24 Mar 2021 18:23:09 +0800
Subject: [PATCH] =?UTF-8?q?:arrow=5Fup:=20=E6=9B=B4=E6=96=B0=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=20Nacos2=20=E6=94=AF=E6=8C=81=E9=95=BF=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E7=89=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-gateway/pom.xml                | 16 ++++++++++++++++
 blade-ops/blade-admin/pom.xml        | 16 ++++++++++++++++
 script/docker/app/deploy.sh          |  2 ++
 script/docker/app/docker-compose.yml |  4 +++-
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml
index 4ac0fa2d..cb7978bc 100644
--- a/blade-gateway/pom.xml
+++ b/blade-gateway/pom.xml
@@ -80,10 +80,26 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba.nacos</groupId>
+                    <artifactId>nacos-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba.nacos</groupId>
+                    <artifactId>nacos-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-client</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml
index b5da9daa..89518a82 100644
--- a/blade-ops/blade-admin/pom.xml
+++ b/blade-ops/blade-admin/pom.xml
@@ -59,10 +59,26 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba.nacos</groupId>
+                    <artifactId>nacos-client</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba.nacos</groupId>
+                    <artifactId>nacos-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-client</artifactId>
         </dependency>
         <!--Admin-Server-->
         <dependency>
diff --git a/script/docker/app/deploy.sh b/script/docker/app/deploy.sh
index 405996e1..015e54c2 100644
--- a/script/docker/app/deploy.sh
+++ b/script/docker/app/deploy.sh
@@ -14,6 +14,8 @@ port(){
 	firewall-cmd --add-port=8000/tcp --permanent
 	#nacos
 	firewall-cmd --add-port=8848/tcp --permanent
+	firewall-cmd --add-port=9848/tcp --permanent
+	firewall-cmd --add-port=9849/tcp --permanent
 	#sentinel
 	firewall-cmd --add-port=8858/tcp --permanent
 	#grafana
diff --git a/script/docker/app/docker-compose.yml b/script/docker/app/docker-compose.yml
index 92b67f3d..67978525 100644
--- a/script/docker/app/docker-compose.yml
+++ b/script/docker/app/docker-compose.yml
@@ -6,7 +6,7 @@ services:
   ####################################################################################################
 
   nacos:
-    image: nacos/nacos-server:1.3.2
+    image: nacos/nacos-server:2.0.0
     hostname: "nacos-standalone"
     environment:
       - MODE=standalone
@@ -16,6 +16,8 @@ services:
       - /docker/nacos/init.d/custom.properties:/home/nacos/init.d/custom.properties
     ports:
       - 8848:8848
+      - 9848:9848
+      - 9849:9849
     networks:
       blade_net:
         ipv4_address: 172.30.0.48