diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute.java index 42f0ee5..def668d 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute.java @@ -34,6 +34,7 @@ public class ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute extends */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); log.debug("接收到服务端需要内网穿透的数据:{}" , nettyProxyMsg); String clientId = nettyClientProperties.getClientId(); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); @@ -42,7 +43,7 @@ public class ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute extends byte[] visitorId = nettyProxyMsg.getVisitorId(); // 真实服务通道 // Channel realChannel = NettyRealIdContext.getReal(new String(visitorId)); - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if (nextChannel == null) { log.error("无法获取访客:{} 真实服务", new String(visitorId)); return; @@ -50,7 +51,7 @@ public class ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute extends // 把数据转到真实服务 - ByteBuf buf = channelHandlerContext.config().getAllocator().buffer(nettyProxyMsg.getData().length); + ByteBuf buf = channel.config().getAllocator().buffer(nettyProxyMsg.getData().length); buf.writeBytes(nettyProxyMsg.getData()); nextChannel.writeAndFlush(buf); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpClientChannelActiveAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpClientChannelActiveAdvanced.java index 396f967..b166ce1 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpClientChannelActiveAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpClientChannelActiveAdvanced.java @@ -1,5 +1,6 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.permeate.udp.advanced; +import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; @@ -25,10 +26,11 @@ public class ClientHandleUdpClientChannelActiveAdvanced extends AbstractHandleUd */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 缓存当前通道 byte[] clientIdByte = nettyProxyMsg.getClientId(); String clientId = new String(clientIdByte); - ChannelContext.push(channelHandlerContext, clientId); - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext, clientId); + ChannelContext.push(channel, clientId); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvanced.java index 5c2a287..c3d0b59 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvanced.java @@ -26,10 +26,11 @@ public class ClientHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvan */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 关闭客户端真实通道、访客通道 - Channel realChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel realChannel = ChannelAttributeKeyUtils.getNextChannel(channel); realChannel.close();// 真实通道关闭 - channelHandlerContext.close(); // 数据传输通道关闭 + channel.close(); // 数据传输通道关闭 } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerTransferCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerTransferCloseTypeAdvanced.java index 6babb9a..5a33a82 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerTransferCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerTransferCloseTypeAdvanced.java @@ -26,9 +26,10 @@ public class ClientHandleUdpDistributeClientPermeateServerTransferCloseTypeAdvan */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 关闭本地通信通道 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); - channelHandlerContext.close(); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); + channel.close(); nextChannel.close(); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java index c3f44be..24735d4 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java @@ -30,6 +30,7 @@ public class ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuc */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 连接成功 开启自动读取写 byte[] msgClientId = nettyProxyMsg.getClientId(); byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); @@ -37,7 +38,7 @@ public class ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuc byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); nextChannel.config().setOption(ChannelOption.AUTO_READ, true); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java index 74ad113..83c49cc 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -33,10 +33,11 @@ public class ClientHandleUdpDistributeClientTransferServerPermeateChannelConnect */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 连接成功 开启自动读取写 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); String visitorId = new String(msgVisitorId); - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); nextChannel.config().setOption(ChannelOption.AUTO_READ, true); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeServicePermeateClientTransferClientResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeServicePermeateClientTransferClientResponseTypeAdvanced.java index 3f42959..4d111f8 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeServicePermeateClientTransferClientResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeServicePermeateClientTransferClientResponseTypeAdvanced.java @@ -30,9 +30,10 @@ public class ClientHandleUdpDistributeServicePermeateClientTransferClientRespons */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel channel = channelHandlerContext.channel(); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); // 把数据转到真实服务 - ByteBuf buf = channelHandlerContext.config().getAllocator().buffer(nettyProxyMsg.getData().length); + ByteBuf buf = channel.config().getAllocator().buffer(nettyProxyMsg.getData().length); buf.writeBytes(nettyProxyMsg.getData()); nextChannel.writeAndFlush(buf); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvanced.java index 33b659d..87ae868 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvanced.java @@ -19,11 +19,12 @@ public class ClientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvance */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 获取访客ID byte[] visitorId = nettyProxyMsg.getVisitorId(); // 获取访客对应的真实代理通道 Channel realChannel = NettyRealIdContext.getReal(visitorId); - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if (nextChannel != null) { nextChannel.config().setOption(ChannelOption.AUTO_READ, true); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyClientTransferRequestAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyClientTransferRequestAdvanced.java index d3496a6..f823c64 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyClientTransferRequestAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyClientTransferRequestAdvanced.java @@ -26,11 +26,11 @@ public class ClientHandleDistributeHttpClientProxyClientTransferRequestAdvanced */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { - + Channel channel = channelHandlerContext.channel(); // 数据发送 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if(ObjectUtils.isNotEmpty(nextChannel)){ - ByteBuf buf = channelHandlerContext.config().getAllocator().buffer(nettyProxyMsg.getData().length); + ByteBuf buf = channel.config().getAllocator().buffer(nettyProxyMsg.getData().length); buf.writeBytes(nettyProxyMsg.getData()); nextChannel.writeAndFlush(buf); }else { diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyServerTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyServerTransferTypeAdvanced.java index 9b618f8..8bdb426 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyServerTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyServerTransferTypeAdvanced.java @@ -26,15 +26,17 @@ public class ClientHandleDistributeHttpClientProxyServerTransferTypeAdvanced ext @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { - String visitorId = ChannelAttributeKeyUtils.getVisitorId(channelHandlerContext); - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel channel = channelHandlerContext.channel(); + + String visitorId = ChannelAttributeKeyUtils.getVisitorId(channel); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if (nextChannel == null) { log.error("无法获取访客:{} 真实服务", visitorId); return; } // 把数据转到真实服务 - ByteBuf buf = channelHandlerContext.config().getAllocator().buffer(nettyProxyMsg.getData().length); + ByteBuf buf = channel.config().getAllocator().buffer(nettyProxyMsg.getData().length); buf.writeBytes(nettyProxyMsg.getData()); nextChannel.writeAndFlush(buf); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpServerProxyClientTransferRequestAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpServerProxyClientTransferRequestAdvanced.java index 3037c33..3c0a277 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpServerProxyClientTransferRequestAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpServerProxyClientTransferRequestAdvanced.java @@ -26,11 +26,11 @@ public class ClientHandleDistributeHttpServerProxyClientTransferRequestAdvanced */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { - + Channel channel = channelHandlerContext.channel(); // 数据发送 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if (ObjectUtils.isNotEmpty(nextChannel)) { - ByteBuf buf = channelHandlerContext.config().getAllocator().buffer(nettyProxyMsg.getData().length); + ByteBuf buf = channel.config().getAllocator().buffer(nettyProxyMsg.getData().length); buf.writeBytes(nettyProxyMsg.getData()); nextChannel.writeAndFlush(buf); } else { diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpClientProxyClientTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpClientProxyClientTypeAdvanced.java index aa5ba37..20da31a 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpClientProxyClientTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpClientProxyClientTypeAdvanced.java @@ -1,5 +1,6 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.http.advanced; +import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.http.NettyHttpClientProxyClient; @@ -29,6 +30,7 @@ public class ClientHandleHttpClientProxyClientTypeAdvanced extends */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); String targetPortString = nettyProxyMsg.getTargetPortString(); String targetIpString = nettyProxyMsg.getTargetIpString(); byte[] data = nettyProxyMsg.getData(); @@ -46,6 +48,6 @@ public class ClientHandleHttpClientProxyClientTypeAdvanced extends nettyHttpClientProxyClient.setNettyClientProperties(nettyClientProperties); nettyHttpClientProxyClient.setData(data); - NettyHttpClientProxyClientProxySocket.buildTransferServer(nettyHttpClientProxyClient, channelHandlerContext); + NettyHttpClientProxyClientProxySocket.buildTransferServer(nettyHttpClientProxyClient, channel); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpClientProxyServerTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpClientProxyServerTypeAdvanced.java index d6e7a84..192f87a 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpClientProxyServerTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpClientProxyServerTypeAdvanced.java @@ -1,5 +1,6 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.http.advanced; +import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.http.NettyHttpClientProxyServer; @@ -29,6 +30,7 @@ public class ClientHandleHttpClientProxyServerTypeAdvanced extends @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); String targetPortString = nettyProxyMsg.getTargetPortString(); String targetIpString = nettyProxyMsg.getTargetIpString(); byte[] data = nettyProxyMsg.getData(); @@ -45,7 +47,7 @@ public class ClientHandleHttpClientProxyServerTypeAdvanced extends nettyHttpClientProxyServer.setNettyClientProperties(nettyClientProperties); nettyHttpClientProxyServer.setData(data); - NettyHttpClientProxyServerProxySocket.buildTransferServer(nettyHttpClientProxyServer, channelHandlerContext); + NettyHttpClientProxyServerProxySocket.buildTransferServer(nettyHttpClientProxyServer, channel); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpDistributeClientProxyClientTransferCLoseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpDistributeClientProxyClientTransferCLoseTypeAdvanced.java index 7e329f0..cf1b825 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpDistributeClientProxyClientTransferCLoseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpDistributeClientProxyClientTransferCLoseTypeAdvanced.java @@ -24,10 +24,10 @@ public class ClientHandleHttpDistributeClientProxyClientTransferCLoseTypeAdvance */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { - + Channel channel = channelHandlerContext.channel(); // 关闭传输通道 - Channel realChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel realChannel = ChannelAttributeKeyUtils.getNextChannel(channel); realChannel.close();// 真实通道关闭 - channelHandlerContext.close(); // 数据传输通道关闭 + channel.close(); // 数据传输通道关闭 } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpDistributeClientProxyClientTransferResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpDistributeClientProxyClientTransferResponseTypeAdvanced.java index ce0ae8a..aad4cb4 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpDistributeClientProxyClientTransferResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleHttpDistributeClientProxyClientTransferResponseTypeAdvanced.java @@ -26,11 +26,11 @@ public class ClientHandleHttpDistributeClientProxyClientTransferResponseTypeAdva */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { - + Channel channel = channelHandlerContext.channel(); // 数据发送 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if(ObjectUtils.isNotEmpty(nextChannel)){ - ByteBuf buf = channelHandlerContext.config().getAllocator().buffer(nettyProxyMsg.getData().length); + ByteBuf buf = channel.config().getAllocator().buffer(nettyProxyMsg.getData().length); buf.writeBytes(nettyProxyMsg.getData()); nextChannel.writeAndFlush(buf); }else { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpClientConnectSuccessTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpClientConnectSuccessTypeAdvanced.java index e39de95..630f6f5 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpClientConnectSuccessTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpClientConnectSuccessTypeAdvanced.java @@ -65,21 +65,21 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg msg) { - + Channel newChannel = channelHandlerContext.channel(); String clientId = msg.getClientIdString(); String appKey = msg.getAppKeyString(); String appSecret = msg.getAppSecretString(); String originalIp = msg.getOriginalIpString(); - ChannelContext.push(channelHandlerContext, clientId); + ChannelContext.push(newChannel, clientId); - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext, clientId); - ChannelAttributeKeyUtils.buildAppKey(channelHandlerContext, appKey); - ChannelAttributeKeyUtils.buildAppSecret(channelHandlerContext, appSecret); - ChannelAttributeKeyUtils.buildOriginalIp(channelHandlerContext, originalIp); + ChannelAttributeKeyUtils.buildClientId(newChannel, clientId); + ChannelAttributeKeyUtils.buildAppKey(newChannel, appKey); + ChannelAttributeKeyUtils.buildAppSecret(newChannel, appSecret); + ChannelAttributeKeyUtils.buildOriginalIp(newChannel, originalIp); // 客户端:{}，IP:{}连接成功 - log.info("Client: {}, IP: {} Connection successful", new String(msg.getClientId()), channelHandlerContext.remoteAddress().toString()); + log.info("Client: {}, IP: {} Connection successful", new String(msg.getClientId()), newChannel.remoteAddress().toString()); // 验证客户端是否时黑名单 LazyNettyClientBlacklist lazyNettyClientBlacklist = new LazyNettyClientBlacklist(); lazyNettyClientBlacklist.setClientId(clientId); @@ -125,7 +125,7 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan }else { // 关闭通道 log.warn("无法认证客户端：【{}】",clientId); - channelHandlerContext.close(); + newChannel.close(); } @@ -150,7 +150,7 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan nettyMsg.setClientTargetIp(permeateTargetIp); nettyMsg.setClientTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); - channelHandlerContext.writeAndFlush(nettyMsg); + newChannel.writeAndFlush(nettyMsg); } }); @@ -174,7 +174,7 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan nettyMsg.setVisitorPort(visitorPort); nettyMsg.setClientId(clientId); nettyMsg.setData(toClientId.getBytes(StandardCharsets.UTF_8)); - channelHandlerContext.writeAndFlush(nettyMsg); + newChannel.writeAndFlush(nettyMsg); } }); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateClientCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateClientCloseTypeAdvanced.java index 809fc10..2bd99a2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateClientCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateClientCloseTypeAdvanced.java @@ -28,10 +28,10 @@ public class ServerHandleUdpReportClientPermeateClientCloseTypeAdvanced extends @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { // 关闭 next、next transfer 通道 - - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); - Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channelHandlerContext); - channelHandlerContext.close(); + Channel channel = channelHandlerContext.channel(); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); + Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); + channel.close(); nextChannel.close(); transferNextChannel.close(); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateClientTransferCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateClientTransferCloseTypeAdvanced.java index 01e4e59..2bf05f1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateClientTransferCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateClientTransferCloseTypeAdvanced.java @@ -29,16 +29,16 @@ public class ServerHandleUdpReportClientPermeateClientTransferCloseTypeAdvanced @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { // 关闭 next、next transfer 通道 - - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); - Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channelHandlerContext); + Channel channel = channelHandlerContext.channel(); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); + Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); // 下发关闭客户端真实通道 NettyProxyMsg closeTransferNettyProxyMsg = new NettyProxyMsg(); closeTransferNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE); transferNextChannel.writeAndFlush(closeTransferNettyProxyMsg); - channelHandlerContext.close(); + channel.close(); nextChannel.close(); transferNextChannel.close(); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateServerTransferCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateServerTransferCloseTypeAdvanced.java index b412f97..f242bf5 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateServerTransferCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateServerTransferCloseTypeAdvanced.java @@ -25,9 +25,10 @@ public class ServerHandleUdpReportClientPermeateServerTransferCloseTypeAdvanced */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 关闭传输通信通道 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); nextChannel.close(); - channelHandlerContext.close(); + channel.close(); } } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateServerTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateServerTransferTypeAdvanced.java index a23d4ac..2cd0611 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateServerTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientPermeateServerTransferTypeAdvanced.java @@ -37,6 +37,7 @@ public class ServerHandleUdpReportClientPermeateServerTransferTypeAdvanced exten */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg msg) { + Channel channel = channelHandlerContext.channel(); String clientId = new String(msg.getClientId()); Integer visitorPort = Integer.valueOf(new String(msg.getVisitorPort())); byte[] visitorId = msg.getVisitorId(); @@ -44,7 +45,7 @@ public class ServerHandleUdpReportClientPermeateServerTransferTypeAdvanced exten log.debug("【客户端渗透服务端】访客ID:【{}】接收到客户端:[{}] 接收服务端数据大小:[{}] 接收服务端数据:[{}]", new String(visitorId), clientId, msg.getData().length, new String(msg.getData())); // 将数据转发访客通道 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if (nextChannel != null) { ByteBuf buf = nextChannel.config().getAllocator().buffer(msg.getData().length); buf.writeBytes(msg.getData()); @@ -59,7 +60,7 @@ public class ServerHandleUdpReportClientPermeateServerTransferTypeAdvanced exten .clientId(clientId) .flow(msg.getData().length) .build(); - channelFlowAdapter.asyncHandler(channelHandlerContext, serverChannelFlow); + channelFlowAdapter.asyncHandler(channel, serverChannelFlow); } log.debug("客户端渗透服务端】访客ID:【{}】接收到客户端:[{}] 传输真实数据成功", new String(visitorId), clientId); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java index d9acfba..dd95dfc 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -28,6 +28,7 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelConnectionS */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); @@ -35,11 +36,11 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelConnectionS byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); byte[] clientId = nettyProxyMsg.getClientId();// 目标客户端ID - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext, clientId); - ChannelAttributeKeyUtils.buildVisitorPort(channelHandlerContext, Integer.parseInt(new String(msgVisitorPort))); - ChannelAttributeKeyUtils.buildVisitorId(channelHandlerContext, msgVisitorId); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); + ChannelAttributeKeyUtils.buildVisitorPort(channel, Integer.parseInt(new String(msgVisitorPort))); + ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId); // 绑定访客通道 - NettyTransferChannelContext.pushVisitor(channelHandlerContext,msgVisitorId); + NettyTransferChannelContext.pushVisitor(channel,msgVisitorId); Channel clientChannel = ChannelContext.getLoadBalance(clientId); NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java index 84c0bb4..ad55ea5 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java @@ -27,6 +27,7 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccess */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); @@ -34,15 +35,15 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccess byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); byte[] clientId = nettyProxyMsg.getClientId(); - ChannelAttributeKeyUtils.buildVisitorPort(channelHandlerContext, Integer.parseInt(new String(msgVisitorPort))); + ChannelAttributeKeyUtils.buildVisitorPort(channel, Integer.parseInt(new String(msgVisitorPort))); // next translation Channel nextTransferChannel = NettyTransferChannelContext.getVisitor(msgVisitorId); - ChannelAttributeKeyUtils.buildTransferNextChannel(nextTransferChannel, channelHandlerContext); - ChannelAttributeKeyUtils.buildTransferNextChannel(channelHandlerContext,nextTransferChannel); - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext,clientId); - ChannelAttributeKeyUtils.buildVisitorId(channelHandlerContext,msgVisitorId); + ChannelAttributeKeyUtils.buildTransferNextChannel(nextTransferChannel, channel); + ChannelAttributeKeyUtils.buildTransferNextChannel(channel,nextTransferChannel); + ChannelAttributeKeyUtils.buildClientId(channel,clientId); + ChannelAttributeKeyUtils.buildVisitorId(channel,msgVisitorId); - Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientResponseTypeAdvanced.java index a6e6152..2870a15 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientResponseTypeAdvanced.java @@ -30,6 +30,9 @@ public class ServerHandleUdpReportClientTransferClientResponseTypeAdvanced exten */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + + Channel channel = channelHandlerContext.channel(); + // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); @@ -37,7 +40,7 @@ public class ServerHandleUdpReportClientTransferClientResponseTypeAdvanced exten byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); String clientId = nettyProxyMsg.getClientIdString(); // 下发客户端初始化成功 - Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); @@ -61,7 +64,7 @@ public class ServerHandleUdpReportClientTransferClientResponseTypeAdvanced exten .flow(clientConnectTagetNettyProxyMsg.getData().length) .build(); - channelFlowAdapter.asyncHandler(channelHandlerContext, serverChannelFlow); + channelFlowAdapter.asyncHandler(channel, serverChannelFlow); }else { log.error("can not find the client:【{}】 channelHandlerContext",clientId); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientTypeAdvanced.java index e430e46..17656d2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientTypeAdvanced.java @@ -30,6 +30,7 @@ public class ServerHandleUdpReportClientTransferClientTypeAdvanced extends Abstr */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); @@ -37,8 +38,8 @@ public class ServerHandleUdpReportClientTransferClientTypeAdvanced extends Abstr byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); String clientId = nettyProxyMsg.getClientIdString(); // 下发客户端初始化成功 - Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channelHandlerContext); - Integer visitorPort = ChannelAttributeKeyUtils.getVisitorPort(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); + Integer visitorPort = ChannelAttributeKeyUtils.getVisitorPort(channel); NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); @@ -60,7 +61,7 @@ public class ServerHandleUdpReportClientTransferClientTypeAdvanced extends Abstr .clientId(clientId) .flow(clientConnectTagetNettyProxyMsg.getData().length) .build(); - channelFlowAdapter.asyncHandler(channelHandlerContext, serverChannelFlow); + channelFlowAdapter.asyncHandler(channel, serverChannelFlow); }else { log.error("can not find the client:【{}】 channelHandlerContext",clientId); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java index 06aaad2..ef0513f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -1,5 +1,6 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.permeate.udp.advanced; +import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.permeate.udp.server.AbstractHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced; @@ -23,6 +24,7 @@ public class ServerHandleUdpReportClientTransferServerPermeateChannelConnectionS */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); @@ -31,13 +33,13 @@ public class ServerHandleUdpReportClientTransferServerPermeateChannelConnectionS byte[] msgClientId = nettyProxyMsg.getClientId(); String clientId = new String(msgClientId); // 绑定客户端ID - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext,clientId); - ChannelAttributeKeyUtils.buildVisitorId(channelHandlerContext,msgVisitorId); + ChannelAttributeKeyUtils.buildClientId(channel,clientId); + ChannelAttributeKeyUtils.buildVisitorId(channel,msgVisitorId); NettyUdpClientPermeateServerConnectRealSocket.buildNewRealServer(new String(msgVisitorId), Integer.parseInt(new String(msgVisitorPort)), new String(msgClientTargetIp), Integer.parseInt(new String(msgClientTargetPort)), - channelHandlerContext + channel ); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportDisconnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportDisconnectTypeAdvanced.java index 3e76725..6b1881e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportDisconnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportDisconnectTypeAdvanced.java @@ -44,13 +44,14 @@ public class ServerHandleUdpReportDisconnectTypeAdvanced extends AbstractHandleU */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg msg) { + Channel deathChannel = channelHandlerContext.channel(); // 关闭连接通知 String clientId = msg.getClientIdString(); log.warn("close client :{} channel", clientId); Channel deathClientChannelDTO = ChannelContext.getLoadBalance(clientId); - String appKey = ChannelAttributeKeyUtils.getAppKey(channelHandlerContext); - String appSecret = ChannelAttributeKeyUtils.getAppSecret(channelHandlerContext); - String originalIp = ChannelAttributeKeyUtils.getOriginalIp(channelHandlerContext); + String appKey = ChannelAttributeKeyUtils.getAppKey(deathChannel); + String appSecret = ChannelAttributeKeyUtils.getAppSecret(deathChannel); + String originalIp = ChannelAttributeKeyUtils.getOriginalIp(deathChannel); if (deathClientChannelDTO != null) { // 服务状态离线 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced.java index 8c2bc69..63b670e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced.java @@ -29,6 +29,7 @@ public class ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced e */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 客户端绑定端口成功 byte[] clientId = nettyProxyMsg.getClientId(); byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); @@ -37,16 +38,16 @@ public class ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced e byte[] visitorId = nettyProxyMsg.getVisitorId(); log.info("客户端:{},绑定真实服务ip:{},port:{},成功", new String(clientId), new String(clientTargetIp), new String(clientTargetPort)); // 绑定服务端访客通信通道 - NettyCommunicationIdContext.pushVisitor(channelHandlerContext, new String(visitorId)); - ChannelAttributeKeyUtils.buildVisitorId(channelHandlerContext, visitorId); - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext, clientId); - ChannelAttributeKeyUtils.buildVisitorPort(channelHandlerContext, Integer.valueOf(new String(visitorPort))); + NettyCommunicationIdContext.pushVisitor(channel, new String(visitorId)); + ChannelAttributeKeyUtils.buildVisitorId(channel, visitorId); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); + ChannelAttributeKeyUtils.buildVisitorPort(channel, Integer.valueOf(new String(visitorPort))); // 访客通道开启自动读取 Channel visitorRealChannel = NettyRealIdContext.getReal(visitorId); visitorRealChannel.config().setOption(ChannelOption.AUTO_READ, true); - ChannelAttributeKeyUtils.buildNextChannel(channelHandlerContext, visitorRealChannel); - ChannelAttributeKeyUtils.buildNextChannel(visitorRealChannel, channelHandlerContext); + ChannelAttributeKeyUtils.buildNextChannel(channel, visitorRealChannel); + ChannelAttributeKeyUtils.buildNextChannel(visitorRealChannel, channel); // 或许此处还应该通知服务端 这个访客绑定的客户端真实通道打开 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientTransferTypeAdvanced.java index 446ad48..f7d098a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientTransferTypeAdvanced.java @@ -41,6 +41,7 @@ public class ServerHandleUdpReportServicePermeateClientTransferTypeAdvanced exte */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg msg) { + Channel channel = channelHandlerContext.channel(); String clientId = new String(msg.getClientId()); Integer visitorPort = Integer.valueOf(new String(msg.getVisitorPort())); byte[] visitorId = msg.getVisitorId(); @@ -48,7 +49,7 @@ public class ServerHandleUdpReportServicePermeateClientTransferTypeAdvanced exte // log.debug("访客ID:【{}】接收到客户端:[{}] 返回数据大小:[{}] 内网穿透返回的数据:[{}]", new String(visitorId), clientId, msg.getData().length, new String(msg.getData())); // 将数据转发访客通道 Channel visitor = NettyRealIdContext.getReal(visitorId); - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if (nextChannel != null) { ByteBuf buf = nextChannel.config().getAllocator().buffer(msg.getData().length); buf.writeBytes(msg.getData()); @@ -63,7 +64,7 @@ public class ServerHandleUdpReportServicePermeateClientTransferTypeAdvanced exte .clientId(clientId) .flow(msg.getData().length) .build(); - channelFlowAdapter.asyncHandler(channelHandlerContext, serverChannelFlow); + channelFlowAdapter.asyncHandler(channel, serverChannelFlow); } log.debug("访客ID:【{}】接收到客户端:[{}] 发送真实数据成功", new String(visitorId), clientId); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportStagingClosedTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportStagingClosedTypeAdvanced.java index bd1de38..4842eba 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportStagingClosedTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportStagingClosedTypeAdvanced.java @@ -38,10 +38,10 @@ public class ServerHandleUdpReportStagingClosedTypeAdvanced extends AbstractHand */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg msg) { - - String appKey = ChannelAttributeKeyUtils.getAppKey(channelHandlerContext); - String appSecret = ChannelAttributeKeyUtils.getAppSecret(channelHandlerContext); - String originalIp = ChannelAttributeKeyUtils.getOriginalIp(channelHandlerContext); + Channel stagingClosedChannel = channelHandlerContext.channel(); + String appKey = ChannelAttributeKeyUtils.getAppKey(stagingClosedChannel); + String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingClosedChannel); + String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingClosedChannel); byte[] clientIdBytes = msg.getClientId(); // 获取所有通道 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportStagingOpenedTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportStagingOpenedTypeAdvanced.java index c782f0f..a6730e4 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportStagingOpenedTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportStagingOpenedTypeAdvanced.java @@ -40,11 +40,12 @@ public class ServerHandleUdpReportStagingOpenedTypeAdvanced extends AbstractHand */ @Override protected void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg msg) { + Channel stagingOpenedChannel = channelHandlerContext.channel(); // 获取所有通道 byte[] clientIdBytes = msg.getClientId(); - String appKey = ChannelAttributeKeyUtils.getAppKey(channelHandlerContext); - String appSecret = ChannelAttributeKeyUtils.getAppSecret(channelHandlerContext); - String originalIp = ChannelAttributeKeyUtils.getOriginalIp(channelHandlerContext); + String appKey = ChannelAttributeKeyUtils.getAppKey(stagingOpenedChannel); + String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingOpenedChannel); + String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingOpenedChannel); List stagingOpenedClientChannel = ChannelContext.get(clientIdBytes); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientConnectTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientConnectTransferTypeAdvanced.java index feeb834..b628194 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientConnectTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientConnectTransferTypeAdvanced.java @@ -35,6 +35,7 @@ public class ServerHandleHttpReportClientProxyClientConnectTransferTypeAdvanced */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 创建链接、发送数据 String targetPortString = nettyProxyMsg.getTargetPortString(); String targetIpString = nettyProxyMsg.getTargetIpString(); @@ -42,13 +43,13 @@ public class ServerHandleHttpReportClientProxyClientConnectTransferTypeAdvanced byte[] visitorId = nettyProxyMsg.getVisitorId(); byte[] clientId = nettyProxyMsg.getClientId(); String msgVisitorId = new String(visitorId); - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext, clientId); - ChannelAttributeKeyUtils.buildVisitorId(channelHandlerContext, msgVisitorId); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); + ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId); - NettyTransferChannelContext.pushVisitor(channelHandlerContext, msgVisitorId); + NettyTransferChannelContext.pushVisitor(channel, msgVisitorId); NettyByteBuf nettyByteBuf = new NettyByteBuf(); nettyByteBuf.setData(data); - ChannelAttributeKeyUtils.buildNettyByteBufData(channelHandlerContext, nettyByteBuf); + ChannelAttributeKeyUtils.buildNettyByteBufData(channel, nettyByteBuf); // 获取客户端心跳通道 Channel loadBalance = ChannelContext.getLoadBalance(clientId); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfulTypeAdvanced.java index efe7ff2..ec3478f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfulTypeAdvanced.java @@ -35,6 +35,7 @@ public class ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfu @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); @@ -44,10 +45,10 @@ public class ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfu // next translation Channel nextTransferChannel = NettyTransferChannelContext.getVisitor(msgVisitorId); - ChannelAttributeKeyUtils.buildTransferNextChannel(nextTransferChannel, channelHandlerContext); - ChannelAttributeKeyUtils.buildTransferNextChannel(channelHandlerContext, nextTransferChannel); - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext, clientId); - ChannelAttributeKeyUtils.buildVisitorId(channelHandlerContext, msgVisitorId); + ChannelAttributeKeyUtils.buildTransferNextChannel(nextTransferChannel, channel); + ChannelAttributeKeyUtils.buildTransferNextChannel(channel, nextTransferChannel); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); + ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId); NettyByteBuf nettyByteBufData = ChannelAttributeKeyUtils.getNettyByteBufData(nextTransferChannel); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferCloseTypeAdvanced.java index 6900fa6..57292d0 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferCloseTypeAdvanced.java @@ -33,19 +33,20 @@ public class ServerHandleHttpReportClientProxyClientTransferCloseTypeAdvanced @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 关闭通道 // 关闭 next、next transfer 通道 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); - Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); + Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); // 下发关闭客户端真实通道 NettyProxyMsg closeTransferNettyProxyMsg = new NettyProxyMsg(); closeTransferNettyProxyMsg.setType(ProxyMessageType.HTTP_DISTRIBUTE_CLIENT_PROXY_CLIENT_TRANSFER_CLOSE_); transferNextChannel.writeAndFlush(closeTransferNettyProxyMsg); - channelHandlerContext.close(); + channel.close(); nextChannel.close(); transferNextChannel.close(); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced.java index 615c2fe..9190d8f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced.java @@ -33,8 +33,9 @@ public class ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 将返回数据下发客户端 - Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channelHandlerContext); + Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); if(ObjectUtils.isNotEmpty(transferNextChannel)) { log.info("目标客户端返回数据通过服务端下发到原始通道"); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerProxyTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerProxyTransferTypeAdvanced.java index 025ffd8..577f64c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerProxyTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerProxyTransferTypeAdvanced.java @@ -1,6 +1,7 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.http.advanced; +import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; @@ -37,6 +38,7 @@ public class ServerHandleHttpReportClientProxyServerProxyTransferTypeAdvanced */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 创建链接、发送数据 String targetPortString = nettyProxyMsg.getTargetPortString(); String targetIpString = nettyProxyMsg.getTargetIpString(); @@ -56,7 +58,7 @@ public class ServerHandleHttpReportClientProxyServerProxyTransferTypeAdvanced nettyHttpClientProxyServerTransfer.setData(data); NettyHttpClientProxyServerRealSocket - .buildRealServer(nettyHttpClientProxyServerTransfer, channelHandlerContext,new String(visitorId)); + .buildRealServer(nettyHttpClientProxyServerTransfer, channel,new String(visitorId)); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferCloseTypeAdvanced.java index 1292cf1..7525852 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferCloseTypeAdvanced.java @@ -31,10 +31,11 @@ public class ServerHandleHttpReportClientProxyServerTransferCloseTypeAdvanced ex */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 关闭传输通信通道 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); nextChannel.close(); - channelHandlerContext.close(); + channel.close(); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferChannelInitSuccessfulTypeAdvanced.java index e9be095..6d9f943 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferChannelInitSuccessfulTypeAdvanced.java @@ -31,6 +31,7 @@ public class ServerHandleHttpReportServerProxyClientTransferChannelInitSuccessfu @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 数据下发 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); @@ -41,11 +42,11 @@ public class ServerHandleHttpReportServerProxyClientTransferChannelInitSuccessfu // next Channel nextChannel = NettyTransferChannelContext.getVisitor(msgVisitorId); - ChannelAttributeKeyUtils.buildNextChannel(nextChannel, channelHandlerContext); - ChannelAttributeKeyUtils.buildNextChannel(channelHandlerContext, nextChannel); + ChannelAttributeKeyUtils.buildNextChannel(nextChannel, channel); + ChannelAttributeKeyUtils.buildNextChannel(channel, nextChannel); - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext, clientId); - ChannelAttributeKeyUtils.buildVisitorId(channelHandlerContext, msgVisitorId); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); + ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId); NettyByteBuf nettyByteBufData = ChannelAttributeKeyUtils.getNettyByteBufData(nextChannel); @@ -60,7 +61,7 @@ public class ServerHandleHttpReportServerProxyClientTransferChannelInitSuccessfu clientConnectTagetNettyProxyMsg.setType(ProxyMessageType.HTTP_DISTRIBUTE_SERVER_PROXY_CLIENT_TRANSFER_REQUEST_); - channelHandlerContext.writeAndFlush(clientConnectTagetNettyProxyMsg); + channel.writeAndFlush(clientConnectTagetNettyProxyMsg); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferCloseTypeAdvanced.java index b7466cc..9efbf9c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferCloseTypeAdvanced.java @@ -27,10 +27,11 @@ public class ServerHandleHttpReportServerProxyClientTransferCloseTypeAdvanced ex */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 关闭传输通信通道 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); nextChannel.close(); - channelHandlerContext.close(); + channel.close(); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced.java index fc7ae7d..d1b2b4c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced.java @@ -30,12 +30,13 @@ public class ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced */ @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 将返回数据 - Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channelHandlerContext); + Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(channel); if(ObjectUtils.isNotEmpty(nextChannel)) { log.info("目标客户端返回数据通过服务端下发到原始通道"); - ByteBuf buf = channelHandlerContext.config().getAllocator().buffer(nettyProxyMsg.getData().length); + ByteBuf buf = channel.config().getAllocator().buffer(nettyProxyMsg.getData().length); buf.writeBytes(nettyProxyMsg.getData()); nextChannel.writeAndFlush(buf); }else { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferTypeAdvanced.java index e3d8750..6d0d944 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferTypeAdvanced.java @@ -32,6 +32,7 @@ public class ServerHandleHttpReportServerProxyClientTransferTypeAdvanced @Override public void doHandler(ChannelHandlerContext channelHandlerContext, NettyProxyMsg nettyProxyMsg) { + Channel channel = channelHandlerContext.channel(); // 创建链接、发送数据 String targetPortString = nettyProxyMsg.getTargetPortString(); String targetIpString = nettyProxyMsg.getTargetIpString(); @@ -39,13 +40,13 @@ public class ServerHandleHttpReportServerProxyClientTransferTypeAdvanced byte[] visitorId = nettyProxyMsg.getVisitorId(); byte[] clientId = nettyProxyMsg.getClientId(); String msgVisitorId = new String(visitorId); - ChannelAttributeKeyUtils.buildClientId(channelHandlerContext, clientId); - ChannelAttributeKeyUtils.buildVisitorId(channelHandlerContext, msgVisitorId); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); + ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId); - NettyTransferChannelContext.pushVisitor(channelHandlerContext, msgVisitorId); + NettyTransferChannelContext.pushVisitor(channel, msgVisitorId); NettyByteBuf nettyByteBuf = new NettyByteBuf(); nettyByteBuf.setData(data); - ChannelAttributeKeyUtils.buildNettyByteBufData(channelHandlerContext, nettyByteBuf); + ChannelAttributeKeyUtils.buildNettyByteBufData(channel, nettyByteBuf); // 获取客户端心跳通道 Channel loadBalance = ChannelContext.getLoadBalance(clientId);