From 0de0eb29a6a45be114c8fd2a3f2fb1344af2b6ab Mon Sep 17 00:00:00 2001
From: otto <731554297@qq.com>
Date: Thu, 27 Apr 2023 13:43:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E9=83=A8=E7=BD=B2):=20?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E9=83=A8=E7=BD=B2=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

微服务新增生产模式配置文件
1、Nacos配置中心和注册中心的连接地址调整为通过变量传入
2、修复SpringBoot在升级到2.5.x以上时，无法通过spring.profiles.active变量识别环境的问题

关联Issue:https://www.gitlink.org.cn/Gitlink/forgeplus/issues/2853
---
 .../src/main/resources/bootstrap-prod.yml     | 27 ++++++++++++
 .../src/main/resources/bootstrap-prod.yml     | 42 +++++++++++++++++++
 .../src/main/resources/bootstrap-prod.yml     | 28 +++++++++++++
 .../src/main/resources/bootstrap-prod.yml     | 27 ++++++++++++
 .../src/main/resources/bootstrap-prod.yml     | 27 ++++++++++++
 .../src/main/resources/bootstrap-prod.yml     | 27 ++++++++++++
 6 files changed, 178 insertions(+)
 create mode 100644 ruoyi-auth/src/main/resources/bootstrap-prod.yml
 create mode 100644 ruoyi-gateway/src/main/resources/bootstrap-prod.yml
 create mode 100644 ruoyi-modules/ruoyi-cms/src/main/resources/bootstrap-prod.yml
 create mode 100644 ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml
 create mode 100644 ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml
 create mode 100644 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml

diff --git a/ruoyi-auth/src/main/resources/bootstrap-prod.yml b/ruoyi-auth/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 000000000..225e3d278
--- /dev/null
+++ b/ruoyi-auth/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9110
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-auth
+    config:
+      activate:
+        # 环境配置
+        on-profile:
+          prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: ${nacos_ip}:${nacos_port}
+      config:
+        # 配置中心地址
+        server-addr: ${nacos_ip}:${nacos_port}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/ruoyi-gateway/src/main/resources/bootstrap-prod.yml b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 000000000..dda8a344e
--- /dev/null
+++ b/ruoyi-gateway/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,42 @@
+# Tomcat
+server:
+  port: 8080
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-gateway
+    config:
+      activate:
+        # 环境配置
+        on-profile:
+          prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: ${nacos_ip}:${nacos_port}
+      config:
+        # 配置中心地址
+        server-addr: ${nacos_ip}:${nacos_port}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    sentinel:
+      # 取消控制台懒加载
+      eager: true
+      transport:
+        # 控制台地址
+        dashboard: 127.0.0.1:8718
+      # nacos配置持久化
+      datasource:
+        ds1:
+          nacos:
+            server-addr: ${nacos_ip}:${nacos_port}
+            dataId: sentinel-ruoyi-gateway
+            groupId: DEFAULT_GROUP
+            data-type: json
+            rule-type: gw-flow
diff --git a/ruoyi-modules/ruoyi-cms/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-cms/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 000000000..35b7b126a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-cms/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,28 @@
+# Tomcat
+server:
+  port: 9116
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-cms
+    config:
+      activate:
+        # 环境配置
+        on-profile:
+          prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: ${nacos_ip}:${nacos_port}
+      config:
+        # 配置中心地址
+        server-addr: ${nacos_ip}:${nacos_port}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+          - ruoyi-file-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 000000000..f418d4b10
--- /dev/null
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9111
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-file
+    config:
+      activate:
+        # 环境配置
+        on-profile:
+          prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: ${nacos_ip}:${nacos_port}
+      config:
+        # 配置中心地址
+        server-addr: ${nacos_ip}:${nacos_port}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 000000000..417f7d826
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9113
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-job
+    config:
+      activate:
+        # 环境配置
+        on-profile:
+          prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: ${nacos_ip}:${nacos_port}
+      config:
+        # 配置中心地址
+        server-addr: ${nacos_ip}:${nacos_port}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml
new file mode 100644
index 000000000..975023152
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap-prod.yml
@@ -0,0 +1,27 @@
+# Tomcat
+server:
+  port: 9114
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: ruoyi-system
+    config:
+      activate:
+        # 环境配置
+        on-profile:
+          prod
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: ${nacos_ip}:${nacos_port}
+      config:
+        # 配置中心地址
+        server-addr: ${nacos_ip}:${nacos_port}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}