From db3d504e9d53c3851b51d9e383e22c95b1fc9ea4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 10 二月 2025 09:48:32 +0800
Subject: [PATCH] 备份数据库sql

---
 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
index 6e08a2e..2349a1a 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java
@@ -9,15 +9,15 @@
 import org.jdom2.Document;
 
 import com.dy.common.mw.UnitInterface;
-import com.dy.common.mw.UnitStartedCallbackInterface;
+import com.dy.common.mw.UnitCallbackInterface;
 import com.dy.common.mw.channel.rmi.RmiConfigVo;
 import com.dy.common.mw.channel.rmi.RmiUnit;
-import com.dy.common.util.ConfigXml;
 import com.dy.common.util.NumUtil;
+import com.dy.common.util.ConfigXmlNoSpringboot;
 
 public class Server{
 
-	private ConfigXml conf = null ;
+	private ConfigXmlNoSpringboot conf = null ;
 	private Document doc = null ;
 	private boolean showStartInfo = false ;
 	
@@ -39,7 +39,7 @@
 		Server sv = new Server();
 		long start = System.currentTimeMillis() ;
 		try {
-			sv.conf = new ConfigXml() ;
+			sv.conf = new ConfigXmlNoSpringboot() ;
 			sv.doc = sv.conf.createDom(sv.getClass(), "config.xml") ;
 			////////////////
 			//鏈嶅姟 閰嶇疆
@@ -105,8 +105,8 @@
 			if(txt.startsWith("0")){
 				throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊间笉鑳戒互0寮�澶�!");
 			}
-			if(txt.length() != 10){
-				throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊奸暱搴﹀繀椤讳负10浣�!");
+			if(!(txt.length() == 10 || txt.length() == 12)){
+				throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrStart鐨勬暟鍊奸暱搴﹀繀椤讳负10浣嶆垨12浣�!");
 			}
 			ServerProperties.rtuAddrStart = Long.valueOf(txt) ;
 			
@@ -121,8 +121,8 @@
 			if(txt.startsWith("0")){
 				throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊间笉鑳戒互0寮�澶�!");
 			}
-			if(txt.length() != 10){
-				throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊奸暱搴﹀繀椤讳负10浣�!");
+			if(!(txt.length() == 10 || txt.length() == 12)){
+				throw new Exception("鍏冪礌config.base鐨勫睘鎬tuAddrEnd鐨勬暟鍊奸暱搴﹀繀椤讳负10浣嶆垨12浣�!");
 			}
 			ServerProperties.rtuAddrEnd = Long.valueOf(txt) ;
 			if(ServerProperties.rtuAddrEnd <= ServerProperties.rtuAddrStart){
@@ -138,6 +138,7 @@
 			ServerProperties.sendInterval = conf.getSetAttrPlusInt(doc, "config.base", "sendInterval", null, 1, null, null) ;
 			ServerProperties.heartbeatTimes = conf.getSetAttrPlusInt(doc, "config.base", "heartbeatTimes", null, 1, null, null) ;
 			ServerProperties.sendTimes = conf.getSetAttrPlusInt(doc, "config.base", "sendTimes", null, 1, null, null) ;
+			ServerProperties.sendOverThenCloseConnect = conf.getSetAttrPlusInt(doc, "config.base", "sendOverThenCloseConnect", null, 0, 1, null) ;
 
 				
 			/////////////////
@@ -153,7 +154,7 @@
 				rmiAdap.setConfig(rmiVo);
 				RmiUnit rmiUnit = RmiUnit.getInstance();
 				rmiUnit.setAdapter(rmiAdap);
-				rmiUnit.start(new UnitStartedCallbackInterface(){
+				rmiUnit.start(new UnitCallbackInterface(){
 					@Override
 					public void call(Object obj) {
 					}

--
Gitblit v1.8.0