增加closeIdleTest，允许关闭连接空闲检测

Lihuanghe · Feb 1, 2025 · 4826824 · 4826824
1 parent 61690e4
commit 4826824
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/src/main/java/com/zx/sms/connect/manager/sgip/SgipClientEndpointConnector.java b/src/main/java/com/zx/sms/connect/manager/sgip/SgipClientEndpointConnector.java
@@ -47,7 +47,9 @@ protected void doBindHandler(ChannelPipeline pipe, EndpointEntity entity) {
 	@Override
 	protected void doinitPipeLine(ChannelPipeline pipeline) {
 		EndpointEntity entity = getEndpointEntity();
-		pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		if(!entity.isCloseIdleTest()) {
+			pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		}
 		pipeline.addLast("SgipServerIdleStateHandler", GlobalConstance.sgipidleHandler);
 		pipeline.addLast(SgipCodecChannelInitializer.pipeName(), new SgipCodecChannelInitializer());
 		pipeline.addLast(GlobalConstance.sessionLoginManager, new SgipSessionLoginManager(getEndpointEntity()));

diff --git a/src/main/java/com/zx/sms/connect/manager/sgip/SgipServerEndpointConnector.java b/src/main/java/com/zx/sms/connect/manager/sgip/SgipServerEndpointConnector.java
@@ -20,7 +20,9 @@ public SgipServerEndpointConnector(EndpointEntity e) {
 	@Override
 	protected void doinitPipeLine(ChannelPipeline pipeline) {
 		EndpointEntity entity = getEndpointEntity();
-		pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		if(!entity.isCloseIdleTest()) {
+			pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		}
 		pipeline.addLast("SgipServerIdleStateHandler", GlobalConstance.sgipidleHandler);
 		pipeline.addLast(SgipCodecChannelInitializer.pipeName(), new SgipCodecChannelInitializer());
 		pipeline.addLast(GlobalConstance.sessionLoginManager, new SgipSessionLoginManager(getEndpointEntity()));

diff --git a/src/main/java/com/zx/sms/connect/manager/smgp/SMGPClientEndpointConnector.java b/src/main/java/com/zx/sms/connect/manager/smgp/SMGPClientEndpointConnector.java
@@ -49,7 +49,9 @@ protected void doBindHandler(ChannelPipeline pipe, EndpointEntity entity) {
 	@Override
 	protected void doinitPipeLine(ChannelPipeline pipeline) {
 		EndpointEntity entity = getEndpointEntity();
-		pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		if(!entity.isCloseIdleTest()) {
+			pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		}
 		pipeline.addLast("SmgpServerIdleStateHandler", GlobalConstance.smgpidleHandler);
 		pipeline.addLast(SMGPCodecChannelInitializer.pipeName(), new SMGPCodecChannelInitializer((int)((SMGPEndpointEntity)entity).getClientVersion()));
 		pipeline.addLast(GlobalConstance.sessionLoginManager, new SMGPSessionLoginManager(getEndpointEntity()));

diff --git a/src/main/java/com/zx/sms/connect/manager/smgp/SMGPServerEndpointConnector.java b/src/main/java/com/zx/sms/connect/manager/smgp/SMGPServerEndpointConnector.java
@@ -19,7 +19,9 @@ public SMGPServerEndpointConnector(EndpointEntity e) {
 	@Override
 	protected void doinitPipeLine(ChannelPipeline pipeline) {
 		EndpointEntity entity = getEndpointEntity();
-		pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		if(!entity.isCloseIdleTest()) {
+			pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		}
 		pipeline.addLast("SmgpServerIdleStateHandler", GlobalConstance.smgpidleHandler);
 		pipeline.addLast(SMGPCodecChannelInitializer.pipeName(), new SMGPCodecChannelInitializer(0x30));  //默认使用3.0协议，用户登陆后再更换为正确的协议
 		pipeline.addLast(GlobalConstance.sessionLoginManager, new SMGPSessionLoginManager(getEndpointEntity()));

diff --git a/src/main/java/com/zx/sms/connect/manager/smpp/SMPPClientEndpointConnector.java b/src/main/java/com/zx/sms/connect/manager/smpp/SMPPClientEndpointConnector.java
@@ -52,7 +52,9 @@ protected void doBindHandler(ChannelPipeline pipe, EndpointEntity entity) {
 	@Override
 	protected void doinitPipeLine(ChannelPipeline pipeline) {
 		EndpointEntity entity = getEndpointEntity();
-		pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		if(!entity.isCloseIdleTest()) {
+			pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		}
 		pipeline.addLast("SmppServerIdleStateHandler", GlobalConstance.smppidleHandler);
 		pipeline.addLast(SMPPCodecChannelInitializer.pipeName(), new SMPPCodecChannelInitializer(entity));
 		pipeline.addLast(GlobalConstance.sessionLoginManager, new SMPPSessionLoginManager(getEndpointEntity()));

diff --git a/src/main/java/com/zx/sms/connect/manager/smpp/SMPPServerEndpointConnector.java b/src/main/java/com/zx/sms/connect/manager/smpp/SMPPServerEndpointConnector.java
@@ -19,7 +19,9 @@ public SMPPServerEndpointConnector(EndpointEntity e) {
 	@Override
 	protected void doinitPipeLine(ChannelPipeline pipeline) {
 		EndpointEntity entity = getEndpointEntity();
-		pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		if(!entity.isCloseIdleTest()) {
+			pipeline.addLast(GlobalConstance.IdleCheckerHandlerName, new IdleStateHandler(0, 0, entity.getIdleTimeSec(), TimeUnit.SECONDS));
+		}
 		pipeline.addLast("SmppServerIdleStateHandler", GlobalConstance.smppidleHandler);
 		pipeline.addLast(SMPPCodecChannelInitializer.pipeName(), new SMPPCodecChannelInitializer(entity));
 		pipeline.addLast(GlobalConstance.sessionLoginManager, new SMPPSessionLoginManager(getEndpointEntity()));