From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:41 +0800
Subject: [PATCH] 1、完善代码和application.yml配置文件，去掉不用的引入文件； 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断； 3、凡是有Server的应用，加载资源方式改为用springboot的工具类加载； 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2，以实现可以在jar包情况下能够扫描类（.class）注解。
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
index cdf2c8e..a4dae41 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-client/src/main/java/com/dy/testClient/tcpClient/TcpConnect.java
@@ -1,5 +1,6 @@
package com.dy.testClient.tcpClient;
+import com.dy.common.util.Callback;
import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
@@ -28,9 +29,18 @@
* @param job rtu宸ヤ綔绫�
* @param host 鏈嶅姟鍣║RI
* @param port 鏈嶅姟鍣ㄧ鍙�
+ * @param connectTimeout 杩炴帴瓒呮椂鏃堕暱
+ * @param handler 鏁版嵁澶勭悊鑰�
+ * @param callback 鍥炶皟
* @return 缃戠粶浼氳瘽
*/
- public IoSession createSession(String rtuAddr, MyThreadJob job, String host , int port , int connectTimeout , TcpHandler handler) throws Exception{
+ public void createSession(String rtuAddr,
+ MyThreadJob job,
+ String host ,
+ int port ,
+ int connectTimeout ,
+ TcpHandler handler,
+ Callback callback) throws Exception{
SocketConnector connector = new NioSocketConnector();
connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new LocalCodecFactory()));
connector.setHandler(handler);
@@ -39,7 +49,7 @@
IoSession se = connectFuture.getSession();
se.setAttribute(rtuAddrKey, rtuAddr) ;
se.setAttribute(threadJobKey, job) ;
- return se ;
+ callback.call(se) ;
}
--
Gitblit v1.8.0