From 48d5fe7eaad22768e6c64711c50c485e8176f6f9 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 20 六月 2025 14:23:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java
index b5234a5..18a1dc2 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java
@@ -123,6 +123,14 @@
newLine = "base.upData.min.interval=" + paramMap.get(ParamKey.UpDataMinInterval);
}else if(newLine != null && newLine.trim().startsWith("mqtt.enable=")){
newLine = "mqtt.enable=" + paramMap.get(ParamKey.MqttEnable);
+ }else if(newLine != null && newLine.trim().startsWith("mqtt.ip=")){
+ newLine = "mqtt.ip=" + paramMap.get(ParamKey.mqttServerIp);
+ }else if(newLine != null && newLine.trim().startsWith("mqtt.port=")){
+ newLine = "mqtt.port=" + paramMap.get(ParamKey.mqttServerPort);
+ }else if(newLine != null && newLine.trim().startsWith("mqtt.protocolAndDeviceIds=")){
+ newLine = "mqtt.protocolAndDeviceIds=" + paramMap.get(ParamKey.mqttProtocolAndDeviceIds);
+ }else if(newLine != null && newLine.trim().startsWith("mqtt.subTopicAndQos=")){
+ newLine = "mqtt.subTopicAndQos=" + paramMap.get(ParamKey.mqttSubTopicAndQos);
}else if(newLine != null && newLine.trim().startsWith("mqtt.noSubThenOff=")){
newLine = "mqtt.noSubThenOff=" + paramMap.get(ParamKey.MqttNoSubThenOff);
}
@@ -154,16 +162,28 @@
key = ParamKey.WebPort;
this.getConfig(env, map, paramNamePre + key, key);
+ key = ParamKey.ActutorPort;
+ this.getConfig(env, map, paramNamePre + key, key);
+
+ key = ParamKey.DbName;
+ this.getConfig(env, map, paramNamePre + key, key);
+
key = ParamKey.MqttEnable;
this.getConfig(env, map, paramNamePre + key, key);
key = ParamKey.MqttNoSubThenOff;
this.getConfig(env, map, paramNamePre + key, key);
- key = ParamKey.ActutorPort;
+ key = ParamKey.mqttProtocolAndDeviceIds;
this.getConfig(env, map, paramNamePre + key, key);
- key = ParamKey.DbName;
+ key = ParamKey.mqttServerIp;
+ this.getConfig(env, map, paramNamePre + key, key);
+
+ key = ParamKey.mqttServerPort;
+ this.getConfig(env, map, paramNamePre + key, key);
+
+ key = ParamKey.mqttSubTopicAndQos;
this.getConfig(env, map, paramNamePre + key, key);
return map ;
--
Gitblit v1.8.0