From bebb67395e293be526c801e13b76cb0150418b7b Mon Sep 17 00:00:00 2001 From: wujiawei <1207537021@qq.com> Date: Sun, 15 Jun 2025 18:08:19 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=9C=8D=E5=8A=A1=E7=AB=AF=E6=B8=97?= =?UTF-8?q?=E9=80=8F=E5=AE=A2=E6=88=B7=E7=AB=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...leTcpClientConnectSuccessTypeAdvanced.java | 2 +- ...leUdpClientConnectSuccessTypeAdvanced.java | 2 +- ...erverPermeateClientMappingApplication.java | 5 ++-- ...rPermeateClientMappingApplicationImpl.java | 25 ++++++++++--------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpClientConnectSuccessTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpClientConnectSuccessTypeAdvanced.java index a9833bb8..c014fb94 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpClientConnectSuccessTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpClientConnectSuccessTypeAdvanced.java @@ -130,7 +130,7 @@ public class ServerHandleTcpClientConnectSuccessTypeAdvanced extends AbstractHan // 开始开启客户端：【{}】,端口映射 log.info("Start opening client: [{}], port mapping", clientId); // 创建访问者（内网穿透连接创建） - lazyServerPermeateClientMappingApplication.createVisitor(clientId); + lazyServerPermeateClientMappingApplication.createVisitor(serverId, clientId); // 结束开启客户端：【{}】,端口映射 log.info("End opening client: [{}], port mapping", clientId); }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 5b0f1832..912e3da3 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 @@ -119,7 +119,7 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan // 开始开启客户端：【{}】,端口映射 log.info("Start opening client: [{}], port mapping", clientId); // 创建访问者（内网穿透连接创建） - lazyServerPermeateClientMappingApplication.createVisitor(clientId); + lazyServerPermeateClientMappingApplication.createVisitor(serverId, clientId); // 结束开启客户端：【{}】,端口映射 log.info("End opening client: [{}], port mapping", clientId); }else { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyServerPermeateClientMappingApplication.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyServerPermeateClientMappingApplication.java index d12fcd3e..b5ca4699 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyServerPermeateClientMappingApplication.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/LazyServerPermeateClientMappingApplication.java @@ -101,7 +101,8 @@ public interface LazyServerPermeateClientMappingApplication { /** * 创建客户端的访问者 * - * @param clientId 客户端ID + * @param namespace + * @param clientId 客户端ID */ - Result createVisitor(String clientId); + Result createVisitor(String namespace,String clientId); } \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyServerPermeateClientMappingApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyServerPermeateClientMappingApplicationImpl.java index b509d0f9..6b8d8f23 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyServerPermeateClientMappingApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyServerPermeateClientMappingApplicationImpl.java @@ -58,14 +58,14 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE.toInternalNetworkPenetrationMapping(lazyServerPermeateClientMappingStoryCommand); lazyNettyServerPermeateClientMapping.setIsDeleted(false); - String clientId = lazyNettyServerPermeateClientMapping.getClientId(); + String targetClientId = lazyNettyServerPermeateClientMapping.getTargetClientId(); String clientTargetIp = lazyNettyServerPermeateClientMapping.getClientTargetIp(); Integer clientTargetPort = lazyNettyServerPermeateClientMapping.getClientTargetPort(); Integer visitorPort = lazyNettyServerPermeateClientMapping.getVisitorPort(); // 创建访客通道池 - this.changeSocket(lazyNettyServerPermeateClientMapping.getTargetNamespace(), clientId, clientTargetIp, clientTargetPort, visitorPort); + this.changeSocket(lazyNettyServerPermeateClientMapping.getTargetNamespace(), targetClientId, clientTargetIp, clientTargetPort, visitorPort); return lazyNettyServerPermeateClientMappingRepository.story(lazyNettyServerPermeateClientMapping); } @@ -93,12 +93,12 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe Result> batchStory = lazyNettyServerPermeateClientMappingRepository.batchStory(lazyNettyServerPermeateClientMappingList); // 开启端口 for (LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping : lazyNettyServerPermeateClientMappingList) { - String clientId = lazyNettyServerPermeateClientMapping.getClientId(); + String targetClientId = lazyNettyServerPermeateClientMapping.getTargetClientId(); String clientTargetIp = lazyNettyServerPermeateClientMapping.getClientTargetIp(); Integer clientTargetPort = lazyNettyServerPermeateClientMapping.getClientTargetPort(); Integer visitorPort = lazyNettyServerPermeateClientMapping.getVisitorPort(); String namespace = lazyNettyServerPermeateClientMapping.getTargetNamespace(); - this.changeSocket(namespace, clientId, clientTargetIp, clientTargetPort, visitorPort); + this.changeSocket(namespace, targetClientId, clientTargetIp, clientTargetPort, visitorPort); } return batchStory; } @@ -119,12 +119,12 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe // 删除绑定数据 Result story = lazyNettyServerPermeateClientMappingRepository.story(lazyNettyServerPermeateClientMapping); - String clientId = lazyNettyServerPermeateClientMapping.getClientId(); + String targetClientId = lazyNettyServerPermeateClientMapping.getTargetClientId(); String clientTargetIp = lazyNettyServerPermeateClientMapping.getClientTargetIp(); Integer clientTargetPort = lazyNettyServerPermeateClientMapping.getClientTargetPort(); Integer visitorPort = lazyNettyServerPermeateClientMapping.getVisitorPort(); - this.changeSocket(lazyNettyServerPermeateClientMapping.getTargetNamespace(), clientId, clientTargetIp, clientTargetPort, visitorPort); + this.changeSocket(lazyNettyServerPermeateClientMapping.getTargetNamespace(), targetClientId, clientTargetIp, clientTargetPort, visitorPort); return story; } @@ -233,23 +233,25 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe Result remove = lazyNettyServerPermeateClientMappingRepository.remove(lazyNettyServerPermeateClientMapping); // 删除端口映射 - String clientId = lazyServerPermeateClientMappingRemoveCommand.getClientId(); + String targetClientId = lazyServerPermeateClientMappingRemoveCommand.getTargetClientId(); Integer visitorPort = lazyServerPermeateClientMappingRemoveCommand.getVisitorPort(); - this.changeCloseSocket(lazyNettyServerPermeateClientMapping.getTargetNamespace(), clientId, visitorPort); + this.changeCloseSocket(lazyNettyServerPermeateClientMapping.getTargetNamespace(), targetClientId, visitorPort); return remove; } /** * 创建客户端的访问者 * - * @param clientId 客户端ID + * @param namespace + * @param clientId 客户端ID */ @Override - public Result createVisitor(String clientId) { + public Result createVisitor(String namespace, String clientId) { // 查询代理信息 LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = new LazyNettyServerPermeateClientMapping(); lazyNettyServerPermeateClientMapping.setIsDeleted(false); - lazyNettyServerPermeateClientMapping.setClientId(clientId); + lazyNettyServerPermeateClientMapping.setTargetClientId(clientId); + lazyNettyServerPermeateClientMapping.setTargetNamespace(namespace); return lazyNettyServerPermeateClientMappingRepository .findList(lazyNettyServerPermeateClientMapping) .applyOther(internalNetworkPenetrationMappings -> { @@ -257,7 +259,6 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe Integer visitorPort = networkPenetrationMapping.getVisitorPort(); String clientTargetIp = networkPenetrationMapping.getClientTargetIp(); Integer clientTargetPort = networkPenetrationMapping.getClientTargetPort(); - String namespace = networkPenetrationMapping.getTargetNamespace(); this.createVisitor(namespace, clientId, clientTargetIp, clientTargetPort, visitorPort); } return ResultFactory.successOf();