From 0d9fb1b9336da142d070109782a8c260744f5e57 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 12:16:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java b/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
index 88c39bd..0613572 100644
--- a/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
+++ b/ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java
@@ -1,22 +1,19 @@
package com.ard.work.component.netty.handler;
-import com.ard.work.component.netty.TyTcpClientManager;
-import com.ard.work.component.netty.command.register.HeartbeatCmd;
-import com.ard.work.domain.cache.TyTcpServerCache;
import com.ard.work.component.netty.command.BaseCmd;
+import com.ard.work.component.netty.command.register.HeartbeatCmd;
+import com.ard.work.component.netty.cache.TyTcpServerCache;
import com.ard.work.service.ITyService;
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.handler.timeout.IdleState;
import io.netty.handler.timeout.IdleStateEvent;
import io.netty.util.AttributeKey;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.net.InetSocketAddress;
-import java.util.concurrent.TimeUnit;
@Component
@@ -26,9 +23,6 @@
@Resource
private ITyService tyService;
-
- @Resource
- private TyTcpClientManager tyTcpClientManager;
@Override
public void channelRead0(ChannelHandlerContext ctx, BaseCmd command) {
@@ -47,7 +41,7 @@
String host = remoteAddress.getHostString();
int port = remoteAddress.getPort();
- log.info("与天宇服务器 [{}] 连接成功 ({}:{})", serverId, host, port);
+ log.info("与边缘服务器 [{}] 连接成功 ({}:{})", serverId, host, port);
// 针对当前连接的服务器进行注册
tyService.registerMessage(serverId);
@@ -68,7 +62,8 @@
switch (event.state()) {
case READER_IDLE:
- log.warn("读空闲超时 - 可能服务器未响应");
+ log.debug("读空闲超时 - 可能服务器未响应");
+ ctx.close(); // <-- 必须加这句
break;
case WRITER_IDLE:
// 写空闲时主动发心跳
@@ -77,7 +72,7 @@
log.debug("写空闲 -> 发送心跳包 时间戳={}", timestamp);
break;
case ALL_IDLE:
- log.info("读写都空闲 - 可考虑关闭连接或重连");
+ log.debug("读写都空闲 - 可考虑关闭连接或重连");
break;
}
} else {
@@ -92,17 +87,8 @@
InetSocketAddress remoteAddress = (InetSocketAddress) channel.remoteAddress();
String host = remoteAddress.getHostString();
int port = remoteAddress.getPort();
- log.error("与六合服务{}:{}连接断开!", host, port);
- TyTcpServerCache.putTcpServerCache(host + ":" + port, false);
- ctx.channel().eventLoop().schedule(() -> {
- log.error("六合服务端链接不上，开始重连操作...");
- try {
- tyTcpClientManager.initConnection(serverId,host, port);
- } catch (Exception e) {
- log.error("六合服务端连接异常: {}", e.getMessage());
- }
- }, 5, TimeUnit.SECONDS);
-
+ log.error("与边缘服务器服务{}:{}连接断开!", host, port);
+ TyTcpServerCache.putTcpServerCache(serverId, false);
super.channelInactive(ctx);
}
--
Gitblit v1.9.3