From 700e88a704c6f420523bb9cd2bd1d0e19c41b3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CLink=2Eli=E2=80=9D?= <0718sowe789> Date: Tue, 30 May 2023 17:14:17 +0800 Subject: [PATCH] =?UTF-8?q?yml=E7=9A=84=E5=8F=98=E9=87=8F=E4=BB=8E?= =?UTF-8?q?=E4=B8=BBpom=E5=8A=A8=E6=80=81=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 19 +++++++++++++++++++ ruoyi-auth/src/main/resources/bootstrap.yml | 11 ++++++++--- .../src/main/resources/bootstrap.yml | 13 +++++++++---- .../src/main/resources/bootstrap.yml | 11 ++++++++--- .../src/main/resources/bootstrap.yml | 11 ++++++++--- .../src/main/resources/bootstrap.yml | 11 ++++++++--- .../src/main/resources/bootstrap.yml | 11 ++++++++--- .../src/main/resources/bootstrap.yml | 11 ++++++++--- 8 files changed, 76 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index b613ba96..305105c4 100644 --- a/pom.xml +++ b/pom.xml @@ -257,6 +257,25 @@ + + + + + dev + + dev + localhost:8848 + 66076b31-9cbd-476b-8fea-6143fc9df04d + nacos + nacos + + + true + + + + + public diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..466da0be 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -9,15 +9,20 @@ spring: name: ruoyi-auth profiles: # 环境配置 - active: dev + active: '@profiles.active@' cloud: nacos: + username: @nacosUser@ + password: @nacosPassword@ discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ + name: ${spring.application.name}-${spring.profiles.active}.yml # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index b6dc98ae..7f56af7d 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -9,15 +9,20 @@ spring: name: ruoyi-gateway profiles: # 环境配置 - active: dev + active: '@profiles.active@' cloud: nacos: + username: @nacosUser@ + password: @nacosPassword@ discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ + name: ${spring.application.name}-${spring.profiles.active}.yml # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +38,7 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff4112..784f7615 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -9,15 +9,20 @@ spring: name: ruoyi-file profiles: # 环境配置 - active: dev + active: '@profiles.active@' cloud: nacos: + username: @nacosUser@ + password: @nacosPassword@ discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ + name: ${spring.application.name}-${spring.profiles.active}.yml # 配置文件格式 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 0ef5a457..dffd9ead 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -9,15 +9,20 @@ spring: name: ruoyi-gen profiles: # 环境配置 - active: dev + active: '@profiles.active@' cloud: nacos: + username: @nacosUser@ + password: @nacosPassword@ discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ + name: ${spring.application.name}-${spring.profiles.active}.yml # 配置文件格式 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 b86f8c9e..1c5e1cf6 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -9,15 +9,20 @@ spring: name: ruoyi-job profiles: # 环境配置 - active: dev + active: '@profiles.active@' cloud: nacos: + username: @nacosUser@ + password: @nacosPassword@ discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ + name: ${spring.application.name}-${spring.profiles.active}.yml # 配置文件格式 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 40ab7816..c8fa918e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -9,15 +9,20 @@ spring: name: ruoyi-system profiles: # 环境配置 - active: dev + active: '@profiles.active@' cloud: nacos: + username: @nacosUser@ + password: @nacosPassword@ discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ + name: ${spring.application.name}-${spring.profiles.active}.yml # 配置文件格式 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 13d90cd7..97092682 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -9,15 +9,20 @@ spring: name: ruoyi-monitor profiles: # 环境配置 - active: dev + active: '@profiles.active@' cloud: nacos: + username: @nacosUser@ + password: @nacosPassword@ discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacosAddress@ + namespace: @nacosNameSpace@ + name: ${spring.application.name}-${spring.profiles.active}.yml # 配置文件格式 file-extension: yml # 共享配置