From 893e212a9f7932dfe49a61d368a0c858ff6e6123 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Tue, 7 Mar 2023 14:33:28 +0800
Subject: [PATCH] :rocket: yml

---
 kicc-auth/src/main/resources/bootstrap.yml                  | 2 +-
 kicc-gateway/src/main/resources/bootstrap.yml               | 2 +-
 .../kicc-common-biz/src/main/resources/bootstrap.yml        | 2 +-
 .../kicc-monitor-biz/src/main/resources/bootstrap.yml       | 2 +-
 .../kicc-system-biz/src/main/resources/bootstrap.yml        | 2 +-
 .../kicc-template-biz/src/main/resources/bootstrap.yml      | 2 +-
 kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml   | 2 +-
 .../src/main/resources/bootstrap.yml                        | 2 +-
 .../src/main/resources/bootstrap.yml                        | 2 +-
 .../kicc-xxl-job-admin/src/main/resources/bootstrap.yml     | 2 +-
 pom.xml                                                     | 6 +++---
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/kicc-auth/src/main/resources/bootstrap.yml b/kicc-auth/src/main/resources/bootstrap.yml
index 93ec6598..3fa7be29 100644
--- a/kicc-auth/src/main/resources/bootstrap.yml
+++ b/kicc-auth/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 2e9ce2b7..d4c71c0f 100644
--- a/kicc-gateway/src/main/resources/bootstrap.yml
+++ b/kicc-gateway/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 0178111e..b2c775ba 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,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 448b4489..9f8954f4 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,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 615829a2..3bec1a3b 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,7 +11,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 6216b8ed..a1bf8ca7 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,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 9ba6cd87..f2f95816 100644
--- a/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml
+++ b/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 a1ed234a..d7f4344a 100644
--- a/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml
+++ b/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml
@@ -18,7 +18,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 745e9e3a..19bcfbdb 100644
--- a/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml
+++ b/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml
@@ -10,7 +10,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 8bb9c8a9..d0e00087 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,7 +9,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        ip: @profiles.discovery.ip
+        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 fba179df..625f900b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,7 +234,7 @@
 				<!-- 环境标识，需要与配置文件的名称相对应 -->
 				<profiles.namespace>kicc-dev</profiles.namespace>
 				<profiles.group>DEV-GROUP</profiles.group>
-				<profiles.discovery.ip>192.168.3.10</profiles.discovery.ip>
+				<profiles.discovery.ip@>192.168.3.10</profiles.discovery.ip@>
 			</properties>
 			<activation>
 				<!-- 默认环境 -->
@@ -247,7 +247,7 @@
 				<!-- 环境标识，需要与配置文件的名称相对应 -->
 				<profiles.namespace>kicc-prod</profiles.namespace>
 				<profiles.group>PROD-GROUP</profiles.group>
-				<profiles.discovery.ip>127.0.0.1</profiles.discovery.ip>
+				<profiles.discovery.ip@>127.0.0.1</profiles.discovery.ip@>
 			</properties>
 		</profile>
 		<profile>
@@ -256,7 +256,7 @@
 				<!-- 环境标识，需要与配置文件的名称相对应 -->
 				<profiles.namespace>kicc-test</profiles.namespace>
 				<profiles.group>TEST-GROUP</profiles.group>
-				<profiles.discovery.ip>127.0.0.1</profiles.discovery.ip>
+				<profiles.discovery.ip@>127.0.0.1</profiles.discovery.ip@>
 			</properties>
 		</profile>
 	</profiles>