From 81636c3be211bdd6c32b60df5b89d2026911f24e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 22 八月 2024 14:53:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 e77a63c..823f420 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
@@ -12,12 +12,12 @@
 import com.dy.common.mw.UnitStartedCallbackInterface;
 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") ;
 			////////////////
 			//鏈嶅姟 閰嶇疆

--
Gitblit v1.8.0