From 25df975b7d444b5f41a2c542ce37c65fbe0a693f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 21 十月 2024 17:04:22 +0800
Subject: [PATCH] 配置文件调整同步

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(test测试).xml          |   10 
 pipIrr-platform/pipIrr-global/src/main/resources/application-global(ym元谋系统).yml        |   54 +++---
 pipIrr-platform/pipIrr-global/src/main/resources/application-global(开发测试---166PC机).yml |   50 +++--
 pipIrr-platform/pipIrr-global/src/main/resources/application-global(test测试系统).yml      |   55 +++---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config(ym元谋).xml            |  284 +++++++++++++++++-----------------
 pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml                |    2 
 6 files changed, 232 insertions(+), 223 deletions(-)

diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
index 4fac75c..bb275f8 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050test\346\265\213\350\257\225\347\263\273\347\273\237\051.yml"
@@ -73,6 +73,8 @@
     global:
         dev: false  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+    nginx:
+        webPort: 54321
     mw:
         webPort: 8072
         actutorPort: 9072
@@ -129,45 +131,44 @@
         actutorPort: 9089
         idSuffix: 11
 
-
     file:
         idSuffix: 99
     file1:
         webPort: 8180
         actutorPort: 9180
     file2:
-        webPort: 8181
-        actutorPort: 9181
+        webPort: 8180
+        actutorPort: 9180
     file3:
-        webPort: 8182
-        actutorPort: 9182
+        webPort: 8180
+        actutorPort: 9180
     file4:
-        webPort: 8183
-        actutorPort: 9183
+        webPort: 8180
+        actutorPort: 9180
     file5:
-        webPort: 8184
-        actutorPort: 9184
+        webPort: 8180
+        actutorPort: 9180
     file6:
-        webPort: 8185
-        actutorPort: 9185
+        webPort: 8180
+        actutorPort: 9180
     file7:
-        webPort: 8186
-        actutorPort: 9186
+        webPort: 8180
+        actutorPort: 9180
     file8:
-        webPort: 8187
-        actutorPort: 9187
+        webPort: 8180
+        actutorPort: 9180
     file9:
-        webPort: 8188
-        actutorPort: 9188
+        webPort: 8180
+        actutorPort: 9180
     file10:
-        webPort: 8189
-        actutorPort: 9189
+        webPort: 8180
+        actutorPort: 9180
     file11:
-        webPort: 8190
-        actutorPort: 9190
+        webPort: 8180
+        actutorPort: 9180
     file12:
-        webPort: 8191
-        actutorPort: 9191
+        webPort: 8180
+        actutorPort: 9180
 
 
 #web鍒嗗竷寮忔枃浠剁郴缁�
@@ -175,7 +176,7 @@
     photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
     webFile:
         fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
-        supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炵収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+        supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
         sv1:
             id: dyFile1
             absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -285,7 +286,6 @@
             webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
             webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
 
-
 #椤圭洰缂栧彿
 #projectCode:
 #    ym: 100
@@ -301,7 +301,7 @@
     divisionCode: 120114403100
 
 
-#閫氳鍗忚
+#閫氳涓棿浠剁浉鍏抽厤缃�
 #protocol: DYJS_2023,DYJS_2024
 mw:
     #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
@@ -329,6 +329,8 @@
         - /remote/comRes/receive
         - /wx/comRes/receive
         - /app/captcha/get
+        - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+
 #鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
 auto-statistics:
     startHour: 0 #寮�濮嬪皬鏃� 0
@@ -360,6 +362,7 @@
             secret: SEC6042bc964d08899a5853eb321eb5a4d842a395982777f815bd07451c879228b7
         at-all: true
         mobile: 18602657034
+
 #闃�鎺у櫒鍙傛暟
 rtu:
     batteryVolt: 17
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
index e925bd5..46e2aab 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050ym\345\205\203\350\260\213\347\263\273\347\273\237\051.yml"
@@ -73,6 +73,8 @@
     global:
         dev: false  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+    nginx:
+        webPort: 54321
     mw:
         webPort: 8070
         actutorPort: 9070
@@ -129,45 +131,44 @@
         actutorPort: 9089
         idSuffix: 11
 
