From ff3d35c172c5cf5f3ebf8ed710643f8038c3675b Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 07 五月 2025 11:27:52 +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.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
index 9e9b323..631ef66 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config.xml
@@ -25,7 +25,7 @@
     sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
      -->
 	<base
-			orgTag="ym"
+			orgTag="${base.orgTag}"
 			isLowPower="false"
 			onlyDealRtus=""
 			onlyOneProtocol="false"
@@ -38,7 +38,7 @@
 			dbDataIdSuffix="0"
 			cacheUpDownDataWarnCount="100000"
 			cacheUpDownDataMaxCount="110000"
-			disconnectedByNoUpDataMinutes="3"
+			disconnectedByNoUpDataMinutes="${base.upData.min.interval}"
 			workReportDealOneByTimes="1"
 			intakeAlarmLossMinValue="1.0"
 			sendDingDingAlarmMsInterval="60"
@@ -159,7 +159,7 @@
     idle: 鍙戝憜鏃堕暱锛堢锛�
      -->
 	<tcp enable="true"
-		 port="60000"
+		 port="${tcp.port}"
 		 processors="3"
 		 idle="10"
 	/>

--
Gitblit v1.8.0