From e9c35d9ac17873881a13b79fad8f3f73935fa0ef Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Thu, 21 Nov 2024 16:36:58 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4pom=E7=9A=84nacos?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 +++ wfc-auth/src/main/resources/bootstrap.yml | 6 +++--- wfc-gateway/src/main/resources/bootstrap.yml | 6 +++--- wfc-modules/pom.xml | 1 + wfc-modules/wfc-file/src/main/resources/bootstrap.yml | 10 ++++++---- wfc-modules/wfc-gen/src/main/resources/bootstrap.yml | 10 ++++++---- wfc-modules/wfc-job/src/main/resources/bootstrap.yml | 10 ++++++---- .../wfc-system/src/main/resources/bootstrap.yml | 4 ++-- wfc-visual/pom.xml | 2 +- wfc-visual/{wfc-monitor => wfc-visual-monitor}/pom.xml | 2 +- .../org/wfc/modules/monitor/WfcMonitorApplication.java | 0 .../modules/monitor/config/WebSecurityConfigurer.java | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/bootstrap.yml | 10 ++++++---- .../src/main/resources/logback.xml | 0 15 files changed, 38 insertions(+), 26 deletions(-) rename wfc-visual/{wfc-monitor => wfc-visual-monitor}/pom.xml (98%) rename wfc-visual/{wfc-monitor => wfc-visual-monitor}/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java (100%) rename wfc-visual/{wfc-monitor => wfc-visual-monitor}/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java (100%) rename wfc-visual/{wfc-monitor => wfc-visual-monitor}/src/main/resources/banner.txt (100%) rename wfc-visual/{wfc-monitor => wfc-visual-monitor}/src/main/resources/bootstrap.yml (65%) rename wfc-visual/{wfc-monitor => wfc-visual-monitor}/src/main/resources/logback.xml (100%) diff --git a/pom.xml b/pom.xml index 4f73978..1108e2b 100644 --- a/pom.xml +++ b/pom.xml @@ -316,6 +316,7 @@ dev + 192.168.2.248:8848 wfc-dev @@ -325,6 +326,7 @@ test + 192.168.2.248:8848 wfc-test @@ -334,6 +336,7 @@ prod + 192.168.2.248:8848 wfc-prod diff --git a/wfc-auth/src/main/resources/bootstrap.yml b/wfc-auth/src/main/resources/bootstrap.yml index feb74fa..f6bc595 100644 --- a/wfc-auth/src/main/resources/bootstrap.yml +++ b/wfc-auth/src/main/resources/bootstrap.yml @@ -14,14 +14,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.2.248:8848 + server-addr: '@nacosServerAddr@' namespace: '@nacosNamespace@' config: # 配置中心地址 - server-addr: 192.168.2.248:8848 + server-addr: '@nacosServerAddr@' namespace: '@nacosNamespace@' # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/wfc-gateway/src/main/resources/bootstrap.yml b/wfc-gateway/src/main/resources/bootstrap.yml index 86b730b..9f731f1 100644 --- a/wfc-gateway/src/main/resources/bootstrap.yml +++ b/wfc-gateway/src/main/resources/bootstrap.yml @@ -14,11 +14,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.2.248:8848 + server-addr: '@nacosServerAddr@' namespace: '@nacosNamespace@' config: # 配置中心地址 - server-addr: 192.168.2.248:8848 + server-addr: '@nacosServerAddr@' namespace: '@nacosNamespace@' # 配置文件格式 file-extension: yml @@ -35,7 +35,7 @@ spring: datasource: ds1: nacos: - server-addr: 192.168.2.248:8848 + server-addr: '@nacosServerAddr@' dataId: sentinel-wfc-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/wfc-modules/pom.xml b/wfc-modules/pom.xml index b7562de..59e7787 100644 --- a/wfc-modules/pom.xml +++ b/wfc-modules/pom.xml @@ -13,6 +13,7 @@ wfc-gen wfc-job wfc-file + wfc-modules-user wfc-modules diff --git a/wfc-modules/wfc-file/src/main/resources/bootstrap.yml b/wfc-modules/wfc-file/src/main/resources/bootstrap.yml index 3f5bc19..e24f2f4 100644 --- a/wfc-modules/wfc-file/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-file/src/main/resources/bootstrap.yml @@ -9,17 +9,19 @@ spring: name: wfc-file profiles: # 环境配置 - active: dev + active: '@profileName@' cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: '@nacosServerAddr@' + namespace: '@nacosNamespace@' config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: '@nacosServerAddr@' + namespace: '@nacosNamespace@' # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml b/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml index 44a1bd0..32e1768 100644 --- a/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-gen/src/main/resources/bootstrap.yml @@ -9,17 +9,19 @@ spring: name: wfc-gen profiles: # 环境配置 - active: dev + active: '@profileName@' cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: '@nacosServerAddr@' + namespace: '@nacosNamespace@' config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: '@nacosServerAddr@' + namespace: '@nacosNamespace@' # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/wfc-modules/wfc-job/src/main/resources/bootstrap.yml b/wfc-modules/wfc-job/src/main/resources/bootstrap.yml index 7bb58a4..3c5ae1d 100644 --- a/wfc-modules/wfc-job/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-job/src/main/resources/bootstrap.yml @@ -9,17 +9,19 @@ spring: name: wfc-job profiles: # 环境配置 - active: dev + active: '@profileName@' cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: '@nacosServerAddr@' + namespace: '@nacosNamespace@' config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: '@nacosServerAddr@' + namespace: '@nacosNamespace@' # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/wfc-modules/wfc-system/src/main/resources/bootstrap.yml b/wfc-modules/wfc-system/src/main/resources/bootstrap.yml index 8fce2a3..b365791 100644 --- a/wfc-modules/wfc-system/src/main/resources/bootstrap.yml +++ b/wfc-modules/wfc-system/src/main/resources/bootstrap.yml @@ -14,11 +14,11 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 192.168.2.248:8848 + server-addr: '@nacosServerAddr@' namespace: '@nacosNamespace@' config: # 配置中心地址 - server-addr: 192.168.2.248:8848 + server-addr: '@nacosServerAddr@' namespace: '@nacosNamespace@' # 配置文件格式 file-extension: yml diff --git a/wfc-visual/pom.xml b/wfc-visual/pom.xml index aeefbd1..001a8d9 100644 --- a/wfc-visual/pom.xml +++ b/wfc-visual/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - wfc-monitor + wfc-visual-monitor wfc-visual diff --git a/wfc-visual/wfc-monitor/pom.xml b/wfc-visual/wfc-visual-monitor/pom.xml similarity index 98% rename from wfc-visual/wfc-monitor/pom.xml rename to wfc-visual/wfc-visual-monitor/pom.xml index aeedd6e..d7e6990 100644 --- a/wfc-visual/wfc-monitor/pom.xml +++ b/wfc-visual/wfc-visual-monitor/pom.xml @@ -11,7 +11,7 @@ wfc-visual-monitor - wfc-visual-monitor监控中心 + wfc-visual-monitor 监控中心 diff --git a/wfc-visual/wfc-monitor/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java b/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java similarity index 100% rename from wfc-visual/wfc-monitor/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java rename to wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/WfcMonitorApplication.java diff --git a/wfc-visual/wfc-monitor/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java b/wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java similarity index 100% rename from wfc-visual/wfc-monitor/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java rename to wfc-visual/wfc-visual-monitor/src/main/java/org/wfc/modules/monitor/config/WebSecurityConfigurer.java diff --git a/wfc-visual/wfc-monitor/src/main/resources/banner.txt b/wfc-visual/wfc-visual-monitor/src/main/resources/banner.txt similarity index 100% rename from wfc-visual/wfc-monitor/src/main/resources/banner.txt rename to wfc-visual/wfc-visual-monitor/src/main/resources/banner.txt diff --git a/wfc-visual/wfc-monitor/src/main/resources/bootstrap.yml b/wfc-visual/wfc-visual-monitor/src/main/resources/bootstrap.yml similarity index 65% rename from wfc-visual/wfc-monitor/src/main/resources/bootstrap.yml rename to wfc-visual/wfc-visual-monitor/src/main/resources/bootstrap.yml index 85ecd5d..04ed72b 100644 --- a/wfc-visual/wfc-monitor/src/main/resources/bootstrap.yml +++ b/wfc-visual/wfc-visual-monitor/src/main/resources/bootstrap.yml @@ -9,17 +9,19 @@ spring: name: wfc-monitor profiles: # 环境配置 - active: dev + active: '@profileName@' cloud: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: '@nacosServerAddr@' + namespace: '@nacosNamespace@' config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: '@nacosServerAddr@' + namespace: '@nacosNamespace@' # 配置文件格式 file-extension: yml # 共享配置 shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} \ No newline at end of file diff --git a/wfc-visual/wfc-monitor/src/main/resources/logback.xml b/wfc-visual/wfc-visual-monitor/src/main/resources/logback.xml similarity index 100% rename from wfc-visual/wfc-monitor/src/main/resources/logback.xml rename to wfc-visual/wfc-visual-monitor/src/main/resources/logback.xml