From 9cda9301d5214e5ea6790cb31c025adf57d919ed Mon Sep 17 00:00:00 2001
From: hetianchen <604582768@qq.com>
Date: Wed, 16 Dec 2020 22:25:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 513 ++++++++++--------
 ruoyi-auth/src/main/resources/bootstrap.yml   |  16 +-
 .../src/main/resources/bootstrap.yml          |  20 +-
 .../src/main/resources/bootstrap.yml          |  16 +-
 .../src/main/resources/bootstrap.yml          |  16 +-
 .../src/main/resources/bootstrap.yml          |  16 +-
 .../src/main/resources/bootstrap.yml          |  16 +-
 .../src/main/resources/bootstrap.yml          |  16 +-
 8 files changed, 369 insertions(+), 260 deletions(-)

diff --git a/pom.xml b/pom.xml
index c81c7b0b..3ded29ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,238 +1,277 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.ruoyi</groupId>
-    <artifactId>ruoyi</artifactId>
-    <version>2.3.0</version>
-
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>若依微服务系统</description>
-
-    <properties>
-        <ruoyi.version>2.3.0</ruoyi.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-        <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
-        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
-        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
-		<spring-boot-admin.version>2.3.0</spring-boot-admin.version>
-        <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
-        <swagger.fox.version>2.9.2</swagger.fox.version>
-        <swagger.core.version>1.5.24</swagger.core.version>
-        <tobato.version>1.26.5</tobato.version>
-        <kaptcha.version>2.3.2</kaptcha.version>
-        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
-        <commons.io.version>2.5</commons.io.version>
-        <commons.fileupload.version>1.3.3</commons.fileupload.version>
-        <velocity.version>1.7</velocity.version>
-        <fastjson.version>1.2.74</fastjson.version>
-		<poi.version>4.1.2</poi.version>
-        <common-pool.version>2.6.2</common-pool.version>
-    </properties>
-
-    <!-- 依赖声明 -->
-    <dependencyManagement>
-        <dependencies>
-
-            <!-- SpringCloud 微服务 -->
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-			<!-- SpringCloud Alibaba 微服务 -->
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring-cloud-alibaba.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- SpringBoot 依赖配置 -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-			
-            <!--  SpringBoot 监控客户端 -->
-            <dependency>
-                <groupId>de.codecentric</groupId>
-                <artifactId>spring-boot-admin-starter-client</artifactId>
-                <version>${spring-boot-admin.version}</version>
-            </dependency>
-			
-            <!-- FastDFS 分布式文件系统 -->
-            <dependency>
-                <groupId>com.github.tobato</groupId>
-                <artifactId>fastdfs-client</artifactId>
-                <version>${tobato.version}</version>
-            </dependency>
-			
-            <!-- Mybatis 依赖配置 -->
-            <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>${spring-boot.mybatis}</version>
-            </dependency>
-			
-            <!-- Swagger 依赖配置 -->
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-models</artifactId>
-                <version>${swagger.core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-annotations</artifactId>
-                <version>${swagger.core.version}</version>
-            </dependency>
-
-            <!-- 验证码 -->
-            <dependency>
-                <groupId>com.github.penggle</groupId>
-                <artifactId>kaptcha</artifactId>
-                <version>${kaptcha.version}</version>
-            </dependency>
-
-            <!-- pagehelper 分页插件 -->
-            <dependency>
-                <groupId>com.github.pagehelper</groupId>
-                <artifactId>pagehelper-spring-boot-starter</artifactId>
-                <version>${pagehelper.boot.version}</version>
-            </dependency>
-
-            <!-- io常用工具类 -->
-            <dependency>
-                <groupId>commons-io</groupId>
-                <artifactId>commons-io</artifactId>
-                <version>${commons.io.version}</version>
-            </dependency>
-
-            <!-- excel工具 -->
-            <dependency>
-                <groupId>org.apache.poi</groupId>
-                <artifactId>poi-ooxml</artifactId>
-                <version>${poi.version}</version>
-            </dependency>
-
-            <!-- 文件上传工具类 -->
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>${commons.fileupload.version}</version>
-            </dependency>
-
-            <!-- 代码生成使用模板 -->
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity</artifactId>
-                <version>${velocity.version}</version>
-            </dependency>
-
-            <!-- JSON 解析器和生成器 -->
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-            
-            <!-- 公共资源池 -->
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-pool2</artifactId>
-                <version>${common-pool.version}</version>
-            </dependency>
-
-            <!-- 核心模块 -->
-	        <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-core</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-            <!-- 接口模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-swagger</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-	        
-            <!-- 安全模块 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-security</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-	        
-            <!-- 权限范围 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-datascope</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-            <!-- 日志记录 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-log</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-            <!-- 缓存服务 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common-redis</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-            <!-- 系统接口 -->
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-api-system</artifactId>
-                <version>${ruoyi.version}</version>
-            </dependency>
-			
-        </dependencies>
-    </dependencyManagement>
-
-    <modules>
-		<module>ruoyi-auth</module>
-		<module>ruoyi-gateway</module>
-		<module>ruoyi-visual</module>
-		<module>ruoyi-modules</module>
-		<module>ruoyi-api</module>
-		<module>ruoyi-common</module>
-    </modules>
-    <packaging>pom</packaging>
-
-    <dependencies>
-        
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.ruoyi</groupId>
+    <artifactId>ruoyi</artifactId>
+    <version>2.3.0</version>
+
+    <name>ruoyi</name>
+    <url>http://www.ruoyi.vip</url>
+    <description>若依微服务系统</description>
+
+    <properties>
+        <ruoyi.version>2.3.0</ruoyi.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
+        <spring-cloud.version>Hoxton.SR8</spring-cloud.version>
+        <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
+		<spring-boot-admin.version>2.3.0</spring-boot-admin.version>
+        <spring-boot.mybatis>2.1.3</spring-boot.mybatis>
+        <swagger.fox.version>2.9.2</swagger.fox.version>
+        <swagger.core.version>1.5.24</swagger.core.version>
+        <tobato.version>1.26.5</tobato.version>
+        <kaptcha.version>2.3.2</kaptcha.version>
+        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>
+        <commons.io.version>2.5</commons.io.version>
+        <commons.fileupload.version>1.3.3</commons.fileupload.version>
+        <velocity.version>1.7</velocity.version>
+        <fastjson.version>1.2.74</fastjson.version>
+		<poi.version>4.1.2</poi.version>
+        <common-pool.version>2.6.2</common-pool.version>
+    </properties>
+
+    <!-- 依赖声明 -->
+    <dependencyManagement>
+        <dependencies>
+
+            <!-- SpringCloud 微服务 -->
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+			<!-- SpringCloud Alibaba 微服务 -->
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>${spring-cloud-alibaba.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- SpringBoot 依赖配置 -->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+			
+            <!--  SpringBoot 监控客户端 -->
+            <dependency>
+                <groupId>de.codecentric</groupId>
+                <artifactId>spring-boot-admin-starter-client</artifactId>
+                <version>${spring-boot-admin.version}</version>
+            </dependency>
+			
+            <!-- FastDFS 分布式文件系统 -->
+            <dependency>
+                <groupId>com.github.tobato</groupId>
+                <artifactId>fastdfs-client</artifactId>
+                <version>${tobato.version}</version>
+            </dependency>
+			
+            <!-- Mybatis 依赖配置 -->
+            <dependency>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${spring-boot.mybatis}</version>
+            </dependency>
+			
+            <!-- Swagger 依赖配置 -->
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-models</artifactId>
+                <version>${swagger.core.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>${swagger.core.version}</version>
+            </dependency>
+
+            <!-- 验证码 -->
+            <dependency>
+                <groupId>com.github.penggle</groupId>
+                <artifactId>kaptcha</artifactId>
+                <version>${kaptcha.version}</version>
+            </dependency>
+
+            <!-- pagehelper 分页插件 -->
+            <dependency>
+                <groupId>com.github.pagehelper</groupId>
+                <artifactId>pagehelper-spring-boot-starter</artifactId>
+                <version>${pagehelper.boot.version}</version>
+            </dependency>
+
+            <!-- io常用工具类 -->
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>${commons.io.version}</version>
+            </dependency>
+
+            <!-- excel工具 -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <!-- 文件上传工具类 -->
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>${commons.fileupload.version}</version>
+            </dependency>
+
+            <!-- 代码生成使用模板 -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity</artifactId>
+                <version>${velocity.version}</version>
+            </dependency>
+
+            <!-- JSON 解析器和生成器 -->
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+            
+            <!-- 公共资源池 -->
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-pool2</artifactId>
+                <version>${common-pool.version}</version>
+            </dependency>
+
+            <!-- 核心模块 -->
+	        <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-core</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+			
+            <!-- 接口模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-swagger</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+	        
+            <!-- 安全模块 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-security</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+	        
+            <!-- 权限范围 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-datascope</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+			
+            <!-- 日志记录 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-log</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+			
+            <!-- 缓存服务 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-redis</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+			
+            <!-- 系统接口 -->
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-api-system</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+			
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+		<module>ruoyi-auth</module>
+		<module>ruoyi-gateway</module>
+		<module>ruoyi-visual</module>
+		<module>ruoyi-modules</module>
+		<module>ruoyi-api</module>
+		<module>ruoyi-common</module>
+    </modules>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+
+        <resources>
+            <!--多环境参数切换必要配置-->
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <includes>
+                    <include>bootstrap.yml</include>
+                    <include>**/*.xml</include>
+                </includes>
+                <!--编译后的文件中${}引用的参数，是否转换为对应数值-->
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+    </build>
+
+    <!-- 环境配置 -->
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <profile.active>dev</profile.active>
+                <discovery.server-addr>127.0.0.1:8848</discovery.server-addr>
+                <config.server-addr>127.0.0.1:8848</config.server-addr>
+                <config.namespaceId>5c8aa4bc-b36e-490a-9f5f-1c13d310caf5</config.namespaceId>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>pro</id>
+            <properties>
+                <profile.active>pro</profile.active>
+                <discovery.server-addr>127.0.0.1:8848</discovery.server-addr>
+                <config.server-addr>127.0.0.1:8848</config.server-addr>
+                <config.namespaceId>5c8aa4bc-b36e-490a-9f5f-1c13d310caf5</config.namespaceId>
+            </properties>
+        </profile>
+    </profiles>
+
 </project>
\ No newline at end of file
diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml
index 037cd7a7..27f526ea 100644
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -9,15 +9,25 @@ spring:
     name: ruoyi-auth
   profiles:
     # 环境配置
-    active: dev
+    active: @profile.active@
   cloud:
     nacos:
+      # 注册中心
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @discovery.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
+      # 配置中心
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @config.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
         # 配置文件格式
         file-extension: yml
         # 共享配置
diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml
index 5f9f269e..ae9a5d94 100644
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -9,17 +9,27 @@ spring:
     name: ruoyi-gateway
   profiles:
     # 环境配置
-    active: dev
+    active: @profile.active@
   main:
     allow-bean-definition-overriding: true
   cloud:
     nacos:
+      # 注册中心
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @discovery.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
+      # 配置中心
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @config.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -34,8 +44,8 @@ spring:
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: @config.server-addr@
             dataId: sentinel-ruoyi-gateway
-            groupId: DEFAULT_GROUP
+            groupId: ${spring.profiles.active}
             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 51520521..33449ace 100644
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -9,15 +9,25 @@ spring:
     name: ruoyi-file
   profiles:
     # 环境配置
-    active: dev
+    active: @profile.active@
   cloud:
     nacos:
+      # 注册中心
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @discovery.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
+      # 配置中心
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @config.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
         # 配置文件格式
         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 752cdbdf..8627333f 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
@@ -9,15 +9,25 @@ spring:
     name: ruoyi-gen
   profiles:
     # 环境配置
-    active: dev
+    active: @profile.active@
   cloud:
     nacos:
+      # 注册中心
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @discovery.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
+      # 配置中心
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @config.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
         # 配置文件格式
         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 480a180f..6bc09c00 100644
--- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
@@ -9,15 +9,25 @@ spring:
     name: ruoyi-job
   profiles:
     # 环境配置
-    active: dev
+    active: @profile.active@
   cloud:
     nacos:
+      # 注册中心
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @discovery.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
+      # 配置中心
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @config.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
         # 配置文件格式
         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 554d7979..de3bd221 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -9,15 +9,25 @@ spring:
     name: ruoyi-system
   profiles:
     # 环境配置
-    active: dev
+    active: @profile.active@
   cloud:
     nacos:
+      # 注册中心
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @discovery.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
+      # 配置中心
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @config.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
         # 配置文件格式
         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 ec9acb3a..a9117e60 100644
--- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
+++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
@@ -9,15 +9,25 @@ spring:
     name: ruoyi-monitor
   profiles:
     # 环境配置
-    active: dev
+    active: @profile.active@
   cloud:
     nacos:
+      # 注册中心
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @discovery.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
+      # 配置中心
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: @config.server-addr@
+        # 配置命名空间
+        namespace: @config.namespaceId@
+        # 配置groupID
+        group: ${spring.profiles.active}
         # 配置文件格式
         file-extension: yml
         # 共享配置