From b9675b8776553828294bc635879d317b7bb83cc2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 29 十一月 2023 20:09:52 +0800
Subject: [PATCH] 1、meterNo改为rtuAddr; 2、去掉一些main方法； 3、pom.xml中依赖common和global的<scope>provided</scope>改为<scope>compile</scope> 4、pipIrr-mwTest-server一些修改； 5、.gitignore文件提交。
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/Server.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 27fcf68..6e08a2e 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
@@ -40,7 +40,7 @@
long start = System.currentTimeMillis() ;
try {
sv.conf = new ConfigXml() ;
- sv.doc = sv.conf.createDom(sv.getClass(), "/config.xml") ;
+ sv.doc = sv.conf.createDom(sv.getClass(), "config.xml") ;
////////////////
//鏈嶅姟 閰嶇疆
sv.showStartInfo = sv.conf.getSetAttrBoolean(sv.doc, "config.server", "showStartInfo", null, null) ;
@@ -135,8 +135,10 @@
}
ServerProperties.tcpServerIp = conf.getSetAttrTxt(doc, "config.base", "tcpServerIp", null, false, null) ;
ServerProperties.tcpServerPort = conf.getSetAttrPlusInt(doc, "config.base", "tcpServerPort", null, 1, 65535, null) ;
+ 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) ;
-
+
/////////////////
//RMI妯″潡
--
Gitblit v1.8.0