-
     file:
         idSuffix: 99
     file1:
         webPort: 8180
         actutorPort: 9180
     file2:
-        webPort: 8181
-        actutorPort: 9181
+        webPort: 8180
+        actutorPort: 9180
     file3:
-        webPort: 8182
-        actutorPort: 9182
+        webPort: 8180
+        actutorPort: 9180
     file4:
-        webPort: 8183
-        actutorPort: 9183
+        webPort: 8180
+        actutorPort: 9180
     file5:
-        webPort: 8184
-        actutorPort: 9184
+        webPort: 8180
+        actutorPort: 9180
     file6:
-        webPort: 8185
-        actutorPort: 9185
+        webPort: 8180
+        actutorPort: 9180
     file7:
-        webPort: 8186
-        actutorPort: 9186
+        webPort: 8180
+        actutorPort: 9180
     file8:
-        webPort: 8187
-        actutorPort: 9187
+        webPort: 8180
+        actutorPort: 9180
     file9:
-        webPort: 8188
-        actutorPort: 9188
+        webPort: 8180
+        actutorPort: 9180
     file10:
-        webPort: 8189
-        actutorPort: 9189
+        webPort: 8180
+        actutorPort: 9180
     file11:
-        webPort: 8190
-        actutorPort: 9190
+        webPort: 8180
+        actutorPort: 9180
     file12:
-        webPort: 8191
-        actutorPort: 9191
+        webPort: 8180
+        actutorPort: 9180
 
 
 #web鍒嗗竷寮忔枃浠剁郴缁�
@@ -175,7 +176,7 @@
     photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
     webFile:
         fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
-        supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炵収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+        supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
         sv1:
             id: dyFile1
             absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -285,7 +286,6 @@
             webUrl: http://127.0.0.1:${pipIrr.nginx.webPort}/webfiles/
             webDownloadPath: http://127.0.0.1:${pipIrr.file12.webPort}/file/download/down?id=
 
-
 #椤圭洰缂栧彿
 #projectCode:
 #    ym: 100
@@ -301,7 +301,7 @@
     divisionCode: 120114403100
 
 
-#閫氳鍗忚
+#閫氳涓棿浠剁浉鍏抽厤缃�
 #protocol: DYJS_2023,DYJS_2024
 mw:
     #鍛戒护鍙戦�佸湴鍧�(涓紑鏄満鏋則ag锛屽叾涔熸槸鏁版嵁婧愬悗缂�鍚嶇О)
@@ -329,6 +329,8 @@
         - /remote/comRes/receive
         - /wx/comRes/receive
         - /app/captcha/get
+        - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+
 #鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
 auto-statistics:
     startHour: 0 #寮�濮嬪皬鏃� 0
diff --git "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml" "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
index aa0e4cb..399f1c8 100644
--- "a/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
+++ "b/pipIrr-platform/pipIrr-global/src/main/resources/application-global\050\345\274\200\345\217\221\346\265\213\350\257\225---166PC\346\234\272\051.yml"
@@ -73,6 +73,8 @@
     global:
         dev: true  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
+    nginx:
+        webPort: 54321
     mw:
         webPort: 8070
         actutorPort: 9070
@@ -136,38 +138,38 @@
         webPort: 8180
         actutorPort: 9180
     file2:
-        webPort: 8181
-        actutorPort: 9181
+        webPort: 8180
+        actutorPort: 9180
     file3:
-        webPort: 8182
-        actutorPort: 9182
+        webPort: 8180
+        actutorPort: 9180
     file4:
-        webPort: 8183
-        actutorPort: 9183
+        webPort: 8180
+        actutorPort: 9180
     file5:
-        webPort: 8184
-        actutorPort: 9184
+        webPort: 8180
+        actutorPort: 9180
     file6:
-        webPort: 8185
-        actutorPort: 9185
+        webPort: 8180
+        actutorPort: 9180
     file7:
-        webPort: 8186
-        actutorPort: 9186
+        webPort: 8180
+        actutorPort: 9180
     file8:
-        webPort: 8187
-        actutorPort: 9187
+        webPort: 8180
+        actutorPort: 9180
     file9:
