From a42edffe1fbd6597883218f2f74343866c726f35 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Tue, 7 Mar 2023 14:27:38 +0800
Subject: [PATCH] =?UTF-8?q?:rocket:=20=E9=85=8D=E7=BD=AEnacos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-cloud/docker-compose.yml                        | 10 ----------
 kicc-auth/src/main/resources/bootstrap.yml             |  1 +
 kicc-gateway/src/main/resources/bootstrap.yml          |  1 +
 .../kicc-common-biz/src/main/resources/bootstrap.yml   |  1 +
 .../kicc-monitor-biz/src/main/resources/bootstrap.yml  |  1 +
 .../kicc-system-biz/src/main/resources/bootstrap.yml   |  1 +
 .../kicc-template-biz/src/main/resources/bootstrap.yml |  1 +
 .../kicc-monitor/src/main/resources/bootstrap.yml      |  1 +
 .../src/main/resources/bootstrap.yml                   |  1 +
 .../src/main/resources/bootstrap.yml                   |  1 +
 .../src/main/resources/bootstrap.yml                   |  1 +
 pom.xml                                                |  3 +++
 12 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/docker-cloud/docker-compose.yml b/docker-cloud/docker-compose.yml
index be750893..f014d428 100644
--- a/docker-cloud/docker-compose.yml
+++ b/docker-cloud/docker-compose.yml
@@ -43,7 +43,6 @@ services:
     build:
       context: ../kicc-gateway
     container_name: kicc-gateway
-    network_mode: host
     image: kicc-gateway
     hostname: kicc-gateway
     restart: always
@@ -55,7 +54,6 @@ services:
     build:
       context: ../kicc-auth
     container_name: kicc-auth
-    network_mode: host
     environment:
       GATEWAY_HOST: 192.168.3.10
     image: kicc-auth
@@ -69,7 +67,6 @@ services:
     build:
       context: ../kicc-platform/kicc-platform-biz/kicc-system-biz
     container_name: kicc-system
-    network_mode: host
     environment:
       GATEWAY_HOST: 192.168.3.10
     image: kicc-system-biz
@@ -83,7 +80,6 @@ services:
     build:
       context: ../kicc-platform/kicc-platform-biz/kicc-common-biz
     container_name: kicc-common
-    network_mode: host
     environment:
       GATEWAY_HOST: 192.168.3.10
     image: kicc-common-biz
@@ -97,7 +93,6 @@ services:
     build:
       context: ../kicc-platform/kicc-platform-biz/kicc-monitor-biz
     container_name: kicc-monitor
-    network_mode: host
     environment:
       GATEWAY_HOST: 192.168.3.10
     image: kicc-monitor-biz
@@ -113,7 +108,6 @@ services:
     build:
       context: ../kicc-platform/kicc-platform-biz/kicc-template-biz
     container_name: kicc-template
-    network_mode: host
     image: kicc-template-biz
     hostname: kicc-template
     restart: always
@@ -125,7 +119,6 @@ services:
     build:
       context: ../kicc-visual/kicc-rocketmq-dashboard
     container_name: kicc-visual-rocketmq
-    network_mode: host
     image: kicc-rocketmq-dashboard
     hostname: kicc-visual-rocketmq
     restart: always
@@ -137,7 +130,6 @@ services:
     build:
       context: ../kicc-visual/kicc-sentinel-dashboard
     container_name: kicc-visual-sentinel
-    network_mode: host
     image: kicc-sentinel-dashboard
     hostname: kicc-visual-sentinel
     restart: always
@@ -149,7 +141,6 @@ services:
     build:
       context: ../kicc-visual/kicc-xxl-job-admin
     container_name: kicc-visual-job
-    network_mode: host
     image: kicc-xxl-job-admin
     hostname: kicc-visual-job
     restart: always
@@ -161,7 +152,6 @@ services:
     build:
       context: ../kicc-visual/kicc-monitor
     container_name: kicc-visual-monitor
-    network_mode: host
     restart: always
     image: kicc-monitor
     hostname: kicc-visual-monitor
diff --git a/kicc-auth/src/main/resources/bootstrap.yml b/kicc-auth/src/main/resources/bootstrap.yml
index c6f452ed..93ec6598 100644
--- a/kicc-auth/src/main/resources/bootstrap.yml
+++ b/kicc-auth/src/main/resources/bootstrap.yml
@@ -7,6 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
         #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
diff --git a/kicc-gateway/src/main/resources/bootstrap.yml b/kicc-gateway/src/main/resources/bootstrap.yml
index 41c98e5a..2e9ce2b7 100644
--- a/kicc-gateway/src/main/resources/bootstrap.yml
+++ b/kicc-gateway/src/main/resources/bootstrap.yml
@@ -7,6 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
index d35d8f80..0178111e 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml
@@ -7,6 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
         #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml
index 3fb820f3..448b4489 100644
--- a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml
+++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml
@@ -7,6 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
index 0f98f600..615829a2 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml
@@ -11,6 +11,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848}
         #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml
index 7d4c2f03..6216b8ed 100644
--- a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml
+++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml
@@ -7,6 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
diff --git a/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml b/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml
index 7475a289..9ba6cd87 100644
--- a/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml
+++ b/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml
@@ -7,6 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
diff --git a/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml b/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml
index 304f8fb3..a1ed234a 100644
--- a/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml
+++ b/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml
@@ -18,6 +18,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
diff --git a/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml b/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml
index af704606..745e9e3a 100644
--- a/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml
+++ b/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml
@@ -10,6 +10,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
diff --git a/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml b/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml
index 9d9c799e..8bb9c8a9 100644
--- a/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml
+++ b/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml
@@ -9,6 +9,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        ip: @profiles.discovery.ip
         server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         metadata:
           management.context-path: ${server.servlet.context-path}/actuator
diff --git a/pom.xml b/pom.xml
index 7129732b..fba179df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,6 +234,7 @@
 				<!-- 环境标识，需要与配置文件的名称相对应 -->
 				<profiles.namespace>kicc-dev</profiles.namespace>
 				<profiles.group>DEV-GROUP</profiles.group>
+				<profiles.discovery.ip>192.168.3.10</profiles.discovery.ip>
 			</properties>
 			<activation>
 				<!-- 默认环境 -->
@@ -246,6 +247,7 @@
 				<!-- 环境标识，需要与配置文件的名称相对应 -->
 				<profiles.namespace>kicc-prod</profiles.namespace>
 				<profiles.group>PROD-GROUP</profiles.group>
+				<profiles.discovery.ip>127.0.0.1</profiles.discovery.ip>
 			</properties>
 		</profile>
 		<profile>
@@ -254,6 +256,7 @@
 				<!-- 环境标识，需要与配置文件的名称相对应 -->
 				<profiles.namespace>kicc-test</profiles.namespace>
 				<profiles.group>TEST-GROUP</profiles.group>
+				<profiles.discovery.ip>127.0.0.1</profiles.discovery.ip>
 			</properties>
 		</profile>
 	</profiles>