From 51852d8fab180c14927eb7e4c4c67347bbb3bcc4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 05 八月 2024 17:05:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
index 7e6e557..777c277 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/Server.java
@@ -19,6 +19,7 @@
import com.dy.common.mw.protocol.ProtocolUnit;
import com.dy.common.mw.support.SupportUnit;
import com.dy.common.mw.support.SupportUnitConfigVo;
+import com.dy.rtuMw.server.tasks.SendMsConstantTask;
import com.dy.rtuMw.server.tasks.ToRtuConstantTask;
import com.dy.rtuMw.resource.ResourceUnit;
import com.dy.rtuMw.resource.ResourceUnitConfigVo;
@@ -59,11 +60,11 @@
// try {
// URL url = Server.class.getResource("/config/this.licence");
// if(!new Lnp(null).parese(url.getPath())){
-// System.out.println("zhzc licence error!") ;
+// System.out.println("licence error!") ;
// return ;
// }
// } catch (Exception e) {
-// System.out.println("zhzc licence error!") ;
+// System.out.println("licence error!") ;
// return ;
// }
//Server sv = new Server();
@@ -294,7 +295,8 @@
/////////////////
- //RMI妯″潡
+ //RMI妯″潡 鏆傛椂涓嶅簲鐢�
+ /*
RmiConfigVo rmiVo = new RmiConfigVo();
rmiVo.enable = conf.getSetAttrBoolean(doc, "config.rmi", "enable", null, null) ;
if(rmiVo.enable){
@@ -310,7 +312,7 @@
RmiSvUrl = "[ip]:" + rmiVo.port + "/" + rmiVo.context ;
units.add(rmiUnit) ;
}
-
+ */
/////////////////
//RTU涓婅鏁版嵁澶勭悊妯″潡
@@ -340,6 +342,7 @@
CoreUnit.addConstantTask(new ToRtuConstantTask());
CoreUnit.addConstantTask(new FromRtuDataConstantTask());
CoreUnit.addConstantTask(new FromRtuComResultConstantTask());
+ CoreUnit.addConstantTask(new SendMsConstantTask());
coreUnit.start(obj -> {
});
units.add(coreUnit) ;
--
Gitblit v1.8.0