-        webPort: 8188
-        actutorPort: 9188
+        webPort: 8180
+        actutorPort: 9180
     file10:
-        webPort: 8189
-        actutorPort: 9189
+        webPort: 8180
+        actutorPort: 9180
     file11:
-        webPort: 8190
-        actutorPort: 9190
+        webPort: 8180
+        actutorPort: 9180
     file12:
-        webPort: 8191
-        actutorPort: 9191
+        webPort: 8180
+        actutorPort: 9180
 
 
 #web鍒嗗竷寮忔枃浠剁郴缁�
@@ -175,7 +177,7 @@
     photoZipWidth: 400 #缂╃暐鍥惧昂瀵�
     webFile:
         fmUrl: http://127.0.0.1:${pipIrr.file1.webPort}/file # fm鐨剋eb涓婁笅鏂� URL
-        supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炵収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
+        supportedFileTypes: docx,xlsx,doc,xls,pdf #鏀寔鐨勬枃妗o紙闈炲獟浣撴枃浠讹紝濡傜収鐗囥�佸綍闊炽�佸綍鍍忥級鏂囦欢绫诲瀷
         sv1:
             id: dyFile1
             absolutePath: E:/java/nginx-1.24.0/html/webfiles/
@@ -329,6 +331,8 @@
         - /remote/comRes/receive
         - /wx/comRes/receive
         - /app/captcha/get
+        - /file/file #web鍒嗗竷寮忔枃浠剁郴缁�
+
 #鑷姩缁熻閰嶇疆锛岃嚜鍔ㄧ粺璁″畾鏃朵换鍔′細姣忓ぉ瀹氭椂杩涜
 auto-statistics:
     startHour: 0 #寮�濮嬪皬鏃� 0
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
index 5828132..46e2aab 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/application-global.yml
@@ -71,7 +71,7 @@
 
 pipIrr:
     global:
-        dev: true  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
+        dev: false  #鏄惁寮�鍙戦樁娈碉紝true鎴杅alse
         dsName: ym  #寮�鍙戦樁娈碉紝璁剧疆涓存椂鐨勬暟鎹簱鍚嶇О
     nginx:
         webPort: 54321
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
index 957c7ba..32a3a8f 100644
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050test\346\265\213\350\257\225\051.xml"
@@ -20,7 +20,7 @@
     cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
     disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
     workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
-    intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙f棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭锛�
+    intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙f棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
     sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
      -->
 	<base
@@ -38,7 +38,7 @@
 		cacheUpDownDataMaxCount="110000"
 		disconnectedByNoUpDataMinutes="3"
 		workReportDealOneByTimes="5"
-		intakeAlarmLossMinValue="1"
+		intakeAlarmLossMinValue="1.0"
 		sendDingDingAlarmMsInterval="60"
 	/>
 
@@ -56,7 +56,7 @@
 
 
 	<!-- 2024-10-08 姝ら厤缃殏鏃舵湭搴旂敤
-	杞欢鍗囩骇 -->
+     杞欢鍗囩骇 -->
 	<updateRtuSoft enable="true">
 		<soft1 enable="true" oldVersionName="meter_v2_0,meter_v1_0" >
 			<newVersion newVersionName="meter_v3_0" file="rtuSoft/meter_v3_0.txt"></newVersion>
@@ -97,14 +97,14 @@
 	<!--
     璧勬簮妯″潡
     rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
-    rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(KB)
+    rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
     rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
     monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
     saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
      -->
 	<resource
 		rtuLogDir="rtuLogs/"
-		rtuLogFileMaxSize="1000"
+		rtuLogFileMaxSize="100000"
 		rtuLogFileMaxCount="2"
 		monitorInterval="2"
 		saveDbInterval="10"
