From 54848f5bc2590c6f17aa1e783b6f78adec00c131 Mon Sep 17 00:00:00 2001 From: wujiawei <1207537021@qq.com> Date: Sat, 21 Sep 2024 02:39:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ientPermeateClientTransferRealFilter.java} | 9 ++++----- ...entPermeateClientTransferRealHandler.java} | 19 +++++++++---------- .../NettyClientPermeateClientRealSocket.java | 5 ++--- 3 files changed, 15 insertions(+), 18 deletions(-) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/{NettyClientPermeateClientTransferFilter.java => NettyClientPermeateClientTransferRealFilter.java} (80%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/{NettyClientPermeateClientTransferHandler.java => NettyClientPermeateClientTransferRealHandler.java} (78%) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientTransferFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientTransferRealFilter.java similarity index 80% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientTransferFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientTransferRealFilter.java index 07989cc..d605345 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientTransferFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/filter/NettyClientPermeateClientTransferRealFilter.java @@ -4,8 +4,7 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; -import org.framework.lazy.cloud.network.heartbeat.client.netty.handler.NettyClientPermeateClientTransferHandler; -import org.framework.lazy.cloud.network.heartbeat.client.netty.handler.NettyServerPermeateClientTransferHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.handler.NettyClientPermeateClientTransferRealHandler; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.decoder.NettyProxyMsgDecoder; import org.framework.lazy.cloud.network.heartbeat.common.encoder.NettyProxyMsgEncoder; @@ -14,10 +13,10 @@ import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInit /** * netty 客户端连接真实服服务端访客拦截器 */ -public class NettyClientPermeateClientTransferFilter extends DebugChannelInitializer { +public class NettyClientPermeateClientTransferRealFilter extends DebugChannelInitializer { private final ChannelTypeAdapter channelTypeAdapter; - public NettyClientPermeateClientTransferFilter(ChannelTypeAdapter channelTypeAdapter) { + public NettyClientPermeateClientTransferRealFilter(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } @@ -38,6 +37,6 @@ public class NettyClientPermeateClientTransferFilter extends DebugChannelInitial // pipeline.addLast(new NettMsgEncoder()); pipeline.addLast(new NettyProxyMsgDecoder(Integer.MAX_VALUE, 0, 4, -4, 0)); pipeline.addLast(new NettyProxyMsgEncoder()); - pipeline.addLast(new NettyClientPermeateClientTransferHandler(channelTypeAdapter)); + pipeline.addLast(new NettyClientPermeateClientTransferRealHandler(channelTypeAdapter)); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientTransferHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientTransferRealHandler.java similarity index 78% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientTransferHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientTransferRealHandler.java index e2a2e89..3226709 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientTransferHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientTransferRealHandler.java @@ -6,7 +6,6 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelOption; import io.netty.channel.SimpleChannelInboundHandler; import lombok.extern.slf4j.Slf4j; -import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.NettyRealIdContext; @@ -18,10 +17,10 @@ import org.wu.framework.core.utils.ObjectUtils; * 客户端访客通信通道 处理器 */ @Slf4j -public class NettyClientPermeateClientTransferHandler extends SimpleChannelInboundHandler { +public class NettyClientPermeateClientTransferRealHandler extends SimpleChannelInboundHandler { private final ChannelTypeAdapter channelTypeAdapter; - public NettyClientPermeateClientTransferHandler(ChannelTypeAdapter channelTypeAdapter) { + public NettyClientPermeateClientTransferRealHandler(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } @@ -42,15 +41,15 @@ public class NettyClientPermeateClientTransferHandler extends SimpleChannelInbou String clientId = ChannelAttributeKeyUtils.getClientId(ctx.channel()); String visitorId = ChannelAttributeKeyUtils.getVisitorId(ctx.channel()); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(ctx.channel()); // 关闭访客 - ChannelContext.ClientChannel clientChannel = ChannelContext.get(clientId); - if (clientChannel != null) { - Channel channel = clientChannel.getChannel(); + if (nextChannel != null) { + // 上报关闭这个客户端的访客通道 NettyProxyMsg closeVisitorMsg = new NettyProxyMsg(); closeVisitorMsg.setType(MessageType.REPORT_CLIENT_PERMEATE_CLIENT_CLOSE); closeVisitorMsg.setVisitorId(visitorId); - channel.writeAndFlush(closeVisitorMsg); + nextChannel.writeAndFlush(closeVisitorMsg); } super.channelInactive(ctx); @@ -65,10 +64,10 @@ public class NettyClientPermeateClientTransferHandler extends SimpleChannelInbou return; } - Channel realChannel = NettyRealIdContext.getReal(visitorId); - if (realChannel != null) { + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(ctx.channel()); + if (nextChannel != null) { log.debug("visitorId:{} transfer AUTO_READ:{} ",visitorId,ctx.channel().isWritable()); - realChannel.config().setOption(ChannelOption.AUTO_READ, ctx.channel().isWritable()); + nextChannel.config().setOption(ChannelOption.AUTO_READ, ctx.channel().isWritable()); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientRealSocket.java index 939fc08..9e16fe7 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateClientRealSocket.java @@ -8,8 +8,7 @@ import io.netty.channel.socket.nio.NioSocketChannel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.filter.NettyClientPermeateClientRealFilter; -import org.framework.lazy.cloud.network.heartbeat.client.netty.filter.NettyClientPermeateClientTransferFilter; -import org.framework.lazy.cloud.network.heartbeat.client.netty.filter.NettyServerPermeateClientTransferFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.filter.NettyClientPermeateClientTransferRealFilter; import org.framework.lazy.cloud.network.heartbeat.common.*; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; @@ -113,7 +112,7 @@ public class NettyClientPermeateClientRealSocket { .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyClientPermeateClientTransferFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList))) + .handler(new NettyClientPermeateClientTransferRealFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList))) ; String inetHost = nettyClientProperties.getInetHost();