From 9c5000f995db4d38947a5870a990367c775aafd8 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Sun, 6 Apr 2025 22:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=20bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/handler/NettyHttpClientProxyClientRealHandler.java | 4 +--- ...tpReportClientProxyClientConnectTransferTypeAdvanced.java | 2 +- ...pReportClientProxyClientTransferResponseTypeAdvanced.java | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/handler/NettyHttpClientProxyClientRealHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/handler/NettyHttpClientProxyClientRealHandler.java index 02a512b..4b585c2 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/handler/NettyHttpClientProxyClientRealHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/handler/NettyHttpClientProxyClientRealHandler.java @@ -22,9 +22,8 @@ public class NettyHttpClientProxyClientRealHandler extends SimpleChannelInboundH byte[] bytes = nettyByteBuf.getData(); log.debug("bytes.length:{}",bytes.length); - log.debug("接收客户端真实服务数据:{}", new String(bytes)); + log.debug("客户端代理客户端,接收目标客户端真实服务数据:{}", new String(bytes)); String visitorId = ChannelAttributeKeyUtils.getVisitorId(ctx.channel()); - Integer visitorPort = ChannelAttributeKeyUtils.getVisitorPort(ctx.channel()); String clientId = ChannelAttributeKeyUtils.getClientId(ctx.channel()); // 访客通信通道 上报服务端代理完成 Channel nextChannel = ChannelAttributeKeyUtils.getNextChannel(ctx.channel()); @@ -32,7 +31,6 @@ public class NettyHttpClientProxyClientRealHandler extends SimpleChannelInboundH returnMessage.setType(TcpMessageType.HTTP_REPORT_CLIENT_PROXY_CLIENT_TRANSFER_RESPONSE_); returnMessage.setVisitorId(visitorId); returnMessage.setClientId(clientId); - returnMessage.setVisitorPort(visitorPort); returnMessage.setData(bytes); nextChannel.writeAndFlush(returnMessage); 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 b355db1..d0ae47e 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 @@ -61,7 +61,7 @@ public class ServerHandleHttpReportClientProxyClientConnectTransferTypeAdvanced // 让客户端主动创建一个数据传输通道 loadBalance.writeAndFlush(clientConnectTagetNettyProxyMsg); }else { - log.error("can not find the client:【】 channel",clientId); + log.error("can not find target client:【】 channel",clientId); } } 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 408c38b..b384bf0 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 @@ -38,9 +38,10 @@ public class ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced // 将返回数据下发客户端 Channel transferNextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(transferChannel); - if(ObjectUtils.isNotEmpty(nettyProxyMsg)) { - + if(ObjectUtils.isNotEmpty(transferNextChannel)) { transferNextChannel.writeAndFlush(nettyProxyMsg); + }else { + log.error("无法将数据下发给原始客户端"); } }