From 14a8a4344adfd10e7a7cb0e5368ceecd5a512141 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 25 Jun 2026 15:54:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(config):=20=E4=B8=BANacos=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E5=BF=83=E6=B7=BB=E5=8A=A0=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在discovery配置中增加username和password字段 - 在config配置中增加username和password字段 - 更新日志配置URL以包含认证参数 - 注释掉原始无认证的日志配置URL - 在事件服务中修改幅度值设置逻辑，同时支持VVADEPTH和RMS参数 --- iot-access/access-boot/src/main/resources/bootstrap.yml | 5 +++++ .../analysis-rt/rt-boot/src/main/resources/bootstrap.yml | 5 +++++ .../stat-boot/src/main/resources/bootstrap.yml | 5 +++++ .../com/njcn/zlevent/service/impl/EventServiceImpl.java | 8 +------- .../zl-event-boot/src/main/resources/bootstrap.yml | 5 +++++ iot-message/message-boot/src/main/resources/bootstrap.yml | 5 +++++ 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/iot-access/access-boot/src/main/resources/bootstrap.yml b/iot-access/access-boot/src/main/resources/bootstrap.yml index 6aabb75..a4787ed 100644 --- a/iot-access/access-boot/src/main/resources/bootstrap.yml +++ b/iot-access/access-boot/src/main/resources/bootstrap.yml @@ -23,9 +23,13 @@ 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: @@ -42,6 +46,7 @@ spring: #项目日志的配置 logging: + # config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&username=@nacos.username@&password=@nacos.password@&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/iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml b/iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml index 0bdf91b..5a079cb 100644 --- a/iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml +++ b/iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml @@ -23,9 +23,13 @@ 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: @@ -38,6 +42,7 @@ spring: #项目日志的配置 logging: + # config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&username=@nacos.username@&password=@nacos.password@&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/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml b/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml index 9503d37..57ced25 100644 --- a/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml +++ b/iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml @@ -23,9 +23,13 @@ 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: @@ -38,6 +42,7 @@ spring: #项目日志的配置 logging: + # config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&username=@nacos.username@&password=@nacos.password@&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/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java index 13a3692..805830c 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java @@ -173,7 +173,7 @@ public class EventServiceImpl implements IEventService { if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_TM)){ csEvent.setPersistTime(Double.parseDouble(param.getData().toString())); } - if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_VVADEPTH)) { + if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_VVADEPTH) || Objects.equals(param.getName(),ZlConstant.EVT_PARAM_RMS)) { csEvent.setAmplitude(Double.parseDouble(param.getData().toString())); } if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_PHASE)) { @@ -182,12 +182,6 @@ public class EventServiceImpl implements IEventService { if (Objects.equals(param.getName(),ZlConstant.SAG_SOURCE)) { csEvent.setSagSource(param.getData().toString()); } - if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_RMS)) { - csEvent.setRms(Double.parseDouble(param.getData().toString())); - } - if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_UCHG)) { - csEvent.setUchg(Double.parseDouble(param.getData().toString())); - } fields.put(param.getName(),param.getData()); } //只有治理型号的设备有监测位置 diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml index a903120..80bc964 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml @@ -23,9 +23,13 @@ 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: @@ -38,6 +42,7 @@ spring: #项目日志的配置 logging: + # config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&username=@nacos.username@&password=@nacos.password@&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/iot-message/message-boot/src/main/resources/bootstrap.yml b/iot-message/message-boot/src/main/resources/bootstrap.yml index 58b0cdd..4073acc 100644 --- a/iot-message/message-boot/src/main/resources/bootstrap.yml +++ b/iot-message/message-boot/src/main/resources/bootstrap.yml @@ -23,9 +23,13 @@ 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: @@ -39,6 +43,7 @@ spring: #项目日志的配置 logging: + # config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&username=@nacos.username@&password=@nacos.password@&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