From 4f58a675d074920e2139e7eb63fba81c9fd34f5c Mon Sep 17 00:00:00 2001
From: wujiawei <1207537021@qq.com>
Date: Sun, 22 Sep 2024 15:49:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=E3=80=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E8=AE=A1=E8=B4=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/NettyClientPermeateClientVisitorHandler.java    | 2 ++
 .../handler/NettyClientPermeateServerVisitorHandler.java    | 2 ++
 .../NettyClientPermeateServerVisitorTransferSocket.java     | 6 +-----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientVisitorHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientVisitorHandler.java
index a95fc5a..38fdfb1 100644
--- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientVisitorHandler.java
+++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateClientVisitorHandler.java
@@ -75,9 +75,11 @@ public class NettyClientPermeateClientVisitorHandler extends SimpleChannelInboun
 
         // 使用访客的通信通道
         Integer visitorPort = internalNetworkClientPermeateClientVisitor.getVisitorPort();
+        String clientId = internalNetworkClientPermeateClientVisitor.getNettyClientProperties().getClientId();
         NettyProxyMsg nettyProxyMsg = new NettyProxyMsg();
         nettyProxyMsg.setType(MessageType.REPORT_CLIENT_TRANSFER_CLIENT_REQUEST);
         nettyProxyMsg.setVisitorId(visitorId);
+        nettyProxyMsg.setClientId(clientId);
         nettyProxyMsg.setVisitorPort(visitorPort);
         nettyProxyMsg.setData(bytes);
         nextChannel.writeAndFlush(nettyProxyMsg);
diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateServerVisitorHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateServerVisitorHandler.java
index e79c238..652f85e 100644
--- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateServerVisitorHandler.java
+++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/handler/NettyClientPermeateServerVisitorHandler.java
@@ -74,9 +74,11 @@ public class NettyClientPermeateServerVisitorHandler extends SimpleChannelInboun
 
         // 使用访客的通信通道
         Integer visitorPort = internalNetworkPermeateServerVisitor.getVisitorPort();
+        String clientId = internalNetworkPermeateServerVisitor.getNettyClientProperties().getClientId();
         NettyProxyMsg nettyProxyMsg = new NettyProxyMsg();
         nettyProxyMsg.setType(MessageType.REPORT_CLIENT_TRANSFER);
         nettyProxyMsg.setVisitorId(visitorId);
+        nettyProxyMsg.setClientId(clientId);
         nettyProxyMsg.setVisitorPort(visitorPort);
         nettyProxyMsg.setData(bytes);
         nextChannel.writeAndFlush(nettyProxyMsg);
diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorTransferSocket.java
index 3469edf..0180e99 100644
--- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorTransferSocket.java
+++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/socket/NettyClientPermeateServerVisitorTransferSocket.java
@@ -101,11 +101,7 @@ public class NettyClientPermeateServerVisitorTransferSocket {
 
 
             } else {
-                log.info("每隔2s重连....");
-                // 离线
-                channel.eventLoop().schedule(() -> {
-                    newTransferConnect2Server(internalNetworkPermeateServerVisitor);
-                }, 2, TimeUnit.SECONDS);
+                log.info("客户端渗透服务端通信通道中断....");
             }
         });
     }