From 5bfa227109b90b20b09345722b3232fac77a1ab1 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 11 九月 2024 11:41:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java
index 7379686..5aa4fdb 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/ServerProperties.java
@@ -7,12 +7,21 @@
 	//RTU鎴鍦板潃
 	public static Long rtuAddrEnd = 0L ;
 	//鏈嶅姟绔疘P
-	public static String serverIp = "" ;
+	public static String tcpServerIp = "" ;
 	//鏈嶅姟绔笂涓嬫枃
-	public static Integer serverPort = 0 ;
+	public static Integer tcpServerPort = 0 ;
+	//鍙戦�佹暟鎹暟鎹棿闅�
+	public static Integer sendInterval = 0 ;//绉�
+	//姣忎竴杞鍙戦�佹暟鎹紝鍏朵腑鍖呮嫭蹇冭烦鏁版嵁鐨勬鏁�
+	public static Integer heartbeatTimes = 3 ;
 	//鍙戦�佹暟鎹鏁�
 	public static Integer sendTimes = 0 ;
-	
-	//mwTestServer鎺у埗鏄惁鍚姩
-	public static boolean startWork = false ;
+	//鍙戦�佸畬鏁版嵁鍚庯紝鏄惁鍏抽棴TCP杩炴帴锛�1鏄紝0鍚�
+	public static Integer sendOverThenCloseConnect = 0 ;
+
+
+	public static boolean startTcpConnectWork = false ;
+
+	//mwTestServer
+	public static boolean startRtuReportWork = false ;
 }

--
Gitblit v1.8.0