diff --git "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050ym\345\205\203\350\260\213\051.xml" "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050ym\345\205\203\350\260\213\051.xml"
index bfb298d..6181178 100644
--- "a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050ym\345\205\203\350\260\213\051.xml"
+++ "b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/resources/config\050ym\345\205\203\350\260\213\051.xml"
@@ -1,148 +1,148 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
-		<server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
-		<!-- 
-		鍩烘湰閰嶇疆
-		orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
-		isLowPower: 鏄惁涓轰綆鍔熻��
-		onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
-		onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
-					     濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭d箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
-					     褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
-		onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
-		downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
-		commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
-		cachWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
-		offLineCachTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
-		lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�(缁忓垵娆″疄楠岋紝1绉掕繕鏄湁闂锛�2绉掓棤闂)
-		dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1 
-		cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
-		cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
-		disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
-		workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
-		intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙f棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭锛�
-		sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
-		 -->
-		<base
-			orgTag="ym"
-			isLowPower="false"
-			onlyDealRtus=""
-			onlyOneProtocol="false"
-			downComandMaxResendTimes="1"
-			commandSendInterval="2"
-			cachWaitResultTimeout="120"
-			offLineCachTimeout="86400"
-			lastUpDataTimeLive="500"
-			dbDataIdSuffix="0"
-			cacheUpDownDataWarnCount="100000"
-			cacheUpDownDataMaxCount="110000"
-			disconnectedByNoUpDataMinutes="3"
-			workReportDealOneByTimes="5"
-			intakeAlarmLossMinValue="1"
-			sendDingDingAlarmMsInterval="60"
-		/>
-		
-		<!--
-		2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
-		centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
-		synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
-		synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
-		 -->
-		<protocol  
-			centerAddr="1"
-			synchroRtuClock="true"
-			synchroRtuClockTimepieces="300000"
-		/>
-		
+	<server name="閫氫俊涓棿浠�" showStartInfo="true" company="http://www.dyjs.com"/>
+	<!--
+    鍩烘湰閰嶇疆
+    orgTag 鏈烘瀯tag(瀵瑰簲鏈烘瀯tag,鍜屾暟鎹簮鍚庣紑)
+    isLowPower: 鏄惁涓轰綆鍔熻��
+    onlyDealRtus:鍙鐞嗘寚瀹歊TU鍦板潃璁惧锛屽叾浠栬澶囨暟鎹涪寮冿紝澶氫釜RTU鍦板潃鐢ㄨ嫳鏂囬�楀彿闅斿紑锛�
+    onlyOneProtocol锛氬湪鏀寔澶氶�氫俊鍗忚鏃讹紝鍙湁RTU涓婄嚎浜嗭紝鎵嶈兘璇嗗埆鍑鸿RTU瀹為檯鐢ㄧ殑閫氫俊鍗忚锛岃繘鑰岀敤姝ゅ崗璁В鏋愪笂琛屾暟鎹強鏋勯�犱笅琛屽懡浠ゃ��
+                     濡傛灉RTU鏈浘涓婄嚎锛堥�氫俊涓棿浠跺惎鍔ㄥ悗璇TU鏈浘涓婄嚎锛夛紝閭d箞鍦ㄥ悜瀹冨彂閫佷笅琛屽懡浠ゆ椂锛屼笉鑳藉垽鏂嚭鍏堕噰鐢ㄧ殑鍗忚锛屼篃涓嶈兘鏋勯�犲懡浠わ紝灏ゅ叾鏄綆鍔熻�楁儏鍐典笅锛屼笉涓婄嚎鏄甯哥幇璞°��
+                     褰撳彧鏈変竴涓崗璁儏鍐典笅锛屽湪RTU鏈浘涓婄嚎鏃讹紝涔熻兘鐢ㄦ鍗忚鏋勯�犲懡浠ゅ苟缂撳瓨涓嬫潵锛屽挨鍏堕�傚悎浣庡姛鑰楁儏鍐点��
+    onlyOneProtocol=true: 閫氫俊涓棿浠跺綋鍓嶅彧鏈変竴涓崗璁�
+    downComandMaxResendTimes: 涓嬭鍛戒护鍏佽鍙戦�佺殑鏈�澶ф鏁癤锛屽嵆鍏佽閲嶅彂X-1
+    commandSendInterval: 閽堝涓�涓猂TU锛屼笅鍙戝懡浠ょ殑鏃堕棿闂撮殧(绉�)
+    cachWaitResultTimeout: 鍛戒护宸茬粡鍙戦�佽揪鏈�澶ф鏁帮紝浠嶆湭鏀跺埌鍛戒护缁撴灉锛岄渶瑕佸湪缂撳瓨缁х画绛夊緟锛屽叾绛夊緟鏈�澶ф椂闀�(绉�)锛屾湰绯荤粺RTU锛屽浜庡紑鍏虫车鍛戒护锛屽叾鍏堟墽琛屽紑鍏虫车鎶ワ紝鐒跺悗鍐嶈繘琛屽懡浠ゅ簲绛旓紝鎵�浠ユ鍊� 瑕佸ぇ涓�浜�
+    offLineCachTimeout: 涓嶅湪绾跨紦瀛樼殑鍛戒护鏈�澶х紦瀛樻椂闀�(绉�)
+    lastUpDataTimeLive: TCP涓婅鏁版嵁鏃跺埢缂撳瓨鏃堕暱(姣)锛屽綋杈惧埌鏃堕暱鏃讹紝TCP涓婅鏁版嵁鏃跺埢琚竻绌猴紝閲囩敤TCP涓婅鏁版嵁鏃跺埢鐩殑鏄紝闃绘涓婅鏁版嵁鍚屾椂涓嬪彂鏁版嵁锛屽洜涓篟TU澶勭悊涓嶈繃鏉�(缁忓垵娆″疄楠岋紝1绉掕繕鏄湁闂锛�2绉掓棤闂)
+    dbDataIdSuffix锛氭暟鎹簱鏁版嵁id鐢熸垚鍣ㄧ殑id鍚庣紑锛�0鏄粯璁ょ殑鍚庣紑锛屼竴鑸瑆eb绯荤粺搴旂敤锛屾暟鎹腑闂翠欢id鍚庣紑澶т簬绛変簬1
+    cacheUpDownDataWarnCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鎶ヨ閲忥紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+    cacheUpDownDataMaxCount锛氫笂涓嬭鏁版嵁缂撳瓨闃熷垪涓紦瀛樻暟鎹釜鏁扮殑鏈�澶у�硷紝杩欎釜涓庣幇瀹為」鐩墍鎺ユ按琛ㄦ暟鐩稿叧
+    disconnectedByNoUpDataMinutes锛氭病鏈変笂琛屾暟鎹殑鍒嗛挓鏁帮紝杈惧埌杩欎釜鍒嗛挓鏁帮紝璁や负RTU鏂綉浜嗭紝鍙栧�艰寖鍥存槸2-100
+    workReportDealOneByTimes: 宸ヤ綔鎶ュお棰戠箒锛孨娆′笂鎶ュ鐞�1娆★紝鍙栧�艰寖鍥存槸1-100
+    intakeAlarmLossMinValue: 瑙﹀彂鍙戦�侀拤閽夋姤璀︽秷鎭殑鍙栨按鍙f棩婕忔崯閲忕殑鏈�灏忓�硷紙鍖呮嫭浣嗛櫎0.0澶栵級锛堝皬鏁帮級
+    sendDingDingAlarmMsInterval: 鏈夋姤璀﹀彂鐢熸椂锛屽悜閽夐拤鍙戦�佹秷鎭殑闂撮殧鏃堕暱锛堝垎閽燂級
+     -->
+	<base
+		orgTag="ym"
+		isLowPower="false"
+		onlyDealRtus=""
+		onlyOneProtocol="false"
+		downComandMaxResendTimes="1"
+		commandSendInterval="2"
+		cachWaitResultTimeout="120"
+		offLineCachTimeout="86400"
+		lastUpDataTimeLive="500"
+		dbDataIdSuffix="0"
+		cacheUpDownDataWarnCount="100000"
+		cacheUpDownDataMaxCount="110000"
+		disconnectedByNoUpDataMinutes="3"
+		workReportDealOneByTimes="5"
+		intakeAlarmLossMinValue="1.0"
+		sendDingDingAlarmMsInterval="60"
+	/>
 
