From b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/netty/handler/ClientHandler.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 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 86f6795..5369d3d 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) {
@@ -64,20 +58,26 @@
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
if (evt instanceof IdleStateEvent) {
IdleStateEvent event = (IdleStateEvent) evt;
- long timestamp = System.currentTimeMillis();
-
switch (event.state()) {
case READER_IDLE:
- log.warn("读空闲超时 - 可能服务器未响应");
+ //log.warn("读空闲超时 - 可能服务器未响应");
break;
case WRITER_IDLE:
- // 写空闲时主动发心跳
- HeartbeatCmd heartbeat = new HeartbeatCmd(timestamp);
- ctx.writeAndFlush(heartbeat);
- log.debug("写空闲 -> 发送心跳包 时间戳={}", timestamp);
+ try {
+ HeartbeatCmd heartbeat = new HeartbeatCmd(System.currentTimeMillis());
+ ctx.writeAndFlush(heartbeat).addListener(future -> {
+ if (!future.isSuccess()) {
+ log.error("写心跳失败，网络断开，关闭连接");
+ ctx.close();
+ }
+ });
+ } catch (Exception e) {
+ log.error("发送心跳异常", e);
+ ctx.close();
+ }
break;
case ALL_IDLE:
- log.info("读写都空闲 - 可考虑关闭连接或重连");
+ log.warn("读写都空闲 - 可考虑关闭连接或重连");
break;
}
} else {
@@ -92,7 +92,7 @@
InetSocketAddress remoteAddress = (InetSocketAddress) channel.remoteAddress();
String host = remoteAddress.getHostString();
int port = remoteAddress.getPort();
- log.error("与六合服务{}:{}连接断开!", host, port);
+ log.error("与边缘服务器服务{}:{}连接断开!", host, port);
TyTcpServerCache.putTcpServerCache(serverId, false);
super.channelInactive(ctx);
}
--
Gitblit v1.9.3