From f0b3b81e6516b2bc9fde363e5fc96492e762b939 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Sat, 21 Mar 2026 14:27:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E6=A8=A1=E5=9D=97=E5=BC=80?= =?UTF-8?q?=E5=90=AFnacos=E9=89=B4=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advance-boot/src/main/resources/bootstrap.yml | 8 ++++++-- pqs-auth/src/main/resources/bootstrap.yml | 8 ++++++-- pqs-bpm/bpm-boot/src/main/resources/bootstrap.yml | 8 ++++++-- .../listener/NacosLogbackConfigLoader.java | 4 ++-- .../njcn/swagger/config/Knife4jSwaggerConfig.java | 1 + .../device-boot/src/main/resources/bootstrap.yml | 10 +++++++--- .../event-boot/src/main/resources/bootstrap.yml | 8 ++++++-- pqs-gateway/src/main/resources/bootstrap.yml | 8 ++++++-- .../harmonic-boot/src/main/resources/bootstrap.yml | 12 ++++++------ .../src/main/resources/bootstrap.yml | 8 ++++++-- .../system-boot/src/main/resources/bootstrap.yml | 8 ++++++-- pqs-user/user-boot/src/main/resources/bootstrap.yml | 8 ++++++-- 12 files changed, 64 insertions(+), 27 deletions(-) diff --git a/pqs-advance/advance-boot/src/main/resources/bootstrap.yml b/pqs-advance/advance-boot/src/main/resources/bootstrap.yml index b8b3caabc..0206906ad 100644 --- a/pqs-advance/advance-boot/src/main/resources/bootstrap.yml +++ b/pqs-advance/advance-boot/src/main/resources/bootstrap.yml @@ -22,15 +22,19 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true servlet: multipart: @@ -43,7 +47,7 @@ spring: #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info diff --git a/pqs-auth/src/main/resources/bootstrap.yml b/pqs-auth/src/main/resources/bootstrap.yml index 5660b5cff..8c46a2ea1 100644 --- a/pqs-auth/src/main/resources/bootstrap.yml +++ b/pqs-auth/src/main/resources/bootstrap.yml @@ -23,15 +23,19 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true main: allow-bean-definition-overriding: true @@ -39,7 +43,7 @@ spring: #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info diff --git a/pqs-bpm/bpm-boot/src/main/resources/bootstrap.yml b/pqs-bpm/bpm-boot/src/main/resources/bootstrap.yml index 30a9b7713..f504fc40d 100644 --- a/pqs-bpm/bpm-boot/src/main/resources/bootstrap.yml +++ b/pqs-bpm/bpm-boot/src/main/resources/bootstrap.yml @@ -25,15 +25,19 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ namespace: @nacos.namespace@ + username: @nacos.username@ + password: @nacos.password@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: bpm-config.yaml + - data-id: bpm-config.yaml refresh: true main: allow-bean-definition-overriding: true @@ -51,7 +55,7 @@ flowable: #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info diff --git a/pqs-common/common-microservice/src/main/java/com/njcn/microservice/listener/NacosLogbackConfigLoader.java b/pqs-common/common-microservice/src/main/java/com/njcn/microservice/listener/NacosLogbackConfigLoader.java index 072f5d280..04f503c2d 100644 --- a/pqs-common/common-microservice/src/main/java/com/njcn/microservice/listener/NacosLogbackConfigLoader.java +++ b/pqs-common/common-microservice/src/main/java/com/njcn/microservice/listener/NacosLogbackConfigLoader.java @@ -34,7 +34,7 @@ public class NacosLogbackConfigLoader implements SpringApplicationRunListener, A @Override public void environmentPrepared(ConfigurableEnvironment environment) { - /* String serverAddr = environment.getProperty("spring.cloud.nacos.config.server-addr"); + String serverAddr = environment.getProperty("spring.cloud.nacos.config.server-addr"); String namespace = environment.getProperty("spring.cloud.nacos.config.namespace"); String projectName = environment.getProperty("microservice.ename"); String logLevel = environment.getProperty("logging.level.root"); @@ -51,7 +51,7 @@ public class NacosLogbackConfigLoader implements SpringApplicationRunListener, A logbackConfigContent = logbackConfigContent.replace("logDefaultLevel",logLevel); // 应用获取到的Logback配置 applyLogbackConfig(logbackConfigContent); - }*/ + } } private void applyLogbackConfig(String logbackConfigContent) { diff --git a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java index 8594b1eda..d7a53f353 100644 --- a/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java +++ b/pqs-common/common-swagger/src/main/java/com/njcn/swagger/config/Knife4jSwaggerConfig.java @@ -59,6 +59,7 @@ public class Knife4jSwaggerConfig { "com.njcn.prepare.harmonic.controller", "com.njcn.prepare.event.controller", "com.njcn.device.pq.controller", + "com.njcn.device.terminal.controller", "com.njcn.device.pms.controller", "com.njcn.auth.controller", "com.njcn.system.controller", diff --git a/pqs-device/device-boot/src/main/resources/bootstrap.yml b/pqs-device/device-boot/src/main/resources/bootstrap.yml index b17c80ccc..fcda579ba 100644 --- a/pqs-device/device-boot/src/main/resources/bootstrap.yml +++ b/pqs-device/device-boot/src/main/resources/bootstrap.yml @@ -24,15 +24,19 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true main: allow-bean-definition-overriding: true @@ -43,10 +47,10 @@ spring: #上传文件的最大值 max-file-size: 200MB -#项目日志的配置 + #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info diff --git a/pqs-event/event-boot/src/main/resources/bootstrap.yml b/pqs-event/event-boot/src/main/resources/bootstrap.yml index 2e789522f..98806bbc4 100644 --- a/pqs-event/event-boot/src/main/resources/bootstrap.yml +++ b/pqs-event/event-boot/src/main/resources/bootstrap.yml @@ -23,21 +23,25 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true main: allow-bean-definition-overriding: true #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info #mybatis配置信息 diff --git a/pqs-gateway/src/main/resources/bootstrap.yml b/pqs-gateway/src/main/resources/bootstrap.yml index 44f1f41b7..0504ba529 100644 --- a/pqs-gateway/src/main/resources/bootstrap.yml +++ b/pqs-gateway/src/main/resources/bootstrap.yml @@ -20,15 +20,19 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true gateway: globalcors: @@ -196,7 +200,7 @@ spring: #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info diff --git a/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml b/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml index 432cfc284..f230fa308 100644 --- a/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml +++ b/pqs-harmonic/harmonic-boot/src/main/resources/bootstrap.yml @@ -23,19 +23,19 @@ spring: ip: @service.server.url@ server-addr: @nacos.url@ namespace: @nacos.namespace@ - #username: @nacos.username@ - #password: @nacos.password@ + username: @nacos.username@ + password: @nacos.password@ config: server-addr: @nacos.url@ namespace: @nacos.namespace@ - #username: @nacos.username@ - #password: @nacos.password@ + username: @nacos.username@ + password: @nacos.password@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true #数据中心使用 - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true #PMS使用 # - data-Id: share-config-harmonic-db.yaml @@ -52,7 +52,7 @@ spring: #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info diff --git a/pqs-supervision/supervision-boot/src/main/resources/bootstrap.yml b/pqs-supervision/supervision-boot/src/main/resources/bootstrap.yml index d89da9bdc..f756703ea 100644 --- a/pqs-supervision/supervision-boot/src/main/resources/bootstrap.yml +++ b/pqs-supervision/supervision-boot/src/main/resources/bootstrap.yml @@ -23,21 +23,25 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true main: allow-bean-definition-overriding: true #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info #mybatis配置信息 diff --git a/pqs-system/system-boot/src/main/resources/bootstrap.yml b/pqs-system/system-boot/src/main/resources/bootstrap.yml index f17ec5db1..7a230e2e0 100644 --- a/pqs-system/system-boot/src/main/resources/bootstrap.yml +++ b/pqs-system/system-boot/src/main/resources/bootstrap.yml @@ -22,15 +22,19 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true main: allow-bean-definition-overriding: true @@ -44,7 +48,7 @@ spring: #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info diff --git a/pqs-user/user-boot/src/main/resources/bootstrap.yml b/pqs-user/user-boot/src/main/resources/bootstrap.yml index 6edc111d1..a604ce20b 100644 --- a/pqs-user/user-boot/src/main/resources/bootstrap.yml +++ b/pqs-user/user-boot/src/main/resources/bootstrap.yml @@ -49,15 +49,19 @@ spring: discovery: ip: @service.server.url@ server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ config: server-addr: @nacos.url@ + username: @nacos.username@ + password: @nacos.password@ namespace: @nacos.namespace@ file-extension: yaml shared-configs: - data-id: share-config.yaml refresh: true - - data-Id: share-config-datasource-db.yaml + - data-id: share-config-datasource-db.yaml refresh: true main: allow-bean-definition-overriding: true @@ -65,7 +69,7 @@ spring: #项目日志的配置 logging: - config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml + #config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: root: info