-		<!-- 2024-10-08 姝ら厤缃殏鏃舵湭搴旂敤
-		 杞欢鍗囩骇 -->
-		<updateRtuSoft enable="true">
-			<soft1 enable="true" oldVersionName="meter_v2_0,meter_v1_0" >
-				<newVersion newVersionName="meter_v3_0" file="rtuSoft/meter_v3_0.txt"></newVersion> 
-			</soft1>
-			<!-- 
-			<soft2 enable="false" oldVersionName="rtu_v1_0,rtu_v2_0,rtu_v3_0" >
-				<newVersion newVersionName="rtu_v4_0" file="rtuSoft/rtu_v4_0.txt"></newVersion> 
-			</soft2>
-			 -->
-		</updateRtuSoft>	
-		
-		<!-- 
-		鏀寔妯″潡
-		鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐g敤鏃惰緝鐭殑宸ヤ綔浠诲姟
-		short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
-		short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
-		short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
-		short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉� 
-		闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐g敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
-		long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
-		long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
-		long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
-		long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒� 
-		enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
-		 -->
-		<support
-			short_maxThread="6"
-			short_minThread="6"
-			short_freeTimeout="60"
-			short_busyTimeout="5"
-			long_maxThread="6"
-			long_minThread="6"
-			long_freeTimeout="60"
-			long_busyTimeout="-1"
-			enableThreadPool="true"
-		/>
-			
-		<!-- 
-		璧勬簮妯″潡
-		rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
-		rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
-		rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
-		monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
-		saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
-		 -->
-		<resource
-			rtuLogDir="rtuLogs/"
-			rtuLogFileMaxSize="100000"
-			rtuLogFileMaxCount="2"
-			monitorInterval="2"
-			saveDbInterval="10"
-		/>
-		
-			
+	<!--
+    2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+    centerAddr: 涓績鍦板潃锛屽綋鍓嶏紝centerAddr鏈敤鍒�
+    synchroRtuClock: 鏄惁瀵筊TU鏍℃椂
+    synchroRtuClockTimepieces锛氬綋RTU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
+     -->
+	<protocol
+		centerAddr="1"
+		synchroRtuClock="true"
+		synchroRtuClockTimepieces="300000"
+	/>
+
+
+	<!-- 2024-10-08 姝ら厤缃殏鏃舵湭搴旂敤
+     杞欢鍗囩骇 -->
+	<updateRtuSoft enable="true">
+		<soft1 enable="true" oldVersionName="meter_v2_0,meter_v1_0" >
+			<newVersion newVersionName="meter_v3_0" file="rtuSoft/meter_v3_0.txt"></newVersion>
+		</soft1>
 		<!--
