From 6b0070a437fa2247599f1c1d000a3830459315a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Wed, 1 Dec 2021 14:57:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=8A=BD=E5=8F=96=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=85=AC=E7=94=A8=E9=85=8D=E7=BD=AE=E5=88=B0=20maven=20profile?=
 =?UTF-8?q?=20=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 36 +++++++++++++++++++
 ruoyi-auth/src/main/resources/bootstrap.yml   | 13 +++++--
 .../src/main/resources/bootstrap.yml          | 23 ++++++++----
 .../src/main/resources/bootstrap.yml          | 13 +++++--
 .../src/main/resources/bootstrap.yml          | 13 +++++--
 .../src/main/resources/bootstrap.yml          | 13 +++++--
 .../src/main/resources/bootstrap.yml          | 13 +++++--
 .../src/main/resources/bootstrap.yml          | 13 +++++--
 8 files changed, 113 insertions(+), 24 deletions(-)

diff --git a/pom.xml b/pom.xml
index f646bf767..5a00ee38a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,34 @@
         <hutool.version>5.7.16</hutool.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>dev</profiles.active>
+                <nacos.server>127.0.0.1:8848</nacos.server>
+                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
+                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
+                <sentinel.server>127.0.0.1:8718</sentinel.server>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profiles.active>prod</profiles.active>
+                <nacos.server>127.0.0.1:8848</nacos.server>
+                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
+                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
+                <sentinel.server>127.0.0.1:8718</sentinel.server>
+            </properties>
+        </profile>
+    </profiles>
+
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
@@ -286,6 +314,14 @@
                 </configuration>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <!--打包该目录下的 application.yml -->
+                <directory>src/main/resources</directory>
+                <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
     <repositories>
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index f456b03c0..d9e0d1953 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -9,15 +9,22 @@ spring:
     name: ruoyi-auth
   profiles:
     # 环境配置
-    active: dev
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 注册组
+        group: @nacos.discovery.group@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 配置组
+        group: @nacos.config.group@
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 0aa81c222..56d7cc3cd 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -9,34 +9,45 @@ spring:
     name: ruoyi-gateway
   profiles:
     # 环境配置
-    active: dev
+    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
+
+--- # nacos 配置
+spring:
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 注册组
+        group: @nacos.discovery.group@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 配置组
+        group: @nacos.config.group@
         # 配置文件格式
         file-extension: yml
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+--- # sentinel 配置
+spring:
+  cloud:
     sentinel:
       # 取消控制台懒加载
       eager: true
       transport:
         # 控制台地址
-        dashboard: 127.0.0.1:8718
+        dashboard: @sentinel.server@
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: @nacos.server@
             dataId: sentinel-ruoyi-gateway
-            groupId: DEFAULT_GROUP
+            groupId: @nacos.config.group@
             data-type: json
             rule-type: flow
diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
index 55ff41125..cacc66b26 100644
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -9,15 +9,22 @@ spring:
     name: ruoyi-file
   profiles:
     # 环境配置
-    active: dev
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 注册组
+        group: @nacos.discovery.group@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 配置组
+        group: @nacos.config.group@
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
index 0ef5a4575..1e0b28b6a 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
@@ -9,15 +9,22 @@ spring:
     name: ruoyi-gen
   profiles:
     # 环境配置
-    active: dev
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 注册组
+        group: @nacos.discovery.group@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 配置组
+        group: @nacos.config.group@
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
index b86f8c9e1..2dfe9fd21 100644
--- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
@@ -9,15 +9,22 @@ spring:
     name: ruoyi-job
   profiles:
     # 环境配置
-    active: dev
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 注册组
+        group: @nacos.discovery.group@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 配置组
+        group: @nacos.config.group@
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
index 40ab78165..bba13d65d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -9,15 +9,22 @@ spring:
     name: ruoyi-system
   profiles:
     # 环境配置
-    active: dev
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 注册组
+        group: @nacos.discovery.group@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 配置组
+        group: @nacos.config.group@
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
index 13d90cd72..09260448f 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
+++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
@@ -9,15 +9,22 @@ spring:
     name: ruoyi-monitor
   profiles:
     # 环境配置
-    active: dev
+    active: @profiles.active@
+
+--- # nacos 配置
+spring:
   cloud:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 注册组
+        group: @nacos.discovery.group@
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @nacos.server@
+        # 配置组
+        group: @nacos.config.group@
         # 配置文件格式
         file-extension: yml
         # 共享配置