From 7701cfdc23bbea6c912dc4038e077a56a0593d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Thu, 16 Apr 2026 15:52:47 +0800 Subject: [PATCH] =?UTF-8?q?chore(config):=20=E6=9B=B4=E6=96=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0Nacos=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=92=8C=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个module的application.yml中添加Nacos的username和password配置 - 新增admin模块application.yml添加server端口和上传大小限制配置 - 新增各模块application-prod.yml增加Loki日志采集配置 - 各模块生产环境配置中新增Hikari数据源连接池参数 - 添加sa-token SSO客户端配置及管理端点追踪设置 - 调整部分模块loki推送地址至192.168.163.85服务器 --- .../src/main/resources/application-prod.yml | 16 +++++++++++++--- .../src/main/resources/application.yml | 4 ++++ .../src/main/resources/application-prod.yml | 14 ++++++++++++-- nflg-wms-auth/src/main/resources/application.yml | 2 ++ .../src/main/resources/application-prod.yml | 14 ++++++++++++-- .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application-prod.yml | 14 ++++++++++++-- .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application-prod.yml | 14 ++++++++++++-- .../src/main/resources/application.yml | 2 ++ .../src/main/resources/application-prod.yml | 14 ++++++++++++-- .../src/main/resources/application.yml | 2 ++ 12 files changed, 87 insertions(+), 13 deletions(-) diff --git a/nflg-wms-admin/src/main/resources/application-prod.yml b/nflg-wms-admin/src/main/resources/application-prod.yml index 67231bbc..a4fd4d79 100644 --- a/nflg-wms-admin/src/main/resources/application-prod.yml +++ b/nflg-wms-admin/src/main/resources/application-prod.yml @@ -1,13 +1,13 @@ logging: loki: - url: http://192.168.163.83:3100/loki/api/v1/push + url: http://192.168.163.85:3100/loki/api/v1/push level: root: info com: nflg: debug alibaba: cloud: - nacos: info + nacos: trace org: springframework: info # sa-token配置 @@ -27,4 +27,14 @@ sa-token: management: otlp: tracing: - endpoint: http://192.168.163.83:4318/v1/traces \ No newline at end of file + endpoint: http://192.168.163.85:4318/v1/traces +spring: + datasource: + hikari: + pool-name: WmsAdminProdPool + maximum-pool-size: 20 + minimum-idle: 20 + idle-timeout: 600000 + max-lifetime: 1800000 + connection-timeout: 30000 + leak-detection-threshold: 60000 \ No newline at end of file diff --git a/nflg-wms-admin/src/main/resources/application.yml b/nflg-wms-admin/src/main/resources/application.yml index 57ecddce..d38ccd46 100644 --- a/nflg-wms-admin/src/main/resources/application.yml +++ b/nflg-wms-admin/src/main/resources/application.yml @@ -13,10 +13,14 @@ spring: import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true cloud: nacos: + username: wms + password: wms config: server-addr: ${nacos.server-addr:192.168.163.83:8848} namespace: wms group: ${spring.profiles.active} + file-extension: properties + refresh-enabled: true discovery: server-addr: ${nacos.server-addr:192.168.163.83:8848} namespace: wms diff --git a/nflg-wms-auth/src/main/resources/application-prod.yml b/nflg-wms-auth/src/main/resources/application-prod.yml index ddd639b0..177e5c82 100644 --- a/nflg-wms-auth/src/main/resources/application-prod.yml +++ b/nflg-wms-auth/src/main/resources/application-prod.yml @@ -1,10 +1,20 @@ logging: loki: - url: http://192.168.163.83:3100/loki/api/v1/push + url: http://192.168.163.85:3100/loki/api/v1/push level: root: info com: nflg: debug alibaba: cloud: - nacos: info \ No newline at end of file + nacos: info +spring: + datasource: + hikari: + pool-name: WmsAuthProdPool + maximum-pool-size: 20 + minimum-idle: 20 + idle-timeout: 600000 + max-lifetime: 1800000 + connection-timeout: 30000 + leak-detection-threshold: 60000 \ No newline at end of file diff --git a/nflg-wms-auth/src/main/resources/application.yml b/nflg-wms-auth/src/main/resources/application.yml index e31f213b..68b855c1 100644 --- a/nflg-wms-auth/src/main/resources/application.yml +++ b/nflg-wms-auth/src/main/resources/application.yml @@ -9,6 +9,8 @@ spring: import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true cloud: nacos: + username: wms + password: wms config: server-addr: ${nacos.server-addr:192.168.163.83:8848} namespace: wms diff --git a/nflg-wms-gateway/src/main/resources/application-prod.yml b/nflg-wms-gateway/src/main/resources/application-prod.yml index ddd639b0..e0ea9cd2 100644 --- a/nflg-wms-gateway/src/main/resources/application-prod.yml +++ b/nflg-wms-gateway/src/main/resources/application-prod.yml @@ -1,10 +1,20 @@ logging: loki: - url: http://192.168.163.83:3100/loki/api/v1/push + url: http://192.168.163.85:3100/loki/api/v1/push level: root: info com: nflg: debug alibaba: cloud: - nacos: info \ No newline at end of file + nacos: info +spring: + datasource: + hikari: + pool-name: WmsGatewayProdPool + maximum-pool-size: 20 + minimum-idle: 20 + idle-timeout: 600000 + max-lifetime: 1800000 + connection-timeout: 30000 + leak-detection-threshold: 60000 \ No newline at end of file diff --git a/nflg-wms-gateway/src/main/resources/application.yml b/nflg-wms-gateway/src/main/resources/application.yml index 803277b8..7e8d2b03 100644 --- a/nflg-wms-gateway/src/main/resources/application.yml +++ b/nflg-wms-gateway/src/main/resources/application.yml @@ -9,6 +9,8 @@ spring: import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true cloud: nacos: + username: wms + password: wms config: server-addr: ${nacos.server-addr:112.74.186.154:8848} namespace: wms diff --git a/nflg-wms-scheduled/src/main/resources/application-prod.yml b/nflg-wms-scheduled/src/main/resources/application-prod.yml index ddd639b0..c730ef6e 100644 --- a/nflg-wms-scheduled/src/main/resources/application-prod.yml +++ b/nflg-wms-scheduled/src/main/resources/application-prod.yml @@ -1,10 +1,20 @@ logging: loki: - url: http://192.168.163.83:3100/loki/api/v1/push + url: http://192.168.163.85:3100/loki/api/v1/push level: root: info com: nflg: debug alibaba: cloud: - nacos: info \ No newline at end of file + nacos: info +spring: + datasource: + hikari: + pool-name: WmsScheduledProdPool + maximum-pool-size: 20 + minimum-idle: 20 + idle-timeout: 600000 + max-lifetime: 1800000 + connection-timeout: 30000 + leak-detection-threshold: 60000 \ No newline at end of file diff --git a/nflg-wms-scheduled/src/main/resources/application.yml b/nflg-wms-scheduled/src/main/resources/application.yml index ef759b32..8837d6a0 100644 --- a/nflg-wms-scheduled/src/main/resources/application.yml +++ b/nflg-wms-scheduled/src/main/resources/application.yml @@ -9,6 +9,8 @@ spring: import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true cloud: nacos: + username: wms + password: wms config: server-addr: ${nacos.server-addr:192.168.163.83:8848} namespace: wms diff --git a/nflg-wms-shipment/src/main/resources/application-prod.yml b/nflg-wms-shipment/src/main/resources/application-prod.yml index 67231bbc..8176a25e 100644 --- a/nflg-wms-shipment/src/main/resources/application-prod.yml +++ b/nflg-wms-shipment/src/main/resources/application-prod.yml @@ -1,6 +1,6 @@ logging: loki: - url: http://192.168.163.83:3100/loki/api/v1/push + url: http://192.168.163.85:3100/loki/api/v1/push level: root: info com: @@ -27,4 +27,14 @@ sa-token: management: otlp: tracing: - endpoint: http://192.168.163.83:4318/v1/traces \ No newline at end of file + endpoint: http://192.168.163.83:4318/v1/traces +spring: + datasource: + hikari: + pool-name: WmsShipmentProdPool + maximum-pool-size: 20 + minimum-idle: 20 + idle-timeout: 600000 + max-lifetime: 1800000 + connection-timeout: 30000 + leak-detection-threshold: 60000 \ No newline at end of file diff --git a/nflg-wms-shipment/src/main/resources/application.yml b/nflg-wms-shipment/src/main/resources/application.yml index 695930c1..0d312c25 100644 --- a/nflg-wms-shipment/src/main/resources/application.yml +++ b/nflg-wms-shipment/src/main/resources/application.yml @@ -13,6 +13,8 @@ spring: import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true cloud: nacos: + username: wms + password: wms config: server-addr: ${nacos.server-addr:192.168.163.83:8848} namespace: wms diff --git a/nflg-wms-srm-receive/src/main/resources/application-prod.yml b/nflg-wms-srm-receive/src/main/resources/application-prod.yml index ddd639b0..5d7d01f9 100644 --- a/nflg-wms-srm-receive/src/main/resources/application-prod.yml +++ b/nflg-wms-srm-receive/src/main/resources/application-prod.yml @@ -1,10 +1,20 @@ logging: loki: - url: http://192.168.163.83:3100/loki/api/v1/push + url: http://192.168.163.85:3100/loki/api/v1/push level: root: info com: nflg: debug alibaba: cloud: - nacos: info \ No newline at end of file + nacos: info +spring: + datasource: + hikari: + pool-name: WmsSrmReceiveProdPool + maximum-pool-size: 20 + minimum-idle: 20 + idle-timeout: 600000 + max-lifetime: 1800000 + connection-timeout: 30000 + leak-detection-threshold: 60000 \ No newline at end of file diff --git a/nflg-wms-srm-receive/src/main/resources/application.yml b/nflg-wms-srm-receive/src/main/resources/application.yml index a8c1f5aa..4b03379c 100644 --- a/nflg-wms-srm-receive/src/main/resources/application.yml +++ b/nflg-wms-srm-receive/src/main/resources/application.yml @@ -13,6 +13,8 @@ spring: import: nacos:shared.properties?group=${spring.profiles.active}&refreshEnabled=true cloud: nacos: + username: wms + password: wms config: server-addr: ${nacos.server-addr:192.168.163.83:8848} namespace: wms