-		2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
-		port锛歳mi鏈嶅姟绔彛鍙�
-		context锛歳mi鏈嶅姟涓婁笅鏂�
-		 -->
-		<rmi enable="true"
-			port="65400"
-			context="rtuMw"
-		/>
-		
-		<!--
-		sleepBigBusy锛氫富绾跨▼澶у繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
-		sleepSmallBusy锛氫富绾跨▼灏忓繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
-		queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
-		queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
-		 -->
-		<core
-			sleepBigBusy="100"
-			sleepSmallBusy="500"
-			queueWarnSize="100000"
-			queueMaxSize="300000"
-		/>
-		
-		<!-- 
-		port锛氱鍙�
-		processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
-		idle: 鍙戝憜鏃堕暱锛堢锛�
-		 -->
-		<tcp enable="true"
-			port="60000"
-			processors="3"
-			idle="10"
-		/>
+        <soft2 enable="false" oldVersionName="rtu_v1_0,rtu_v2_0,rtu_v3_0" >
+            <newVersion newVersionName="rtu_v4_0" file="rtuSoft/rtu_v4_0.txt"></newVersion>
+        </soft2>
+         -->
+	</updateRtuSoft>
+
+	<!--
+    鏀寔妯″潡
+    鐭伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐g敤鏃惰緝鐭殑宸ヤ綔浠诲姟
+    short_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒� 锛岃缃负0锛岃〃绀轰笉鍚姩绾跨▼姹�
+    short_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+    short_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋嬶紝涓轰簡涓嶆竻闄わ紝鎶妋inThread涓巑axThread璁剧疆鐩哥瓑
+    short_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝璁や负绾跨▼宸茬粡浜嗗穿婧冿紝灏嗗己鍒舵竻闄わ紝鐭伐浣滄椂闀胯缃负5绉�
+    闀垮伐浣滄椂闀跨嚎绋嬫睜锛岀嚎绋嬭礋璐g敤鏃惰緝闀跨殑宸ヤ綔浠诲姟锛屼緥濡傛暟鎹簱瀛樺彇鎿嶄綔
+    long_maxThread锛� 姹犱腑鏈�澶х嚎绋嬫暟涓烘墍鏈塁PU鏍告暟+1锛坰hort姹犱笌long姹犲悇鍒嗕竴鍗婏級锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+    long_minThread锛� 姹犱腑鏈�灏忕嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒讹紝璁剧疆涓�0锛岃〃绀轰笉鍚姩绾跨▼姹�
+    long_freeTimeout锛� 绾跨▼鏁扮┖闂叉椂闀匡紝鑻ユ睜涓嚎绋嬫暟閲忓ぇ浜巑inThread锛屼笖鏈夌殑绾跨▼绌洪棽鏃堕暱瓒呰繃freeTimeout锛屽垯娓呴櫎璇ョ嚎绋�
+    long_busyTimeout锛氱嚎绋嬩笉闂存柇宸ヤ綔鏃堕暱锛堝崟浣嶄负绉�)瓒呮椂闄愶紝鑻ヤ负-1锛屼笉鍙楅檺鍒�
+    enableThreadPool锛氭槸鍚﹀惎鐢ㄧ嚎绋嬫睜
+     -->
+	<support
+		short_maxThread="6"
+		short_minThread="6"
+		short_freeTimeout="60"
+		short_busyTimeout="5"
+		long_maxThread="6"
+		long_minThread="6"
+		long_freeTimeout="60"
+		long_busyTimeout="-1"
+		enableThreadPool="true"
+	/>
+
+	<!--
+    璧勬簮妯″潡
+    rtuLogDir锛歊TU鏃ュ織鏂囦欢瀛樺偍鐩綍(鐩稿鐩綍)
+    rtuLogFileMaxSize锛歊TU鏃ュ織鏂囦欢鏈�澶у瓧鑺傛暟(B)
+    rtuLogFileMaxCount锛歊TU鏃ュ織鏂囦欢鏈�澶ф枃浠舵暟
+    monitorInterval锛歊tu鐘舵�佺洃瑙嗛棿闅�(鍒嗛挓)
+    saveDbInterval锛歊tu鐘舵�佸瓨鏁版嵁搴撻棿闅�(鍒嗛挓)
+     -->
+	<resource
+		rtuLogDir="rtuLogs/"
+		rtuLogFileMaxSize="100000"
+		rtuLogFileMaxCount="2"
+		monitorInterval="2"
+		saveDbInterval="10"
+	/>
+
+
+	<!--
+    2024-08-22 姝ら厤缃殏鏃舵湭搴旂敤
+    port锛歳mi鏈嶅姟绔彛鍙�
+    context锛歳mi鏈嶅姟涓婁笅鏂�
+     -->
+	<rmi enable="true"
+		 port="65400"
+		 context="rtuMw"
+	/>
+
+	<!--
+    sleepBigBusy锛氫富绾跨▼澶у繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
+    sleepSmallBusy锛氫富绾跨▼灏忓繖鏃舵瘡娆℃墽琛岄棿闅旀椂闀匡紙姣锛�
+    queueWarnSize: 缂撳瓨闃熷垪鑺傜偣鏁拌鍛婃暟閲�
+    queueMaxSize: 缂撳瓨闃熷垪鑺傜偣鏁版渶澶ф暟閲�
+     -->
+	<core
+		sleepBigBusy="100"
+		sleepSmallBusy="500"
+		queueWarnSize="100000"
+		queueMaxSize="300000"
+	/>
+
+	<!--
+    port锛氱鍙�
+    processors锛� Mina IO 澶勭悊涓婁笅琛屾暟鎹殑绾跨▼鏁帮紝涓�鑸槸CPU鎬绘牳鏁�+1
+    idle: 鍙戝憜鏃堕暱锛堢锛�
+     -->
+	<tcp enable="true"
+		 port="60000"
+		 processors="3"
+		 idle="10"
+	/>
 
 </config>
\ No newline at end of file

--
Gitblit v1.8.0