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/resources/application-params.yml | 93 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 20 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml
index de19a1c..d59660a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-param-set/src/main/resources/application-params.yml
@@ -4,90 +4,143 @@
orgTag: ym
tcpPort: 60000
upDataMinInterval: 6
- mqttEnable: false
- noSubThenOff: 10
webPort: 8070
actutorPort: 9070
dbName: pipIrr_ym
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
sp:
orgTag: sp
tcpPort: 62000
upDataMinInterval: 6
- mqttEnable: false
- noSubThenOff: 10
webPort: 8073
actutorPort: 9073
dbName: pipIrr_sp
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
test:
orgTag: test
tcpPort: 65000
upDataMinInterval: 6
- mqttEnable: false
- noSubThenOff: 10
webPort: 8072
actutorPort: 9072
dbName: pipIrr_test
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
mj:
orgTag: mj
tcpPort: 61000
upDataMinInterval: 6
- mqttEnable: false
- noSubThenOff: 10
webPort: 8071
actutorPort: 9071
dbName: pipIrr_mj
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
sv121:
mq:
orgTag: mq
tcpPort: 60100
upDataMinInterval: 6
- mqttEnable: true
- noSubThenOff: 10
webPort: 8100
actutorPort: 9100
dbName: pipIrr_mq
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
yq:
orgTag: yq
tcpPort: 60101
upDataMinInterval: 6
- mqttEnable: false
- noSubThenOff: 10
webPort: 8101
actutorPort: 9101
dbName: pipIrr_yq
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
hlj:
orgTag: hlj
tcpPort: 60102
upDataMinInterval: 6
- mqttEnable: false
- noSubThenOff: 10
webPort: 8102
actutorPort: 9102
dbName: pipIrr_hlj
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
gz:
orgTag: gz
tcpPort: 60103
upDataMinInterval: 6
- mqttEnable: false
- noSubThenOff: 10
webPort: 8103
actutorPort: 9103
dbName: pipIrr_gz
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
lz:
orgTag: lz
tcpPort: 60104
upDataMinInterval: 6
- mqttEnable: false
- noSubThenOff: 10
webPort: 8104
actutorPort: 9104
dbName: pipIrr_lz
+ mqttEnable: false
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
jc:
orgTag: jc
tcpPort: 60105
upDataMinInterval: 6
- mqttEnable: true
- noSubThenOff: 10
webPort: 8105
actutorPort: 9105
dbName: pipIrr_jc
+ mqttEnable: true
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds:
+ mqttSubTopicAndQos:
+ jyg:
+ orgTag: jyg
+ tcpPort: 60106
+ upDataMinInterval: 6
+ webPort: 8106
+ actutorPort: 9106
+ dbName: pipIrr_jyg
+ mqttEnable: true
+ mqttNoSubThenOff: 10
+ mqttServerIp: 127.0.0.1
+ mqttServerPort: 1883
+ mqttProtocolAndDeviceIds: sd1/2430002404000840,sd1/2430002404000840
+ mqttSubTopicAndQos: weather/1,1;soil/1,1;manure/1,1
--
Gitblit v1.8.0