From c057d7b2d562c8cc599fa7f1e087a8e51d148468 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Tue, 20 May 2025 15:59:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AFsocks=E4=BB=A3=E7=90=86=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=97=B6=E6=96=AD=E6=97=B6=E7=BB=AD=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/NettySocksServerProxyClientRealHandler.java | 1 + .../handler/NettySocksServerProxyClientTransferHandler.java | 3 +++ .../protocol/handler/NettyProxy2RealInboundHandler.java | 4 ++-- .../netty/permeate/tcp/handler/NettyTcpServerHandler.java | 4 ++-- ...eportServerProxyClientConnectionSuccessTypeAdvanced.java | 4 +++- ...cksReportServerProxyClientTransferCloseTypeAdvanced.java | 6 ++++-- ...erverHandleSocksReportServerProxyClientTypeAdvanced.java | 6 +----- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientRealHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientRealHandler.java index a2fc648..fa52aa4 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientRealHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientRealHandler.java @@ -50,6 +50,7 @@ public class NettySocksServerProxyClientRealHandler extends SimpleChannelInbound // 客户端真实通信通道 Channel transferChannel = ChannelAttributeKeyUtils.getNextChannel(ctx.channel()); if (transferChannel != null&&transferChannel.isActive()) { + log.debug("上报关闭这个客户端的访客通道"); // 上报关闭这个客户端的访客通道 NettyProxyMsg closeVisitorMsg = new NettyProxyMsg(); closeVisitorMsg.setType(ProxyMessageType.SOCKS_REPORT_SERVER_PROXY_CLIENT_TRANSFER_CLOSE_); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientTransferHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientTransferHandler.java index ff22040..7f87810 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientTransferHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/handler/NettySocksServerProxyClientTransferHandler.java @@ -37,8 +37,11 @@ public class NettySocksServerProxyClientTransferHandler extends SimpleChannelInb String visitorId = ChannelAttributeKeyUtils.getVisitorId(ctx.channel()); Channel realChannel = ChannelAttributeKeyUtils.getNextChannel(ctx.channel()); log.warn("close server proxy client transfer real clientId:{} visitorId:{}", clientId, visitorId); + // 上报关闭当前通道 + // 关闭真实通道 if (realChannel != null) { + log.debug("关闭真实通道"); realChannel.close(); } diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyProxy2RealInboundHandler.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyProxy2RealInboundHandler.java index 7fb4e1f..96fcace 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyProxy2RealInboundHandler.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyProxy2RealInboundHandler.java @@ -26,7 +26,7 @@ public class NettyProxy2RealInboundHandler extends ChannelInboundHandlerAdapter @Override public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception { - log.info("本地转发客户端的请求到代理服务器"); + log.debug("本地转发客户端的请求到代理服务器"); if (dstChannelFuture.channel().isActive()) { dstChannelFuture.channel().writeAndFlush(msg); } else { @@ -37,7 +37,7 @@ public class NettyProxy2RealInboundHandler extends ChannelInboundHandlerAdapter @Override public void channelInactive(ChannelHandlerContext ctx) throws Exception { - log.info("客户端与代理服务器的连接已经断开，即将断开代理服务器和目标服务器的连接"); + log.debug("客户端与代理服务器的连接已经断开，即将断开代理服务器和目标服务器的连接"); if (dstChannelFuture.channel().isActive()) { if (ctx.channel().isActive()) { ctx.channel().writeAndFlush(Unpooled.EMPTY_BUFFER).addListener(ChannelFutureListener.CLOSE); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerHandler.java index 726e71b..982a770 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerHandler.java @@ -67,7 +67,7 @@ public class NettyTcpServerHandler extends SimpleChannelInboundHandler