Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat(config): 为Nacos配置中心添加认证支持

Browse Source 
- 在discovery配置中增加username和password字段
- 在config配置中增加username和password字段
- 更新日志配置URL以包含认证参数
- 注释掉原始无认证的日志配置URL
- 在事件服务中修改幅度值设置逻辑，同时支持VVADEPTH和RMS参数
This commit is contained in:
xy
2026-06-25 15:54:52 +08:00
parent cf6e07eec1
commit 14a8a4344a
6 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
iot-access/access-boot/src/main/resources/bootstrap.yml
View File

@@ -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

5
iot-analysis/analysis-rt/rt-boot/src/main/resources/bootstrap.yml
View File

@@ -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

5
iot-analysis/analysis-stat/stat-boot/src/main/resources/bootstrap.yml
View File

@@ -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

8
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
View File

@@ -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());
}
//只有治理型号的设备有监测位置

5
iot-analysis/analysis-zl-event/zl-event-boot/src/main/resources/bootstrap.yml
View File

@@ -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

5
iot-message/message-boot/src/main/resources/bootstrap.yml
View File

@@ -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