diff --git a/pom.xml b/pom.xml index 0a99434e..e4c3d76f 100644 --- a/pom.xml +++ b/pom.xml @@ -241,6 +241,31 @@ + + + + dev + + + dev + 127.0.0.1:8848 + + + + true + + + + test + + + test + 127.0.0.1:8848 + + + + + ruoyi-auth ruoyi-gateway @@ -271,6 +296,13 @@ + + + src/main/resources + + true + + \ 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 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 51502b55..65b645b7 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -9,7 +9,7 @@ spring: name: ruoyi-gateway profiles: # 环境配置 - active: dev + active: @spring.profile@ main: allow-circular-references: true allow-bean-definition-overriding: true @@ -17,10 +17,12 @@ spring: 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-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 # 共享配置