From a7969fcc0cf323eedcced57b1347dcf2a621c2e9 Mon Sep 17 00:00:00 2001 From: sglmsn <2450572350@qq.com> Date: Sun, 29 Aug 2021 18:43:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=8A=E5=85=AC=E5=85=B1=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=8F=90=E5=8F=96=E5=88=B0maven=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=87=8C,=E6=96=B9=E4=BE=BF=E7=BB=9F=E4=B8=80=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 32 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 8 +++-- .../src/main/resources/bootstrap.yml | 8 +++-- .../src/main/resources/bootstrap.yml | 8 +++-- .../src/main/resources/bootstrap.yml | 8 +++-- 5 files changed, 52 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index adf5c546..829e562d 100644 --- a/pom.xml +++ b/pom.xml @@ -239,6 +239,31 @@ + + + + dev + + + dev + 127.0.0.1:8848 + + + + true + + + + test + + + test + 127.0.0.1:8848 + + + + + ruoyi-auth ruoyi-gateway @@ -269,6 +294,13 @@ + + + src/main/resources + + true + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff4112..5f8fd798 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -9,15 +9,17 @@ spring: name: ruoyi-file profiles: # 环境配置 - active: dev + active: @spring.profile@ cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ # 配置文件格式 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..39c339de 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -9,15 +9,17 @@ spring: name: ruoyi-gen profiles: # 环境配置 - active: dev + active: @spring.profile@ cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ # 配置文件格式 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..0a18e06a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -9,15 +9,17 @@ spring: name: ruoyi-job profiles: # 环境配置 - active: dev + active: @spring.profile@ cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ # 配置文件格式 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..7cc6d7b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -9,15 +9,17 @@ spring: name: ruoyi-system profiles: # 环境配置 - active: dev + active: @spring.profile@ cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ # 配置文件格式 file-extension: yml # 共享配置 From 0e12577c4c79b635a78baf2d363019ec2bac0e4c Mon Sep 17 00:00:00 2001 From: sglmsn <2450572350@qq.com> Date: Sun, 29 Aug 2021 18:49:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=8A=E5=85=AC=E5=85=B1=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=8F=90=E5=8F=96=E5=88=B0maven=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=87=8C,=E6=96=B9=E4=BE=BF=E7=BB=9F=E4=B8=80=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-auth/src/main/resources/bootstrap.yml | 8 +++++--- ruoyi-gateway/src/main/resources/bootstrap.yml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..8d856295 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -9,15 +9,17 @@ spring: name: ruoyi-auth profiles: # 环境配置 - active: dev + active: @spring.profile@ cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 0aa81c22..d5c3d9ee 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -9,17 +9,19 @@ spring: name: ruoyi-gateway profiles: # 环境配置 - active: dev + active: @spring.profile@ main: allow-bean-definition-overriding: true cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.server.address@ + namespace: @nacos.server.namespace@ # 配置文件格式 file-extension: yml # 共享配置