From 70f61b0638e32274d0e5f9b972ce2a18f139f1b4 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 12 六月 2025 09:51:30 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/java/com/dy/pipIrrParamSet/paramSet/ParamSetMw.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 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 806467e..b5234a5 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
@@ -121,6 +121,10 @@
                     newLine = "tcp.port=" + paramMap.get(ParamKey.TcpPort);
                 }else if(newLine != null && newLine.trim().startsWith("base.upData.min.interval=")){
                     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.noSubThenOff=")){
+                    newLine = "mqtt.noSubThenOff=" + paramMap.get(ParamKey.MqttNoSubThenOff);
                 }
                 newLines.add(newLine);
             }
@@ -150,6 +154,12 @@
         key = ParamKey.WebPort;
         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;
         this.getConfig(env, map, paramNamePre + key, key);
 

--
Gitblit v1.8.0