From e88d34fd4cbe3a0cc57ecfdc1710d66bc88e26b5 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 10 六月 2025 14:07:53 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties index 7f7fbd1..08e4d72 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.properties @@ -10,7 +10,7 @@ # 鐢樺窞锛� gz # 鍑夊窞锛� lz # 閲戝窛锛� jc -base.orgTag=mq +base.orgTag=ym # 233鏈嶅姟鍣細 # 鍏冭皨锛� 60000 @@ -24,8 +24,25 @@ # 鐢樺窞锛� 60103 # 鍑夊窞锛� 60104 # 閲戝窛锛� 60105 -tcp.port=60100 +tcp.port=60000 -#RTU涓婅鏁版嵁闂撮殧锛屾祴鎺т竴浣撻榾鏄�3锛岃〃闃�涓�浣撴満鏄�6 +#RTU涓婅鏁版嵁鏈�灏忛棿闅旓紝澶т簬杩欎釜闂撮殧璁や负璁惧绂荤嚎浜嗭紝娴嬫帶涓�浣撻榾鏄�3锛岃〃闃�涓�浣撴満鏄�6锛岄粯璁ら噰鐢ㄦ椂闂存渶闀跨殑6 base.upData.min.interval=6 +# MQTT鏈嶅姟閰嶇疆 +# 233鏈嶅姟鍣細 +# 鍏冭皨锛� mqtt.enable=false +# 娌欑洏锛� mqtt.enable=false +# 娴嬭瘯锛� mqtt.enable=false +# 姊呮睙锛� mqtt.enable=false +# 121鏈嶅姟鍣細 +# 姘戝嫟锛� mqtt.enable=true +# 寤跺簡锛� mqtt.enable=false +# 榛戦緳姹燂細 mqtt.enable=false +# 鐢樺窞锛� mqtt.enable=false +# 鍑夊窞锛� mqtt.enable=false +# 閲戝窛锛� mqtt.enable=true +# mq/sd1/338220031439/weather +mqtt.enable=true +mqtt.topicAndQos=ym/sd1/10000/control/m1,1;ym/sd1/10000/control/m2,1;ym/sd1/control/m4,1;ym/sd1/10000/control/m80,1 + -- Gitblit v1.8.0