From 3163987ef725d7720ce7260346407c7452a5bfc4 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Wed, 11 Jun 2025 16:19:11 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=20=E6=B7=BB=E5=8A=A0namespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...NettyServerPropertiesQueryListCommand.java | 4 +- ...yNettyServerPropertiesQueryOneCommand.java | 4 +- ...azyNettyServerPropertiesRemoveCommand.java | 4 +- ...LazyNettyServerPropertiesStoryCommand.java | 4 +- ...azyNettyServerPropertiesUpdateCommand.java | 4 +- .../dto/LazyNettyServerPropertiesDTO.java | 4 +- ...yNettyServerPropertiesApplicationImpl.java | 6 +- .../client/config/NettyClientProperties.java | 2 +- .../NettyClientSocketApplicationListener.java | 6 +- .../properties/LazyNettyServerProperties.java | 2 +- .../entity/LazyNettyServerPropertiesDO.java | 6 +- ...zyNettyServerPropertiesRepositoryImpl.java | 6 +- .../NettyClientPermeateClientVisitor.java | 4 + ...tHandleTcpClientChannelActiveAdvanced.java | 8 +- ...eClientPermeateClientInitTypeAdvanced.java | 5 +- .../tcp/handler/NettyTcpClientHandler.java | 8 +- ...yTcpClientPermeateClientVisitorSocket.java | 18 +++ ...ntPermeateClientVisitorTransferSocket.java | 2 + .../tcp/socket/NettyTcpClientSocket.java | 14 +- ...tHandleUdpClientChannelActiveAdvanced.java | 4 +- .../udp/handler/NettyUdpClientHandler.java | 2 + ...ntPermeateClientVisitorTransferSocket.java | 2 + .../udp/socket/NettyUdpClientSocket.java | 22 +-- ...ndleHttpClientProxyClientTypeAdvanced.java | 4 +- ...ndleHttpClientProxyServerTypeAdvanced.java | 4 +- ...NettyHttpClientProxyClientProxySocket.java | 3 +- ...ClientOtherConnectionTransferAdvanced.java | 6 +- ...ketClientProxyClientStartTypeAdvanced.java | 4 +- ...ketClientProxyServerStartTypeAdvanced.java | 4 +- ...ProxyClientConnectionInitTypeAdvanced.java | 7 +- ...lientProxyClientVisitorTransferSocket.java | 2 + .../client/rpc/StagingNoticeApiRpc.java | 1 + .../{index-Dx8CuNMY.js => index-CtIDExbE.js} | 2 +- .../netty-client-local-ui/v1/index.html | 2 +- .../heartbeat/common/ChannelContext.java | 136 +++++++++++------- .../InternalNetworkPenetrationRealClient.java | 4 + .../heartbeat/common/NettyClientChannel.java | 4 +- .../heartbeat/common/NettyServerContext.java | 19 +-- .../advanced/payload/NettyProxyMsg.java | 36 ++++- .../common/constant/UdpMessageType.java | 20 +-- .../common/decoder/NettyProxyMsgDecoder.java | 8 ++ .../common/encoder/NettyProxyMsgEncoder.java | 19 +++ ...ttpClientProxyClientProxyTypeAdvanced.java | 4 +- ...olHandleChannelLocalProxyTypeAdvanced.java | 4 +- ...colHandleSocketLocalProxyTypeAdvanced.java | 4 +- .../handler/NettyHttpProxyHandler.java | 4 +- .../NettySocks5CommandRequestHandler.java | 3 +- .../protocol/route/ClientProxyRoute.java | 4 + .../heartbeat/protocol/route/ProxyRoute.java | 3 + .../protocol/route/ServerProxyRoute.java | 5 + .../LazyNettyClusterNodeRepositoryImpl.java | 2 +- ...leTcpClientConnectSuccessTypeAdvanced.java | 7 +- ...annelConnectionSuccessfulTypeAdvanced.java | 13 +- ...entTransferClientResponseTypeAdvanced.java | 2 +- ...eportClientTransferClientTypeAdvanced.java | 2 +- ...HandleTcpReportDisconnectTypeAdvanced.java | 8 +- ...dleTcpReportStagingClosedTypeAdvanced.java | 7 +- ...dleTcpReportStagingOpenedTypeAdvanced.java | 6 +- ...TcpServerPermeateClientVisitorHandler.java | 4 +- ...yTcpServerPermeateClientVisitorSocket.java | 18 +++ ...leUdpClientConnectSuccessTypeAdvanced.java | 6 +- ...annelConnectionSuccessfulTypeAdvanced.java | 13 +- ...entTransferClientResponseTypeAdvanced.java | 2 +- ...eportClientTransferClientTypeAdvanced.java | 2 +- ...HandleUdpReportDisconnectTypeAdvanced.java | 9 +- ...dleUdpReportStagingClosedTypeAdvanced.java | 10 +- ...dleUdpReportStagingOpenedTypeAdvanced.java | 7 +- ...UdpServerPermeateClientVisitorHandler.java | 4 +- ...yUdpServerPermeateClientVisitorSocket.java | 8 ++ ...roxyClientTransferRequestTypeAdvanced.java | 9 +- ...oxyClientTransferResponseTypeAdvanced.java | 4 +- ...roxyServerTransferRequestTypeAdvanced.java | 6 +- ...roxyClientTransferRequestTypeAdvanced.java | 4 +- ...ServerProxyClientTransferTypeAdvanced.java | 27 ++-- ...roxyClientConnectTransferTypeAdvanced.java | 22 +-- ...roxyServerConnectTransferTypeAdvanced.java | 5 +- ...ksReportServerProxyClientTypeAdvanced.java | 11 +- ...yNettyClientBlacklistQueryListCommand.java | 6 +- ...zyNettyClientBlacklistQueryOneCommand.java | 6 +- ...LazyNettyClientBlacklistRemoveCommand.java | 6 +- .../LazyNettyClientBlacklistStoryCommand.java | 9 +- ...LazyNettyClientBlacklistUpdateCommand.java | 10 +- ...PermeateClientMappingQueryListCommand.java | 7 +- ...tPermeateClientMappingQueryOneCommand.java | 7 +- ...entPermeateClientMappingRemoveCommand.java | 7 +- ...ientPermeateClientMappingStoryCommand.java | 7 +- ...entPermeateClientMappingUpdateCommand.java | 7 +- ...PermeateServerMappingQueryListCommand.java | 7 +- ...tPermeateServerMappingQueryOneCommand.java | 7 +- ...entPermeateServerMappingRemoveCommand.java | 7 +- ...ientPermeateServerMappingStoryCommand.java | 7 +- ...entPermeateServerMappingUpdateCommand.java | 7 +- .../state/LazyNettyClientLoginCommand.java | 6 +- .../state/LazyNettyClientMessageCommand.java | 6 +- .../LazyNettyClientStateQueryListCommand.java | 9 +- .../LazyNettyClientStateQueryOneCommand.java | 9 +- .../LazyNettyClientStateRemoveCommand.java | 9 +- .../LazyNettyClientStateStoryCommand.java | 10 +- .../LazyNettyClientStateUpdateCommand.java | 9 +- ...ettyClientStateRecordQueryListCommand.java | 7 +- ...NettyClientStateRecordQueryOneCommand.java | 7 +- ...zyNettyClientStateRecordRemoveCommand.java | 7 +- ...azyNettyClientStateRecordStoryCommand.java | 8 +- ...zyNettyClientStateRecordUpdateCommand.java | 7 +- ...PermeateClientMappingQueryListCommand.java | 9 +- ...rPermeateClientMappingQueryOneCommand.java | 8 +- ...verPermeateClientMappingRemoveCommand.java | 8 +- ...rverPermeateClientMappingStoryCommand.java | 9 +- ...verPermeateClientMappingUpdateCommand.java | 8 +- ...azyNettyServerVisitorQueryListCommand.java | 6 +- ...LazyNettyServerVisitorQueryOneCommand.java | 6 +- .../LazyNettyServerVisitorRemoveCommand.java | 6 +- .../LazyNettyServerVisitorStoryCommand.java | 6 +- .../LazyNettyServerVisitorUpdateCommand.java | 6 +- ...PermeateServerMappingQueryListCommand.java | 7 +- ...rPermeateServerMappingQueryOneCommand.java | 7 +- ...verPermeateServerMappingRemoveCommand.java | 7 +- ...rverPermeateServerMappingStoryCommand.java | 7 +- ...verPermeateServerMappingUpdateCommand.java | 7 +- .../flow/LazyProxyFlowQueryListCommand.java | 7 +- .../flow/LazyProxyFlowQueryOneCommand.java | 7 +- .../flow/LazyProxyFlowRemoveCommand.java | 8 +- .../proxy/flow/LazyProxyFlowStoryCommand.java | 7 +- .../flow/LazyProxyFlowUpdateCommand.java | 8 +- .../LazyProxyPerDayFlowQueryListCommand.java | 7 +- .../LazyProxyPerDayFlowQueryOneCommand.java | 8 +- .../LazyProxyPerDayFlowRemoveCommand.java | 7 +- .../flow/LazyProxyPerDayFlowStoryCommand.java | 7 +- .../LazyProxyPerDayFlowUpdateCommand.java | 7 +- .../LazyVisitorPortFlowQueryListCommand.java | 9 +- .../LazyVisitorPortFlowQueryOneCommand.java | 6 +- .../LazyVisitorPortFlowRemoveCommand.java | 9 +- .../flow/LazyVisitorPortFlowStoryCommand.java | 9 +- .../LazyVisitorPortFlowUpdateCommand.java | 9 +- ...VisitorPortPerDayFlowQueryListCommand.java | 9 +- ...yVisitorPortPerDayFlowQueryOneCommand.java | 9 +- ...azyVisitorPortPerDayFlowRemoveCommand.java | 9 +- ...LazyVisitorPortPerDayFlowStoryCommand.java | 9 +- ...azyVisitorPortPerDayFlowUpdateCommand.java | 9 +- .../LazyClientPermeateClientMappingDTO.java | 7 +- .../LazyClientPermeateServerMappingDTO.java | 7 +- .../dto/LazyClientProxyFlowDTO.java | 6 +- .../dto/LazyNettyClientBlacklistDTO.java | 6 +- .../dto/LazyNettyClientStateDTO.java | 6 +- .../LazyNettyClientStateGroupByClientDTO.java | 6 +- .../dto/LazyNettyClientStateRecordDTO.java | 7 +- .../LazyNettyServerPermeatePortPoolDTO.java | 7 +- .../dto/LazyNettyServerVisitorDTO.java | 6 +- .../application/dto/LazyProxyFlowDTO.java | 6 +- .../dto/LazyProxyPerDayFlowDTO.java | 7 +- .../LazyServerPermeateClientMappingDTO.java | 10 +- .../LazyServerPermeateServerMappingDTO.java | 7 +- .../application/dto/LazyVisitorFlowDTO.java | 6 +- .../dto/LazyVisitorPortFlowDTO.java | 9 +- .../dto/LazyVisitorPortPerDayFlowDTO.java | 9 +- ...tPermeateClientMappingApplicationImpl.java | 7 +- ...tPermeateServerMappingApplicationImpl.java | 13 +- .../LazyClientStatsChangeApplicationImpl.java | 22 +-- ...zyNettyClientBlacklistApplicationImpl.java | 21 +-- .../LazyNettyClientStateApplicationImpl.java | 29 ++-- ...ettyServerVirtualRouteApplicationImpl.java | 26 ++-- ...LazyNettyServerVisitorApplicationImpl.java | 14 +- .../impl/LazyProxyFlowApplicationImpl.java | 14 +- ...rPermeateClientMappingApplicationImpl.java | 43 +++--- ...rPermeateServerMappingApplicationImpl.java | 6 +- .../LazyVisitorPortFlowApplicationImpl.java | 28 ++-- ...yVisitorPortPerDayFlowApplicationImpl.java | 22 +-- .../controller/LazyChannelController.java | 23 +-- .../blacklist/LazyNettyClientBlacklist.java | 6 +- .../LazyNettyClientPermeateClientMapping.java | 4 +- .../LazyNettyClientPermeateServerMapping.java | 8 +- .../client/state/LazyNettyClientState.java | 6 +- .../LazyNettyClientStateGroupByClient.java | 6 +- .../record/LazyNettyClientStateRecord.java | 7 +- .../LazyNettyServerPermeateClientMapping.java | 6 +- .../port/pool/LazyNettyServerVisitor.java | 6 +- .../LazyNettyServerPermeateServerMapping.java | 7 +- .../model/lazy/proxy/flow/LazyProxyFlow.java | 7 +- .../per/day/flow/LazyProxyPerDayFlow.java | 7 +- .../lazy/visitor/LazyClientPerDayFlow.java | 9 +- .../visitor/flow/LazyVisitorPortFlow.java | 9 +- .../flow/LazyVisitorPortFlowRepository.java | 4 +- .../day/flow/LazyVisitorPortPerDayFlow.java | 9 +- ...ClientPermeateClientMappingConverter.java} | 4 +- ...ClientPermeateServerMappingConverter.java} | 4 +- ...LazyNettyPenetrationMappingConverter.java} | 4 +- ...ServerPermeateServerMappingConverter.java} | 6 +- .../entity/LazyNettyClientBlacklistDO.java | 8 +- ...azyNettyClientPermeateClientMappingDO.java | 9 +- ...azyNettyClientPermeateServerMappingDO.java | 9 +- .../entity/LazyNettyClientStateDO.java | 8 +- .../entity/LazyNettyClientStateRecordDO.java | 9 +- .../entity/LazyNettyClientVirtualRouteDO.java | 8 +- ...azyNettyServerPermeateClientMappingDO.java | 8 +- .../LazyNettyServerPermeatePortPoolDO.java | 9 +- ...azyNettyServerPermeateServerMappingDO.java | 10 +- .../entity/LazyNettyServerRouteDO.java | 7 + .../entity/LazyNettyServerVirtualRouteDO.java | 6 + .../entity/LazyProxyFlowDO.java | 9 +- .../entity/LazyProxyPerDayFlowDO.java | 9 +- .../entity/LazyVisitorPortFlowDO.java | 8 +- .../entity/LazyVisitorPortPerDayFlowDO.java | 8 +- ...ntPermeateClientMappingRepositoryImpl.java | 16 +-- ...ntPermeateServerMappingRepositoryImpl.java | 16 +-- ...erPermeateClientMappingRepositoryImpl.java | 16 +-- ...erPermeateServerMappingRepositoryImpl.java | 16 +-- .../LazyProxyFlowRepositoryImpl.java | 2 +- .../LazyVisitorPortFlowRepositoryImpl.java | 6 +- 208 files changed, 1011 insertions(+), 828 deletions(-) rename wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/assets/{index-Dx8CuNMY.js => index-CtIDExbE.js} (99%) rename wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/{LazyInternalNetworkClientPermeateClientMappingConverter.java => LazyNettyClientPermeateClientMappingConverter.java} (89%) rename wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/{LazyInternalNetworkClientPermeateServerMappingConverter.java => LazyNettyClientPermeateServerMappingConverter.java} (89%) rename wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/{LazyInternalNetworkPenetrationMappingConverter.java => LazyNettyPenetrationMappingConverter.java} (89%) rename wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/{LazyInternalNetworkServerPermeateServerMappingConverter.java => LazyNettyServerPermeateServerMappingConverter.java} (88%) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryListCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryListCommand.java index a1d15d03..29442545 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryListCommand.java @@ -22,8 +22,8 @@ public class LazyNettyServerPropertiesQueryListCommand { /** * 命名空间 */ - @Schema(description ="命名空间",name ="serverId",example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + private String namespace; /** * * 客户身份ID diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryOneCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryOneCommand.java index 504dc0fd..ce923669 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesQueryOneCommand.java @@ -26,8 +26,8 @@ public class LazyNettyServerPropertiesQueryOneCommand { /** * 命名空间 */ - @Schema(description ="命名空间",name ="serverId",example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + private String namespace; /** * * 客户身份ID diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesRemoveCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesRemoveCommand.java index 29e5462b..4a6c29be 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesRemoveCommand.java @@ -26,8 +26,8 @@ public class LazyNettyServerPropertiesRemoveCommand { /** * 命名空间 */ - @Schema(description ="命名空间",name ="serverId",example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + private String namespace; /** * * 客户身份ID diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesStoryCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesStoryCommand.java index 0208e2cd..b8ec0d2b 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesStoryCommand.java @@ -26,8 +26,8 @@ public class LazyNettyServerPropertiesStoryCommand { /** * 命名空间 */ - @Schema(description ="命名空间",name ="serverId",example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + private String namespace; /** * * 客户身份ID diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesUpdateCommand.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesUpdateCommand.java index b6f44220..b495c684 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/command/lazy/netty/server/properties/LazyNettyServerPropertiesUpdateCommand.java @@ -25,8 +25,8 @@ public class LazyNettyServerPropertiesUpdateCommand { /** * 命名空间 */ - @Schema(description ="命名空间",name ="serverId",example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/dto/LazyNettyServerPropertiesDTO.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/dto/LazyNettyServerPropertiesDTO.java index 2c3868f6..ecdd6de8 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/dto/LazyNettyServerPropertiesDTO.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/dto/LazyNettyServerPropertiesDTO.java @@ -23,8 +23,8 @@ public class LazyNettyServerPropertiesDTO { /** * 命名空间 */ - @Schema(description = "命名空间", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * * 客户身份ID diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/impl/LazyNettyServerPropertiesApplicationImpl.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/impl/LazyNettyServerPropertiesApplicationImpl.java index ea73d826..96361a34 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/impl/LazyNettyServerPropertiesApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/application/impl/LazyNettyServerPropertiesApplicationImpl.java @@ -185,7 +185,7 @@ public class LazyNettyServerPropertiesApplicationImpl implements LazyNettyServer public void starterOneClientSocket(LazyNettyServerProperties lazyNettyServerProperties) { boolean enabled = nettyClientProperties.isEnabled(); if (enabled) { - String serverId = lazyNettyServerProperties.getServerId(); + String namespace = lazyNettyServerProperties.getNamespace(); String inetHost = lazyNettyServerProperties.getInetHost(); Integer inetPort = lazyNettyServerProperties.getInetPort(); String clientId = lazyNettyServerProperties.getClientId(); @@ -196,12 +196,12 @@ public class LazyNettyServerPropertiesApplicationImpl implements LazyNettyServer if (ProtocolType.TCP.equals(protocolType)) { nettyClientSocket = new NettyTcpClientSocket(inetHost, inetPort, clientId, - serverId, appKey, appSecret, + namespace, appKey, appSecret, clientChangeEvent, handleChannelTypeAdvancedList); } else if (ProtocolType.UDP.equals(protocolType)) { nettyClientSocket = new NettyUdpClientSocket(inetHost, inetPort, clientId, - serverId, appKey, appSecret, + namespace, appKey, appSecret, clientChangeEvent, handleChannelTypeAdvancedList); } else { nettyClientSocket = null; diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/NettyClientProperties.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/NettyClientProperties.java index f1b70e33..3ec4665b 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/NettyClientProperties.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/NettyClientProperties.java @@ -18,7 +18,7 @@ public class NettyClientProperties { /** * 命名空间 */ - private String serverId= NormalUsedString.DEFAULT; + private String namespace= NormalUsedString.DEFAULT; /** * 服务端地址 如：127.0.0.1 */ diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/context/NettyClientSocketApplicationListener.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/context/NettyClientSocketApplicationListener.java index 4bc5f86d..d6ff8926 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/context/NettyClientSocketApplicationListener.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/context/NettyClientSocketApplicationListener.java @@ -46,14 +46,14 @@ public class NettyClientSocketApplicationListener implements ApplicationListener String appKey = nettyClientProperties.getAppKey(); String appSecret = nettyClientProperties.getAppSecret(); ProtocolType protocolType = nettyClientProperties.getProtocolType(); - String serverId = nettyClientProperties.getServerId(); + String namespace = nettyClientProperties.getNamespace(); if (Objects.isNull(clientId) || Objects.isNull(inetHost)) { log.warn("配置信息为空，请通过页面添加配置信息:{}", nettyClientProperties); return; } LazyNettyServerPropertiesDO lazyNettyServerPropertiesDO = new LazyNettyServerPropertiesDO(); - lazyNettyServerPropertiesDO.setServerId(serverId); + lazyNettyServerPropertiesDO.setNamespace(namespace); lazyNettyServerPropertiesDO.setClientId(clientId); lazyNettyServerPropertiesDO.setInetHost(inetHost); lazyNettyServerPropertiesDO.setInetPort(inetPort); @@ -66,7 +66,7 @@ public class NettyClientSocketApplicationListener implements ApplicationListener // 根据服务端端口、port 唯一性验证 boolean exists = lazyLambdaStream.exists(LazyWrappers.lambdaWrapper() - .eq(LazyNettyServerPropertiesDO::getServerId, serverId) + .eq(LazyNettyServerPropertiesDO::getNamespace, namespace) .eq(LazyNettyServerPropertiesDO::getInetHost, inetHost) .eq(LazyNettyServerPropertiesDO::getInetPort, inetPort) .eq(LazyNettyServerPropertiesDO::getClientId, clientId) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/domain/model/lazy/netty/server/properties/LazyNettyServerProperties.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/domain/model/lazy/netty/server/properties/LazyNettyServerProperties.java index a4465ad9..66046f9f 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/domain/model/lazy/netty/server/properties/LazyNettyServerProperties.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/domain/model/lazy/netty/server/properties/LazyNettyServerProperties.java @@ -26,7 +26,7 @@ public class LazyNettyServerProperties { * 命名空间 */ @Schema(description ="命名空间",name ="namespace",example = "") - private String serverId; + private String namespace; /** * * 客户身份ID diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/entity/LazyNettyServerPropertiesDO.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/entity/LazyNettyServerPropertiesDO.java index 78bdc774..49aa81a9 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/entity/LazyNettyServerPropertiesDO.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/entity/LazyNettyServerPropertiesDO.java @@ -29,9 +29,9 @@ public class LazyNettyServerPropertiesDO { /** * 命名空间 */ - @Schema(description ="命名空间",name ="serverId",example = "") - @LazyTableFieldUnique(name="server_id",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/persistence/LazyNettyServerPropertiesRepositoryImpl.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/persistence/LazyNettyServerPropertiesRepositoryImpl.java index 2967240e..ca6fc13d 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/persistence/LazyNettyServerPropertiesRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/infrastructure/persistence/LazyNettyServerPropertiesRepositoryImpl.java @@ -40,7 +40,7 @@ public class LazyNettyServerPropertiesRepositoryImpl implements LazyNettyServerP @Override public Result story(LazyNettyServerProperties lazyNettyServerProperties) { LazyNettyServerPropertiesDO lazyNettyServerPropertiesDO = LazyNettyServerPropertiesConverter.INSTANCE.fromLazyNettyServerProperties(lazyNettyServerProperties); - String serverId = lazyNettyServerPropertiesDO.getServerId(); + String namespace = lazyNettyServerPropertiesDO.getNamespace(); String inetHost = lazyNettyServerPropertiesDO.getInetHost(); Integer inetPort = lazyNettyServerPropertiesDO.getInetPort(); String clientId = lazyNettyServerPropertiesDO.getClientId(); @@ -48,7 +48,7 @@ public class LazyNettyServerPropertiesRepositoryImpl implements LazyNettyServerP // 查询 ip、端口、客户端 boolean exists = lazyLambdaStream.exists(LazyWrappers.lambdaWrapper() - .eq(LazyNettyServerPropertiesDO::getServerId, serverId) + .eq(LazyNettyServerPropertiesDO::getNamespace, namespace) .eq(LazyNettyServerPropertiesDO::getInetHost, inetHost) .eq(LazyNettyServerPropertiesDO::getInetPort, inetPort) .eq(LazyNettyServerPropertiesDO::getClientId, clientId) @@ -56,7 +56,7 @@ public class LazyNettyServerPropertiesRepositoryImpl implements LazyNettyServerP if (exists) { // 更新 lazyLambdaStream.update(lazyNettyServerPropertiesDO, LazyWrappers.lambdaWrapper() - .eq(LazyNettyServerPropertiesDO::getServerId, serverId) + .eq(LazyNettyServerPropertiesDO::getNamespace, namespace) .eq(LazyNettyServerPropertiesDO::getInetHost, inetHost) .eq(LazyNettyServerPropertiesDO::getInetPort, inetPort) .eq(LazyNettyServerPropertiesDO::getClientId, clientId) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/NettyClientPermeateClientVisitor.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/NettyClientPermeateClientVisitor.java index 8120defd..a9a44157 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/NettyClientPermeateClientVisitor.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/NettyClientPermeateClientVisitor.java @@ -13,6 +13,10 @@ import java.util.List; @Data public class NettyClientPermeateClientVisitor implements InternalNetworkPermeate { + /** + * namespace + */ + private String namespace; /** * 当前客户端ID */ diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpClientChannelActiveAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpClientChannelActiveAdvanced.java index 6957125a..b43ebe7d 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpClientChannelActiveAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpClientChannelActiveAdvanced.java @@ -31,9 +31,11 @@ public class ClientHandleTcpClientChannelActiveAdvanced extends AbstractHandleTc protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel channel = nettyChannelContext.channel(); // 缓存当前通道 - byte[] clientIdByte = nettyProxyMsg.getClientId(); - String clientId = new String(clientIdByte); - ChannelContext.push(channel, clientId); + String clientId = nettyProxyMsg.clientId(); + String serverId = nettyProxyMsg.namespace(); + + + ChannelContext.push(channel, serverId, 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/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java index 71f7a158..15e5d792 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java @@ -24,7 +24,8 @@ import java.util.List; */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Slf4j -public class ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced extends AbstractHandleTcpDistributeClientPermeateClientInitTypeAdvanced { +public class ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced + extends AbstractHandleTcpDistributeClientPermeateClientInitTypeAdvanced { /** * 处理当前数据 @@ -35,6 +36,7 @@ public class ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced exten @Override public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { // 初始化 客户端渗透服务端socket + String namespace = nettyProxyMsg.namespace(); byte[] fromClientIdBytes = nettyProxyMsg.getClientId(); byte[] visitorPortBytes = nettyProxyMsg.getVisitorPort(); byte[] clientTargetIpBytes = nettyProxyMsg.getClientTargetIp(); @@ -54,6 +56,7 @@ public class ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced exten fromClientId, toClientId, visitorPort, clientTargetIp, clientTargetPort); NettyTcpClientPermeateClientVisitorSocket nettyTcpClientPermeateClientVisitorSocket = NettyTcpClientPermeateClientVisitorSocket.NettyClientPermeateClientVisitorSocketBuilder.builder() + .builderNamespace(namespace) .builderClientId(fromClientId) .builderClientTargetIp(clientTargetIp) .builderClientTargetPort(clientTargetPort) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/handler/NettyTcpClientHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/handler/NettyTcpClientHandler.java index 60eee0b8..7fed8bc6 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/handler/NettyTcpClientHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/handler/NettyTcpClientHandler.java @@ -8,9 +8,9 @@ import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleStateEvent; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.netty.permeate.tcp.socket.NettyTcpClientSocket; -import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; -import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; +import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; +import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import java.nio.charset.StandardCharsets; import java.util.Date; @@ -59,11 +59,13 @@ public class NettyTcpClientHandler extends SimpleChannelInboundHandler { try { nettyTcpClientSocket.newConnect2Server(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorSocket.java index c7ddea79..fd474795 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorSocket.java @@ -114,6 +114,10 @@ public class NettyTcpClientPermeateClientVisitorSocket implements PermeateVisito public static final class NettyClientPermeateClientVisitorSocketBuilder { + /** + * namespace + */ + private String namespace; /** * 客户端ID */ @@ -161,6 +165,16 @@ public class NettyTcpClientPermeateClientVisitorSocket implements PermeateVisito return new NettyClientPermeateClientVisitorSocketBuilder(); } + /** + * 填充客户端 + * + * @param clientId 客户端 + * @return 返回当前对象 + */ + public NettyClientPermeateClientVisitorSocketBuilder builderNamespace(String namespace) { + this.namespace = namespace; + return this; + } /** * 填充客户端 * @@ -257,6 +271,9 @@ public class NettyTcpClientPermeateClientVisitorSocket implements PermeateVisito return this; } public NettyTcpClientPermeateClientVisitorSocket build() { + if (namespace == null) { + throw new IllegalArgumentException("namespace must not null"); + } if (clientTargetIp == null) { throw new IllegalArgumentException("clientTargetIp must not null"); } @@ -268,6 +285,7 @@ public class NettyTcpClientPermeateClientVisitorSocket implements PermeateVisito } NettyClientPermeateClientVisitor nettyClientPermeateClientVisitor = new NettyClientPermeateClientVisitor(); + nettyClientPermeateClientVisitor.setNamespace(namespace); nettyClientPermeateClientVisitor.setFromClientId(nettyClientProperties.getClientId()); nettyClientPermeateClientVisitor.setToClientId(toClientId); nettyClientPermeateClientVisitor.setTargetIp(clientTargetIp); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java index 89d47bb6..6acac359 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java @@ -46,6 +46,7 @@ public class NettyTcpClientPermeateClientVisitorTransferSocket { .handler(new NettyTcpClientPermeateClientTransferFilter(new ChannelTypeAdapter(nettyClientPermeateClientVisitor.getHandleChannelTypeAdvancedList()))) ; NettyClientProperties nettyClientProperties = nettyClientPermeateClientVisitor.getNettyClientProperties(); + String namespace = nettyClientProperties.getNamespace(); String inetHost = nettyClientProperties.getInetHost(); int inetPort = nettyClientProperties.getInetPort(); // local client id @@ -70,6 +71,7 @@ public class NettyTcpClientPermeateClientVisitorTransferSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setType(TcpMessageType.TCP_REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL); + nettyProxyMsg.setNamespace(namespace); // other clientId nettyProxyMsg.setClientId(toClientId); nettyProxyMsg.setVisitorPort(visitorPort); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientSocket.java index 2d39a46b..52be53f9 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientSocket.java @@ -44,7 +44,8 @@ public class NettyTcpClientSocket implements NettyClientSocket { /** * 当前连接的服务端ID */ - private final String serverId; + @Getter + private final String namespace; private final String appKey; private final String appSecret; /** @@ -57,7 +58,7 @@ public class NettyTcpClientSocket implements NettyClientSocket { public NettyTcpClientSocket(String inetHost, int inetPort, String clientId, - String serverId, + String namespace, String appKey, String appSecret, ClientChangeEvent clientChangeEvent, @@ -65,7 +66,7 @@ public class NettyTcpClientSocket implements NettyClientSocket { this.inetHost = inetHost; this.inetPort = inetPort; this.clientId = clientId; - this.serverId = serverId; + this.namespace = namespace; this.appKey = appKey; this.appSecret = appSecret; this.clientChangeEvent = clientChangeEvent; @@ -88,7 +89,7 @@ public class NettyTcpClientSocket implements NettyClientSocket { .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) .handler(new NettyTcpClientFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList), this)) ; - log.info("use clientId:{} connect to server serverId:{}, IP:{},server port :{}", clientId, serverId, inetHost, inetPort); + log.info("use clientId:{} connect to server namespace:{}, IP:{},server port :{}", clientId, serverId, inetHost, inetPort); ChannelFuture future = bootstrap.connect(inetHost, inetPort); // 客户端连接服务端的channel Channel serviceChannel = future.channel(); @@ -96,11 +97,12 @@ public class NettyTcpClientSocket implements NettyClientSocket { future.addListener((ChannelFutureListener) futureListener -> { if (futureListener.isSuccess()) { - log.info("clientId:{},connect to serverId:{}, server IP:{},server port :{} isSuccess ", clientId, serverId, inetHost, inetPort); + log.info("clientId:{},connect to namespace:{}, server IP:{},server port :{} isSuccess ", clientId, serverId, inetHost, inetPort); // 告诉服务端这条连接是client的连接 NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setType(TcpMessageType.TCP_REPORT_CLIENT_CONNECT_SUCCESS); nettyMsg.setClientId(clientId); + nettyMsg.setNamespace(serverId); String hostAddress = InetAddress.getLocalHost().getHostAddress(); nettyMsg.setOriginalIpString(hostAddress); nettyMsg.setData((clientId).getBytes()); @@ -145,6 +147,6 @@ public class NettyTcpClientSocket implements NettyClientSocket { */ @Override public void newConnect2Server() throws InterruptedException { - newTcpConnect2Server(inetHost, inetPort, clientId, serverId, clientChangeEvent); + newTcpConnect2Server(inetHost, inetPort, clientId, namespace, clientChangeEvent); } } \ No newline at end of file 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 60e9cb2a..ee8f6504 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 @@ -32,8 +32,10 @@ public class ClientHandleUdpClientChannelActiveAdvanced extends AbstractHandleUd Channel channel = nettyChannelContext.channel(); // 缓存当前通道 byte[] clientIdByte = nettyProxyMsg.getClientId(); + byte[] serverIdByte = nettyProxyMsg.getNamespace(); String clientId = new String(clientIdByte); - ChannelContext.push(channel, clientId); + String serverId = new String(clientIdByte); + ChannelContext.push(channel,serverId, 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/handler/NettyUdpClientHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/handler/NettyUdpClientHandler.java index 1677bdb9..758dd3a3 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/handler/NettyUdpClientHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/handler/NettyUdpClientHandler.java @@ -59,11 +59,13 @@ public class NettyUdpClientHandler extends SimpleChannelInboundHandler { try { - newConnect2Server(inetHost, inetPort, clientId, serverId, clientChangeEvent); + newConnect2Server(inetHost, inetPort, clientId, namespace, clientChangeEvent); } catch (InterruptedException e) { e.printStackTrace(); } 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 03fa9729..eee44fa2 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 @@ -34,8 +34,8 @@ public class ClientHandleHttpClientProxyClientTypeAdvanced extends @Override protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel channel = nettyChannelContext.channel(); - String targetPortString = nettyProxyMsg.getTargetPortString(); - String targetIpString = nettyProxyMsg.getTargetIpString(); + String targetPortString = nettyProxyMsg.targetPort(); + String targetIpString = nettyProxyMsg.targetIp(); byte[] data = nettyProxyMsg.getData(); byte[] clientId = nettyProxyMsg.getClientId(); List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); 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 f5dcaede..24db3fb9 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 @@ -34,8 +34,8 @@ public class ClientHandleHttpClientProxyServerTypeAdvanced extends protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel channel = nettyChannelContext.channel(); - String targetPortString = nettyProxyMsg.getTargetPortString(); - String targetIpString = nettyProxyMsg.getTargetIpString(); + String targetPortString = nettyProxyMsg.targetPort(); + String targetIpString = nettyProxyMsg.targetIp(); byte[] data = nettyProxyMsg.getData(); List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); NettyClientProperties nettyClientProperties = SpringContextHolder.getBean(NettyClientProperties.class); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientProxySocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientProxySocket.java index ac084e3a..c6cae239 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientProxySocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientProxySocket.java @@ -3,7 +3,6 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.http.socke import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; -import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; @@ -50,6 +49,7 @@ public class NettyHttpClientProxyClientProxySocket { int inetPort = nettyClientProperties.getInetPort(); // local client id + String namespace = nettyClientProperties.getNamespace(); String clientId = nettyClientProperties.getClientId(); String targetIp = nettyHttpClientProxyClient.getTargetIp(); @@ -71,6 +71,7 @@ public class NettyHttpClientProxyClientProxySocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setType(ProxyMessageType.HTTP_REPORT_CLIENT_PROXY_CLIENT_TRANSFER_CONNECTION_); + nettyProxyMsg.setNamespace(namespace); // other clientId nettyProxyMsg.setClientId(targetClientId); nettyProxyMsg.setClientTargetIp(targetIp); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleDistributeSocksClientProxyClientOtherConnectionTransferAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleDistributeSocksClientProxyClientOtherConnectionTransferAdvanced.java index 8971c0a5..dd2c1b68 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleDistributeSocksClientProxyClientOtherConnectionTransferAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleDistributeSocksClientProxyClientOtherConnectionTransferAdvanced.java @@ -32,10 +32,10 @@ public class ClientHandleDistributeSocksClientProxyClientOtherConnectionTransfer @Override protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel channel = nettyChannelContext.channel(); - String clientId = nettyProxyMsg.getClientIdString(); + String clientId = nettyProxyMsg.clientId(); byte[] visitorId = nettyProxyMsg.getVisitorId(); - String targetIp = nettyProxyMsg.getTargetIpString(); - Integer targetPort = Integer.parseInt(nettyProxyMsg.getTargetPortString()); + String targetIp = nettyProxyMsg.targetIp(); + Integer targetPort = Integer.parseInt(nettyProxyMsg.targetPort()); List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); NettyClientProperties nettyClientProperties = SpringContextHolder.getBean(NettyClientProperties.class); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleNettySocketProtocolHandleSocketClientProxyClientStartTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleNettySocketProtocolHandleSocketClientProxyClientStartTypeAdvanced.java index 1419560f..9269ff0f 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleNettySocketProtocolHandleSocketClientProxyClientStartTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleNettySocketProtocolHandleSocketClientProxyClientStartTypeAdvanced.java @@ -37,8 +37,8 @@ public class ClientHandleNettySocketProtocolHandleSocketClientProxyClientStartTy NettySocketChannelContext nettySocketChannelContext = (NettySocketChannelContext) nettyChannelContext; Channel proxyChannel = nettySocketChannelContext.channel(); - String host = nettyProxyMsg.getTargetIpString(); - Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString()); + String host = nettyProxyMsg.targetIp(); + Integer port = Integer.parseInt(nettyProxyMsg.targetPort()); byte[] clientId = nettyProxyMsg.getClientId(); byte[] visitorId = nettyProxyMsg.getVisitorId(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleNettySocketProtocolHandleSocketClientProxyServerStartTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleNettySocketProtocolHandleSocketClientProxyServerStartTypeAdvanced.java index 8dbf64f9..a9e403a8 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleNettySocketProtocolHandleSocketClientProxyServerStartTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleNettySocketProtocolHandleSocketClientProxyServerStartTypeAdvanced.java @@ -40,8 +40,8 @@ public class ClientHandleNettySocketProtocolHandleSocketClientProxyServerStartTy NettySocketChannelContext nettySocketChannelContext = (NettySocketChannelContext) nettyChannelContext; Channel proxyChannel = nettySocketChannelContext.channel(); - String host = nettyProxyMsg.getTargetIpString(); - Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString()); + String host = nettyProxyMsg.targetIp(); + Integer port = Integer.parseInt(nettyProxyMsg.targetPort()); Socks5AddressType socks5AddressType = nettySocketChannelContext.getSocks5AddressType(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleSocksDistributeServerProxyClientConnectionInitTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleSocksDistributeServerProxyClientConnectionInitTypeAdvanced.java index 8ea7491b..48044a23 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleSocksDistributeServerProxyClientConnectionInitTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/advanced/ClientHandleSocksDistributeServerProxyClientConnectionInitTypeAdvanced.java @@ -1,7 +1,6 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.socks.advanced; import io.netty.channel.Channel; -import io.netty.handler.codec.socksx.v5.Socks5AddressType; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.socks.NettySocksClientProxyClient; @@ -37,10 +36,10 @@ public class ClientHandleSocksDistributeServerProxyClientConnectionInitTypeAdvan // 绑定真实通道 Channel channel = nettyChannelContext.channel(); - String clientId = nettyProxyMsg.getClientIdString(); + String clientId = nettyProxyMsg.clientId(); byte[] visitorId = nettyProxyMsg.getVisitorId(); - String targetIp = nettyProxyMsg.getTargetIpString(); - Integer targetPort = Integer.parseInt(nettyProxyMsg.getTargetPortString()); + String targetIp = nettyProxyMsg.targetIp(); + Integer targetPort = Integer.parseInt(nettyProxyMsg.targetPort()); List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientVisitorTransferSocket.java index 5c301927..25eb4b63 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientVisitorTransferSocket.java @@ -41,6 +41,7 @@ public class NettySocksClientProxyClientVisitorTransferSocket { .handler(new NettySocksClientProxyClientVisitorTransferFilter(new ChannelTypeAdapter(nettySocksClientProxyClient.getHandleChannelTypeAdvancedList()))) ; NettyClientProperties nettyClientProperties = nettySocksClientProxyClient.getNettyClientProperties(); + String namespace = nettyClientProperties.getNamespace(); String inetHost = nettyClientProperties.getInetHost(); int inetPort = nettyClientProperties.getInetPort(); // local client id @@ -69,6 +70,7 @@ public class NettySocksClientProxyClientVisitorTransferSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setType(ProxyMessageType.SOCKS_REPORT_CLIENT_PROXY_CLIENT_TRANSFER_CONNECTION_); + nettyProxyMsg.setNamespace(namespace); // other clientId nettyProxyMsg.setClientTargetIp(targetIp); nettyProxyMsg.setClientTargetPort(targetPort); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/rpc/StagingNoticeApiRpc.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/rpc/StagingNoticeApiRpc.java index 5fe73694..0551b818 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/rpc/StagingNoticeApiRpc.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/rpc/StagingNoticeApiRpc.java @@ -52,6 +52,7 @@ // // 上报 当前通道暂存关闭了 // Channel channel = clientChannel.getChannel(); // NettyProxyMsg nettyMsg = new NettyProxyMsg(); +// nettyMsg.setNamespace(); // nettyMsg.setType(MessageType.TCP_REPORT_CLIENT_STAGING_CLOSED); // nettyMsg.setData((clientId // .getBytes(StandardCharsets.UTF_8))); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/assets/index-Dx8CuNMY.js b/wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/assets/index-CtIDExbE.js similarity index 99% rename from wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/assets/index-Dx8CuNMY.js rename to wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/assets/index-CtIDExbE.js index cc547482..37f214a5 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/assets/index-Dx8CuNMY.js +++ b/wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/assets/index-CtIDExbE.js @@ -62,4 +62,4 @@ var __=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports);var cie=__((Un,Yn `)}get[Symbol.toStringTag](){return"AxiosHeaders"}static from(t){return t instanceof this?t:new this(t)}static concat(t,...n){const o=new this(t);return n.forEach(a=>o.set(a)),o}static accessor(t){const o=(this[um]=this[um]={accessors:{}}).accessors,a=this.prototype;function r(l){const i=Jl(l);o[i]||(Dse(a,l),o[i]=!0)}return Ve.isArray(t)?t.forEach(r):r(t),this}}Yc.accessor(["Content-Type","Content-Length","Accept","Accept-Encoding","User-Agent","Authorization"]);Ve.reduceDescriptors(Yc.prototype,({value:e},t)=>{let n=t[0].toUpperCase()+t.slice(1);return{get:()=>e,set(o){this[n]=o}}});Ve.freezeMethods(Yc);const ta=Yc;function Dd(e,t){const n=this||Ep,o=t||n,a=ta.from(o.headers);let r=o.data;return Ve.forEach(e,function(i){r=i.call(n,r,a.normalize(),t?t.status:void 0)}),a.normalize(),r}function v_(e){return!!(e&&e.__CANCEL__)}function pi(e,t,n){Nt.call(this,e??"canceled",Nt.ERR_CANCELED,t,n),this.name="CanceledError"}Ve.inherits(pi,Nt,{__CANCEL__:!0});function Fse(e,t,n){const o=n.config.validateStatus;!n.status||!o||o(n.status)?e(n):t(new Nt("Request failed with status code "+n.status,[Nt.ERR_BAD_REQUEST,Nt.ERR_BAD_RESPONSE][Math.floor(n.status/100)-4],n.config,n.request,n))}const Kse=No.hasStandardBrowserEnv?{write(e,t,n,o,a,r){const l=[e+"="+encodeURIComponent(t)];Ve.isNumber(n)&&l.push("expires="+new Date(n).toGMTString()),Ve.isString(o)&&l.push("path="+o),Ve.isString(a)&&l.push("domain="+a),r===!0&&l.push("secure"),document.cookie=l.join("; ")},read(e){const t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove(e){this.write(e,"",Date.now()-864e5)}}:{write(){},read(){return null},remove(){}};function Wse(e){return/^([a-z][a-z\d+\-.]*:)?\/\//i.test(e)}function jse(e,t){return t?e.replace(/\/?\/$/,"")+"/"+t.replace(/^\/+/,""):e}function h_(e,t){return e&&!Wse(t)?jse(e,t):t}const qse=No.hasStandardBrowserEnv?function(){const t=/(msie|trident)/i.test(navigator.userAgent),n=document.createElement("a");let o;function a(r){let l=r;return t&&(n.setAttribute("href",l),l=n.href),n.setAttribute("href",l),{href:n.href,protocol:n.protocol?n.protocol.replace(/:$/,""):"",host:n.host,search:n.search?n.search.replace(/^\?/,""):"",hash:n.hash?n.hash.replace(/^#/,""):"",hostname:n.hostname,port:n.port,pathname:n.pathname.charAt(0)==="/"?n.pathname:"/"+n.pathname}}return o=a(window.location.href),function(l){const i=Ve.isString(l)?a(l):l;return i.protocol===o.protocol&&i.host===o.host}}():function(){return function(){return!0}}();function Use(e){const t=/^([-+\w]{1,25})(:?\/\/|:)/.exec(e);return t&&t[1]||""}function Yse(e,t){e=e||10;const n=new Array(e),o=new Array(e);let a=0,r=0,l;return t=t!==void 0?t:1e3,function(u){const c=Date.now(),f=o[r];l||(l=c),n[a]=u,o[a]=c;let d=r,p=0;for(;d!==a;)p+=n[d++],d=d%e;if(a=(a+1)%e,a===r&&(r=(r+1)%e),c-l{const r=a.loaded,l=a.lengthComputable?a.total:void 0,i=r-n,u=o(i),c=r<=l;n=r;const f={loaded:r,total:l,progress:l?r/l:void 0,bytes:i,rate:u||void 0,estimated:u&&l&&c?(l-r)/u:void 0,event:a};f[t?"download":"upload"]=!0,e(f)}}const Gse=typeof XMLHttpRequest<"u",Xse=Gse&&function(e){return new Promise(function(n,o){let a=e.data;const r=ta.from(e.headers).normalize();let{responseType:l,withXSRFToken:i}=e,u;function c(){e.cancelToken&&e.cancelToken.unsubscribe(u),e.signal&&e.signal.removeEventListener("abort",u)}let f;if(Ve.isFormData(a)){if(No.hasStandardBrowserEnv||No.hasStandardBrowserWebWorkerEnv)r.setContentType(!1);else if((f=r.getContentType())!==!1){const[v,..._]=f?f.split(";").map(g=>g.trim()).filter(Boolean):[];r.setContentType([v||"multipart/form-data",..._].join("; "))}}let d=new XMLHttpRequest;if(e.auth){const v=e.auth.username||"",_=e.auth.password?unescape(encodeURIComponent(e.auth.password)):"";r.set("Authorization","Basic "+btoa(v+":"+_))}const p=h_(e.baseURL,e.url);d.open(e.method.toUpperCase(),c_(p,e.params,e.paramsSerializer),!0),d.timeout=e.timeout;function h(){if(!d)return;const v=ta.from("getAllResponseHeaders"in d&&d.getAllResponseHeaders()),g={data:!l||l==="text"||l==="json"?d.responseText:d.response,status:d.status,statusText:d.statusText,headers:v,config:e,request:d};Fse(function(b){n(b),c()},function(b){o(b),c()},g),d=null}if("onloadend"in d?d.onloadend=h:d.onreadystatechange=function(){!d||d.readyState!==4||d.status===0&&!(d.responseURL&&d.responseURL.indexOf("file:")===0)||setTimeout(h)},d.onabort=function(){d&&(o(new Nt("Request aborted",Nt.ECONNABORTED,e,d)),d=null)},d.onerror=function(){o(new Nt("Network Error",Nt.ERR_NETWORK,e,d)),d=null},d.ontimeout=function(){let _=e.timeout?"timeout of "+e.timeout+"ms exceeded":"timeout exceeded";const g=e.transitional||d_;e.timeoutErrorMessage&&(_=e.timeoutErrorMessage),o(new Nt(_,g.clarifyTimeoutError?Nt.ETIMEDOUT:Nt.ECONNABORTED,e,d)),d=null},No.hasStandardBrowserEnv&&(i&&Ve.isFunction(i)&&(i=i(e)),i||i!==!1&&qse(p))){const v=e.xsrfHeaderName&&e.xsrfCookieName&&Kse.read(e.xsrfCookieName);v&&r.set(e.xsrfHeaderName,v)}a===void 0&&r.setContentType(null),"setRequestHeader"in d&&Ve.forEach(r.toJSON(),function(_,g){d.setRequestHeader(g,_)}),Ve.isUndefined(e.withCredentials)||(d.withCredentials=!!e.withCredentials),l&&l!=="json"&&(d.responseType=e.responseType),typeof e.onDownloadProgress=="function"&&d.addEventListener("progress",cm(e.onDownloadProgress,!0)),typeof e.onUploadProgress=="function"&&d.upload&&d.upload.addEventListener("progress",cm(e.onUploadProgress)),(e.cancelToken||e.signal)&&(u=v=>{d&&(o(!v||v.type?new pi(null,e,d):v),d.abort(),d=null)},e.cancelToken&&e.cancelToken.subscribe(u),e.signal&&(e.signal.aborted?u():e.signal.addEventListener("abort",u)));const m=Use(p);if(m&&No.protocols.indexOf(m)===-1){o(new Nt("Unsupported protocol "+m+":",Nt.ERR_BAD_REQUEST,e));return}d.send(a||null)})},v0={http:wse,xhr:Xse};Ve.forEach(v0,(e,t)=>{if(e){try{Object.defineProperty(e,"name",{value:t})}catch{}Object.defineProperty(e,"adapterName",{value:t})}});const dm=e=>`- ${e}`,Jse=e=>Ve.isFunction(e)||e===null||e===!1,m_={getAdapter:e=>{e=Ve.isArray(e)?e:[e];const{length:t}=e;let n,o;const a={};for(let r=0;r`adapter ${i} `+(u===!1?"is not supported by the environment":"is not available in the build"));let l=t?r.length>1?`since : `+r.map(dm).join(` `):" "+dm(r[0]):"as no adapter specified";throw new Nt("There is no suitable adapter to dispatch the request "+l,"ERR_NOT_SUPPORT")}return o},adapters:v0};function Fd(e){if(e.cancelToken&&e.cancelToken.throwIfRequested(),e.signal&&e.signal.aborted)throw new pi(null,e)}function fm(e){return Fd(e),e.headers=ta.from(e.headers),e.data=Dd.call(e,e.transformRequest),["post","put","patch"].indexOf(e.method)!==-1&&e.headers.setContentType("application/x-www-form-urlencoded",!1),m_.getAdapter(e.adapter||Ep.adapter)(e).then(function(o){return Fd(e),o.data=Dd.call(e,e.transformResponse,o),o.headers=ta.from(o.headers),o},function(o){return v_(o)||(Fd(e),o&&o.response&&(o.response.data=Dd.call(e,e.transformResponse,o.response),o.response.headers=ta.from(o.response.headers))),Promise.reject(o)})}const pm=e=>e instanceof ta?{...e}:e;function Al(e,t){t=t||{};const n={};function o(c,f,d){return Ve.isPlainObject(c)&&Ve.isPlainObject(f)?Ve.merge.call({caseless:d},c,f):Ve.isPlainObject(f)?Ve.merge({},f):Ve.isArray(f)?f.slice():f}function a(c,f,d){if(Ve.isUndefined(f)){if(!Ve.isUndefined(c))return o(void 0,c,d)}else return o(c,f,d)}function r(c,f){if(!Ve.isUndefined(f))return o(void 0,f)}function l(c,f){if(Ve.isUndefined(f)){if(!Ve.isUndefined(c))return o(void 0,c)}else return o(void 0,f)}function i(c,f,d){if(d in t)return o(c,f);if(d in e)return o(void 0,c)}const u={url:r,method:r,data:r,baseURL:l,transformRequest:l,transformResponse:l,paramsSerializer:l,timeout:l,timeoutMessage:l,withCredentials:l,withXSRFToken:l,adapter:l,responseType:l,xsrfCookieName:l,xsrfHeaderName:l,onUploadProgress:l,onDownloadProgress:l,decompress:l,maxContentLength:l,maxBodyLength:l,beforeRedirect:l,transport:l,httpAgent:l,httpsAgent:l,cancelToken:l,socketPath:l,responseEncoding:l,validateStatus:i,headers:(c,f)=>a(pm(c),pm(f),!0)};return Ve.forEach(Object.keys(Object.assign({},e,t)),function(f){const d=u[f]||a,p=d(e[f],t[f],f);Ve.isUndefined(p)&&d!==i||(n[f]=p)}),n}const g_="1.6.8",xp={};["object","boolean","number","function","string","symbol"].forEach((e,t)=>{xp[e]=function(o){return typeof o===e||"a"+(t<1?"n ":" ")+e}});const vm={};xp.transitional=function(t,n,o){function a(r,l){return"[Axios v"+g_+"] Transitional option '"+r+"'"+l+(o?". "+o:"")}return(r,l,i)=>{if(t===!1)throw new Nt(a(l," has been removed"+(n?" in "+n:"")),Nt.ERR_DEPRECATED);return n&&!vm[l]&&(vm[l]=!0,console.warn(a(l," has been deprecated since v"+n+" and will be removed in the near future"))),t?t(r,l,i):!0}};function Zse(e,t,n){if(typeof e!="object")throw new Nt("options must be an object",Nt.ERR_BAD_OPTION_VALUE);const o=Object.keys(e);let a=o.length;for(;a-- >0;){const r=o[a],l=t[r];if(l){const i=e[r],u=i===void 0||l(i,r,e);if(u!==!0)throw new Nt("option "+r+" must be "+u,Nt.ERR_BAD_OPTION_VALUE);continue}if(n!==!0)throw new Nt("Unknown option "+r,Nt.ERR_BAD_OPTION)}}const h0={assertOptions:Zse,validators:xp},wa=h0.validators;class Qu{constructor(t){this.defaults=t,this.interceptors={request:new im,response:new im}}async request(t,n){try{return await this._request(t,n)}catch(o){if(o instanceof Error){let a;Error.captureStackTrace?Error.captureStackTrace(a={}):a=new Error;const r=a.stack?a.stack.replace(/^.+\n/,""):"";o.stack?r&&!String(o.stack).endsWith(r.replace(/^.+\n.+\n/,""))&&(o.stack+=` -`+r):o.stack=r}throw o}}_request(t,n){typeof t=="string"?(n=n||{},n.url=t):n=t||{},n=Al(this.defaults,n);const{transitional:o,paramsSerializer:a,headers:r}=n;o!==void 0&&h0.assertOptions(o,{silentJSONParsing:wa.transitional(wa.boolean),forcedJSONParsing:wa.transitional(wa.boolean),clarifyTimeoutError:wa.transitional(wa.boolean)},!1),a!=null&&(Ve.isFunction(a)?n.paramsSerializer={serialize:a}:h0.assertOptions(a,{encode:wa.function,serialize:wa.function},!0)),n.method=(n.method||this.defaults.method||"get").toLowerCase();let l=r&&Ve.merge(r.common,r[n.method]);r&&Ve.forEach(["delete","get","head","post","put","patch","common"],m=>{delete r[m]}),n.headers=ta.concat(l,r);const i=[];let u=!0;this.interceptors.request.forEach(function(v){typeof v.runWhen=="function"&&v.runWhen(n)===!1||(u=u&&v.synchronous,i.unshift(v.fulfilled,v.rejected))});const c=[];this.interceptors.response.forEach(function(v){c.push(v.fulfilled,v.rejected)});let f,d=0,p;if(!u){const m=[fm.bind(this),void 0];for(m.unshift.apply(m,i),m.push.apply(m,c),p=m.length,f=Promise.resolve(n);d{if(!o._listeners)return;let r=o._listeners.length;for(;r-- >0;)o._listeners[r](a);o._listeners=null}),this.promise.then=a=>{let r;const l=new Promise(i=>{o.subscribe(i),r=i}).then(a);return l.cancel=function(){o.unsubscribe(r)},l},t(function(r,l,i){o.reason||(o.reason=new pi(r,l,i),n(o.reason))})}throwIfRequested(){if(this.reason)throw this.reason}subscribe(t){if(this.reason){t(this.reason);return}this._listeners?this._listeners.push(t):this._listeners=[t]}unsubscribe(t){if(!this._listeners)return;const n=this._listeners.indexOf(t);n!==-1&&this._listeners.splice(n,1)}static source(){let t;return{token:new Mp(function(a){t=a}),cancel:t}}}const Qse=Mp;function eie(e){return function(n){return e.apply(null,n)}}function tie(e){return Ve.isObject(e)&&e.isAxiosError===!0}const m0={Continue:100,SwitchingProtocols:101,Processing:102,EarlyHints:103,Ok:200,Created:201,Accepted:202,NonAuthoritativeInformation:203,NoContent:204,ResetContent:205,PartialContent:206,MultiStatus:207,AlreadyReported:208,ImUsed:226,MultipleChoices:300,MovedPermanently:301,Found:302,SeeOther:303,NotModified:304,UseProxy:305,Unused:306,TemporaryRedirect:307,PermanentRedirect:308,BadRequest:400,Unauthorized:401,PaymentRequired:402,Forbidden:403,NotFound:404,MethodNotAllowed:405,NotAcceptable:406,ProxyAuthenticationRequired:407,RequestTimeout:408,Conflict:409,Gone:410,LengthRequired:411,PreconditionFailed:412,PayloadTooLarge:413,UriTooLong:414,UnsupportedMediaType:415,RangeNotSatisfiable:416,ExpectationFailed:417,ImATeapot:418,MisdirectedRequest:421,UnprocessableEntity:422,Locked:423,FailedDependency:424,TooEarly:425,UpgradeRequired:426,PreconditionRequired:428,TooManyRequests:429,RequestHeaderFieldsTooLarge:431,UnavailableForLegalReasons:451,InternalServerError:500,NotImplemented:501,BadGateway:502,ServiceUnavailable:503,GatewayTimeout:504,HttpVersionNotSupported:505,VariantAlsoNegotiates:506,InsufficientStorage:507,LoopDetected:508,NotExtended:510,NetworkAuthenticationRequired:511};Object.entries(m0).forEach(([e,t])=>{m0[t]=e});const nie=m0;function y_(e){const t=new wu(e),n=Zy(wu.prototype.request,t);return Ve.extend(n,wu.prototype,t,{allOwnKeys:!0}),Ve.extend(n,t,null,{allOwnKeys:!0}),n.create=function(a){return y_(Al(e,a))},n}const en=y_(Ep);en.Axios=wu;en.CanceledError=pi;en.CancelToken=Qse;en.isCancel=v_;en.VERSION=g_;en.toFormData=Uc;en.AxiosError=Nt;en.Cancel=en.CanceledError;en.all=function(t){return Promise.all(t)};en.spread=eie;en.isAxiosError=tie;en.mergeConfig=Al;en.AxiosHeaders=ta;en.formToJSON=e=>p_(Ve.isHTMLForm(e)?new FormData(e):e);en.getAdapter=m_.getAdapter;en.HttpStatusCode=nie;en.default=en;const oie={data:()=>({description:"客户端生成code工厂",buttons:{generate:{name:"生成代码"}},type:"1",icon:"HotWater",name:"客户端生成code工厂"})},aie=Object.assign(oie,{__name:"LocalClientProperties",setup(e){const t=R(""),n=R([]),o=()=>{n.value.push({serverId:"DEFAULT",inetHost:"",inetPort:"",clientId:"",appKey:"",appSecret:"",edit:!0})},a=(c,f)=>{f.edit=!0,console.log(c,f)},r=(c,f)=>{f.edit=!1,console.log(c,f),u(f),i()},l=(c,f)=>{console.log(c,f),en.delete("/v1/api/lazy/netty/server/properties/remove",{params:f}).then(d=>{const{status:p,data:h}=d,{code:m,message:v}=h;p===200&&m===0?(os({message:"修改配置成功",type:"success"}),i()):os.error("修改配置失败:"+v)})};et(async()=>{i()});const i=()=>{en.get("/v1/api/lazy/netty/server/properties/findList",{params:{instanceId:"",schema:""}}).then(c=>{c.status===200&&c.data?(c.data.data.map(f=>{f.edit=!1}),n.value=c.data.data?c.data.data:[]):console.error(c)})},u=c=>{en.post("/v1/api/lazy/netty/server/properties/story",c).then(f=>{const{status:d,data:p}=f,{code:h,message:m}=p;d===200&&h===0?(os({message:"新增、修改配置成功",type:"success"}),i()):os.error("新增、修改配置失败:"+m)})};return(c,f)=>{const d=nt("Plus"),p=Be,h=rn,m=mn,v=fy,_=nt("Edit"),g=nt("Select"),w=dy;return y(),x("div",null,[W(h,{onClick:f[0]||(f[0]=b=>o())},{default:G(()=>[vt(" 新增配置 "),W(p,null,{default:G(()=>[W(d)]),_:1})]),_:1}),W(w,{data:n.value,style:{width:"100%"}},{default:G(()=>[W(v,{label:"服务端ID",prop:"serverId"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.serverId,"onUpdate:modelValue":C=>b.row.serverId=C,placeholder:"服务端ID"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"服务端IP",prop:"inetHost"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.inetHost,"onUpdate:modelValue":C=>b.row.inetHost=C,placeholder:"服务端IP"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"服务端端口",prop:"inetPort"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.inetPort,"onUpdate:modelValue":C=>b.row.inetPort=C,placeholder:"服务端端口"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"客户端端ID",prop:"clientId"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.clientId,"onUpdate:modelValue":C=>b.row.clientId=C,placeholder:"客户端端ID"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"令牌key",prop:"appKey"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.appKey,"onUpdate:modelValue":C=>b.row.appKey=C,placeholder:"令牌key"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"令牌密钥",prop:"appSecret"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.appSecret,"onUpdate:modelValue":C=>b.row.appSecret=C,placeholder:"令牌密钥"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"连接状态",prop:"connectStatus"}),W(v,{label:"配置类型",prop:"type"}),W(v,{align:"right"},{header:G(()=>[W(m,{modelValue:t.value,"onUpdate:modelValue":f[1]||(f[1]=b=>t.value=b),size:"small",placeholder:"Type to search"},null,8,["modelValue"])]),default:G(b=>[b.row.edit?Z("",!0):(y(),ne(h,{key:0,size:"small",onClick:C=>a(b.$index,b.row)},{default:G(()=>[vt(" Edit "),W(p,null,{default:G(()=>[W(_)]),_:1})]),_:2},1032,["onClick"])),b.row.edit?(y(),ne(h,{key:1,size:"small",onClick:C=>r(b.$index,b.row)},{default:G(()=>[vt(" submit "),W(p,null,{default:G(()=>[W(g)]),_:1})]),_:2},1032,["onClick"])):Z("",!0),W(h,{size:"small",type:"danger",onClick:C=>l(b.$index,b.row)},{default:G(()=>[vt("Delete ")]),_:2},1032,["onClick"])]),_:1})]),_:1},8,["data"])])}}}),rie=e=>(Um("data-v-7b2edd67"),e=e(),Ym(),e),lie=rie(()=>k("div",null,[k("img",{alt:"Vue logo",class:"logo",src:Dw,width:"125",height:"125"})],-1)),sie={class:"wrapper"},iie={__name:"App",setup(e){return(t,n)=>(y(),x(Fe,null,[k("header",null,[lie,k("div",sie,[W(Uw,{msg:"Java 使用 Lazy ORM 网络穿透客户端"})])]),k("main",null,[W(aie)])],64))}},uie=I4(iie,[["__scopeId","data-v-7b2edd67"]]),$p=N4(uie);for(const[e,t]of Object.entries(CP))$p.component(e,t);$p.use(Hle);$p.mount("#app")});export default cie(); +`+r):o.stack=r}throw o}}_request(t,n){typeof t=="string"?(n=n||{},n.url=t):n=t||{},n=Al(this.defaults,n);const{transitional:o,paramsSerializer:a,headers:r}=n;o!==void 0&&h0.assertOptions(o,{silentJSONParsing:wa.transitional(wa.boolean),forcedJSONParsing:wa.transitional(wa.boolean),clarifyTimeoutError:wa.transitional(wa.boolean)},!1),a!=null&&(Ve.isFunction(a)?n.paramsSerializer={serialize:a}:h0.assertOptions(a,{encode:wa.function,serialize:wa.function},!0)),n.method=(n.method||this.defaults.method||"get").toLowerCase();let l=r&&Ve.merge(r.common,r[n.method]);r&&Ve.forEach(["delete","get","head","post","put","patch","common"],m=>{delete r[m]}),n.headers=ta.concat(l,r);const i=[];let u=!0;this.interceptors.request.forEach(function(v){typeof v.runWhen=="function"&&v.runWhen(n)===!1||(u=u&&v.synchronous,i.unshift(v.fulfilled,v.rejected))});const c=[];this.interceptors.response.forEach(function(v){c.push(v.fulfilled,v.rejected)});let f,d=0,p;if(!u){const m=[fm.bind(this),void 0];for(m.unshift.apply(m,i),m.push.apply(m,c),p=m.length,f=Promise.resolve(n);d{if(!o._listeners)return;let r=o._listeners.length;for(;r-- >0;)o._listeners[r](a);o._listeners=null}),this.promise.then=a=>{let r;const l=new Promise(i=>{o.subscribe(i),r=i}).then(a);return l.cancel=function(){o.unsubscribe(r)},l},t(function(r,l,i){o.reason||(o.reason=new pi(r,l,i),n(o.reason))})}throwIfRequested(){if(this.reason)throw this.reason}subscribe(t){if(this.reason){t(this.reason);return}this._listeners?this._listeners.push(t):this._listeners=[t]}unsubscribe(t){if(!this._listeners)return;const n=this._listeners.indexOf(t);n!==-1&&this._listeners.splice(n,1)}static source(){let t;return{token:new Mp(function(a){t=a}),cancel:t}}}const Qse=Mp;function eie(e){return function(n){return e.apply(null,n)}}function tie(e){return Ve.isObject(e)&&e.isAxiosError===!0}const m0={Continue:100,SwitchingProtocols:101,Processing:102,EarlyHints:103,Ok:200,Created:201,Accepted:202,NonAuthoritativeInformation:203,NoContent:204,ResetContent:205,PartialContent:206,MultiStatus:207,AlreadyReported:208,ImUsed:226,MultipleChoices:300,MovedPermanently:301,Found:302,SeeOther:303,NotModified:304,UseProxy:305,Unused:306,TemporaryRedirect:307,PermanentRedirect:308,BadRequest:400,Unauthorized:401,PaymentRequired:402,Forbidden:403,NotFound:404,MethodNotAllowed:405,NotAcceptable:406,ProxyAuthenticationRequired:407,RequestTimeout:408,Conflict:409,Gone:410,LengthRequired:411,PreconditionFailed:412,PayloadTooLarge:413,UriTooLong:414,UnsupportedMediaType:415,RangeNotSatisfiable:416,ExpectationFailed:417,ImATeapot:418,MisdirectedRequest:421,UnprocessableEntity:422,Locked:423,FailedDependency:424,TooEarly:425,UpgradeRequired:426,PreconditionRequired:428,TooManyRequests:429,RequestHeaderFieldsTooLarge:431,UnavailableForLegalReasons:451,InternalServerError:500,NotImplemented:501,BadGateway:502,ServiceUnavailable:503,GatewayTimeout:504,HttpVersionNotSupported:505,VariantAlsoNegotiates:506,InsufficientStorage:507,LoopDetected:508,NotExtended:510,NetworkAuthenticationRequired:511};Object.entries(m0).forEach(([e,t])=>{m0[t]=e});const nie=m0;function y_(e){const t=new wu(e),n=Zy(wu.prototype.request,t);return Ve.extend(n,wu.prototype,t,{allOwnKeys:!0}),Ve.extend(n,t,null,{allOwnKeys:!0}),n.create=function(a){return y_(Al(e,a))},n}const en=y_(Ep);en.Axios=wu;en.CanceledError=pi;en.CancelToken=Qse;en.isCancel=v_;en.VERSION=g_;en.toFormData=Uc;en.AxiosError=Nt;en.Cancel=en.CanceledError;en.all=function(t){return Promise.all(t)};en.spread=eie;en.isAxiosError=tie;en.mergeConfig=Al;en.AxiosHeaders=ta;en.formToJSON=e=>p_(Ve.isHTMLForm(e)?new FormData(e):e);en.getAdapter=m_.getAdapter;en.HttpStatusCode=nie;en.default=en;const oie={data:()=>({description:"客户端生成code工厂",buttons:{generate:{name:"生成代码"}},type:"1",icon:"HotWater",name:"客户端生成code工厂"})},aie=Object.assign(oie,{__name:"LocalClientProperties",setup(e){const t=R(""),n=R([]),o=()=>{n.value.push({namespace:"DEFAULT",inetHost:"",inetPort:"",clientId:"",appKey:"",appSecret:"",edit:!0})},a=(c,f)=>{f.edit=!0,console.log(c,f)},r=(c,f)=>{f.edit=!1,console.log(c,f),u(f),i()},l=(c,f)=>{console.log(c,f),en.delete("/v1/api/lazy/netty/server/properties/remove",{params:f}).then(d=>{const{status:p,data:h}=d,{code:m,message:v}=h;p===200&&m===0?(os({message:"修改配置成功",type:"success"}),i()):os.error("修改配置失败:"+v)})};et(async()=>{i()});const i=()=>{en.get("/v1/api/lazy/netty/server/properties/findList",{params:{instanceId:"",schema:""}}).then(c=>{c.status===200&&c.data?(c.data.data.map(f=>{f.edit=!1}),n.value=c.data.data?c.data.data:[]):console.error(c)})},u=c=>{en.post("/v1/api/lazy/netty/server/properties/story",c).then(f=>{const{status:d,data:p}=f,{code:h,message:m}=p;d===200&&h===0?(os({message:"新增、修改配置成功",type:"success"}),i()):os.error("新增、修改配置失败:"+m)})};return(c,f)=>{const d=nt("Plus"),p=Be,h=rn,m=mn,v=fy,_=nt("Edit"),g=nt("Select"),w=dy;return y(),x("div",null,[W(h,{onClick:f[0]||(f[0]=b=>o())},{default:G(()=>[vt(" 新增配置 "),W(p,null,{default:G(()=>[W(d)]),_:1})]),_:1}),W(w,{data:n.value,style:{width:"100%"}},{default:G(()=>[W(v,{label:"命名空间",prop:"namespace"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.namespace,"onUpdate:modelValue":C=>b.row.namespace=C,placeholder:"命名空间"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"服务端IP",prop:"inetHost"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.inetHost,"onUpdate:modelValue":C=>b.row.inetHost=C,placeholder:"服务端IP"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"服务端端口",prop:"inetPort"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.inetPort,"onUpdate:modelValue":C=>b.row.inetPort=C,placeholder:"服务端端口"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"客户端端ID",prop:"clientId"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.clientId,"onUpdate:modelValue":C=>b.row.clientId=C,placeholder:"客户端端ID"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"令牌key",prop:"appKey"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.appKey,"onUpdate:modelValue":C=>b.row.appKey=C,placeholder:"令牌key"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"令牌密钥",prop:"appSecret"},{default:G(b=>[b.row.edit?(y(),ne(m,{key:0,modelValue:b.row.appSecret,"onUpdate:modelValue":C=>b.row.appSecret=C,placeholder:"令牌密钥"},null,8,["modelValue","onUpdate:modelValue"])):Z("",!0)]),_:1}),W(v,{label:"连接状态",prop:"connectStatus"}),W(v,{label:"配置类型",prop:"type"}),W(v,{align:"right"},{header:G(()=>[W(m,{modelValue:t.value,"onUpdate:modelValue":f[1]||(f[1]=b=>t.value=b),size:"small",placeholder:"Type to search"},null,8,["modelValue"])]),default:G(b=>[b.row.edit?Z("",!0):(y(),ne(h,{key:0,size:"small",onClick:C=>a(b.$index,b.row)},{default:G(()=>[vt(" Edit "),W(p,null,{default:G(()=>[W(_)]),_:1})]),_:2},1032,["onClick"])),b.row.edit?(y(),ne(h,{key:1,size:"small",onClick:C=>r(b.$index,b.row)},{default:G(()=>[vt(" submit "),W(p,null,{default:G(()=>[W(g)]),_:1})]),_:2},1032,["onClick"])):Z("",!0),W(h,{size:"small",type:"danger",onClick:C=>l(b.$index,b.row)},{default:G(()=>[vt("Delete ")]),_:2},1032,["onClick"])]),_:1})]),_:1},8,["data"])])}}}),rie=e=>(Um("data-v-7b2edd67"),e=e(),Ym(),e),lie=rie(()=>k("div",null,[k("img",{alt:"Vue logo",class:"logo",src:Dw,width:"125",height:"125"})],-1)),sie={class:"wrapper"},iie={__name:"App",setup(e){return(t,n)=>(y(),x(Fe,null,[k("header",null,[lie,k("div",sie,[W(Uw,{msg:"Java 使用 Lazy ORM 网络穿透客户端"})])]),k("main",null,[W(aie)])],64))}},uie=I4(iie,[["__scopeId","data-v-7b2edd67"]]),$p=N4(uie);for(const[e,t]of Object.entries(CP))$p.component(e,t);$p.use(Hle);$p.mount("#app")});export default cie(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/index.html b/wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/index.html index 6afa2e06..af80627e 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/index.html +++ b/wu-lazy-cloud-heartbeat-client/src/main/resources/netty-client-local-ui/v1/index.html @@ -5,7 +5,7 @@ Java 使用 Lazy ORM 网络穿透客户端! - + diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/ChannelContext.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/ChannelContext.java index e0eda628..4901c3e5 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/ChannelContext.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/ChannelContext.java @@ -1,6 +1,7 @@ package org.framework.lazy.cloud.network.heartbeat.common; import io.netty.channel.Channel; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.wu.framework.core.utils.ObjectUtils; @@ -19,8 +20,9 @@ import java.util.stream.Collectors; @Slf4j public class ChannelContext { - private final static ConcurrentHashMap/*通道*/> - channelIdClientChannelDTOConcurrentHashMap = new ConcurrentHashMap<>(); + private final static ConcurrentHashMap/*通道*/>> + cacheClientChannelConcurrentHashMap = new ConcurrentHashMap<>(); /** * 新增通道 @@ -28,26 +30,37 @@ public class ChannelContext { * @param channel 通道 * @param clientId 客户端ID */ - public static void push(Channel channel, String clientId) { - // 如果客户端已经存在 移除 - if (channelIdClientChannelDTOConcurrentHashMap.containsKey(clientId)) { -// clear(clientId); - List existChannelList = new ArrayList<>(); - List oldChannels = channelIdClientChannelDTOConcurrentHashMap.get(clientId); - for (Channel existChannel : oldChannels) { - if (existChannel != null) { - if(existChannel.isActive()){ - existChannelList.add(existChannel); - }else { - log.warn("close channel with client:{}", ChannelAttributeKeyUtils.getClientId(existChannel)); - existChannel.close(); + public static void push(Channel channel, String namespace, String clientId) { + // 如果服务端已经存在 移除 + if (cacheClientChannelConcurrentHashMap.containsKey(namespace)) { + + ConcurrentHashMap/*通道*/> clientChannelListConcurrentHashMap = + cacheClientChannelConcurrentHashMap.get(namespace); + + + // 判断是否存在客户端 + if (clientChannelListConcurrentHashMap.containsKey(clientId)) { + List existChannelList = new ArrayList<>(); + List oldChannels = clientChannelListConcurrentHashMap.get(clientId); + for (Channel existChannel : oldChannels) { + if (existChannel != null) { + if (existChannel.isActive()) { + existChannelList.add(existChannel); + } else { + log.warn("close channel with namespace:{} client:{}", namespace, ChannelAttributeKeyUtils.getClientId(existChannel)); + existChannel.close(); + } } } + existChannelList.add(channel); + clientChannelListConcurrentHashMap.put(clientId, existChannelList); + cacheClientChannelConcurrentHashMap.put(namespace, clientChannelListConcurrentHashMap); } - existChannelList.add(channel); - channelIdClientChannelDTOConcurrentHashMap.put(clientId, existChannelList); }else { - channelIdClientChannelDTOConcurrentHashMap.putIfAbsent(clientId, Collections.synchronizedList(new ArrayList<>(List.of(channel)))); + ConcurrentHashMap/*通道*/> clientChannelListConcurrentHashMap = + new ConcurrentHashMap<>(); + clientChannelListConcurrentHashMap.put(clientId, Collections.synchronizedList(new ArrayList<>(List.of(channel)))); + cacheClientChannelConcurrentHashMap.putIfAbsent(namespace, clientChannelListConcurrentHashMap); } } @@ -58,8 +71,17 @@ public class ChannelContext { * @param channel 通道 * @param clientId 客户端ID */ - public static void push(Channel channel, byte[] clientId) { - push(channel,new String(clientId, StandardCharsets.UTF_8)); + public static void push(Channel channel, byte[] namespace, byte[] clientId) { + push(channel, new String(namespace, StandardCharsets.UTF_8), new String(clientId, StandardCharsets.UTF_8)); + } + + /** + * 获取指定服务端所有通道 + * + * @return 返回所有通道信息 + */ + public static ConcurrentMap/*通道*/> getChannels(String namespace) { + return cacheClientChannelConcurrentHashMap.get(namespace); } /** @@ -67,8 +89,20 @@ public class ChannelContext { * * @return 返回所有通道信息 */ - public static ConcurrentMap/*通道*/> getChannels() { - return channelIdClientChannelDTOConcurrentHashMap; + public static ConcurrentMap/*通道*/> getChannels() { + + ConcurrentHashMap/*通道*/> channelListConcurrentHashMap = + new ConcurrentHashMap<>(); + cacheClientChannelConcurrentHashMap.forEach((namespace, item) -> { + item.forEach((clientId, channels) -> { + ServerClient serverClient = new ServerClient(); + serverClient.setClientId(namespace); + serverClient.setClientId(clientId); + channelListConcurrentHashMap.put(serverClient, channels); + }); + }); + return channelListConcurrentHashMap; + } /** * 获取所有通道 @@ -76,7 +110,7 @@ public class ChannelContext { * @return 返回所有通道信息 */ public static List getClientIds() { - return new ArrayList<>(channelIdClientChannelDTOConcurrentHashMap.keySet().stream().toList()); + return new ArrayList<>(cacheClientChannelConcurrentHashMap.keySet().stream().toList()); } @@ -86,16 +120,15 @@ public class ChannelContext { * @param clientId 客户端ID * @return 通道信息 */ - public static List get(byte[] clientId) { - if (channelIdClientChannelDTOConcurrentHashMap - .containsKey(new String(clientId))) { - return channelIdClientChannelDTOConcurrentHashMap - .get(new String(clientId)); - } else { + public static List get(byte[] namespace, byte[] clientId) { + try { + return cacheClientChannelConcurrentHashMap.get(new String(namespace, StandardCharsets.UTF_8)).get(new String(clientId, StandardCharsets.UTF_8)); + } catch (Exception e) { // 无法通过客户端ID[{}]获取通道信息 - log.error("Unable to obtain channel information through client ID [{}]",new String(clientId)); + log.error("Unable to obtain channel information through namespace:{} client ID [{}]", new String(namespace), new String(clientId)); return null; } + } /** @@ -104,8 +137,8 @@ public class ChannelContext { * @param clientId 客户端ID * @return 通道信息 */ - public static List get(String clientId) { - return get(clientId.getBytes(StandardCharsets.UTF_8)); + public static List get(String namespace, String clientId) { + return get(namespace.getBytes(StandardCharsets.UTF_8), clientId.getBytes(StandardCharsets.UTF_8)); } /** * 根据通道ID获取通道信息 @@ -113,8 +146,8 @@ public class ChannelContext { * @param clientId 客户端ID * @return 通道信息 */ - public static Channel getLoadBalance(byte[] clientId) { - List channels = get(clientId); + public static Channel getLoadBalance(byte[] namespace, byte[] clientId) { + List channels = get(namespace, clientId); if(ObjectUtils.isEmpty(channels)){ return null; } @@ -132,8 +165,8 @@ public class ChannelContext { * @param clientId 客户端ID * @return 通道信息 */ - public static Channel getLoadBalance(String clientId) { - return getLoadBalance(clientId.getBytes(StandardCharsets.UTF_8)); + public static Channel getLoadBalance(String namespace, String clientId) { + return getLoadBalance(namespace.getBytes(StandardCharsets.UTF_8), clientId.getBytes(StandardCharsets.UTF_8)); } /** @@ -141,10 +174,10 @@ public class ChannelContext { * * @param clientId 客户端ID */ - public static void clear(String clientId) { - List channels = get(clientId); + public static void clear(String namespace, String clientId) { + List channels = get(namespace, clientId); if (channels != null) { - remove(clientId); + remove(namespace, clientId); for (Channel channel : channels) { if (channel != null && channel.isActive()) { channel.close(); @@ -153,7 +186,7 @@ public class ChannelContext { } else { // log warm // 无法通过客户ID:[{}]移除客户端 - log.warn("Unable to remove client through customer ID: [{}]", clientId); + log.warn("Unable to remove client through namespace:{} clientId: [{}]", namespace, clientId); } } @@ -162,13 +195,13 @@ public class ChannelContext { * * @param clientId 客户端ID */ - public static void remove(byte[] clientId) { - List clientChannel = get(clientId); + public static void remove(byte[] namespace, byte[] clientId) { + List clientChannel = get(namespace, clientId); if (clientChannel != null) { - channelIdClientChannelDTOConcurrentHashMap.remove(new String(clientId)); + cacheClientChannelConcurrentHashMap.get(new String(namespace, StandardCharsets.UTF_8)).remove(new String(clientId, StandardCharsets.UTF_8)); } else { // log warm 无法通过客户ID:[{}]移除客户端 - log.warn("Unable to remove client through customer ID: [{}]", new String(clientId)); + log.warn("Unable to remove client through namespace:{} clientId: [{}]", new String(namespace), new String(clientId)); } } @@ -177,13 +210,13 @@ public class ChannelContext { * * @param clientId 客户端ID */ - public static void remove(String clientId) { - List clientChannel = get(clientId); + public static void remove(String namespace, String clientId) { + List clientChannel = get(namespace, clientId); if (clientChannel != null) { - channelIdClientChannelDTOConcurrentHashMap.remove(clientId); + cacheClientChannelConcurrentHashMap.get(namespace).remove(clientId); } else { // log warm 无法通过客户ID:[{}]移除客户端 - log.warn("Unable to remove client through customer ID: [{}]", clientId); + log.warn("Unable to remove client through namespace :【{}】 clientId: 【{}】", namespace, clientId); } } @@ -206,5 +239,12 @@ public class ChannelContext { } + @Data + public static class ServerClient { + + private String namespace; + private String clientId; + } + } diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/InternalNetworkPenetrationRealClient.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/InternalNetworkPenetrationRealClient.java index d55825c6..f27a392a 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/InternalNetworkPenetrationRealClient.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/InternalNetworkPenetrationRealClient.java @@ -16,6 +16,10 @@ import lombok.experimental.Accessors; public class InternalNetworkPenetrationRealClient { + /** + * 命名空间 + */ + private String namespace; /** * 客户端ID */ diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyClientChannel.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyClientChannel.java index acf8aa99..ab058961 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyClientChannel.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyClientChannel.java @@ -20,8 +20,8 @@ public class NettyClientChannel { */ private Channel channel; /** - * 服务端ID + * namespace */ - private String serverId; + private String namespace; } \ No newline at end of file diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyServerContext.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyServerContext.java index a481960b..d762a2bc 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyServerContext.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/NettyServerContext.java @@ -15,21 +15,24 @@ import java.util.stream.Collectors; public class NettyServerContext { - protected static final ConcurrentHashMap/*NettyClientChannel*/> + protected static final ConcurrentHashMap/*NettyClientChannel*/> NETTY_CLIENT_CHANNEL_SOCKET = new ConcurrentHashMap<>(); /** * 添加访客 * - * @param serverId 服务端ID + * @param namespace namespace * @param clientId 客户端ID * @param channel channel */ - public static void pushServerEndpointChannel(String serverId, String clientId, Channel channel) { - List nettyClientChannelList = getServerEndpointChannels(serverId); + public static void pushServerEndpointChannel(String namespace, String clientId, Channel channel) { + List nettyClientChannelList = getServerEndpointChannels(namespace); // 关闭旧的通道 - nettyClientChannelList.stream().filter(nettyClientChannel -> nettyClientChannel.getClientId().equals(clientId) && nettyClientChannel.getServerId().equals(serverId)).forEach(nettyClientChannel -> { + nettyClientChannelList + .stream() + .filter(nettyClientChannel -> + nettyClientChannel.getClientId().equals(clientId) && nettyClientChannel.getNamespace().equals(namespace)).forEach(nettyClientChannel -> { Channel oldChannel = nettyClientChannel.getChannel(); if (oldChannel != null && oldChannel.isActive()) { oldChannel.close(); @@ -39,11 +42,11 @@ public class NettyServerContext { List activeNettyClientChannelList = nettyClientChannelList .stream() .filter(nettyClientChannel -> - !nettyClientChannel.getClientId().equals(clientId) && !nettyClientChannel.getServerId().equals(serverId)) + !nettyClientChannel.getClientId().equals(clientId) && !nettyClientChannel.getNamespace().equals(namespace)) .collect(Collectors.toList()); - NettyClientChannel nettyClientChannel = new NettyClientChannel(clientId, channel, serverId); + NettyClientChannel nettyClientChannel = new NettyClientChannel(clientId, channel, namespace); activeNettyClientChannelList.add(nettyClientChannel); - NETTY_CLIENT_CHANNEL_SOCKET.put(serverId, activeNettyClientChannelList); + NETTY_CLIENT_CHANNEL_SOCKET.put(namespace, activeNettyClientChannelList); } /** diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/payload/NettyProxyMsg.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/payload/NettyProxyMsg.java index f83e398e..4ab967b0 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/payload/NettyProxyMsg.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/payload/NettyProxyMsg.java @@ -15,8 +15,8 @@ import java.nio.charset.StandardCharsets; @Setter @Getter public class NettyProxyMsg { - // body 长度 type 1 isSsl 1 appKey 4 appSecret 4 clientId 4 originalIp 4 clientTargetIp 4 clientTargetPort 4 visitorPort 4 visitorId 4 data 4 - public static final int bodyLength = 1 + 1 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4; + // body 长度 type 1 isSsl 1 appKey 4 appSecret 4 clientId 4 namespace 4 originalIp 4 clientTargetIp 4 clientTargetPort 4 visitorPort 4 visitorId 4 data 4 + public static final int bodyLength = 1 + 1 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4; /** @@ -55,6 +55,12 @@ public class NettyProxyMsg { * @since 1.2.9 */ private byte[] originalIp; + + /** + * namespace + * byte[] 长度 4 + */ + private byte[] namespace; /** * 客户端ID * byte[] 长度 4 @@ -106,6 +112,14 @@ public class NettyProxyMsg { this.clientId = clientId.getBytes(StandardCharsets.UTF_8); } + public void setNamespace(byte[] namespace) { + this.namespace = namespace; + } + + public void setNamespace(String serverId) { + this.namespace = serverId.getBytes(StandardCharsets.UTF_8); + } + public void setAppKeyString(String appKey) { if (ObjectUtils.isEmpty(appKey)) { @@ -172,18 +186,28 @@ public class NettyProxyMsg { return new String(originalIp, StandardCharsets.UTF_8); } - public String getClientIdString() { + public String clientId() { if (ObjectUtils.isEmpty(clientId)) { return null; } return new String(clientId, StandardCharsets.UTF_8); } + + /** + * namespace + */ + public String namespace() { + if (ObjectUtils.isEmpty(namespace)) { + return null; + } + return new String(namespace, StandardCharsets.UTF_8); + } /** * 客户端目标地址 * * @return 客户端目标地址 */ - public String getTargetIpString() { + public String targetIp() { if (ObjectUtils.isEmpty(clientTargetIp)) { return null; } @@ -194,7 +218,7 @@ public class NettyProxyMsg { * * @return 客户端目标端口 */ - public String getTargetPortString() { + public String targetPort() { if (ObjectUtils.isEmpty(clientTargetPort)) { return null; } @@ -205,7 +229,7 @@ public class NettyProxyMsg { * 获取访客ID * @return */ - public String getVisitorIdString() { + public String visitorId() { if (ObjectUtils.isEmpty(visitorId)) { return null; } diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/constant/UdpMessageType.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/constant/UdpMessageType.java index 2c43fc07..251b2fa9 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/constant/UdpMessageType.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/constant/UdpMessageType.java @@ -173,7 +173,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL * @see AbstractHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced - * @see TcpMessageType#UDP_DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL + * @see UdpMessageType#UDP_DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL */ public static final byte UDP_REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL = UDP_REPORT_CLIENT_PERMEATE_CLIENT_CLOSE+1; @@ -183,7 +183,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_INIT_SUCCESSFUL * @see AbstractHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced - * @see TcpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL + * @see UdpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL */ public static final byte UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL = UDP_REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL+1; /** @@ -191,7 +191,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_REPORT_CLIENT_TRANSFER_CLIENT_REQUEST * @see AbstractHandleUdpReportClientTransferClientTypeAdvanced - * @see TcpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST + * @see UdpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST */ public static final byte UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST = UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL+1; @@ -200,7 +200,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_REPORT_CLIENT_TRANSFER_CLIENT_RESPONSE * @see AbstractHandleUdpReportClientTransferClientResponseTypeAdvanced - * @see TcpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_RESPONSE + * @see UdpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_RESPONSE */ public static final byte UDP_REPORT_CLIENT_TRANSFER_CLIENT_RESPONSE = UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST+1; @@ -209,7 +209,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE * @see AbstractHandleUdpReportClientPermeateClientTransferCloseTypeAdvanced - * @see TcpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE + * @see UdpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE */ public static final byte UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE = UDP_REPORT_CLIENT_TRANSFER_CLIENT_RESPONSE+1; @@ -370,7 +370,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL * @see AbstractHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced - * @see TcpMessageType#UDP_REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL + * @see UdpMessageType#UDP_REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL */ public static final byte UDP_DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL = UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_CLOSE-1; @@ -380,7 +380,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL * @see AbstractHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced - * @see TcpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL + * @see UdpMessageType#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL */ public static final byte UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL = UDP_DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL-1; @@ -389,7 +389,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST * @see AbstractHandleUdpDistributeClientTransferClientRequestTypeAdvanced - * @see TcpMessageType#UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST + * @see UdpMessageType#UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST */ public static final byte UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST = UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL-1; /** @@ -397,7 +397,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_RESPONSE * @see AbstractHandleUdpDistributeServicePermeateClientTransferClientResponseTypeAdvanced - * @see TcpMessageType#UDP_REPORT_CLIENT_TRANSFER_CLIENT_RESPONSE + * @see UdpMessageType#UDP_REPORT_CLIENT_TRANSFER_CLIENT_RESPONSE */ public static final byte UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_RESPONSE = UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST-1; @@ -407,7 +407,7 @@ public class UdpMessageType { * * @see UdpMessageTypeEnums#UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE * @see AbstractHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvanced - * @see TcpMessageType#UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE + * @see UdpMessageType#UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE */ public static final byte UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CLOSE = UDP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_RESPONSE-1; diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/decoder/NettyProxyMsgDecoder.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/decoder/NettyProxyMsgDecoder.java index 5783be1e..9b019cbf 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/decoder/NettyProxyMsgDecoder.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/decoder/NettyProxyMsgDecoder.java @@ -128,6 +128,13 @@ public class NettyProxyMsgDecoder extends LengthFieldBasedFrameDecoder { in.readBytes(originalIpBytes); nettyProxyMsg.setOriginalIp(originalIpBytes); + + int namespaceLength = in.readInt(); + byte[] namespaceBytes = new byte[namespaceLength]; + in.readBytes(namespaceBytes); + nettyProxyMsg.setNamespace(namespaceBytes); + + int clientIdLength = in.readInt(); byte[] clientIdBytes = new byte[clientIdLength]; in.readBytes(clientIdBytes); @@ -159,6 +166,7 @@ public class NettyProxyMsgDecoder extends LengthFieldBasedFrameDecoder { appKeyLength - appSecretLength - originalIpLength - + namespaceLength - clientIdLength - clientTargetIpLength - clientTargetPortLength - diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/encoder/NettyProxyMsgEncoder.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/encoder/NettyProxyMsgEncoder.java index 243e38ab..52040051 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/encoder/NettyProxyMsgEncoder.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/encoder/NettyProxyMsgEncoder.java @@ -28,6 +28,7 @@ public class NettyProxyMsgEncoder extends MessageToByteEncoder { byte[] appKey = msg.getAppKey(); byte[] appSecret = msg.getAppSecret(); byte[] originalIp = msg.getOriginalIp(); + byte[] namespace = msg.getNamespace(); byte[] clientIdBytes = msg.getClientId(); byte[] clientTargetIpBytes = msg.getClientTargetIp(); byte[] clientTargetPortBytes = msg.getClientTargetPort(); @@ -44,6 +45,9 @@ public class NettyProxyMsgEncoder extends MessageToByteEncoder { if (originalIp != null) { bodyLength += originalIp.length; } + if (namespace != null) { + bodyLength += namespace.length; + } if (clientIdBytes != null) { bodyLength += clientIdBytes.length; } @@ -95,6 +99,18 @@ public class NettyProxyMsgEncoder extends MessageToByteEncoder { // 防止原始IP 未填写 out.writeInt(0x00); } + + + // 防止数据读错位置 服务端IP + if (namespace != null) { + out.writeInt(namespace.length); + out.writeBytes(namespace); + } else { + // 防止 服务端IP 未填写 + out.writeInt(0x00); + } + + // 防止数据读错位置 clientId if (clientIdBytes != null) { out.writeInt(clientIdBytes.length); @@ -132,6 +148,7 @@ public class NettyProxyMsgEncoder extends MessageToByteEncoder { out.writeInt(0x00); } + // 访客ID if (visitorIdBytes != null) { out.writeInt(visitorIdBytes.length); out.writeBytes(visitorIdBytes); @@ -139,6 +156,8 @@ public class NettyProxyMsgEncoder extends MessageToByteEncoder { // 防止客户端 访客ID未填写 out.writeInt(0x00); } + + // 数据消息体 if (msgDataBytes != null) { out.writeBytes(msgDataBytes); } diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/HttpClientProxyClientProxyTypeAdvanced.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/HttpClientProxyClientProxyTypeAdvanced.java index 9399bfd7..22c5ef85 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/HttpClientProxyClientProxyTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/HttpClientProxyClientProxyTypeAdvanced.java @@ -30,8 +30,8 @@ public class HttpClientProxyClientProxyTypeAdvanced extends AbstractHttpClientPr @Override protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel channel = nettyChannelContext.channel(); - String targetPortString = nettyProxyMsg.getTargetPortString(); - String targetIpString = nettyProxyMsg.getTargetIpString(); + String targetPortString = nettyProxyMsg.targetPort(); + String targetIpString = nettyProxyMsg.targetIp(); Bootstrap b = new Bootstrap(); b.group(channel.eventLoop()) .channel(NioSocketChannel.class) diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/HttpProtocolHandleChannelLocalProxyTypeAdvanced.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/HttpProtocolHandleChannelLocalProxyTypeAdvanced.java index aa96008e..a1087869 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/HttpProtocolHandleChannelLocalProxyTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/HttpProtocolHandleChannelLocalProxyTypeAdvanced.java @@ -29,8 +29,8 @@ public class HttpProtocolHandleChannelLocalProxyTypeAdvanced extends AbstractHtt */ @Override protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { - String targetPortString = nettyProxyMsg.getTargetPortString(); - String targetIpString = nettyProxyMsg.getTargetIpString(); + String targetPortString = nettyProxyMsg.targetPort(); + String targetIpString = nettyProxyMsg.targetIp(); Bootstrap b = new Bootstrap(); Channel channel = nettyChannelContext.channel(); b.group(channel.eventLoop()) diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/NettySocketProtocolHandleSocketLocalProxyTypeAdvanced.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/NettySocketProtocolHandleSocketLocalProxyTypeAdvanced.java index a9b933c3..7b166058 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/NettySocketProtocolHandleSocketLocalProxyTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/advanced/NettySocketProtocolHandleSocketLocalProxyTypeAdvanced.java @@ -37,8 +37,8 @@ public class NettySocketProtocolHandleSocketLocalProxyTypeAdvanced Channel channel = nettySocketChannelContext.channel(); ChannelHandlerContext channelHandlerContext = nettySocketChannelContext.channelHandlerContext(); EventLoopGroup group = EventLoopGroupFactory.createClientWorkGroup(); - String host = nettyProxyMsg.getTargetIpString(); - Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString()); + String host = nettyProxyMsg.targetIp(); + Integer port = Integer.parseInt(nettyProxyMsg.targetPort()); Bootstrap b = new Bootstrap(); Socks5AddressType socks5AddressType = nettySocketChannelContext.getSocks5AddressType(); diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyHttpProxyHandler.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyHttpProxyHandler.java index e1f04719..709da075 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyHttpProxyHandler.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyHttpProxyHandler.java @@ -83,11 +83,11 @@ public class NettyHttpProxyHandler extends ChannelInboundHandlerAdapter { ProxyRoute route = RouteContext.getRoute(originHost, String.valueOf(originPort)); - + String namespace = route.getNamespace(); proxyMsg.setVisitorId(visitorId); proxyMsg.setData(bytes); - + proxyMsg.setNamespace(namespace); if(ObjectUtils.isEmpty(route)){ // 本地代理 diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettySocks5CommandRequestHandler.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettySocks5CommandRequestHandler.java index 3f87f087..0e4a4591 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettySocks5CommandRequestHandler.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettySocks5CommandRequestHandler.java @@ -60,7 +60,8 @@ public class NettySocks5CommandRequestHandler extends SimpleChannelInboundHandle proxyMsg.setVisitorId(visitorId); ProxyRoute route = RouteContext.getRoute(originHost, String.valueOf(originPort)); - + String namespace = route.getNamespace(); + proxyMsg.setNamespace(namespace); if(ObjectUtils.isEmpty(route)){ diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ClientProxyRoute.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ClientProxyRoute.java index 276b7c4b..d077130d 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ClientProxyRoute.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ClientProxyRoute.java @@ -24,6 +24,10 @@ public class ClientProxyRoute implements ProxyRoute{ * 虚拟端口 */ private String virtualPort; + /** + * 命名空间 + */ + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ProxyRoute.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ProxyRoute.java index a326a76a..93ea6b40 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ProxyRoute.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ProxyRoute.java @@ -6,6 +6,9 @@ package org.framework.lazy.cloud.network.heartbeat.protocol.route; public interface ProxyRoute { + String getNamespace(); + + String getVirtualIp(); diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ServerProxyRoute.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ServerProxyRoute.java index fd7f8c98..9a3089cc 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ServerProxyRoute.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/route/ServerProxyRoute.java @@ -9,6 +9,11 @@ import lombok.Data; @Data public class ServerProxyRoute implements ProxyRoute { + + /** + * 命名空间 + */ + private String namespace; /** * * 服务端ip diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/infrastructure/persistence/LazyNettyClusterNodeRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/infrastructure/persistence/LazyNettyClusterNodeRepositoryImpl.java index 9411ee53..0eabaf02 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/infrastructure/persistence/LazyNettyClusterNodeRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/infrastructure/persistence/LazyNettyClusterNodeRepositoryImpl.java @@ -161,7 +161,7 @@ public class LazyNettyClusterNodeRepositoryImpl implements LazyNettyClusterNodeR // 查询这个节点下客户端注册是否正常 List lazyNettyClientStateDOList = lazyLambdaStream.selectList( LazyWrappers.lambdaWrapper() - .eq(LazyNettyClientStateDO::getServerId, clusterNodeId) + .eq(LazyNettyClientStateDO::getNamespace, clusterNodeId) ); boolean anyMatch = lazyNettyClientStateDOList.stream() .anyMatch(lazyNettyClientStateDO -> 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 8651c84a..4cdc5e2c 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 @@ -76,11 +76,12 @@ public class ServerHandleTcpClientConnectSuccessTypeAdvanced extends AbstractHan public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) { Channel newChannel = nettyChannelContext.channel(); - String clientId = msg.getClientIdString(); + String serverId = msg.namespace(); + String clientId = msg.clientId(); String appKey = msg.getAppKeyString(); String appSecret = msg.getAppSecretString(); String originalIp = msg.getOriginalIpString(); - ChannelContext.push(newChannel, clientId); + ChannelContext.push(newChannel,serverId, clientId); ChannelAttributeKeyUtils.buildClientId(newChannel, clientId); ChannelAttributeKeyUtils.buildAppKey(newChannel, appKey); @@ -172,11 +173,13 @@ public class ServerHandleTcpClientConnectSuccessTypeAdvanced extends AbstractHan .accept(lazyInternalNetworkClientPermeateServerMappingDTOS -> { for (LazyClientPermeateClientMappingDTO lazyClientPermeateClientMappingDTO : lazyInternalNetworkClientPermeateServerMappingDTOS) { + String selfNamespace = lazyClientPermeateClientMappingDTO.getNamespace(); String permeateTargetIp = lazyClientPermeateClientMappingDTO.getPermeateTargetIp(); Integer permeateTargetPort = lazyClientPermeateClientMappingDTO.getPermeateTargetPort(); Integer visitorPort = lazyClientPermeateClientMappingDTO.getVisitorPort(); String toClientId = lazyClientPermeateClientMappingDTO.getToClientId(); NettyProxyMsg nettyMsg = new NettyProxyMsg(); + nettyMsg.setNamespace(selfNamespace); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT); nettyMsg.setClientTargetIp(permeateTargetIp); nettyMsg.setClientTargetPort(permeateTargetPort); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java index f62c2e73..21d861ea 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -2,9 +2,10 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.permeate.tcp.adv import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; -import org.framework.lazy.cloud.network.heartbeat.common.*; -import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; +import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; +import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext; +import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.permeate.tcp.server.AbstractHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; @@ -18,7 +19,8 @@ import org.springframework.stereotype.Component; @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Slf4j @Component -public class ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced extends AbstractHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced { +public class ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced + extends AbstractHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced { /** * 处理当前数据 * @@ -33,14 +35,15 @@ public class ServerHandleTcpReportClientTransferClientPermeateChannelConnectionS byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); - byte[] clientId = nettyProxyMsg.getClientId();// 目标客户端ID + String clientId = nettyProxyMsg.clientId();// 目标客户端ID + String namespace = nettyProxyMsg.namespace(); ChannelAttributeKeyUtils.buildClientId(transferChannel, clientId); ChannelAttributeKeyUtils.buildVisitorPort(transferChannel, Integer.parseInt(new String(msgVisitorPort))); ChannelAttributeKeyUtils.buildVisitorId(transferChannel, msgVisitorId); // 绑定访客通道 NettyTransferChannelContext.pushVisitor(transferChannel,msgVisitorId); - Channel clientChannel = ChannelContext.getLoadBalance(clientId); + Channel clientChannel = ChannelContext.getLoadBalance(namespace, clientId); 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/tcp/advanced/ServerHandleTcpReportClientTransferClientResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientResponseTypeAdvanced.java index 67f96da0..06f43381 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientResponseTypeAdvanced.java @@ -36,7 +36,7 @@ public class ServerHandleTcpReportClientTransferClientResponseTypeAdvanced exten byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); - String clientId = nettyProxyMsg.getClientIdString(); + String clientId = nettyProxyMsg.clientId(); // 下发客户端初始化成功 Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientTypeAdvanced.java index 4d91d071..e9ff73f1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientTypeAdvanced.java @@ -36,7 +36,7 @@ public class ServerHandleTcpReportClientTransferClientTypeAdvanced extends Abstr byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); - String clientId = nettyProxyMsg.getClientIdString(); + String clientId = nettyProxyMsg.clientId(); // 下发客户端初始化成功 Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); Integer visitorPort = ChannelAttributeKeyUtils.getVisitorPort(channel); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportDisconnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportDisconnectTypeAdvanced.java index 04136fcb..30b390b8 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportDisconnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportDisconnectTypeAdvanced.java @@ -47,9 +47,10 @@ public class ServerHandleTcpReportDisconnectTypeAdvanced extends AbstractHandleT Channel deathChannel = nettyChannelContext.channel(); log.debug("close the channel with id :{}",deathChannel.id().asLongText()); // 关闭连接通知 - String clientId = msg.getClientIdString(); + String clientId = msg.clientId(); + String serverId = msg.namespace(); log.warn("close client :{} channel", clientId); - Channel deathClientChannelDTO = ChannelContext.getLoadBalance(clientId); + Channel deathClientChannelDTO = ChannelContext.getLoadBalance(serverId,clientId); String appKey = ChannelAttributeKeyUtils.getAppKey(deathChannel); String appSecret = ChannelAttributeKeyUtils.getAppSecret(deathChannel); String originalIp = ChannelAttributeKeyUtils.getOriginalIp(deathChannel); @@ -58,11 +59,12 @@ public class ServerHandleTcpReportDisconnectTypeAdvanced extends AbstractHandleT LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand(); lazyNettyClientLoginCommand.setClientId(clientId); + lazyNettyClientLoginCommand.setNamespace(serverId); lazyNettyClientLoginCommand.setAppKey(appKey); lazyNettyClientLoginCommand.setAppSecret(appSecret); lazyNettyClientLoginCommand.setOriginalIp(originalIp); lazyClientStatsChangeApplication.clientOffLine(lazyNettyClientLoginCommand); - ChannelContext.remove(clientId); + ChannelContext.remove(serverId,clientId); // 通知其他客户端 channelId 关闭了 ChannelContext.getChannels().forEach((existClientId, channels) -> { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportStagingClosedTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportStagingClosedTypeAdvanced.java index 2d71718c..9b995595 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportStagingClosedTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportStagingClosedTypeAdvanced.java @@ -43,11 +43,12 @@ public class ServerHandleTcpReportStagingClosedTypeAdvanced extends AbstractHand String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingClosedChannel); String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingClosedChannel); - byte[] clientIdBytes = msg.getClientId(); + String serverId= msg.namespace(); + String clientId = msg.clientId(); // 获取所有通道 - List stagingOpenedClientChannel = ChannelContext.get(clientIdBytes); + List stagingOpenedClientChannel = ChannelContext.get(serverId,clientId); if (stagingOpenedClientChannel != null) { - String clientId = new String(clientIdBytes); + // 存储当前客户端暂存关闭 LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand(); lazyNettyClientLoginCommand.setClientId(clientId); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportStagingOpenedTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportStagingOpenedTypeAdvanced.java index 834950d5..29eb5c2b 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportStagingOpenedTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportStagingOpenedTypeAdvanced.java @@ -42,15 +42,15 @@ public class ServerHandleTcpReportStagingOpenedTypeAdvanced extends AbstractHand protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) { Channel stagingOpenedChannel = nettyChannelContext.channel(); // 获取所有通道 - byte[] clientIdBytes = msg.getClientId(); + String serverId = msg.namespace(); + String clientId = msg.clientId(); String appKey = ChannelAttributeKeyUtils.getAppKey(stagingOpenedChannel); String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingOpenedChannel); String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingOpenedChannel); - List stagingOpenedClientChannel = ChannelContext.get(clientIdBytes); + List stagingOpenedClientChannel = ChannelContext.get(serverId,clientId); // 存储当前客户端暂存关闭 - String clientId = new String(clientIdBytes); LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand(); lazyNettyClientLoginCommand.setClientId(clientId); lazyNettyClientLoginCommand.setAppKey(appKey); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerPermeateClientVisitorHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerPermeateClientVisitorHandler.java index 4d57c020..c6bf4ba6 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerPermeateClientVisitorHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerPermeateClientVisitorHandler.java @@ -40,6 +40,7 @@ public class NettyTcpServerPermeateClientVisitorHandler extends SimpleChannelInb // 生成访客ID String visitorId = UUID.randomUUID().toString(); + String namespace = internalNetworkPenetrationRealClient.getNamespace(); String clientId = internalNetworkPenetrationRealClient.getClientId(); Integer visitorPort = internalNetworkPenetrationRealClient.getVisitorPort(); String clientTargetIp = internalNetworkPenetrationRealClient.getClientTargetIp(); @@ -50,6 +51,7 @@ public class NettyTcpServerPermeateClientVisitorHandler extends SimpleChannelInb ChannelAttributeKeyUtils.buildVisitorId(visitorChannel, visitorId); ChannelAttributeKeyUtils.buildClientId(visitorChannel, clientId); NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); + nettyProxyMsg.setNamespace(namespace); nettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_SINGLE_CLIENT_REAL_CONNECT); nettyProxyMsg.setClientId(clientId); nettyProxyMsg.setVisitorPort(visitorPort); @@ -62,7 +64,7 @@ public class NettyTcpServerPermeateClientVisitorHandler extends SimpleChannelInb // Channel transferChannel = nettyChannelPool.availableChannel(visitorId); // if (transferChannel == null) { // 客户端心跳通道 - Channel clientChannel = ChannelContext.getLoadBalance(clientId); + Channel clientChannel = ChannelContext.getLoadBalance(namespace,clientId); if (clientChannel != null) { log.info("通过客户端:{},获取通道而后创建连接", clientId); clientChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/socket/NettyTcpServerPermeateClientVisitorSocket.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/socket/NettyTcpServerPermeateClientVisitorSocket.java index 998f4e3b..42b5e86a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/socket/NettyTcpServerPermeateClientVisitorSocket.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/socket/NettyTcpServerPermeateClientVisitorSocket.java @@ -106,6 +106,10 @@ public class NettyTcpServerPermeateClientVisitorSocket implements PermeateVisito public static final class NettyVisitorSocketBuilder { + /** + * 命名空间 + */ + private String namespace; /** * 客户端ID */ @@ -140,6 +144,16 @@ public class NettyTcpServerPermeateClientVisitorSocket implements PermeateVisito return new NettyVisitorSocketBuilder(); } + /** + * 填充客户端 + * + * @param clientId 客户端 + * @return 返回当前对象 + */ + public NettyVisitorSocketBuilder builderNamespace(String namespace) { + this.namespace = namespace; + return this; + } /** * 填充客户端 * @@ -207,6 +221,9 @@ public class NettyTcpServerPermeateClientVisitorSocket implements PermeateVisito } public NettyTcpServerPermeateClientVisitorSocket build() { + if (namespace == null) { + throw new IllegalArgumentException("namespace must not null"); + } if (clientId == null) { throw new IllegalArgumentException("clientId must not null"); } @@ -221,6 +238,7 @@ public class NettyTcpServerPermeateClientVisitorSocket implements PermeateVisito } InternalNetworkPenetrationRealClient internalNetworkPenetrationRealClient = InternalNetworkPenetrationRealClient .builder() + .namespace(namespace) .clientId(clientId) .clientTargetIp(clientTargetIp) .clientTargetPort(clientTargetPort) 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 c2b60d44..618bfcc6 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 @@ -66,12 +66,12 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan @Override public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) { Channel newChannel = nettyChannelContext.channel(); - - String clientId = msg.getClientIdString(); + String serverId = msg.namespace(); + String clientId = msg.clientId(); String appKey = msg.getAppKeyString(); String appSecret = msg.getAppSecretString(); String originalIp = msg.getOriginalIpString(); - ChannelContext.push(newChannel, clientId); + ChannelContext.push(newChannel, serverId,clientId); ChannelAttributeKeyUtils.buildClientId(newChannel, clientId); ChannelAttributeKeyUtils.buildAppKey(newChannel, appKey); 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 f4355a2d..a9394dfc 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 @@ -3,11 +3,11 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.permeate.udp.adv import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; -import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext; -import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; -import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext; +import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext; +import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.permeate.udp.server.AbstractHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced; +import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Role; @@ -30,18 +30,19 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelConnectionS protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel channel = nettyChannelContext.channel(); // 创建目标地址连接 + String namespace = nettyProxyMsg.namespace(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); + String msgClientTargetIp = nettyProxyMsg.targetIp(); byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); - byte[] clientId = nettyProxyMsg.getClientId();// 目标客户端ID + String clientId = nettyProxyMsg.clientId();// 目标客户端ID ChannelAttributeKeyUtils.buildClientId(channel, clientId); ChannelAttributeKeyUtils.buildVisitorPort(channel, Integer.parseInt(new String(msgVisitorPort))); ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId); // 绑定访客通道 NettyTransferChannelContext.pushVisitor(channel,msgVisitorId); - Channel clientChannel = ChannelContext.getLoadBalance(clientId); + Channel clientChannel = ChannelContext.getLoadBalance(namespace,clientId); 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 bb517e98..405ba9de 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 @@ -38,7 +38,7 @@ public class ServerHandleUdpReportClientTransferClientResponseTypeAdvanced exten byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); - String clientId = nettyProxyMsg.getClientIdString(); + String clientId = nettyProxyMsg.clientId(); // 下发客户端初始化成功 Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); 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 205087ba..3c5a1b51 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 @@ -36,7 +36,7 @@ public class ServerHandleUdpReportClientTransferClientTypeAdvanced extends Abstr byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); - String clientId = nettyProxyMsg.getClientIdString(); + String clientId = nettyProxyMsg.clientId(); // 下发客户端初始化成功 Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); Integer visitorPort = ChannelAttributeKeyUtils.getVisitorPort(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 294bb543..650139ea 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 @@ -46,9 +46,10 @@ public class ServerHandleUdpReportDisconnectTypeAdvanced extends AbstractHandleU public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) { Channel deathChannel = nettyChannelContext.channel(); // 关闭连接通知 - String clientId = msg.getClientIdString(); + String clientId = msg.clientId(); + String serverId = msg.namespace(); log.warn("close client :{} channel", clientId); - Channel deathClientChannelDTO = ChannelContext.getLoadBalance(clientId); + Channel deathClientChannelDTO = ChannelContext.getLoadBalance(serverId,clientId); String appKey = ChannelAttributeKeyUtils.getAppKey(deathChannel); String appSecret = ChannelAttributeKeyUtils.getAppSecret(deathChannel); String originalIp = ChannelAttributeKeyUtils.getOriginalIp(deathChannel); @@ -61,7 +62,7 @@ public class ServerHandleUdpReportDisconnectTypeAdvanced extends AbstractHandleU lazyNettyClientLoginCommand.setAppSecret(appSecret); lazyNettyClientLoginCommand.setOriginalIp(originalIp); lazyClientStatsChangeApplication.clientOffLine(lazyNettyClientLoginCommand); - ChannelContext.remove(clientId); + ChannelContext.remove(serverId,clientId); // 通知其他客户端 channelId 关闭了 ChannelContext.getChannels().forEach((existClientId, channels) -> { @@ -87,7 +88,7 @@ public class ServerHandleUdpReportDisconnectTypeAdvanced extends AbstractHandleU for (NettyUdpServerPermeateClientVisitorSocket visitorSocket : visitorSockets) { int visitorPort = visitorSocket.getVisitorPort(); visitorSocket.close(); - log.warn("client :[{}] visitorPort:[{}] close", new String(clientId), visitorPort); + log.warn("client :[{}] visitorPort:[{}] close", clientId, visitorPort); } } 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 8e9b04e7..444abce6 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 @@ -4,9 +4,9 @@ import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext; -import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.permeate.udp.server.AbstractHandleUdpReportStagingClosedTypeAdvanced; +import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyClientStatsChangeApplication; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.state.LazyNettyClientLoginCommand; @@ -42,12 +42,12 @@ public class ServerHandleUdpReportStagingClosedTypeAdvanced extends AbstractHand String appKey = ChannelAttributeKeyUtils.getAppKey(stagingClosedChannel); String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingClosedChannel); String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingClosedChannel); - - byte[] clientIdBytes = msg.getClientId(); + String serverId = msg.namespace(); + String clientId = msg.clientId(); // 获取所有通道 - List stagingOpenedClientChannel = ChannelContext.get(clientIdBytes); + List stagingOpenedClientChannel = ChannelContext.get(serverId, clientId); if (stagingOpenedClientChannel != null) { - String clientId = new String(clientIdBytes); + // 存储当前客户端暂存关闭 LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand(); lazyNettyClientLoginCommand.setClientId(clientId); 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 37ff59dc..5aa9e5c4 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 @@ -42,15 +42,16 @@ public class ServerHandleUdpReportStagingOpenedTypeAdvanced extends AbstractHand protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) { Channel stagingOpenedChannel = nettyChannelContext.channel(); // 获取所有通道 - byte[] clientIdBytes = msg.getClientId(); + String serverId = msg.namespace(); + String clientId = msg.clientId(); String appKey = ChannelAttributeKeyUtils.getAppKey(stagingOpenedChannel); String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingOpenedChannel); String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingOpenedChannel); - List stagingOpenedClientChannel = ChannelContext.get(clientIdBytes); + List stagingOpenedClientChannel = ChannelContext.get(serverId,clientId); // 存储当前客户端暂存关闭 - String clientId = new String(clientIdBytes); + LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand(); lazyNettyClientLoginCommand.setClientId(clientId); lazyNettyClientLoginCommand.setAppKey(appKey); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/handler/NettyUdpServerPermeateClientVisitorHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/handler/NettyUdpServerPermeateClientVisitorHandler.java index 1c06b326..2488b74c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/handler/NettyUdpServerPermeateClientVisitorHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/handler/NettyUdpServerPermeateClientVisitorHandler.java @@ -40,6 +40,7 @@ public class NettyUdpServerPermeateClientVisitorHandler extends SimpleChannelInb // 生成访客ID String visitorId = UUID.randomUUID().toString(); + String namespace = internalNetworkPenetrationRealClient.getNamespace(); String clientId = internalNetworkPenetrationRealClient.getClientId(); Integer visitorPort = internalNetworkPenetrationRealClient.getVisitorPort(); String clientTargetIp = internalNetworkPenetrationRealClient.getClientTargetIp(); @@ -54,6 +55,7 @@ public class NettyUdpServerPermeateClientVisitorHandler extends SimpleChannelInb nettyProxyMsg.setClientId(clientId); nettyProxyMsg.setVisitorPort(visitorPort); nettyProxyMsg.setClientTargetIp(clientTargetIp); + nettyProxyMsg.setNamespace(namespace); nettyProxyMsg.setClientTargetPort(clientTargetPort); nettyProxyMsg.setVisitorId(visitorId); @@ -62,7 +64,7 @@ public class NettyUdpServerPermeateClientVisitorHandler extends SimpleChannelInb // Channel transferChannel = nettyChannelPool.availableChannel(visitorId); // if (transferChannel == null) { // 客户端心跳通道 - Channel clientChannel = ChannelContext.getLoadBalance(clientId); + Channel clientChannel = ChannelContext.getLoadBalance(namespace,clientId); if (clientChannel != null) { log.info("通过客户端:{},获取通道而后创建连接", clientId); clientChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/socket/NettyUdpServerPermeateClientVisitorSocket.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/socket/NettyUdpServerPermeateClientVisitorSocket.java index 20de3325..9596278e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/socket/NettyUdpServerPermeateClientVisitorSocket.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/socket/NettyUdpServerPermeateClientVisitorSocket.java @@ -106,6 +106,10 @@ public class NettyUdpServerPermeateClientVisitorSocket implements PermeateVisito public static final class NettyVisitorSocketBuilder { + /** + * 命名空间 + */ + private String namespace; /** * 客户端ID */ @@ -207,6 +211,9 @@ public class NettyUdpServerPermeateClientVisitorSocket implements PermeateVisito } public NettyUdpServerPermeateClientVisitorSocket build() { + if (namespace == null) { + throw new IllegalArgumentException("namespace must not null"); + } if (clientId == null) { throw new IllegalArgumentException("clientId must not null"); } @@ -221,6 +228,7 @@ public class NettyUdpServerPermeateClientVisitorSocket implements PermeateVisito } InternalNetworkPenetrationRealClient internalNetworkPenetrationRealClient = InternalNetworkPenetrationRealClient .builder() + .namespace(namespace) .clientId(clientId) .clientTargetIp(clientTargetIp) .clientTargetPort(clientTargetPort) diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced.java index 0c0725e6..1fc9c021 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced.java @@ -48,12 +48,13 @@ public class ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel channel = nettyChannelContext.channel(); // 创建链接、发送数据 - String targetPortString = nettyProxyMsg.getTargetPortString(); + String targetPortString = nettyProxyMsg.targetPort(); Integer targetPort = Integer.parseInt(targetPortString); - String targetIpString = nettyProxyMsg.getTargetIpString(); + String targetIpString = nettyProxyMsg.targetIp(); byte[] data = nettyProxyMsg.getData(); byte[] visitorId = nettyProxyMsg.getVisitorId(); - byte[] clientId = nettyProxyMsg.getClientId(); + String serverId = nettyProxyMsg.namespace(); + String clientId = nettyProxyMsg.clientId(); String msgVisitorId = new String(visitorId); ChannelAttributeKeyUtils.buildClientId(channel, clientId); ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId); @@ -66,7 +67,7 @@ public class ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced nettyByteBuf.setData(data); ChannelAttributeKeyUtils.buildNettyByteBufData(channel, nettyByteBuf); // 获取客户端心跳通道 - Channel loadBalance = ChannelContext.getLoadBalance(clientId); + Channel loadBalance = ChannelContext.getLoadBalance(serverId,clientId); 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/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 e13a30b2..f18818c4 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 @@ -50,9 +50,9 @@ public class ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced String targetIp = ChannelAttributeKeyUtils.getTargetIp(transferNextChannel); Integer targetPort = ChannelAttributeKeyUtils.getTargetPort(transferNextChannel); - String clientId = nettyProxyMsg.getClientIdString(); + String clientId = nettyProxyMsg.clientId(); Integer visitorPort = nettyProxyMsg.getVisitorPortInt(); - String visitorId = nettyProxyMsg.getVisitorIdString(); + String visitorId = nettyProxyMsg.visitorId(); if(ObjectUtils.isNotEmpty(transferNextChannel)) { log.info("目标客户端返回数据通过服务端下发到原始通道"); NettyProxyMsg responseProxyMsg = new NettyProxyMsg(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced.java index b3a0476b..ccceee9c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced.java @@ -51,10 +51,10 @@ public class ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel channel = nettyChannelContext.channel(); // 创建链接、发送数据 - String targetPortString = nettyProxyMsg.getTargetPortString(); + String targetPortString = nettyProxyMsg.targetPort(); int targetPort = Integer.parseInt(targetPortString); - String targetIpString = nettyProxyMsg.getTargetIpString(); - String clientIdString = nettyProxyMsg.getClientIdString(); + String targetIpString = nettyProxyMsg.targetIp(); + String clientIdString = nettyProxyMsg.clientId(); byte[] data = nettyProxyMsg.getData(); byte[] visitorId = nettyProxyMsg.getVisitorId(); String originalIpString = nettyProxyMsg.getOriginalIpString(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced.java index 32d8db95..b803a129 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced.java @@ -45,8 +45,8 @@ public class ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced // 数据下发 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); - String targetIpString = nettyProxyMsg.getTargetIpString(); - String targetPortString = nettyProxyMsg.getTargetPortString(); + String targetIpString = nettyProxyMsg.targetIp(); + String targetPortString = nettyProxyMsg.targetPort(); Integer targetPort = Integer.parseInt(targetPortString); 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 bc9df480..7cbdf490 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 @@ -34,33 +34,34 @@ public class ServerHandleHttpReportServerProxyClientTransferTypeAdvanced Channel channel = nettyChannelContext.channel(); // 创建链接、发送数据 - String targetPortString = nettyProxyMsg.getTargetPortString(); - String targetIpString = nettyProxyMsg.getTargetIpString(); + String targetPort = nettyProxyMsg.targetPort(); + String targetIp = nettyProxyMsg.targetIp(); byte[] data = nettyProxyMsg.getData(); - byte[] visitorId = nettyProxyMsg.getVisitorId(); - byte[] clientId = nettyProxyMsg.getClientId(); - String msgVisitorId = new String(visitorId); - ChannelAttributeKeyUtils.buildClientId(channel, clientId); - ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId); + String visitorId = nettyProxyMsg.visitorId(); + String namespace = nettyProxyMsg.namespace(); + String clientId = nettyProxyMsg.clientId(); - NettyTransferChannelContext.pushVisitor(channel, msgVisitorId); + ChannelAttributeKeyUtils.buildClientId(channel, clientId); + ChannelAttributeKeyUtils.buildVisitorId(channel, visitorId); + + NettyTransferChannelContext.pushVisitor(channel, visitorId); NettyByteBuf nettyByteBuf = new NettyByteBuf(); nettyByteBuf.setData(data); ChannelAttributeKeyUtils.buildNettyByteBufData(channel, nettyByteBuf); // 获取客户端心跳通道 - Channel loadBalance = ChannelContext.getLoadBalance(clientId); + Channel loadBalance = ChannelContext.getLoadBalance(namespace,clientId); NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); - clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); - clientConnectTagetNettyProxyMsg.setClientTargetIp(targetIpString); - clientConnectTagetNettyProxyMsg.setClientTargetPort(Integer.parseInt(targetPortString)); + clientConnectTagetNettyProxyMsg.setVisitorId(visitorId); + clientConnectTagetNettyProxyMsg.setClientTargetIp(targetIp); + clientConnectTagetNettyProxyMsg.setClientTargetPort(Integer.parseInt(targetPort)); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setType(ProxyMessageType.HTTP_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_SUCCESSFUL_); if (loadBalance != null) { // 让客户端主动创建一个数据传输通道 loadBalance.writeAndFlush(clientConnectTagetNettyProxyMsg); }else { - log.error("can not find target client:【】 nettyChannelContext",clientId); + log.error("can not find target client:【{}】 nettyChannelContext",clientId); } } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced.java index 90d7fb9b..6959a44f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced.java @@ -1,13 +1,7 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.advanced; -import io.netty.bootstrap.Bootstrap; -import io.netty.channel.*; -import io.netty.channel.socket.SocketChannel; -import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.handler.codec.socksx.v5.DefaultSocks5CommandResponse; -import io.netty.handler.codec.socksx.v5.Socks5AddressType; -import io.netty.handler.codec.socksx.v5.Socks5CommandStatus; +import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext; @@ -15,17 +9,12 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyC import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.socks.server.AbstractHandleSocksReportClientProxyClientConnectionTransferTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; -import org.framework.lazy.cloud.network.heartbeat.common.decoder.TransferDecoder; -import org.framework.lazy.cloud.network.heartbeat.common.factory.EventLoopGroupFactory; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; -import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.handler.NettySocksClientProxyServerRealHandler; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Role; import org.springframework.stereotype.Component; import org.wu.framework.core.utils.ObjectUtils; -import java.net.InetSocketAddress; - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @Slf4j @@ -44,11 +33,12 @@ public class ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { Channel transferChannel = nettyChannelContext.channel(); - String host = nettyProxyMsg.getTargetIpString(); - Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString()); + String namespace = nettyProxyMsg.namespace(); + String host = nettyProxyMsg.targetIp(); + Integer port = Integer.parseInt(nettyProxyMsg.targetPort()); byte[] data = nettyProxyMsg.getData(); byte[] visitorId = nettyProxyMsg.getVisitorId(); - byte[] targetClientId = nettyProxyMsg.getClientId(); + String targetClientId = nettyProxyMsg.clientId(); String msgVisitorId = new String(visitorId); ChannelAttributeKeyUtils.buildClientId(transferChannel, targetClientId); ChannelAttributeKeyUtils.buildVisitorId(transferChannel, msgVisitorId); @@ -58,7 +48,7 @@ public class ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced NettyTransferChannelContext.pushVisitor(transferChannel, msgVisitorId); // 客户端连接客户端传输通道 - Channel loadBalance = ChannelContext.getLoadBalance(targetClientId); + Channel loadBalance = ChannelContext.getLoadBalance(namespace, targetClientId); if(ObjectUtils.isNotEmpty(loadBalance)) { // 下发创建新链接指令 NettyProxyMsg otherClientConnectServer = new NettyProxyMsg(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced.java index 905d1d24..596af309 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced.java @@ -9,7 +9,6 @@ import io.netty.handler.codec.socksx.v5.DefaultSocks5CommandResponse; import io.netty.handler.codec.socksx.v5.Socks5AddressType; import io.netty.handler.codec.socksx.v5.Socks5CommandStatus; import lombok.extern.slf4j.Slf4j; -import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; @@ -49,8 +48,8 @@ public class ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced Channel transferChannel = nettyChannelContext.channel(); - String host = nettyProxyMsg.getTargetIpString(); - Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString()); + String host = nettyProxyMsg.targetIp(); + Integer port = Integer.parseInt(nettyProxyMsg.targetPort()); byte[] data = nettyProxyMsg.getData(); byte[] visitorId = nettyProxyMsg.getVisitorId(); byte[] clientId = nettyProxyMsg.getClientId(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientTypeAdvanced.java index 56f78e1c..126cc64d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientTypeAdvanced.java @@ -1,7 +1,7 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.advanced; -import io.netty.channel.*; +import io.netty.channel.Channel; import io.netty.handler.codec.socksx.v5.Socks5AddressType; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; @@ -35,13 +35,14 @@ public class ServerHandleSocksReportServerProxyClientTypeAdvanced public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { NettySocketChannelContext nettySocketChannelContext = (NettySocketChannelContext) nettyChannelContext; Channel visitorrChannel = nettySocketChannelContext.channel(); - String host = nettyProxyMsg.getTargetIpString(); - Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString()); + String namespace = nettyProxyMsg.namespace(); + String host = nettyProxyMsg.targetIp(); + Integer port = Integer.parseInt(nettyProxyMsg.targetPort()); byte[] visitorId = nettyProxyMsg.getVisitorId(); - byte[] targetClientId = nettyProxyMsg.getClientId(); + String targetClientId = nettyProxyMsg.clientId(); Socks5AddressType socks5AddressType = nettySocketChannelContext.getSocks5AddressType(); byte socks5AddressTypeByte = socks5AddressType.byteValue(); @@ -55,7 +56,7 @@ public class ServerHandleSocksReportServerProxyClientTypeAdvanced NettyTransferChannelContext.pushVisitor(visitorrChannel, msgVisitorId); // 客户端连接客户端传输通道 - Channel loadBalance = ChannelContext.getLoadBalance(targetClientId); + Channel loadBalance = ChannelContext.getLoadBalance(namespace,targetClientId); if(ObjectUtils.isNotEmpty(loadBalance)) { // 下发创建新链接指令 NettyProxyMsg otherClientConnectServer = new NettyProxyMsg(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistQueryListCommand.java index e98ce1fb..bf62f4ae 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistQueryListCommand.java @@ -50,8 +50,8 @@ public class LazyNettyClientBlacklistQueryListCommand { @Schema(description = "更新时间", name = "updateTime", example = "") private LocalDateTime updateTime; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistQueryOneCommand.java index 6ba24e1c..b862a572 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistQueryOneCommand.java @@ -50,8 +50,8 @@ public class LazyNettyClientBlacklistQueryOneCommand { @Schema(description = "更新时间", name = "updateTime", example = "") private LocalDateTime updateTime; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistRemoveCommand.java index 8795ea7e..8dc5a662 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistRemoveCommand.java @@ -50,8 +50,8 @@ public class LazyNettyClientBlacklistRemoveCommand { @Schema(description = "更新时间", name = "updateTime", example = "") private LocalDateTime updateTime; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistStoryCommand.java index 95e95fb8..167ddec7 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistStoryCommand.java @@ -52,10 +52,11 @@ public class LazyNettyClientBlacklistStoryCommand { * 更新时间 */ @Schema(description = "更新时间", name = "updateTime", example = "") - private LocalDateTime updateTime; /** - * 服务端ID + private LocalDateTime updateTime; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistUpdateCommand.java index 8d376bff..9f261f8e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/blacklist/LazyNettyClientBlacklistUpdateCommand.java @@ -48,10 +48,10 @@ public class LazyNettyClientBlacklistUpdateCommand { * 更新时间 */ @Schema(description = "更新时间", name = "updateTime", example = "") - private LocalDateTime updateTime; /** - * 服务端ID + private LocalDateTime updateTime; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; - + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingQueryListCommand.java index 011611e6..16acd0cb 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingQueryListCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingQueryListCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingQueryOneCommand.java index 62562f96..e8267455 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingQueryOneCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingQueryOneCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingRemoveCommand.java index 12aa0e01..6c6139cf 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingRemoveCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingRemoveCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingStoryCommand.java index 503802b4..9a05f5b9 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingStoryCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingStoryCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingUpdateCommand.java index b908163d..4b710680 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/client/mapping/LazyClientPermeateClientMappingUpdateCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingUpdateCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingQueryListCommand.java index 843898ca..82aacf21 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingQueryListCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingQueryListCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingQueryOneCommand.java index 40a5d9ef..fff9f7d1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingQueryOneCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingQueryOneCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingRemoveCommand.java index e7e80a39..12ce5848 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingRemoveCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingRemoveCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingStoryCommand.java index ed3cb63e..ebbe4736 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingStoryCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingStoryCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingUpdateCommand.java index d749ed25..388866ff 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/permeate/server/mapping/LazyClientPermeateServerMappingUpdateCommand.java @@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingUpdateCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientLoginCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientLoginCommand.java index 6fd5a662..c216b81d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientLoginCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientLoginCommand.java @@ -46,10 +46,10 @@ public class LazyNettyClientLoginCommand { private String stagingState; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 令牌key diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientMessageCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientMessageCommand.java index b981f43b..0b55ce41 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientMessageCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientMessageCommand.java @@ -31,9 +31,9 @@ public class LazyNettyClientMessageCommand { @Schema(description = "发送的消息", name = "message", example = "") private String message; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/state/LazyNettyClientStateQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateQueryListCommand.java index e040eb97..dd183e95 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateQueryListCommand.java @@ -66,10 +66,11 @@ public class LazyNettyClientStateQueryListCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; /** - * 服务端ID + private String describe; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/state/LazyNettyClientStateQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateQueryOneCommand.java index 27a5857e..bcf9a921 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateQueryOneCommand.java @@ -67,9 +67,10 @@ public class LazyNettyClientStateQueryOneCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; /** - * 服务端ID + private String describe; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/state/LazyNettyClientStateRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateRemoveCommand.java index feb54ea5..2bb97b65 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateRemoveCommand.java @@ -61,10 +61,11 @@ public class LazyNettyClientStateRemoveCommand { * 修改时间 */ @Schema(description = "修改时间", name = "updateTime", example = "") - private LocalDateTime updateTime; /** - * 服务端ID + private LocalDateTime updateTime; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/state/LazyNettyClientStateStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateStoryCommand.java index 7ec7ef5d..7c00b3cb 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateStoryCommand.java @@ -66,10 +66,10 @@ public class LazyNettyClientStateStoryCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; /** - * 服务端ID + private String describe; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; - + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/state/LazyNettyClientStateUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateUpdateCommand.java index 67a74b3d..88df214c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/LazyNettyClientStateUpdateCommand.java @@ -66,9 +66,10 @@ public class LazyNettyClientStateUpdateCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; /** - * 服务端ID + private String describe; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryListCommand.java index 089f32be..15983297 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryListCommand.java @@ -50,11 +50,10 @@ public class LazyNettyClientStateRecordQueryListCommand { private NettyClientStatus onLineState; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryOneCommand.java index ca9c6931..d0b3cb45 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordQueryOneCommand.java @@ -48,11 +48,10 @@ public class LazyNettyClientStateRecordQueryOneCommand { private String onLineState; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordRemoveCommand.java index 787d0360..5c6b1628 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordRemoveCommand.java @@ -48,11 +48,10 @@ public class LazyNettyClientStateRecordRemoveCommand { private String onLineState; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordStoryCommand.java index f68747cc..f8adf15c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordStoryCommand.java @@ -48,12 +48,10 @@ public class LazyNettyClientStateRecordStoryCommand { private String onLineState; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; - + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * * 暂存状态（开启、关闭） diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordUpdateCommand.java index 1b719948..c6af1767 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/client/state/record/LazyNettyClientStateRecordUpdateCommand.java @@ -48,11 +48,10 @@ public class LazyNettyClientStateRecordUpdateCommand { private String onLineState; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingQueryListCommand.java index a64ae041..140aad6d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingQueryListCommand.java @@ -67,11 +67,12 @@ public class LazyServerPermeateClientMappingQueryListCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; /** - * 服务端ID + private String describe; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * from 客户端 协议类型 */ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingQueryOneCommand.java index bee03dae..aa22696c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingQueryOneCommand.java @@ -66,12 +66,12 @@ public class LazyServerPermeateClientMappingQueryOneCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; + private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * from 客户端 协议类型 */ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingRemoveCommand.java index a30eef44..52081214 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingRemoveCommand.java @@ -58,12 +58,12 @@ public class LazyServerPermeateClientMappingRemoveCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; + private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * from 客户端 协议类型 */ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingStoryCommand.java index a039fe10..fd105af9 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingStoryCommand.java @@ -52,13 +52,12 @@ public class LazyServerPermeateClientMappingStoryCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; + private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; - + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 是否是ssl */ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingUpdateCommand.java index 3056a86b..015e5b7a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/client/mapping/LazyServerPermeateClientMappingUpdateCommand.java @@ -57,12 +57,12 @@ public class LazyServerPermeateClientMappingUpdateCommand { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; + private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 是否是ssl diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorQueryListCommand.java index 47dae0e4..2ae7c50e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorQueryListCommand.java @@ -61,9 +61,9 @@ public class LazyNettyServerVisitorQueryListCommand { @Schema(description = "访客端口池大小", name = "poolSize", example = "") private Integer poolSize; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorQueryOneCommand.java index 11f38c9e..904c12e0 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorQueryOneCommand.java @@ -61,8 +61,8 @@ public class LazyNettyServerVisitorQueryOneCommand { @Schema(description = "访客端口池大小", name = "poolSize", example = "") private Integer poolSize; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorRemoveCommand.java index ea40fd4e..af1e9ab0 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorRemoveCommand.java @@ -61,8 +61,8 @@ public class LazyNettyServerVisitorRemoveCommand { @Schema(description = "访客端口池大小", name = "poolSize", example = "") private Integer poolSize; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorStoryCommand.java index d8e183e9..411d7789 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorStoryCommand.java @@ -61,8 +61,8 @@ public class LazyNettyServerVisitorStoryCommand { @Schema(description = "访客端口池大小", name = "poolSize", example = "") private Integer poolSize=20; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorUpdateCommand.java index 0dbd4b9a..54e4bdb4 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitorUpdateCommand.java @@ -61,8 +61,8 @@ public class LazyNettyServerVisitorUpdateCommand { @Schema(description = "访客端口池大小", name = "poolSize", example = "") private Integer poolSize; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingQueryListCommand.java index 5f8af4c2..d920b387 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingQueryListCommand.java @@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingQueryListCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingQueryOneCommand.java index 065521ac..747e023a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingQueryOneCommand.java @@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingQueryOneCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingRemoveCommand.java index 77b79fb5..b1cd6a93 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingRemoveCommand.java @@ -68,11 +68,10 @@ public class LazyServerPermeateServerMappingRemoveCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingStoryCommand.java index b92f6e0b..89ac6bc0 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingStoryCommand.java @@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingStoryCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingUpdateCommand.java index bb496c7a..e1445bbe 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/netty/server/permeate/server/mapping/LazyServerPermeateServerMappingUpdateCommand.java @@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingUpdateCommand { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryListCommand.java index 36401770..50793f68 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryListCommand.java @@ -91,11 +91,10 @@ public class LazyProxyFlowQueryListCommand { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryOneCommand.java index 5b08ebf4..b9f52d5e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowQueryOneCommand.java @@ -95,11 +95,10 @@ public class LazyProxyFlowQueryOneCommand { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowRemoveCommand.java index 8f53a3f2..c2c793b2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowRemoveCommand.java @@ -95,12 +95,10 @@ public class LazyProxyFlowRemoveCommand { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; - + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowStoryCommand.java index cc20ed56..092a509a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowStoryCommand.java @@ -95,11 +95,10 @@ public class LazyProxyFlowStoryCommand { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowUpdateCommand.java index fff6fab8..fbf72074 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/flow/LazyProxyFlowUpdateCommand.java @@ -93,13 +93,11 @@ public class LazyProxyFlowUpdateCommand { */ @Schema(description ="代理类型",name ="proxyType",example = "") private ChannelProxyType proxyType; - /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryListCommand.java index 25223621..57ac87dc 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryListCommand.java @@ -102,11 +102,10 @@ public class LazyProxyPerDayFlowQueryListCommand { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryOneCommand.java index 96f4f83c..117e5f3a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowQueryOneCommand.java @@ -100,13 +100,11 @@ public class LazyProxyPerDayFlowQueryOneCommand { */ @Schema(description ="代理类型",name ="proxyType",example = "") private ChannelProxyType proxyType; - /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowRemoveCommand.java index 6949c875..b4facaf2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowRemoveCommand.java @@ -102,11 +102,10 @@ public class LazyProxyPerDayFlowRemoveCommand { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowStoryCommand.java index 25b5542c..c1fc2888 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowStoryCommand.java @@ -102,11 +102,10 @@ public class LazyProxyPerDayFlowStoryCommand { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowUpdateCommand.java index 11a6a984..459238e3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/lazy/proxy/per/day/flow/LazyProxyPerDayFlowUpdateCommand.java @@ -98,11 +98,10 @@ public class LazyProxyPerDayFlowUpdateCommand { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowQueryListCommand.java index 9729981b..0caf4dd8 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowQueryListCommand.java @@ -66,10 +66,11 @@ public class LazyVisitorPortFlowQueryListCommand { * 访客端口 */ @Schema(description = "访客端口", name = "visitorPort", example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/flow/LazyVisitorPortFlowQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowQueryOneCommand.java index cf73aa70..d32d40f3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowQueryOneCommand.java @@ -68,8 +68,8 @@ public class LazyVisitorPortFlowQueryOneCommand { @Schema(description = "访客端口", name = "visitorPort", example = "") private Integer visitorPort; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/flow/LazyVisitorPortFlowRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowRemoveCommand.java index 6ba69be9..6eefd4b9 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowRemoveCommand.java @@ -66,10 +66,11 @@ public class LazyVisitorPortFlowRemoveCommand { * 访客端口 */ @Schema(description = "访客端口", name = "visitorPort", example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/flow/LazyVisitorPortFlowStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowStoryCommand.java index 043552b1..d2320a03 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowStoryCommand.java @@ -66,10 +66,11 @@ public class LazyVisitorPortFlowStoryCommand { * 访客端口 */ @Schema(description = "访客端口", name = "visitorPort", example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/flow/LazyVisitorPortFlowUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowUpdateCommand.java index 8f8a6e49..68f4a9e6 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/flow/LazyVisitorPortFlowUpdateCommand.java @@ -66,10 +66,11 @@ public class LazyVisitorPortFlowUpdateCommand { * 访客端口 */ @Schema(description = "访客端口", name = "visitorPort", example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowQueryListCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowQueryListCommand.java index b874294d..cf4b4aae 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowQueryListCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowQueryListCommand.java @@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowQueryListCommand { * 访客端口 */ @Schema(description ="访客端口",name ="visitorPort",example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowQueryOneCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowQueryOneCommand.java index 7d6cf287..6c608f17 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowQueryOneCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowQueryOneCommand.java @@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowQueryOneCommand { * 访客端口 */ @Schema(description ="访客端口",name ="visitorPort",example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowRemoveCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowRemoveCommand.java index 94ec3a6a..347b9535 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowRemoveCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowRemoveCommand.java @@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowRemoveCommand { * 访客端口 */ @Schema(description ="访客端口",name ="visitorPort",example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowStoryCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowStoryCommand.java index 313919b5..0326c85d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowStoryCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowStoryCommand.java @@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowStoryCommand { * 访客端口 */ @Schema(description ="访客端口",name ="visitorPort",example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowUpdateCommand.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowUpdateCommand.java index d92aeee6..66f2e74b 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowUpdateCommand.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/command/visitor/port/per/day/flow/LazyVisitorPortPerDayFlowUpdateCommand.java @@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowUpdateCommand { * 访客端口 */ @Schema(description ="访客端口",name ="visitorPort",example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/dto/LazyClientPermeateClientMappingDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientPermeateClientMappingDTO.java index 1790f1b6..b9579c17 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientPermeateClientMappingDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientPermeateClientMappingDTO.java @@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingDTO { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientPermeateServerMappingDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientPermeateServerMappingDTO.java index edc646fb..6e92dc7c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientPermeateServerMappingDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientPermeateServerMappingDTO.java @@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingDTO { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientProxyFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientProxyFlowDTO.java index 9454d3a8..18b103e6 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientProxyFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyClientProxyFlowDTO.java @@ -84,10 +84,10 @@ public class LazyClientProxyFlowDTO { private ChannelProxyType proxyType; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientBlacklistDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientBlacklistDTO.java index 47b13d17..a3b70bb1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientBlacklistDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientBlacklistDTO.java @@ -50,8 +50,8 @@ public class LazyNettyClientBlacklistDTO { @Schema(description = "更新时间", name = "updateTime", example = "") private LocalDateTime updateTime; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/dto/LazyNettyClientStateDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateDTO.java index 28bb1083..1583f5b2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateDTO.java @@ -69,10 +69,10 @@ public class LazyNettyClientStateDTO { @Schema(description = "描述", name = "describe", example = "") private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 原始IP * byte[] 长度 4 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateGroupByClientDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateGroupByClientDTO.java index e9a87db8..48e5787f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateGroupByClientDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateGroupByClientDTO.java @@ -58,10 +58,10 @@ public class LazyNettyClientStateGroupByClientDTO { @Schema(description = "描述", name = "describe", example = "") private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 客户端数量 */ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateRecordDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateRecordDTO.java index 0637c925..cdf9b91c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateRecordDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyClientStateRecordDTO.java @@ -51,11 +51,10 @@ public class LazyNettyClientStateRecordDTO { private String onLineState; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyServerPermeatePortPoolDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyServerPermeatePortPoolDTO.java index 83fb7c0f..24bbed2d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyServerPermeatePortPoolDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyServerPermeatePortPoolDTO.java @@ -71,11 +71,10 @@ public class LazyNettyServerPermeatePortPoolDTO { private Integer poolSize; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyServerVisitorDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyServerVisitorDTO.java index 2b42f7ac..dc5fd8f7 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyServerVisitorDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyNettyServerVisitorDTO.java @@ -61,10 +61,10 @@ public class LazyNettyServerVisitorDTO { @Schema(description = "访客端口池大小", name = "poolSize", example = "") private Integer poolSize; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 是否被占用 */ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyFlowDTO.java index 1af9fc73..3f59ab97 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyFlowDTO.java @@ -83,10 +83,10 @@ public class LazyProxyFlowDTO { private ChannelProxyType proxyType; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyPerDayFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyPerDayFlowDTO.java index 5f4f577e..d4048330 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyPerDayFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyProxyPerDayFlowDTO.java @@ -102,11 +102,10 @@ public class LazyProxyPerDayFlowDTO { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyServerPermeateClientMappingDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyServerPermeateClientMappingDTO.java index 5a2e742e..e0fc8a2a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyServerPermeateClientMappingDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyServerPermeateClientMappingDTO.java @@ -75,12 +75,12 @@ public class LazyServerPermeateClientMappingDTO { * 描述 */ @Schema(description = "描述", name = "describe", example = "") - private String describe; /** - * 服务端ID + private String describe; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; - + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 是否是ssl */ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyServerPermeateServerMappingDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyServerPermeateServerMappingDTO.java index d9bcf1e1..03098717 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyServerPermeateServerMappingDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyServerPermeateServerMappingDTO.java @@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingDTO { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorFlowDTO.java index 3f3be94c..028246af 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorFlowDTO.java @@ -59,10 +59,10 @@ public class LazyVisitorFlowDTO { @Schema(description = "修改时间", name = "updateTime", example = "") private LocalDateTime updateTime; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 当前访客下所有端口的流量 */ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorPortFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorPortFlowDTO.java index ed1be5b7..105cc583 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorPortFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorPortFlowDTO.java @@ -67,11 +67,12 @@ public class LazyVisitorPortFlowDTO { * 访客端口 */ @Schema(description = "访客端口", name = "visitorPort", example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; public Integer getInFlowSize() { if (inFlow == null) return 0; diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorPortPerDayFlowDTO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorPortPerDayFlowDTO.java index 5ad17cde..1175c1ba 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorPortPerDayFlowDTO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/dto/LazyVisitorPortPerDayFlowDTO.java @@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowDTO { * 访客端口 */ @Schema(description ="访客端口",name ="visitorPort",example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/LazyClientPermeateClientMappingApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateClientMappingApplicationImpl.java index cd1d67fd..0e830bf8 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateClientMappingApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateClientMappingApplicationImpl.java @@ -155,8 +155,9 @@ public class LazyClientPermeateClientMappingApplicationImpl implements LazyClien */ public void closeClientPermeateClientSocketMessage(LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMapping){ // 发送客户端初始化渗透 + String namespace = lazyNettyClientPermeateClientMapping.getNamespace(); String clientId = lazyNettyClientPermeateClientMapping.getFromClientId(); - Channel clientChannel = ChannelContext.getLoadBalance(clientId); + Channel clientChannel = ChannelContext.getLoadBalance(namespace,clientId); if (clientChannel != null && clientChannel.isActive()) { String permeateTargetIp = lazyNettyClientPermeateClientMapping.getPermeateTargetIp(); @@ -178,9 +179,10 @@ public class LazyClientPermeateClientMappingApplicationImpl implements LazyClien */ public void createClientPermeateClientSocketMessage(LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMapping){ // 发送客户端初始化渗透 + String namespace = lazyNettyClientPermeateClientMapping.getNamespace(); String fromClientId = lazyNettyClientPermeateClientMapping.getFromClientId(); String toClientId = lazyNettyClientPermeateClientMapping.getToClientId(); - Channel clientChannel = ChannelContext.getLoadBalance(fromClientId); + Channel clientChannel = ChannelContext.getLoadBalance(namespace,fromClientId); if(clientChannel!=null &&clientChannel.isActive()){ String permeateTargetIp = lazyNettyClientPermeateClientMapping.getPermeateTargetIp(); Integer permeateTargetPort = lazyNettyClientPermeateClientMapping.getPermeateTargetPort(); @@ -191,6 +193,7 @@ public class LazyClientPermeateClientMappingApplicationImpl implements LazyClien nettyMsg.setClientTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); nettyMsg.setClientId(fromClientId); + nettyMsg.setNamespace(namespace); nettyMsg.setData(toClientId.getBytes(StandardCharsets.UTF_8)); clientChannel.writeAndFlush(nettyMsg); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateServerMappingApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateServerMappingApplicationImpl.java index cb68400b..9ad20098 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateServerMappingApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateServerMappingApplicationImpl.java @@ -49,7 +49,7 @@ public class LazyClientPermeateServerMappingApplicationImpl implements LazyClien public Result story(LazyClientPermeateServerMappingStoryCommand lazyClientPermeateServerMappingStoryCommand) { LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping = LazyNettyClientPermeateServerMappingDTOAssembler.INSTANCE.toLazyInternalNetworkClientPermeateServerMapping(lazyClientPermeateServerMappingStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientPermeateServerMapping.setServerId(serverId); + lazyNettyClientPermeateServerMapping.setNamespace(serverId); // 发送客户端初始化渗透 createClientPermeateServerSocketMessage(lazyNettyClientPermeateServerMapping); return lazyNettyClientPermeateServerMappingRepository.story(lazyNettyClientPermeateServerMapping); @@ -69,7 +69,7 @@ public class LazyClientPermeateServerMappingApplicationImpl implements LazyClien List lazyNettyClientPermeateServerMappingList = lazyClientPermeateServerMappingStoryCommandList.stream().map( LazyNettyClientPermeateServerMappingDTOAssembler.INSTANCE::toLazyInternalNetworkClientPermeateServerMapping).collect(Collectors.toList()); for (LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping : lazyNettyClientPermeateServerMappingList) { String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientPermeateServerMapping.setServerId(serverId); + lazyNettyClientPermeateServerMapping.setNamespace(serverId); createClientPermeateServerSocketMessage(lazyNettyClientPermeateServerMapping); } return lazyNettyClientPermeateServerMappingRepository.batchStory(lazyNettyClientPermeateServerMappingList); @@ -88,7 +88,7 @@ public class LazyClientPermeateServerMappingApplicationImpl implements LazyClien public Result updateOne(LazyClientPermeateServerMappingUpdateCommand lazyClientPermeateServerMappingUpdateCommand) { LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping = LazyNettyClientPermeateServerMappingDTOAssembler.INSTANCE.toLazyInternalNetworkClientPermeateServerMapping(lazyClientPermeateServerMappingUpdateCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientPermeateServerMapping.setServerId(serverId); + lazyNettyClientPermeateServerMapping.setNamespace(serverId); // 关闭 LazyNettyClientPermeateServerMapping mapping = new LazyNettyClientPermeateServerMapping(); mapping.setId(lazyNettyClientPermeateServerMapping.getId()); @@ -169,8 +169,9 @@ public class LazyClientPermeateServerMappingApplicationImpl implements LazyClien */ public void closeClientPermeateServerSocketMessage(LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping){ // 发送客户端初始化渗透 + String serverId = lazyNettyClientPermeateServerMapping.getNamespace(); String clientId = lazyNettyClientPermeateServerMapping.getClientId(); - Channel clientChannel = ChannelContext.getLoadBalance(clientId); + Channel clientChannel = ChannelContext.getLoadBalance(serverId,clientId); if(clientChannel!=null &&clientChannel.isActive()){ String permeateTargetIp = lazyNettyClientPermeateServerMapping.getPermeateTargetIp(); Integer permeateTargetPort = lazyNettyClientPermeateServerMapping.getPermeateTargetPort(); @@ -190,8 +191,10 @@ public class LazyClientPermeateServerMappingApplicationImpl implements LazyClien */ public void createClientPermeateServerSocketMessage(LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping){ // 发送客户端初始化渗透 + String serverId = lazyNettyClientPermeateServerMapping.getNamespace(); String clientId = lazyNettyClientPermeateServerMapping.getClientId(); - Channel clientChannel = ChannelContext.getLoadBalance(clientId); + + Channel clientChannel = ChannelContext.getLoadBalance(serverId,clientId); if(clientChannel!=null &&clientChannel.isActive()){ String permeateTargetIp = lazyNettyClientPermeateServerMapping.getPermeateTargetIp(); Integer permeateTargetPort = lazyNettyClientPermeateServerMapping.getPermeateTargetPort(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientStatsChangeApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientStatsChangeApplicationImpl.java index 958abced..b630beee 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientStatsChangeApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientStatsChangeApplicationImpl.java @@ -34,17 +34,17 @@ public class LazyClientStatsChangeApplicationImpl implements LazyClientStatsChan this.lazyNettyClientStateRecordRepository = lazyNettyClientStateRecordRepository; } - // private void storyClientStateRecord(String clientId,String serverId,String onLineState,String stagingState){ + // private void storyClientStateRecord(String clientId,String namespace,String onLineState,String stagingState){ private void storyClientStateRecord(LazyNettyClientLoginCommand lazyNettyClientLoginCommand) { String clientId = lazyNettyClientLoginCommand.getClientId(); - String serverId = lazyNettyClientLoginCommand.getServerId(); + String serverId = lazyNettyClientLoginCommand.getNamespace(); NettyClientStatus onLineState = lazyNettyClientLoginCommand.getOnLineState(); String originalIp = lazyNettyClientLoginCommand.getOriginalIp(); String stagingState = lazyNettyClientLoginCommand.getStagingState(); LazyNettyClientStateRecord lazyNettyClientStateRecord = new LazyNettyClientStateRecord(); lazyNettyClientStateRecord.setClientId(clientId); lazyNettyClientStateRecord.setCreateTime(LocalDateTime.now()); - lazyNettyClientStateRecord.setServerId(serverId); + lazyNettyClientStateRecord.setNamespace(serverId); lazyNettyClientStateRecord.setOnLineState(onLineState); lazyNettyClientStateRecord.setStagingState(stagingState); lazyNettyClientStateRecord.setOriginalIp(originalIp); @@ -66,12 +66,12 @@ public class LazyClientStatsChangeApplicationImpl implements LazyClientStatsChan lazyNettyClientState.setClientId(clientId); lazyNettyClientState.setOnLineState(NettyClientStatus.ON_LINE); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); lazyNettyClientState.setOriginalIp(lazyNettyClientLoginCommand.getOriginalIp()); lazyNettyClientStateRepository.updateOnLIneState(lazyNettyClientState); lazyNettyClientLoginCommand.setOnLineState(NettyClientStatus.ON_LINE); lazyNettyClientLoginCommand.setStagingState("CLOSE"); - lazyNettyClientLoginCommand.setServerId(serverId); + lazyNettyClientLoginCommand.setNamespace(serverId); storyClientStateRecord(lazyNettyClientLoginCommand); // 触发暂存扫描 // ClientOnLineState clientOnLineState = new ClientOnLineState(); @@ -97,13 +97,13 @@ public class LazyClientStatsChangeApplicationImpl implements LazyClientStatsChan lazyNettyClientState.setOnLineState(NettyClientStatus.OFF_LINE); lazyNettyClientState.setStagingState("OPENED"); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); lazyNettyClientState.setOriginalIp(lazyNettyClientLoginCommand.getOriginalIp()); lazyNettyClientStateRepository.updateOnLIneState(lazyNettyClientState); // 创建变更记录 lazyNettyClientLoginCommand.setOnLineState(NettyClientStatus.OFF_LINE); lazyNettyClientLoginCommand.setStagingState("OPENED"); - lazyNettyClientLoginCommand.setServerId(serverId); + lazyNettyClientLoginCommand.setNamespace(serverId); storyClientStateRecord(lazyNettyClientLoginCommand); // // 触发暂存扫描 // ClientOnLineState clientOnLineState = new ClientOnLineState(); @@ -125,12 +125,12 @@ public class LazyClientStatsChangeApplicationImpl implements LazyClientStatsChan lazyNettyClientState.setClientId(clientId); lazyNettyClientState.setStagingState("CLOSED"); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); lazyNettyClientState.setOriginalIp(lazyNettyClientLoginCommand.getOriginalIp()); lazyNettyClientStateRepository.updateStagingState(lazyNettyClientState); lazyNettyClientLoginCommand.setStagingState("CLOSED"); lazyNettyClientLoginCommand.setOnLineState(NettyClientStatus.ON_LINE); - lazyNettyClientLoginCommand.setServerId(serverId); + lazyNettyClientLoginCommand.setNamespace(serverId); storyClientStateRecord(lazyNettyClientLoginCommand); } @@ -147,12 +147,12 @@ public class LazyClientStatsChangeApplicationImpl implements LazyClientStatsChan lazyNettyClientState.setClientId(clientId); lazyNettyClientState.setStagingState("OPENED"); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); lazyNettyClientState.setOriginalIp(originalIp); lazyNettyClientStateRepository.updateStagingState(lazyNettyClientState); lazyNettyClientLoginCommand.setStagingState("OPENED"); lazyNettyClientLoginCommand.setOnLineState(NettyClientStatus.OFF_LINE); - lazyNettyClientLoginCommand.setServerId(serverId); + lazyNettyClientLoginCommand.setNamespace(serverId); storyClientStateRecord(lazyNettyClientLoginCommand); } } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientBlacklistApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientBlacklistApplicationImpl.java index 65ff83ed..325fba91 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientBlacklistApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientBlacklistApplicationImpl.java @@ -17,7 +17,6 @@ import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; -import java.nio.charset.StandardCharsets; import java.util.List; import java.util.stream.Collectors; @@ -49,16 +48,18 @@ public class LazyNettyClientBlacklistApplicationImpl implements LazyNettyClientB public Result story(LazyNettyClientBlacklistStoryCommand lazyNettyClientBlacklistStoryCommand) { LazyNettyClientBlacklist lazyNettyClientBlacklist = NettyClientBlacklistDTOAssembler.INSTANCE.toNettyClientBlacklist(lazyNettyClientBlacklistStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientBlacklist.setServerId(serverId); + lazyNettyClientBlacklist.setNamespace(serverId); // 添加和名单，客户端下线 Result story = lazyNettyClientBlacklistRepository.story(lazyNettyClientBlacklist); // 获取客户端channel 发送下下通知 String clientId = lazyNettyClientBlacklist.getClientId(); - Channel clientChannel = ChannelContext.getLoadBalance(clientId.getBytes(StandardCharsets.UTF_8)); + Channel clientChannel = ChannelContext + .getLoadBalance(serverId,clientId); if (null != clientChannel) { // 模拟客户端发送下线通知 NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setClientId(clientId); + nettyMsg.setNamespace(serverId); nettyMsg.setType(TcpMessageType.TCP_REPORT_CLIENT_DISCONNECTION); clientChannel.writeAndFlush(nettyMsg); @@ -84,7 +85,7 @@ public class LazyNettyClientBlacklistApplicationImpl implements LazyNettyClientB lazyNettyClientBlacklistStoryCommand -> { LazyNettyClientBlacklist lazyNettyClientBlacklist = NettyClientBlacklistDTOAssembler.INSTANCE.toNettyClientBlacklist(lazyNettyClientBlacklistStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientBlacklist.setServerId(serverId); + lazyNettyClientBlacklist.setNamespace(serverId); return lazyNettyClientBlacklist; } @@ -106,7 +107,7 @@ public class LazyNettyClientBlacklistApplicationImpl implements LazyNettyClientB public Result updateOne(LazyNettyClientBlacklistUpdateCommand lazyNettyClientBlacklistUpdateCommand) { LazyNettyClientBlacklist lazyNettyClientBlacklist = NettyClientBlacklistDTOAssembler.INSTANCE.toNettyClientBlacklist(lazyNettyClientBlacklistUpdateCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientBlacklist.setServerId(serverId); + lazyNettyClientBlacklist.setNamespace(serverId); return lazyNettyClientBlacklistRepository.story(lazyNettyClientBlacklist); } @@ -123,7 +124,7 @@ public class LazyNettyClientBlacklistApplicationImpl implements LazyNettyClientB public Result findOne(LazyNettyClientBlacklistQueryOneCommand lazyNettyClientBlacklistQueryOneCommand) { LazyNettyClientBlacklist lazyNettyClientBlacklist = NettyClientBlacklistDTOAssembler.INSTANCE.toNettyClientBlacklist(lazyNettyClientBlacklistQueryOneCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientBlacklist.setServerId(serverId); + lazyNettyClientBlacklist.setNamespace(serverId); return lazyNettyClientBlacklistRepository.findOne(lazyNettyClientBlacklist).convert(NettyClientBlacklistDTOAssembler.INSTANCE::fromNettyClientBlacklist); } @@ -140,7 +141,7 @@ public class LazyNettyClientBlacklistApplicationImpl implements LazyNettyClientB public Result> findList(LazyNettyClientBlacklistQueryListCommand lazyNettyClientBlacklistQueryListCommand) { LazyNettyClientBlacklist lazyNettyClientBlacklist = NettyClientBlacklistDTOAssembler.INSTANCE.toNettyClientBlacklist(lazyNettyClientBlacklistQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientBlacklist.setServerId(serverId); + lazyNettyClientBlacklist.setNamespace(serverId); return lazyNettyClientBlacklistRepository.findList(lazyNettyClientBlacklist).convert(nettyClientBlacklists -> nettyClientBlacklists.stream().map(NettyClientBlacklistDTOAssembler.INSTANCE::fromNettyClientBlacklist).collect(Collectors.toList())); } @@ -157,7 +158,7 @@ public class LazyNettyClientBlacklistApplicationImpl implements LazyNettyClientB public Result> findPage(int size, int current, LazyNettyClientBlacklistQueryListCommand lazyNettyClientBlacklistQueryListCommand) { LazyNettyClientBlacklist lazyNettyClientBlacklist = NettyClientBlacklistDTOAssembler.INSTANCE.toNettyClientBlacklist(lazyNettyClientBlacklistQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientBlacklist.setServerId(serverId); + lazyNettyClientBlacklist.setNamespace(serverId); return lazyNettyClientBlacklistRepository.findPage(size, current, lazyNettyClientBlacklist).convert(page -> page.convert(NettyClientBlacklistDTOAssembler.INSTANCE::fromNettyClientBlacklist)); } @@ -174,7 +175,7 @@ public class LazyNettyClientBlacklistApplicationImpl implements LazyNettyClientB public Result remove(LazyNettyClientBlacklistRemoveCommand lazyNettyClientBlacklistRemoveCommand) { LazyNettyClientBlacklist lazyNettyClientBlacklist = NettyClientBlacklistDTOAssembler.INSTANCE.toNettyClientBlacklist(lazyNettyClientBlacklistRemoveCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientBlacklist.setServerId(serverId); + lazyNettyClientBlacklist.setNamespace(serverId); return lazyNettyClientBlacklistRepository.remove(lazyNettyClientBlacklist); } @@ -189,7 +190,7 @@ public class LazyNettyClientBlacklistApplicationImpl implements LazyNettyClientB @Override public Result exists(LazyNettyClientBlacklist lazyNettyClientBlacklist) { String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientBlacklist.setServerId(serverId); + lazyNettyClientBlacklist.setNamespace(serverId); return lazyNettyClientBlacklistRepository.exists(lazyNettyClientBlacklist); } } \ 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/LazyNettyClientStateApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientStateApplicationImpl.java index 4ead302a..1d02e954 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientStateApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyClientStateApplicationImpl.java @@ -5,9 +5,9 @@ import io.netty.channel.Channel; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; -import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyClientVisitorContext; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; +import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import org.framework.lazy.cloud.network.heartbeat.server.netty.permeate.tcp.socket.NettyTcpServerPermeateClientVisitorSocket; import org.framework.lazy.cloud.network.heartbeat.server.properties.ServerNodeProperties; import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyNettyClientStateApplication; @@ -18,9 +18,9 @@ import org.framework.lazy.cloud.network.heartbeat.server.standalone.application. import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.state.LazyNettyClientState; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.state.LazyNettyClientStateRepository; import org.wu.framework.core.utils.ObjectUtils; -import org.wu.framework.lazy.orm.web.plus.stereotype.LazyApplication; import org.wu.framework.lazy.orm.core.persistence.reverse.lazy.ddd.DefaultDDDLazyApplicationImpl; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; +import org.wu.framework.lazy.orm.web.plus.stereotype.LazyApplication; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; @@ -58,7 +58,7 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return lazyNettyClientStateRepository.story(lazyNettyClientState); } @@ -78,7 +78,7 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState .map(lazyNettyClientStateStoryCommand -> { LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return lazyNettyClientState; }) .collect(Collectors.toList()); @@ -98,7 +98,7 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState public Result updateOne(LazyNettyClientStateUpdateCommand lazyNettyClientStateUpdateCommand) { LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateUpdateCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return lazyNettyClientStateRepository.updateOne(lazyNettyClientState); } @@ -115,7 +115,7 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState public Result findOne(LazyNettyClientStateQueryOneCommand lazyNettyClientStateQueryOneCommand) { LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateQueryOneCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return lazyNettyClientStateRepository.findOne(lazyNettyClientState).convert(NettyClientStateDTOAssembler.INSTANCE::fromNettyClientState); } @@ -132,7 +132,7 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState public Result> findList(LazyNettyClientStateQueryListCommand lazyNettyClientStateQueryListCommand) { LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return lazyNettyClientStateRepository.findList(lazyNettyClientState).convert(nettyClientStates -> nettyClientStates.stream().map(NettyClientStateDTOAssembler.INSTANCE::fromNettyClientState).collect(Collectors.toList())); } @@ -149,7 +149,7 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState public Result> findPage(int size, int current, LazyNettyClientStateQueryListCommand lazyNettyClientStateQueryListCommand) { LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return lazyNettyClientStateRepository.findPage(size, current, lazyNettyClientState).convert(page -> page.convert(NettyClientStateDTOAssembler.INSTANCE::fromNettyClientState)); } @@ -165,7 +165,7 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState public Result> findListGroupByClient(LazyNettyClientStateQueryListCommand lazyNettyClientStateQueryListCommand) { LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return lazyNettyClientStateRepository.findListGroupByClient(lazyNettyClientState).convert(nettyClientStates -> nettyClientStates.stream().map(NettyClientStateDTOAssembler.INSTANCE::fromNettyClientState).collect(Collectors.toList())); } @@ -184,7 +184,7 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState public Result> findPageGroupByClient(int size, int current, LazyNettyClientStateQueryListCommand lazyNettyClientStateQueryListCommand) { LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return lazyNettyClientStateRepository.findPageGroupByClient(size, current, lazyNettyClientState).convert(page -> page.convert(NettyClientStateDTOAssembler.INSTANCE::fromNettyClientState)); } @@ -201,11 +201,11 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState public Result remove(LazyNettyClientStateRemoveCommand lazyNettyClientStateRemoveCommand) { LazyNettyClientState lazyNettyClientState = NettyClientStateDTOAssembler.INSTANCE.toNettyClientState(lazyNettyClientStateRemoveCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); // 获取当前客户端通道 而后关闭 String clientId = lazyNettyClientStateRemoveCommand.getClientId(); // 心跳关闭 - ChannelContext.clear(clientId); + ChannelContext.clear(serverId, clientId); // 关闭访客 List nettyTcpServerPermeateClientVisitorSocketList = NettyClientVisitorContext.getVisitorSockets(clientId); if (!ObjectUtils.isEmpty(nettyTcpServerPermeateClientVisitorSocketList)) { @@ -226,11 +226,12 @@ public class LazyNettyClientStateApplicationImpl implements LazyNettyClientState @Override public Result sendMessage2HeartbeatClient(LazyNettyClientMessageCommand lazyNettyClientMessageCommand) { // 获取客户端ID + String namespace = lazyNettyClientMessageCommand.getNamespace(); String clientId = lazyNettyClientMessageCommand.getClientId(); String message = lazyNettyClientMessageCommand.getMessage(); - Channel clientChannel = ChannelContext.getLoadBalance(clientId); + Channel clientChannel = ChannelContext.getLoadBalance(namespace, clientId); if (clientChannel == null) { - return ResultFactory.errorOf("客户端：" + clientId + "不存在"); + return ResultFactory.errorOf("服务端：" + namespace + " 客户端：" + clientId + "不存在"); } // 发送消息到客户端 NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyServerVirtualRouteApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyServerVirtualRouteApplicationImpl.java index b2e92a4d..08536e0e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyServerVirtualRouteApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyServerVirtualRouteApplicationImpl.java @@ -1,24 +1,18 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.application.impl; -import org.wu.framework.lazy.orm.web.plus.stereotype.LazyApplication; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyNettyServerVirtualRouteApplication; -import org.springframework.web.bind.annotation.*; -import org.wu.framework.web.response.Result; -import org.wu.framework.web.response.ResultFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.server.virtual.route.LazyNettyServerVirtualRoute; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.server.virtual.route.LazyNettyServerVirtualRouteRemoveCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.server.virtual.route.LazyNettyServerVirtualRouteStoryCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.server.virtual.route.LazyNettyServerVirtualRouteUpdateCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.server.virtual.route.LazyNettyServerVirtualRouteQueryListCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.server.virtual.route.LazyNettyServerVirtualRouteQueryOneCommand; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.assembler.LazyNettyServerVirtualRouteDTOAssembler; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.dto.LazyNettyServerVirtualRouteDTO; -import java.util.stream.Collectors; import jakarta.annotation.Resource; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyNettyServerVirtualRouteApplication; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.assembler.LazyNettyServerVirtualRouteDTOAssembler; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.server.virtual.route.*; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.dto.LazyNettyServerVirtualRouteDTO; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.server.virtual.route.LazyNettyServerVirtualRoute; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.server.virtual.route.LazyNettyServerVirtualRouteRepository; -import java.util.List; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; +import org.wu.framework.lazy.orm.web.plus.stereotype.LazyApplication; +import org.wu.framework.web.response.Result; + +import java.util.List; +import java.util.stream.Collectors; /** * describe 服务端虚拟路由管理 * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyServerVisitorApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyServerVisitorApplicationImpl.java index af2abad4..3d45ce4d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyServerVisitorApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyNettyServerVisitorApplicationImpl.java @@ -45,7 +45,7 @@ public class LazyNettyServerVisitorApplicationImpl implements LazyNettyServerVis public Result story(LazyNettyServerVisitorStoryCommand lazyNettyServerVisitorStoryCommand) { LazyNettyServerVisitor lazyNettyServerVisitor = NettyServerVisitorDTOAssembler.INSTANCE.toNettyServerVisitor(lazyNettyServerVisitorStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerVisitor.setServerId(serverId); + lazyNettyServerVisitor.setNamespace(serverId); return lazyNettyServerVisitorRepository.story(lazyNettyServerVisitor); } @@ -65,7 +65,7 @@ public class LazyNettyServerVisitorApplicationImpl implements LazyNettyServerVis .map(lazyNettyServerVisitorStoryCommand -> { LazyNettyServerVisitor lazyNettyServerVisitor = NettyServerVisitorDTOAssembler.INSTANCE.toNettyServerVisitor(lazyNettyServerVisitorStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerVisitor.setServerId(serverId); + lazyNettyServerVisitor.setNamespace(serverId); return lazyNettyServerVisitor; } ) @@ -86,7 +86,7 @@ public class LazyNettyServerVisitorApplicationImpl implements LazyNettyServerVis public Result updateOne(LazyNettyServerVisitorUpdateCommand lazyNettyServerVisitorUpdateCommand) { LazyNettyServerVisitor lazyNettyServerVisitor = NettyServerVisitorDTOAssembler.INSTANCE.toNettyServerVisitor(lazyNettyServerVisitorUpdateCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerVisitor.setServerId(serverId); + lazyNettyServerVisitor.setNamespace(serverId); return lazyNettyServerVisitorRepository.story(lazyNettyServerVisitor); } @@ -103,7 +103,7 @@ public class LazyNettyServerVisitorApplicationImpl implements LazyNettyServerVis public Result findOne(LazyNettyServerVisitorQueryOneCommand lazyNettyServerVisitorQueryOneCommand) { LazyNettyServerVisitor lazyNettyServerVisitor = NettyServerVisitorDTOAssembler.INSTANCE.toNettyServerVisitor(lazyNettyServerVisitorQueryOneCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerVisitor.setServerId(serverId); + lazyNettyServerVisitor.setNamespace(serverId); return lazyNettyServerVisitorRepository.findOne(lazyNettyServerVisitor).convert(NettyServerVisitorDTOAssembler.INSTANCE::fromNettyServerVisitor); } @@ -120,7 +120,7 @@ public class LazyNettyServerVisitorApplicationImpl implements LazyNettyServerVis public Result> findList(LazyNettyServerVisitorQueryListCommand lazyNettyServerVisitorQueryListCommand) { LazyNettyServerVisitor lazyNettyServerVisitor = NettyServerVisitorDTOAssembler.INSTANCE.toNettyServerVisitor(lazyNettyServerVisitorQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerVisitor.setServerId(serverId); + lazyNettyServerVisitor.setNamespace(serverId); return lazyNettyServerVisitorRepository.findList(lazyNettyServerVisitor).convert(nettyServerVisitors -> nettyServerVisitors.stream().map(NettyServerVisitorDTOAssembler.INSTANCE::fromNettyServerVisitor).collect(Collectors.toList())); } @@ -137,7 +137,7 @@ public class LazyNettyServerVisitorApplicationImpl implements LazyNettyServerVis public Result> findPage(int size, int current, LazyNettyServerVisitorQueryListCommand lazyNettyServerVisitorQueryListCommand) { LazyNettyServerVisitor lazyNettyServerVisitor = NettyServerVisitorDTOAssembler.INSTANCE.toNettyServerVisitor(lazyNettyServerVisitorQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerVisitor.setServerId(serverId); + lazyNettyServerVisitor.setNamespace(serverId); return lazyNettyServerVisitorRepository.findPage(size, current, lazyNettyServerVisitor).convert(page -> page.convert(NettyServerVisitorDTOAssembler.INSTANCE::fromNettyServerVisitor)); } @@ -154,7 +154,7 @@ public class LazyNettyServerVisitorApplicationImpl implements LazyNettyServerVis public Result remove(LazyNettyServerVisitorRemoveCommand lazyNettyServerVisitorRemoveCommand) { LazyNettyServerVisitor lazyNettyServerVisitor = NettyServerVisitorDTOAssembler.INSTANCE.toNettyServerVisitor(lazyNettyServerVisitorRemoveCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerVisitor.setServerId(serverId); + lazyNettyServerVisitor.setNamespace(serverId); return lazyNettyServerVisitorRepository.remove(lazyNettyServerVisitor); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyProxyFlowApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyProxyFlowApplicationImpl.java index c6872f1d..7c47f5ea 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyProxyFlowApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyProxyFlowApplicationImpl.java @@ -60,7 +60,7 @@ public class LazyProxyFlowApplicationImpl implements LazyProxyFlowApplication { public Result story(LazyProxyFlowStoryCommand lazyProxyFlowStoryCommand) { LazyProxyFlow lazyProxyFlow = LazyProxyFlowDTOAssembler.INSTANCE.toLazyProxyFlow(lazyProxyFlowStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyProxyFlow.setServerId(serverId); + lazyProxyFlow.setNamespace(serverId); return lazyProxyFlowRepository.story(lazyProxyFlow); } @@ -79,7 +79,7 @@ public class LazyProxyFlowApplicationImpl implements LazyProxyFlowApplication { ChannelProxyType proxyType = lazyProxyFlowStoryCommand.getProxyType(); Integer port = lazyProxyFlowStoryCommand.getPort(); String serverId = serverNodeProperties.getNodeId(); - lazyProxyFlowStoryCommand.setServerId(serverId); + lazyProxyFlowStoryCommand.setNamespace(serverId); Integer realOutFlow = ObjectUtils.isEmpty(lazyProxyFlowStoryCommand.getOutFlow()) ? 0 : lazyProxyFlowStoryCommand.getOutFlow(); Integer realInFlow = ObjectUtils.isEmpty(lazyProxyFlowStoryCommand.getInFlow()) ? 0 : lazyProxyFlowStoryCommand.getInFlow(); @@ -91,7 +91,7 @@ public class LazyProxyFlowApplicationImpl implements LazyProxyFlowApplication { findOneLazyProxyFlowQuery.setProtocolType(protocolType); findOneLazyProxyFlowQuery.setProxyType(proxyType); - findOneLazyProxyFlowQuery.setServerId(serverId); + findOneLazyProxyFlowQuery.setNamespace(serverId); lazyProxyFlowRepository.findOne(findOneLazyProxyFlowQuery).accept(existVisitorFlow -> { Integer inFlow = existVisitorFlow.getInFlow(); Integer outFlow = existVisitorFlow.getOutFlow(); @@ -116,13 +116,13 @@ public class LazyProxyFlowApplicationImpl implements LazyProxyFlowApplication { lazyProxyPerDayFlowStoryCommand.setOutFlow(realOutFlow); lazyProxyPerDayFlowStoryCommand.setInFlow(realInFlow); - lazyProxyPerDayFlowStoryCommand.setServerId(serverId); + lazyProxyPerDayFlowStoryCommand.setNamespace(serverId); LazyProxyPerDayFlow findOneLazyProxyPerDayFlowQuery = new LazyProxyPerDayFlow(); findOneLazyProxyPerDayFlowQuery.setClientId(clientId); findOneLazyProxyPerDayFlowQuery.setPort(port); findOneLazyProxyPerDayFlowQuery.setDay(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - findOneLazyProxyPerDayFlowQuery.setServerId(serverId); + findOneLazyProxyPerDayFlowQuery.setNamespace(serverId); findOneLazyProxyPerDayFlowQuery.setIp(ip); findOneLazyProxyPerDayFlowQuery.setProtocolType(protocolType); findOneLazyProxyPerDayFlowQuery.setProxyType(proxyType); @@ -162,7 +162,7 @@ public class LazyProxyFlowApplicationImpl implements LazyProxyFlowApplication { .map(lazyProxyFlowStoryCommand -> { LazyProxyFlow lazyProxyFlow = LazyProxyFlowDTOAssembler.INSTANCE.toLazyProxyFlow(lazyProxyFlowStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyProxyFlow.setServerId(serverId); + lazyProxyFlow.setNamespace(serverId); return lazyProxyFlow; } @@ -258,7 +258,7 @@ public class LazyProxyFlowApplicationImpl implements LazyProxyFlowApplication { public Result> findClientFlowPage(int size, int current, LazyProxyFlowQueryListCommand lazyProxyFlowQueryListCommand) { LazyProxyFlow lazyLazyProxyFlow = LazyProxyFlowDTOAssembler.INSTANCE.toLazyProxyFlow(lazyProxyFlowQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyLazyProxyFlow.setServerId(serverId); + lazyLazyProxyFlow.setNamespace(serverId); return lazyProxyFlowRepository.findPageGroupByClientId(size, current, lazyLazyProxyFlow).convert(lazyProxyFlowLazyPage -> { List clientIdList = lazyProxyFlowLazyPage .getRecords() 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 88f89f48..2b43256d 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 @@ -14,9 +14,9 @@ import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.server.permeate.client.mapping.LazyNettyServerPermeateClientMappingRepository; import org.springframework.transaction.annotation.Transactional; import org.wu.framework.core.utils.ObjectUtils; -import org.wu.framework.lazy.orm.web.plus.stereotype.LazyApplication; import org.wu.framework.lazy.orm.core.persistence.reverse.lazy.ddd.DefaultDDDLazyApplicationImpl; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; +import org.wu.framework.lazy.orm.web.plus.stereotype.LazyApplication; import org.wu.framework.web.response.Result; import org.wu.framework.web.response.ResultFactory; @@ -58,7 +58,7 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE.toInternalNetworkPenetrationMapping(lazyServerPermeateClientMappingStoryCommand); lazyNettyServerPermeateClientMapping.setIsDeleted(false); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateClientMapping.setServerId(serverId); + lazyNettyServerPermeateClientMapping.setNamespace(serverId); String clientId = lazyNettyServerPermeateClientMapping.getClientId(); String clientTargetIp = lazyNettyServerPermeateClientMapping.getClientTargetIp(); @@ -67,7 +67,7 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe // 创建访客通道池 - this.changeSocket(clientId, clientTargetIp, clientTargetPort, visitorPort); + this.changeSocket(serverId, clientId, clientTargetIp, clientTargetPort, visitorPort); return lazyNettyServerPermeateClientMappingRepository.story(lazyNettyServerPermeateClientMapping); } @@ -89,7 +89,7 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe .map(lazyInternalNetworkPenetrationMappingStoryCommand -> { LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE.toInternalNetworkPenetrationMapping(lazyInternalNetworkPenetrationMappingStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateClientMapping.setServerId(serverId); + lazyNettyServerPermeateClientMapping.setNamespace(serverId); return lazyNettyServerPermeateClientMapping; }) .collect(Collectors.toList()); @@ -101,7 +101,8 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe String clientTargetIp = lazyNettyServerPermeateClientMapping.getClientTargetIp(); Integer clientTargetPort = lazyNettyServerPermeateClientMapping.getClientTargetPort(); Integer visitorPort = lazyNettyServerPermeateClientMapping.getVisitorPort(); - this.changeSocket(clientId, clientTargetIp, clientTargetPort, visitorPort); + String namespace = lazyNettyServerPermeateClientMapping.getNamespace(); + this.changeSocket(namespace, clientId, clientTargetIp, clientTargetPort, visitorPort); } return batchStory; } @@ -120,14 +121,15 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe public Result updateOne(LazyServerPermeateClientMappingUpdateCommand lazyServerPermeateClientMappingUpdateCommand) { LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE.toInternalNetworkPenetrationMapping(lazyServerPermeateClientMappingUpdateCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateClientMapping.setServerId(serverId); + lazyNettyServerPermeateClientMapping.setNamespace(serverId); // 删除绑定数据 Result story = lazyNettyServerPermeateClientMappingRepository.story(lazyNettyServerPermeateClientMapping); String clientId = lazyNettyServerPermeateClientMapping.getClientId(); String clientTargetIp = lazyNettyServerPermeateClientMapping.getClientTargetIp(); Integer clientTargetPort = lazyNettyServerPermeateClientMapping.getClientTargetPort(); Integer visitorPort = lazyNettyServerPermeateClientMapping.getVisitorPort(); - this.changeSocket(clientId, clientTargetIp, clientTargetPort, visitorPort); + + this.changeSocket(serverId, clientId, clientTargetIp, clientTargetPort, visitorPort); return story; } @@ -135,26 +137,28 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe /** * 变更 网络穿透 * + * @param namespace 客户端ID * @param clientId 客户端ID * @param clientTargetIp 客户端目标IP * @param clientTargetPort 客户端莫表端口 * @param visitorPort 访客端口 */ - private void changeSocket(String clientId, String clientTargetIp, Integer clientTargetPort, Integer visitorPort) { + private void changeSocket(String namespace, String clientId, String clientTargetIp, Integer clientTargetPort, Integer visitorPort) { // 删除 客户端映射 - this.changeCloseSocket(clientId, visitorPort); + this.changeCloseSocket(namespace, clientId, visitorPort); // 更新 客户端映射 - createVisitor(clientId, clientTargetIp, clientTargetPort, visitorPort); + createVisitor(namespace, clientId, clientTargetIp, clientTargetPort, visitorPort); } /** * 删除 通道 * + * @param namespace namespace * @param clientId 客户端ID * @param visitorPort 访客端口 */ - private void changeCloseSocket(String clientId, Integer visitorPort) { + private void changeCloseSocket(String namespace, String clientId, Integer visitorPort) { // 删除 客户端映射 List nettyTcpServerPermeateClientVisitorSocketList = NettyClientVisitorContext.getVisitorSockets(clientId); if (!ObjectUtils.isEmpty(nettyTcpServerPermeateClientVisitorSocketList)) { @@ -183,7 +187,7 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe public Result findOne(LazyServerPermeateClientMappingQueryOneCommand lazyServerPermeateClientMappingQueryOneCommand) { LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE.toInternalNetworkPenetrationMapping(lazyServerPermeateClientMappingQueryOneCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateClientMapping.setServerId(serverId); + lazyNettyServerPermeateClientMapping.setNamespace(serverId); return lazyNettyServerPermeateClientMappingRepository.findOne(lazyNettyServerPermeateClientMapping).convert(LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE::fromInternalNetworkPenetrationMapping); } @@ -201,7 +205,7 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE.toInternalNetworkPenetrationMapping(lazyServerPermeateClientMappingQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateClientMapping.setServerId(serverId); + lazyNettyServerPermeateClientMapping.setNamespace(serverId); return lazyNettyServerPermeateClientMappingRepository.findList(lazyNettyServerPermeateClientMapping).convert(internalNetworkPenetrationMappings -> internalNetworkPenetrationMappings.stream().map(LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE::fromInternalNetworkPenetrationMapping).collect(Collectors.toList())); } @@ -218,7 +222,7 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe public Result> findPage(int size, int current, LazyServerPermeateClientMappingQueryListCommand lazyServerPermeateClientMappingQueryListCommand) { LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE.toInternalNetworkPenetrationMapping(lazyServerPermeateClientMappingQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateClientMapping.setServerId(serverId); + lazyNettyServerPermeateClientMapping.setNamespace(serverId); return lazyNettyServerPermeateClientMappingRepository.findPage(size, current, lazyNettyServerPermeateClientMapping).convert(page -> page.convert(LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE::fromInternalNetworkPenetrationMapping)); } @@ -236,12 +240,12 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe public Result remove(LazyServerPermeateClientMappingRemoveCommand lazyServerPermeateClientMappingRemoveCommand) { LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping = LazyNettyServerPermeateClientMappingDTOAssembler.INSTANCE.toInternalNetworkPenetrationMapping(lazyServerPermeateClientMappingRemoveCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateClientMapping.setServerId(serverId); + lazyNettyServerPermeateClientMapping.setNamespace(serverId); Result remove = lazyNettyServerPermeateClientMappingRepository.remove(lazyNettyServerPermeateClientMapping); // 删除端口映射 String clientId = lazyServerPermeateClientMappingRemoveCommand.getClientId(); Integer visitorPort = lazyServerPermeateClientMappingRemoveCommand.getVisitorPort(); - this.changeCloseSocket(clientId, visitorPort); + this.changeCloseSocket(serverId, clientId, visitorPort); return remove; } @@ -263,7 +267,8 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe Integer visitorPort = networkPenetrationMapping.getVisitorPort(); String clientTargetIp = networkPenetrationMapping.getClientTargetIp(); Integer clientTargetPort = networkPenetrationMapping.getClientTargetPort(); - this.createVisitor(clientId, clientTargetIp, clientTargetPort, visitorPort); + String namespace = networkPenetrationMapping.getNamespace(); + this.createVisitor(namespace, clientId, clientTargetIp, clientTargetPort, visitorPort); } return ResultFactory.successOf(); }); @@ -272,18 +277,20 @@ public class LazyServerPermeateClientMappingApplicationImpl implements LazyServe /** * 创建访客 * + * @param namespace namespace * @param clientId 客户端ID * @param clientTargetIp 客户端目标IP * @param clientTargetPort 客户端目标端口 * @param visitorPort 访客端口 */ - private void createVisitor(String clientId, String clientTargetIp, Integer clientTargetPort, Integer visitorPort) { + private void createVisitor(String namespace, String clientId, String clientTargetIp, Integer clientTargetPort, Integer visitorPort) { try { // 更新 客户端映射 NettyTcpServerPermeateClientVisitorSocket nettyTcpServerPermeateClientVisitorSocket = NettyTcpServerPermeateClientVisitorSocket.NettyVisitorSocketBuilder .builder() + .builderNamespace(namespace) .builderClientId(clientId) .builderClientTargetIp(clientTargetIp) .builderClientTargetPort(clientTargetPort) diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyServerPermeateServerMappingApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyServerPermeateServerMappingApplicationImpl.java index e4a4bbc2..880e7835 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyServerPermeateServerMappingApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyServerPermeateServerMappingApplicationImpl.java @@ -54,7 +54,7 @@ public class LazyServerPermeateServerMappingApplicationImpl implements LazyServe public Result story(LazyServerPermeateServerMappingStoryCommand lazyServerPermeateServerMappingStoryCommand) { LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping = LazyNettyServerPermeateServerMappingDTOAssembler.INSTANCE.toLazyInternalNetworkServerPermeateMapping(lazyServerPermeateServerMappingStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateServerMapping.setServerId(serverId); + lazyNettyServerPermeateServerMapping.setNamespace(serverId); // 开启端口 String permeateTargetIp = lazyNettyServerPermeateServerMapping.getPermeateTargetIp(); Integer permeateTargetPort = lazyNettyServerPermeateServerMapping.getPermeateTargetPort(); @@ -78,7 +78,7 @@ public class LazyServerPermeateServerMappingApplicationImpl implements LazyServe List lazyNettyServerPermeateServerMappingList = lazyServerPermeateServerMappingStoryCommandList.stream().map(LazyNettyServerPermeateServerMappingDTOAssembler.INSTANCE::toLazyInternalNetworkServerPermeateMapping).collect(Collectors.toList()); for (LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping : lazyNettyServerPermeateServerMappingList) { String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateServerMapping.setServerId(serverId); + lazyNettyServerPermeateServerMapping.setNamespace(serverId); // 开启端口 String permeateTargetIp = lazyNettyServerPermeateServerMapping.getPermeateTargetIp(); Integer permeateTargetPort = lazyNettyServerPermeateServerMapping.getPermeateTargetPort(); @@ -102,7 +102,7 @@ public class LazyServerPermeateServerMappingApplicationImpl implements LazyServe public Result updateOne(LazyServerPermeateServerMappingUpdateCommand lazyServerPermeateServerMappingUpdateCommand) { LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping = LazyNettyServerPermeateServerMappingDTOAssembler.INSTANCE.toLazyInternalNetworkServerPermeateMapping(lazyServerPermeateServerMappingUpdateCommand); String serverId = serverNodeProperties.getNodeId(); - lazyNettyServerPermeateServerMapping.setServerId(serverId); + lazyNettyServerPermeateServerMapping.setNamespace(serverId); // 开启端口 String permeateTargetIp = lazyNettyServerPermeateServerMapping.getPermeateTargetIp(); Integer permeateTargetPort = lazyNettyServerPermeateServerMapping.getPermeateTargetPort(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyVisitorPortFlowApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyVisitorPortFlowApplicationImpl.java index 9c1d467c..2e2cee73 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyVisitorPortFlowApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyVisitorPortFlowApplicationImpl.java @@ -59,7 +59,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp public Result story(LazyVisitorPortFlowStoryCommand lazyVisitorPortFlowStoryCommand) { LazyVisitorPortFlow lazyVisitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(lazyVisitorPortFlowStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortFlow.setServerId(serverId); + lazyVisitorPortFlow.setNamespace(serverId); return lazyVisitorPortFlowRepository.story(lazyVisitorPortFlow); } @@ -75,7 +75,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp String clientId = lazyVisitorPortFlowStoryCommand.getClientId(); Integer visitorPort = lazyVisitorPortFlowStoryCommand.getVisitorPort(); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortFlowStoryCommand.setServerId(serverId); + lazyVisitorPortFlowStoryCommand.setNamespace(serverId); Integer realOutFlow = ObjectUtils.isEmpty(lazyVisitorPortFlowStoryCommand.getOutFlow()) ? 0 : lazyVisitorPortFlowStoryCommand.getOutFlow(); Integer realInFlow = ObjectUtils.isEmpty(lazyVisitorPortFlowStoryCommand.getInFlow()) ? 0 : lazyVisitorPortFlowStoryCommand.getInFlow(); @@ -84,7 +84,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp findOneLazyVisitorPortFlowQuery.setClientId(clientId); findOneLazyVisitorPortFlowQuery.setVisitorPort(visitorPort); - findOneLazyVisitorPortFlowQuery.setServerId(serverId); + findOneLazyVisitorPortFlowQuery.setNamespace(serverId); lazyVisitorPortFlowRepository.findOne(findOneLazyVisitorPortFlowQuery).accept(existVisitorFlow -> { Integer inFlow = existVisitorFlow.getInFlow(); Integer outFlow = existVisitorFlow.getOutFlow(); @@ -106,13 +106,13 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp lazyVisitorPortPerDayFlowStoryCommand.setOutFlow(realOutFlow); lazyVisitorPortPerDayFlowStoryCommand.setInFlow(realInFlow); - lazyVisitorPortPerDayFlowStoryCommand.setServerId(serverId); + lazyVisitorPortPerDayFlowStoryCommand.setNamespace(serverId); LazyVisitorPortPerDayFlow findOneLazyVisitorPortPerDayFlowQuery = new LazyVisitorPortPerDayFlow(); findOneLazyVisitorPortPerDayFlowQuery.setClientId(clientId); findOneLazyVisitorPortPerDayFlowQuery.setVisitorPort(visitorPort); findOneLazyVisitorPortPerDayFlowQuery.setDay(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - findOneLazyVisitorPortPerDayFlowQuery.setServerId(serverId); + findOneLazyVisitorPortPerDayFlowQuery.setNamespace(serverId); lazyVisitorPortPerDayFlowRepository.findOne(findOneLazyVisitorPortPerDayFlowQuery).accept(existVisitorPortPerDayFlow -> { Integer inFlow = existVisitorPortPerDayFlow.getInFlow(); @@ -147,7 +147,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp .map(visitorPortFlowStoryCommand -> { LazyVisitorPortFlow visitorFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorPortFlowStoryCommand); String serverId = serverNodeProperties.getNodeId(); - visitorFlow.setServerId(serverId); + visitorFlow.setNamespace(serverId); return visitorFlow; } @@ -169,7 +169,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp public Result updateOne(LazyVisitorPortFlowUpdateCommand lazyVisitorPortFlowUpdateCommand) { LazyVisitorPortFlow lazyVisitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(lazyVisitorPortFlowUpdateCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortFlow.setServerId(serverId); + lazyVisitorPortFlow.setNamespace(serverId); return lazyVisitorPortFlowRepository.story(lazyVisitorPortFlow); } @@ -186,7 +186,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp public Result findOne(LazyVisitorPortFlowQueryOneCommand lazyVisitorPortFlowQueryOneCommand) { LazyVisitorPortFlow lazyVisitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(lazyVisitorPortFlowQueryOneCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortFlow.setServerId(serverId); + lazyVisitorPortFlow.setNamespace(serverId); return lazyVisitorPortFlowRepository.findOne(lazyVisitorPortFlow).convert(VisitorPortFlowDTOAssembler.INSTANCE::fromVisitorFlow); } @@ -203,7 +203,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp public Result> findList(LazyVisitorPortFlowQueryListCommand visitorFlowQueryListCommand) { LazyVisitorPortFlow lazyVisitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(visitorFlowQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortFlow.setServerId(serverId); + lazyVisitorPortFlow.setNamespace(serverId); return lazyVisitorPortFlowRepository.findList(lazyVisitorPortFlow).convert(visitorFlows -> visitorFlows.stream().map(VisitorPortFlowDTOAssembler.INSTANCE::fromVisitorFlow).collect(Collectors.toList())); } @@ -220,7 +220,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp public Result> findPage(int size, int current, LazyVisitorPortFlowQueryListCommand lazyVisitorPortFlowQueryListCommand) { LazyVisitorPortFlow lazyVisitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(lazyVisitorPortFlowQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortFlow.setServerId(serverId); + lazyVisitorPortFlow.setNamespace(serverId); return lazyVisitorPortFlowRepository.findPage(size, current, lazyVisitorPortFlow).convert(page -> page.convert(VisitorPortFlowDTOAssembler.INSTANCE::fromVisitorFlow)); } @@ -237,7 +237,7 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp public Result remove(LazyVisitorPortFlowRemoveCommand lazyVisitorPortFlowRemoveCommand) { LazyVisitorPortFlow lazyVisitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(lazyVisitorPortFlowRemoveCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortFlow.setServerId(serverId); + lazyVisitorPortFlow.setNamespace(serverId); return lazyVisitorPortFlowRepository.remove(lazyVisitorPortFlow); } @@ -252,15 +252,15 @@ public class LazyVisitorPortFlowApplicationImpl implements LazyVisitorPortFlowAp @Override public Result> findClientFlowPage(int size, int current, LazyVisitorPortFlowQueryListCommand lazyVisitorPortFlowQueryListCommand) { LazyVisitorPortFlow lazyVisitorPortFlow = VisitorPortFlowDTOAssembler.INSTANCE.toVisitorFlow(lazyVisitorPortFlowQueryListCommand); - String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortFlow.setServerId(serverId); + String namespace = serverNodeProperties.getNodeId(); + lazyVisitorPortFlow.setNamespace(namespace); return lazyVisitorPortFlowRepository.findPageGroupByClientId(size, current, lazyVisitorPortFlow).convert(visitorPortFlowLazyPage -> { List clientIdList = visitorPortFlowLazyPage .getRecords() .stream() .map(LazyVisitorPortFlow::getClientId) .toList(); - List lazyVisitorPortFlowList = lazyVisitorPortFlowRepository.findListByClientIds(clientIdList, serverId); + List lazyVisitorPortFlowList = lazyVisitorPortFlowRepository.findListByClientIds(clientIdList, namespace); // 根据客户端进行分组 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyVisitorPortPerDayFlowApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyVisitorPortPerDayFlowApplicationImpl.java index 55fbb98c..51d58144 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyVisitorPortPerDayFlowApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyVisitorPortPerDayFlowApplicationImpl.java @@ -59,7 +59,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow = VisitorPortPerDayFlowDTOAssembler.INSTANCE.toVisitorPortPerDayFlow(lazyVisitorPortPerDayFlowStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortPerDayFlow.setServerId(serverId); + lazyVisitorPortPerDayFlow.setNamespace(serverId); return lazyVisitorPortPerDayFlowRepository.story(lazyVisitorPortPerDayFlow); } @@ -80,7 +80,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow = VisitorPortPerDayFlowDTOAssembler.INSTANCE.toVisitorPortPerDayFlow(lazyVisitorPortPerDayFlowStoryCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortPerDayFlow.setServerId(serverId); + lazyVisitorPortPerDayFlow.setNamespace(serverId); return lazyVisitorPortPerDayFlow; } ) @@ -102,7 +102,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow = VisitorPortPerDayFlowDTOAssembler.INSTANCE.toVisitorPortPerDayFlow(lazyVisitorPortPerDayFlowUpdateCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortPerDayFlow.setServerId(serverId); return lazyVisitorPortPerDayFlowRepository.story(lazyVisitorPortPerDayFlow); + lazyVisitorPortPerDayFlow.setNamespace(serverId); return lazyVisitorPortPerDayFlowRepository.story(lazyVisitorPortPerDayFlow); } /** @@ -119,7 +119,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow = VisitorPortPerDayFlowDTOAssembler.INSTANCE.toVisitorPortPerDayFlow(lazyVisitorPortPerDayFlowQueryOneCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortPerDayFlow.setServerId(serverId); return lazyVisitorPortPerDayFlowRepository.findOne(lazyVisitorPortPerDayFlow).convert(VisitorPortPerDayFlowDTOAssembler.INSTANCE::fromVisitorPortPerDayFlow); + lazyVisitorPortPerDayFlow.setNamespace(serverId); return lazyVisitorPortPerDayFlowRepository.findOne(lazyVisitorPortPerDayFlow).convert(VisitorPortPerDayFlowDTOAssembler.INSTANCE::fromVisitorPortPerDayFlow); } /** @@ -136,7 +136,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow = VisitorPortPerDayFlowDTOAssembler.INSTANCE.toVisitorPortPerDayFlow(lazyVisitorPortPerDayFlowQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortPerDayFlow.setServerId(serverId); return lazyVisitorPortPerDayFlowRepository.findList(lazyVisitorPortPerDayFlow).convert(visitorPortPerDayFlows -> visitorPortPerDayFlows.stream().map(VisitorPortPerDayFlowDTOAssembler.INSTANCE::fromVisitorPortPerDayFlow).collect(Collectors.toList())); + lazyVisitorPortPerDayFlow.setNamespace(serverId); return lazyVisitorPortPerDayFlowRepository.findList(lazyVisitorPortPerDayFlow).convert(visitorPortPerDayFlows -> visitorPortPerDayFlows.stream().map(VisitorPortPerDayFlowDTOAssembler.INSTANCE::fromVisitorPortPerDayFlow).collect(Collectors.toList())); } /** @@ -153,7 +153,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow = VisitorPortPerDayFlowDTOAssembler.INSTANCE.toVisitorPortPerDayFlow(lazyVisitorPortPerDayFlowQueryListCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortPerDayFlow.setServerId(serverId); return lazyVisitorPortPerDayFlowRepository.findPage(size, current, lazyVisitorPortPerDayFlow).convert(page -> page.convert(VisitorPortPerDayFlowDTOAssembler.INSTANCE::fromVisitorPortPerDayFlow)); + lazyVisitorPortPerDayFlow.setNamespace(serverId); return lazyVisitorPortPerDayFlowRepository.findPage(size, current, lazyVisitorPortPerDayFlow).convert(page -> page.convert(VisitorPortPerDayFlowDTOAssembler.INSTANCE::fromVisitorPortPerDayFlow)); } /** @@ -170,7 +170,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow = VisitorPortPerDayFlowDTOAssembler.INSTANCE.toVisitorPortPerDayFlow(lazyVisitorPortPerDayFlowRemoveCommand); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortPerDayFlow.setServerId(serverId); return lazyVisitorPortPerDayFlowRepository.remove(lazyVisitorPortPerDayFlow); + lazyVisitorPortPerDayFlow.setNamespace(serverId); return lazyVisitorPortPerDayFlowRepository.remove(lazyVisitorPortPerDayFlow); } /** @@ -186,7 +186,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyNettyClientState lazyNettyClientState = new LazyNettyClientState(); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); return findClientDayFlow(dayLength, null); } @@ -211,7 +211,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyNettyClientState lazyNettyClientState = new LazyNettyClientState(); String serverId = serverNodeProperties.getNodeId(); - lazyNettyClientState.setServerId(serverId); + lazyNettyClientState.setNamespace(serverId); // 客户端ID if (ObjectUtils.isEmpty(clientIds)) { // 客户端ID @@ -222,7 +222,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort } lazyClientPortFlowPerDayEchartsDTO.setClientIdList(clientIds); LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow1 = new LazyVisitorPortPerDayFlow(); - lazyVisitorPortPerDayFlow1.setServerId(serverId); + lazyVisitorPortPerDayFlow1.setNamespace(serverId); List lazyVisitorPortPerDayFlowList = lazyVisitorPortPerDayFlowRepository.findList(lazyVisitorPortPerDayFlow1) .applyOther(clientPerDayFlows -> clientPerDayFlows); @@ -300,7 +300,7 @@ public class LazyVisitorPortPerDayFlowApplicationImpl implements LazyVisitorPort LazyClientFlowPerDayEchartsDTO lazyClientFlowPerDayEchartsDTO = new LazyClientFlowPerDayEchartsDTO(); LazyVisitorPortPerDayFlow lazyVisitorPortPerDayFlow1 = new LazyVisitorPortPerDayFlow(); String serverId = serverNodeProperties.getNodeId(); - lazyVisitorPortPerDayFlow1.setServerId(serverId); + lazyVisitorPortPerDayFlow1.setNamespace(serverId); List lazyVisitorPortPerDayFlowList = lazyVisitorPortPerDayFlowRepository.findList(lazyVisitorPortPerDayFlow1).applyOther(clientPerDayFlows -> clientPerDayFlows) ; diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/controller/LazyChannelController.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/controller/LazyChannelController.java index 93e7a69a..86f4e724 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/controller/LazyChannelController.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/controller/LazyChannelController.java @@ -1,21 +1,21 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.controller; -import org.wu.framework.web.spring.EasyController; -import org.wu.framework.web.response.Result; -import org.wu.framework.web.response.ResultFactory; import io.netty.channel.Channel; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; +import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; +import org.framework.lazy.cloud.network.heartbeat.common.InternalNetworkPenetrationRealClient; +import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; +import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; -import org.framework.lazy.cloud.network.heartbeat.common.InternalNetworkPenetrationRealClient; -import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType; -import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; +import org.wu.framework.web.response.Result; +import org.wu.framework.web.response.ResultFactory; +import org.wu.framework.web.spring.EasyController; import java.nio.charset.StandardCharsets; import java.util.List; @@ -29,11 +29,11 @@ import java.util.List; public class LazyChannelController { @Operation(summary = "服务端访问客户端") - @GetMapping("/{clientId}") - public void fetchClientId(@PathVariable("clientId") String clientId) { + @GetMapping("/{serverId}/{clientId}") + public void fetchClientId(@PathVariable("serverId") String serverId, @PathVariable("clientId") String clientId) { log.info("clientId:{}", clientId); // 获取客户端channel - Channel clientChannel = ChannelContext.getLoadBalance(clientId.getBytes(StandardCharsets.UTF_8)); + Channel clientChannel = ChannelContext.getLoadBalance(serverId, clientId); if (clientChannel == null) { if (log.isDebugEnabled()) { @@ -88,8 +88,9 @@ public class LazyChannelController { String clientTargetIp = internalNetworkPenetrationRealClient.getClientTargetIp(); Integer clientTargetPort = internalNetworkPenetrationRealClient.getClientTargetPort(); Integer visitorPort = internalNetworkPenetrationRealClient.getVisitorPort(); - ChannelContext.getChannels().forEach((clientId, channels) -> { + ChannelContext.getChannels().forEach((serverClient, channels) -> { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); + String clientId = serverClient.getClientId(); // 下发 客户端消息 nettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_TRANSFER); nettyProxyMsg.setClientId(clientId); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/blacklist/LazyNettyClientBlacklist.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/blacklist/LazyNettyClientBlacklist.java index 6a0b9c3e..b0eca425 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/blacklist/LazyNettyClientBlacklist.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/blacklist/LazyNettyClientBlacklist.java @@ -50,8 +50,8 @@ public class LazyNettyClientBlacklist { @Schema(description = "更新时间", name = "updateTime", example = "") private LocalDateTime updateTime; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/domain/model/lazy/netty/client/permeate/client/mapping/LazyNettyClientPermeateClientMapping.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/permeate/client/mapping/LazyNettyClientPermeateClientMapping.java index 07ae989c..e7f4638f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/permeate/client/mapping/LazyNettyClientPermeateClientMapping.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/permeate/client/mapping/LazyNettyClientPermeateClientMapping.java @@ -75,8 +75,8 @@ public class LazyNettyClientPermeateClientMapping { * * 服务端ID */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description ="服务端ID",name ="namespace",example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/permeate/server/mapping/LazyNettyClientPermeateServerMapping.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/permeate/server/mapping/LazyNettyClientPermeateServerMapping.java index daed4124..59e11d6c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/permeate/server/mapping/LazyNettyClientPermeateServerMapping.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/permeate/server/mapping/LazyNettyClientPermeateServerMapping.java @@ -71,12 +71,10 @@ public class LazyNettyClientPermeateServerMapping { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; - + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/LazyNettyClientState.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/LazyNettyClientState.java index 15b19715..ebe6dae2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/LazyNettyClientState.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/LazyNettyClientState.java @@ -68,10 +68,10 @@ public class LazyNettyClientState { @Schema(description = "描述", name = "describe", example = "") private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 原始IP diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/LazyNettyClientStateGroupByClient.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/LazyNettyClientStateGroupByClient.java index ee4cb940..3b3ef155 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/LazyNettyClientStateGroupByClient.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/LazyNettyClientStateGroupByClient.java @@ -50,10 +50,10 @@ public class LazyNettyClientStateGroupByClient { @Schema(description = "描述", name = "describe", example = "") private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 客户端数量 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/record/LazyNettyClientStateRecord.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/record/LazyNettyClientStateRecord.java index a2d8c241..b0b19888 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/record/LazyNettyClientStateRecord.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/client/state/record/LazyNettyClientStateRecord.java @@ -50,11 +50,10 @@ public class LazyNettyClientStateRecord { private NettyClientStatus onLineState; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/client/mapping/LazyNettyServerPermeateClientMapping.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/client/mapping/LazyNettyServerPermeateClientMapping.java index b3aa1e8d..22378a53 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/client/mapping/LazyNettyServerPermeateClientMapping.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/client/mapping/LazyNettyServerPermeateClientMapping.java @@ -74,10 +74,10 @@ public class LazyNettyServerPermeateClientMapping { @Schema(description = "描述", name = "describe", example = "") private String describe; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * 是否是ssl diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitor.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitor.java index 7a81c074..de420835 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitor.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/port/pool/LazyNettyServerVisitor.java @@ -61,10 +61,10 @@ public class LazyNettyServerVisitor { @Schema(description = "访客端口池大小", name = "poolSize", example = "") private Integer poolSize; /** - * 服务端ID + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/server/mapping/LazyNettyServerPermeateServerMapping.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/server/mapping/LazyNettyServerPermeateServerMapping.java index 9b66e920..d87749bb 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/server/mapping/LazyNettyServerPermeateServerMapping.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/netty/server/permeate/server/mapping/LazyNettyServerPermeateServerMapping.java @@ -67,11 +67,10 @@ public class LazyNettyServerPermeateServerMapping { private Integer permeateTargetPort; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/flow/LazyProxyFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/flow/LazyProxyFlow.java index d80732df..f177fc28 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/flow/LazyProxyFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/flow/LazyProxyFlow.java @@ -95,11 +95,10 @@ public class LazyProxyFlow { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/per/day/flow/LazyProxyPerDayFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/per/day/flow/LazyProxyPerDayFlow.java index 7e862a71..4d80bd77 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/per/day/flow/LazyProxyPerDayFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/proxy/per/day/flow/LazyProxyPerDayFlow.java @@ -102,11 +102,10 @@ public class LazyProxyPerDayFlow { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/LazyClientPerDayFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/LazyClientPerDayFlow.java index 867ef529..524ab686 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/LazyClientPerDayFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/LazyClientPerDayFlow.java @@ -60,11 +60,12 @@ public class LazyClientPerDayFlow { * 修改时间 */ @Schema(description ="修改时间",name ="updateTime",example = "") - private LocalDateTime updateTime; /** - * 服务端ID + private LocalDateTime updateTime; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/domain/model/lazy/visitor/flow/LazyVisitorPortFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/flow/LazyVisitorPortFlow.java index dfa80ec4..94e2fdd9 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/flow/LazyVisitorPortFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/flow/LazyVisitorPortFlow.java @@ -66,10 +66,11 @@ public class LazyVisitorPortFlow { * 访客端口 */ @Schema(description = "访客端口", name = "visitorPort", example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/domain/model/lazy/visitor/flow/LazyVisitorPortFlowRepository.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/flow/LazyVisitorPortFlowRepository.java index ed5fe1fe..afd52bde 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/flow/LazyVisitorPortFlowRepository.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/flow/LazyVisitorPortFlowRepository.java @@ -110,8 +110,8 @@ public interface LazyVisitorPortFlowRepository { * 根据客户端ID查询出 客户端所有的进出口流量 * * @param clientIdList 客户端ID - * @param serverId 服务ID + * @param namespace namespace * @return 客户端所有的进出口流量 */ - List findListByClientIds(List clientIdList, String serverId); + List findListByClientIds(List clientIdList, String namespace); } \ 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/domain/model/lazy/visitor/port/per/day/flow/LazyVisitorPortPerDayFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/port/per/day/flow/LazyVisitorPortPerDayFlow.java index 67aabeae..597a427c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/port/per/day/flow/LazyVisitorPortPerDayFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/domain/model/lazy/visitor/port/per/day/flow/LazyVisitorPortPerDayFlow.java @@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlow { * 访客端口 */ @Schema(description ="访客端口",name ="visitorPort",example = "") - private Integer visitorPort; /** - * 服务端ID + private Integer visitorPort; + /** + * 命名空间 */ - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description = "命名空间", name = "namespace", example = "") + private String namespace; } \ 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/infrastructure/converter/LazyInternalNetworkClientPermeateClientMappingConverter.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyClientPermeateClientMappingConverter.java similarity index 89% rename from wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkClientPermeateClientMappingConverter.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyClientPermeateClientMappingConverter.java index e5e59637..f74cc96e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkClientPermeateClientMappingConverter.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyClientPermeateClientMappingConverter.java @@ -13,7 +13,7 @@ import org.mapstruct.factory.Mappers; * @see org.wu.framework.lazy.orm.core.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructureConverter **/ @Mapper -public interface LazyInternalNetworkClientPermeateClientMappingConverter { +public interface LazyNettyClientPermeateClientMappingConverter { /** @@ -25,7 +25,7 @@ public interface LazyInternalNetworkClientPermeateClientMappingConverter { * @author Jia wei Wu * @date 2024/09/17 09:55 晚上 **/ - LazyInternalNetworkClientPermeateClientMappingConverter INSTANCE = Mappers.getMapper(LazyInternalNetworkClientPermeateClientMappingConverter.class); + LazyNettyClientPermeateClientMappingConverter INSTANCE = Mappers.getMapper(LazyNettyClientPermeateClientMappingConverter.class); /** * describe 实体对象 转换成领域对象 * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkClientPermeateServerMappingConverter.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyClientPermeateServerMappingConverter.java similarity index 89% rename from wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkClientPermeateServerMappingConverter.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyClientPermeateServerMappingConverter.java index f2f967a1..94048e21 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkClientPermeateServerMappingConverter.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyClientPermeateServerMappingConverter.java @@ -12,7 +12,7 @@ import org.mapstruct.Mapper; * @see org.wu.framework.lazy.orm.core.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructureConverter **/ @Mapper -public interface LazyInternalNetworkClientPermeateServerMappingConverter { +public interface LazyNettyClientPermeateServerMappingConverter { /** @@ -24,7 +24,7 @@ public interface LazyInternalNetworkClientPermeateServerMappingConverter { * @author Jia wei Wu * @date 2024/09/17 09:26 晚上 **/ - LazyInternalNetworkClientPermeateServerMappingConverter INSTANCE = Mappers.getMapper(LazyInternalNetworkClientPermeateServerMappingConverter.class); + LazyNettyClientPermeateServerMappingConverter INSTANCE = Mappers.getMapper(LazyNettyClientPermeateServerMappingConverter.class); /** * describe 实体对象 转换成领域对象 * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkPenetrationMappingConverter.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyPenetrationMappingConverter.java similarity index 89% rename from wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkPenetrationMappingConverter.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyPenetrationMappingConverter.java index e32259fd..c3609276 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkPenetrationMappingConverter.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyPenetrationMappingConverter.java @@ -14,7 +14,7 @@ import org.wu.framework.lazy.orm.core.persistence.reverse.lazy.ddd.DefaultDDDLaz * @see DefaultDDDLazyInfrastructureConverter **/ @Mapper -public interface LazyInternalNetworkPenetrationMappingConverter { +public interface LazyNettyPenetrationMappingConverter { /** @@ -23,7 +23,7 @@ public interface LazyInternalNetworkPenetrationMappingConverter { * @author Jia wei Wu * @date 2023/12/29 05:21 下午 **/ - LazyInternalNetworkPenetrationMappingConverter INSTANCE = Mappers.getMapper(LazyInternalNetworkPenetrationMappingConverter.class); + LazyNettyPenetrationMappingConverter INSTANCE = Mappers.getMapper(LazyNettyPenetrationMappingConverter.class); /** * describe 实体对象 转换成领域对象 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkServerPermeateServerMappingConverter.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyServerPermeateServerMappingConverter.java similarity index 88% rename from wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkServerPermeateServerMappingConverter.java rename to wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyServerPermeateServerMappingConverter.java index d6ae2fa5..7000ea8d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyInternalNetworkServerPermeateServerMappingConverter.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/converter/LazyNettyServerPermeateServerMappingConverter.java @@ -2,8 +2,8 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastruct import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.server.permeate.server.mapping.LazyNettyServerPermeateServerMapping; import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.entity.LazyNettyServerPermeateServerMappingDO; -import org.mapstruct.factory.Mappers; import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; /** * describe 服务端网络渗透映射 * @@ -12,7 +12,7 @@ import org.mapstruct.Mapper; * @see org.wu.framework.lazy.orm.core.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructureConverter **/ @Mapper -public interface LazyInternalNetworkServerPermeateServerMappingConverter { +public interface LazyNettyServerPermeateServerMappingConverter { /** @@ -24,7 +24,7 @@ public interface LazyInternalNetworkServerPermeateServerMappingConverter { * @author Jia wei Wu * @date 2024/09/17 01:35 下午 **/ - LazyInternalNetworkServerPermeateServerMappingConverter INSTANCE = Mappers.getMapper(LazyInternalNetworkServerPermeateServerMappingConverter.class); + LazyNettyServerPermeateServerMappingConverter INSTANCE = Mappers.getMapper(LazyNettyServerPermeateServerMappingConverter.class); /** * describe 实体对象 转换成领域对象 * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientBlacklistDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientBlacklistDO.java index 590e1496..7a31e2f2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientBlacklistDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientBlacklistDO.java @@ -58,9 +58,9 @@ public class LazyNettyClientBlacklistDO { @LazyTableFieldUpdateTime private LocalDateTime updateTime; /** - * 服务端ID + * 命名空间 */ - @LazyTableFieldUnique(name = "server_id", comment = "服务端ID",notNull = true) - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; } \ 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/infrastructure/entity/LazyNettyClientPermeateClientMappingDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientPermeateClientMappingDO.java index 024f7ba2..a4c5aabb 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientPermeateClientMappingDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientPermeateClientMappingDO.java @@ -109,12 +109,11 @@ public class LazyNettyClientPermeateClientMappingDO { @Schema(description = "to 客户端协议类型", name = "to_protocol_type", example = "") private ProtocolType toProtocolType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - @LazyTableField(name="server_id",comment="服务端ID",columnType="varchar(255)") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientPermeateServerMappingDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientPermeateServerMappingDO.java index f3e4d4c3..85e40bdf 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientPermeateServerMappingDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientPermeateServerMappingDO.java @@ -105,12 +105,11 @@ public class LazyNettyClientPermeateServerMappingDO { @Schema(description = "to 客户端协议类型", name = "to_protocol_type", example = "") private ProtocolType toProtocolType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - @LazyTableField(name="server_id",comment="服务端ID",columnType="varchar(255)") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientStateDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientStateDO.java index f010613b..e07431a4 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientStateDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientStateDO.java @@ -81,11 +81,11 @@ public class LazyNettyClientStateDO { private String describe; /** - * 服务端ID + * 命名空间 */ - @LazyTableFieldUnique(name = "server_id", comment = "服务端ID",notNull = true) - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * 原始IP diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientStateRecordDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientStateRecordDO.java index b990bcad..79f86f55 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientStateRecordDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientStateRecordDO.java @@ -61,12 +61,11 @@ public class LazyNettyClientStateRecordDO { private String onLineState; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - @LazyTableField(name="server_id",comment="服务端ID",notNull=true,columnType="varchar(255)") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientVirtualRouteDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientVirtualRouteDO.java index 50cfb9b1..03e4e818 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientVirtualRouteDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyClientVirtualRouteDO.java @@ -103,10 +103,16 @@ public class LazyNettyClientVirtualRouteDO { /** * - * 客户端虚拟路由端口：默认ALL + * 客户端虚拟路由端口：默认* */ @Schema(description ="客户端虚拟路由端口：默认ALL",name ="virtualPort",example = "") @LazyTableFieldUnique(name="virtual_port",comment="客户端虚拟路由端口：默认ALL",notNull=true,defaultValue="'*'",upsertStrategy = LazyFieldStrategy.NEVER,columnType="varchar(255)") private String virtualPort; + /** + * 命名空间 + */ + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; } \ 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/infrastructure/entity/LazyNettyServerPermeateClientMappingDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeateClientMappingDO.java index 80ce490f..cff6b93f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeateClientMappingDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeateClientMappingDO.java @@ -102,11 +102,11 @@ public class LazyNettyServerPermeateClientMappingDO { @LazyTableField(comment = "描述") private String describe; /** - * 服务端ID + * 命名空间 */ - @LazyTableFieldUnique(name = "server_id", comment = "服务端ID") - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * 是否是ssl diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeatePortPoolDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeatePortPoolDO.java index 744fb5f8..8dbf5d45 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeatePortPoolDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeatePortPoolDO.java @@ -79,12 +79,11 @@ public class LazyNettyServerPermeatePortPoolDO { @LazyTableField(name = "pool_size", comment = "访客端口池大小", columnType = "int",defaultValue = "'20'") private Integer poolSize; /** - * 服务端ID + * 命名空间 */ - @LazyTableFieldUnique(name = "server_id", comment = "服务端ID",notNull = true) - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; - + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * 类型：服务端内网穿透、服务端内网渗透、客户端渗透服务端、客户端渗透客户端 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeateServerMappingDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeateServerMappingDO.java index 15129749..e041db7c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeateServerMappingDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerPermeateServerMappingDO.java @@ -83,13 +83,11 @@ public class LazyNettyServerPermeateServerMappingDO { @Schema(description = "to 客户端协议类型", name = "to_protocol_type", example = "") private ProtocolType toProtocolType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - @LazyTableField(name="server_id",comment="服务端ID",columnType="varchar(255)") - private String serverId; - + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerRouteDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerRouteDO.java index cca2fd6b..d321008c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerRouteDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerRouteDO.java @@ -78,4 +78,11 @@ public class LazyNettyServerRouteDO { @LazyTableField(name="update_time",comment="更新时间",defaultValue="CURRENT_TIMESTAMP",upsertStrategy = LazyFieldStrategy.NEVER,columnType="datetime",extra=" on update CURRENT_TIMESTAMP") private LocalDateTime updateTime; + /** + * 命名空间 + */ + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; + } \ 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/infrastructure/entity/LazyNettyServerVirtualRouteDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerVirtualRouteDO.java index cb62e1eb..2ff5df2d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerVirtualRouteDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyNettyServerVirtualRouteDO.java @@ -53,6 +53,12 @@ public class LazyNettyServerVirtualRouteDO { @LazyTableFieldId(name = "id", comment = "主键ID") private Long id; + /** + * 命名空间 + */ + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * * 是否删除 diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java index 4c2a73dd..34ab3aa3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java @@ -113,12 +113,11 @@ public class LazyProxyFlowDO { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - @LazyTableFieldUnique(name="server_id",comment="服务端ID",notNull=true,columnType="varchar(25)") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyPerDayFlowDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyPerDayFlowDO.java index 1bea8004..0ab36502 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyPerDayFlowDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyPerDayFlowDO.java @@ -121,12 +121,11 @@ public class LazyProxyPerDayFlowDO { private ChannelProxyType proxyType; /** - * - * 服务端ID + * 命名空间 */ - @Schema(description ="服务端ID",name ="serverId",example = "") - @LazyTableFieldUnique(name="server_id",comment="服务端ID",notNull=true,columnType="varchar(25)") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; /** * diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyVisitorPortFlowDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyVisitorPortFlowDO.java index a0af1a4e..e4f52377 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyVisitorPortFlowDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyVisitorPortFlowDO.java @@ -79,10 +79,10 @@ public class LazyVisitorPortFlowDO { @LazyTableFieldUnique(name = "visitor_port", comment = "访客端口", columnType = "int") private Integer visitorPort; /** /** - * 服务端ID + * 命名空间 */ - @LazyTableFieldUnique(name = "server_id", comment = "服务端ID",notNull = true) - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; } \ 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/infrastructure/entity/LazyVisitorPortPerDayFlowDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyVisitorPortPerDayFlowDO.java index 1def1ddc..2ee496f8 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyVisitorPortPerDayFlowDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyVisitorPortPerDayFlowDO.java @@ -93,9 +93,9 @@ public class LazyVisitorPortPerDayFlowDO { @LazyTableFieldUnique(name = "visitor_port", comment = "访客端口", columnType = "int") private Integer visitorPort; /** - * 服务端ID + * 命名空间 */ - @LazyTableFieldUnique(name = "server_id", comment = "服务端ID",notNull = true) - @Schema(description = "服务端ID", name = "serverId", example = "") - private String serverId; + @Schema(description ="命名空间",name ="namespace",example = "") + @LazyTableFieldUnique(name="namespace",comment="命名空间",columnType="varchar(25)",defaultValue = "DEFAULT") + private String namespace; } \ 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/infrastructure/persistence/LazyNettyClientPermeateClientMappingRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientPermeateClientMappingRepositoryImpl.java index 2fcf9083..88b5a040 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientPermeateClientMappingRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientPermeateClientMappingRepositoryImpl.java @@ -3,7 +3,7 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastruct import jakarta.annotation.Resource; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.permeate.client.mapping.LazyNettyClientPermeateClientMapping; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.permeate.client.mapping.LazyNettyClientPermeateClientMappingRepository; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyInternalNetworkClientPermeateClientMappingConverter; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyNettyClientPermeateClientMappingConverter; import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.entity.LazyNettyClientPermeateClientMappingDO; import org.springframework.stereotype.Repository; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; @@ -39,7 +39,7 @@ public class LazyNettyClientPermeateClientMappingRepositoryImpl implements LazyN @Override public Result story(LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMapping) { - LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyInternalNetworkClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); + LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyNettyClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); lazyLambdaStream.upsert(lazyNettyClientPermeateClientMappingDO); return ResultFactory.successOf(); } @@ -56,7 +56,7 @@ public class LazyNettyClientPermeateClientMappingRepositoryImpl implements LazyN @Override public Result> batchStory(List lazyNettyClientPermeateClientMappingList) { - List lazyNettyClientPermeateClientMappingDOList = lazyNettyClientPermeateClientMappingList.stream().map(LazyInternalNetworkClientPermeateClientMappingConverter.INSTANCE::fromLazyInternalNetworkClientPermeateClientMapping).collect(Collectors.toList()); + List lazyNettyClientPermeateClientMappingDOList = lazyNettyClientPermeateClientMappingList.stream().map(LazyNettyClientPermeateClientMappingConverter.INSTANCE::fromLazyInternalNetworkClientPermeateClientMapping).collect(Collectors.toList()); lazyLambdaStream.upsert(lazyNettyClientPermeateClientMappingDOList); return ResultFactory.successOf(); } @@ -73,7 +73,7 @@ public class LazyNettyClientPermeateClientMappingRepositoryImpl implements LazyN @Override public Result findOne(LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMapping) { - LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyInternalNetworkClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); + LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyNettyClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMappingOne = lazyLambdaStream.selectOne(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateClientMappingDO), LazyNettyClientPermeateClientMapping.class); return ResultFactory.successOf(lazyNettyClientPermeateClientMappingOne); } @@ -90,7 +90,7 @@ public class LazyNettyClientPermeateClientMappingRepositoryImpl implements LazyN @Override public Result> findList(LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMapping) { - LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyInternalNetworkClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); + LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyNettyClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); List lazyNettyClientPermeateClientMappingList = lazyLambdaStream.selectList(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateClientMappingDO), LazyNettyClientPermeateClientMapping.class); return ResultFactory.successOf(lazyNettyClientPermeateClientMappingList); } @@ -109,7 +109,7 @@ public class LazyNettyClientPermeateClientMappingRepositoryImpl implements LazyN @Override public Result> findPage(int size, int current, LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMapping) { - LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyInternalNetworkClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); + LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyNettyClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); LazyPage lazyPage = new LazyPage<>(current,size); LazyPage lazyInternalNetworkClientPermeateClientMappingLazyPage = lazyLambdaStream.selectPage(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateClientMappingDO),lazyPage, LazyNettyClientPermeateClientMapping.class); return ResultFactory.successOf(lazyInternalNetworkClientPermeateClientMappingLazyPage); @@ -127,7 +127,7 @@ public class LazyNettyClientPermeateClientMappingRepositoryImpl implements LazyN @Override public Result remove(LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMapping) { - LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyInternalNetworkClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); + LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyNettyClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); lazyLambdaStream.delete(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateClientMappingDO)); return ResultFactory.successOf(); } @@ -144,7 +144,7 @@ public class LazyNettyClientPermeateClientMappingRepositoryImpl implements LazyN @Override public Result exists(LazyNettyClientPermeateClientMapping lazyNettyClientPermeateClientMapping) { - LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyInternalNetworkClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); + LazyNettyClientPermeateClientMappingDO lazyNettyClientPermeateClientMappingDO = LazyNettyClientPermeateClientMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateClientMapping(lazyNettyClientPermeateClientMapping); Boolean exists=lazyLambdaStream.exists(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateClientMappingDO)); return ResultFactory.successOf(exists); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientPermeateServerMappingRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientPermeateServerMappingRepositoryImpl.java index c5e070e9..6a57c55c 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientPermeateServerMappingRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyClientPermeateServerMappingRepositoryImpl.java @@ -3,7 +3,7 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastruct import jakarta.annotation.Resource; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.permeate.server.mapping.LazyNettyClientPermeateServerMapping; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.client.permeate.server.mapping.LazyNettyClientPermeateServerMappingRepository; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyInternalNetworkClientPermeateServerMappingConverter; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyNettyClientPermeateServerMappingConverter; import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.entity.LazyNettyClientPermeateServerMappingDO; import org.springframework.stereotype.Repository; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; @@ -39,7 +39,7 @@ public class LazyNettyClientPermeateServerMappingRepositoryImpl implements LazyN @Override public Result story(LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping) { - LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyInternalNetworkClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); + LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyNettyClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); lazyLambdaStream.upsert(lazyNettyClientPermeateServerMappingDO); return ResultFactory.successOf(); } @@ -56,7 +56,7 @@ public class LazyNettyClientPermeateServerMappingRepositoryImpl implements LazyN @Override public Result> batchStory(List lazyNettyClientPermeateServerMappingList) { - List lazyNettyClientPermeateServerMappingDOList = lazyNettyClientPermeateServerMappingList.stream().map(LazyInternalNetworkClientPermeateServerMappingConverter.INSTANCE::fromLazyInternalNetworkClientPermeateServerMapping).collect(Collectors.toList()); + List lazyNettyClientPermeateServerMappingDOList = lazyNettyClientPermeateServerMappingList.stream().map(LazyNettyClientPermeateServerMappingConverter.INSTANCE::fromLazyInternalNetworkClientPermeateServerMapping).collect(Collectors.toList()); lazyLambdaStream.upsert(lazyNettyClientPermeateServerMappingDOList); return ResultFactory.successOf(); } @@ -73,7 +73,7 @@ public class LazyNettyClientPermeateServerMappingRepositoryImpl implements LazyN @Override public Result findOne(LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping) { - LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyInternalNetworkClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); + LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyNettyClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMappingOne = lazyLambdaStream.selectOne(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateServerMappingDO), LazyNettyClientPermeateServerMapping.class); return ResultFactory.successOf(lazyNettyClientPermeateServerMappingOne); } @@ -90,7 +90,7 @@ public class LazyNettyClientPermeateServerMappingRepositoryImpl implements LazyN @Override public Result> findList(LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping) { - LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyInternalNetworkClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); + LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyNettyClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); List lazyNettyClientPermeateServerMappingList = lazyLambdaStream.selectList(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateServerMappingDO), LazyNettyClientPermeateServerMapping.class); return ResultFactory.successOf(lazyNettyClientPermeateServerMappingList); } @@ -109,7 +109,7 @@ public class LazyNettyClientPermeateServerMappingRepositoryImpl implements LazyN @Override public Result> findPage(int size, int current, LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping) { - LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyInternalNetworkClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); + LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyNettyClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); LazyPage lazyPage = new LazyPage<>(current,size); LazyPage lazyInternalNetworkClientPermeateServerMappingLazyPage = lazyLambdaStream.selectPage(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateServerMappingDO),lazyPage, LazyNettyClientPermeateServerMapping.class); return ResultFactory.successOf(lazyInternalNetworkClientPermeateServerMappingLazyPage); @@ -127,7 +127,7 @@ public class LazyNettyClientPermeateServerMappingRepositoryImpl implements LazyN @Override public Result remove(LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping) { - LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyInternalNetworkClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); + LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyNettyClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); lazyLambdaStream.delete(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateServerMappingDO)); return ResultFactory.successOf(); } @@ -144,7 +144,7 @@ public class LazyNettyClientPermeateServerMappingRepositoryImpl implements LazyN @Override public Result exists(LazyNettyClientPermeateServerMapping lazyNettyClientPermeateServerMapping) { - LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyInternalNetworkClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); + LazyNettyClientPermeateServerMappingDO lazyNettyClientPermeateServerMappingDO = LazyNettyClientPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkClientPermeateServerMapping(lazyNettyClientPermeateServerMapping); Boolean exists=lazyLambdaStream.exists(LazyWrappers.lambdaWrapperBean(lazyNettyClientPermeateServerMappingDO)); return ResultFactory.successOf(exists); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerPermeateClientMappingRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerPermeateClientMappingRepositoryImpl.java index 2a8db56a..8c6b4a54 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerPermeateClientMappingRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerPermeateClientMappingRepositoryImpl.java @@ -11,7 +11,7 @@ import org.wu.framework.web.response.ResultFactory; import jakarta.annotation.Resource; import org.springframework.stereotype.Repository; import org.wu.framework.lazy.orm.core.persistence.reverse.lazy.ddd.DefaultDDDLazyInfrastructurePersistence; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyInternalNetworkPenetrationMappingConverter; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyNettyPenetrationMappingConverter; import java.util.List; import java.util.stream.Collectors; @@ -40,7 +40,7 @@ public class LazyNettyServerPermeateClientMappingRepositoryImpl implements LazyN @Override public Result story(LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping) { - LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyInternalNetworkPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); + LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyNettyPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); lazyNettyServerPermeateClientMappingDO.setIsDeleted(false); lazyLambdaStream.upsertRemoveNull(lazyNettyServerPermeateClientMappingDO); return ResultFactory.successOf(); @@ -57,7 +57,7 @@ public class LazyNettyServerPermeateClientMappingRepositoryImpl implements LazyN @Override public Result> batchStory(List lazyNettyServerPermeateClientMappingList) { - List lazyNettyServerPermeateClientMappingDOList = lazyNettyServerPermeateClientMappingList.stream().map(LazyInternalNetworkPenetrationMappingConverter.INSTANCE::fromInternalNetworkPenetrationMapping).collect(Collectors.toList()); + List lazyNettyServerPermeateClientMappingDOList = lazyNettyServerPermeateClientMappingList.stream().map(LazyNettyPenetrationMappingConverter.INSTANCE::fromInternalNetworkPenetrationMapping).collect(Collectors.toList()); lazyLambdaStream.upsert(lazyNettyServerPermeateClientMappingDOList); return ResultFactory.successOf(); } @@ -73,7 +73,7 @@ public class LazyNettyServerPermeateClientMappingRepositoryImpl implements LazyN @Override public Result findOne(LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping) { - LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyInternalNetworkPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); + LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyNettyPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMappingOne = lazyLambdaStream.selectOne(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateClientMappingDO), LazyNettyServerPermeateClientMapping.class); return ResultFactory.successOf(lazyNettyServerPermeateClientMappingOne); } @@ -89,7 +89,7 @@ public class LazyNettyServerPermeateClientMappingRepositoryImpl implements LazyN @Override public Result> findList(LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping) { - LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyInternalNetworkPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); + LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyNettyPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); List lazyNettyServerPermeateClientMappingList = lazyLambdaStream.selectList(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateClientMappingDO), LazyNettyServerPermeateClientMapping.class); return ResultFactory.successOf(lazyNettyServerPermeateClientMappingList); } @@ -107,7 +107,7 @@ public class LazyNettyServerPermeateClientMappingRepositoryImpl implements LazyN @Override public Result> findPage(int size, int current, LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping) { - LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyInternalNetworkPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); + LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyNettyPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); LazyPage lazyPage = new LazyPage<>(current, size); LazyPage internalNetworkPenetrationMappingLazyPage = lazyLambdaStream.selectPage(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateClientMappingDO), lazyPage, LazyNettyServerPermeateClientMapping.class); return ResultFactory.successOf(internalNetworkPenetrationMappingLazyPage); @@ -124,7 +124,7 @@ public class LazyNettyServerPermeateClientMappingRepositoryImpl implements LazyN @Override public Result remove(LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping) { - LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyInternalNetworkPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); + LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyNettyPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); lazyLambdaStream.delete(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateClientMappingDO)); return ResultFactory.successOf(); } @@ -140,7 +140,7 @@ public class LazyNettyServerPermeateClientMappingRepositoryImpl implements LazyN @Override public Result exists(LazyNettyServerPermeateClientMapping lazyNettyServerPermeateClientMapping) { - LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyInternalNetworkPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); + LazyNettyServerPermeateClientMappingDO lazyNettyServerPermeateClientMappingDO = LazyNettyPenetrationMappingConverter.INSTANCE.fromInternalNetworkPenetrationMapping(lazyNettyServerPermeateClientMapping); Boolean exists = lazyLambdaStream.exists(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateClientMappingDO)); return ResultFactory.successOf(exists); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerPermeateServerMappingRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerPermeateServerMappingRepositoryImpl.java index 45dcd17b..4db1750a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerPermeateServerMappingRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyNettyServerPermeateServerMappingRepositoryImpl.java @@ -3,7 +3,7 @@ package org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastruct import jakarta.annotation.Resource; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.server.permeate.server.mapping.LazyNettyServerPermeateServerMapping; import org.framework.lazy.cloud.network.heartbeat.server.standalone.domain.model.lazy.netty.server.permeate.server.mapping.LazyNettyServerPermeateServerMappingRepository; -import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyInternalNetworkServerPermeateServerMappingConverter; +import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.converter.LazyNettyServerPermeateServerMappingConverter; import org.framework.lazy.cloud.network.heartbeat.server.standalone.infrastructure.entity.LazyNettyServerPermeateServerMappingDO; import org.springframework.stereotype.Repository; import org.wu.framework.lazy.orm.database.lambda.domain.LazyPage; @@ -39,7 +39,7 @@ public class LazyNettyServerPermeateServerMappingRepositoryImpl implements LazyN @Override public Result story(LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping) { - LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyInternalNetworkServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); + LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyNettyServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); lazyLambdaStream.upsert(lazyNettyServerPermeateServerMappingDO); return ResultFactory.successOf(); } @@ -56,7 +56,7 @@ public class LazyNettyServerPermeateServerMappingRepositoryImpl implements LazyN @Override public Result> batchStory(List lazyNettyServerPermeateServerMappingList) { - List lazyNettyServerPermeateServerMappingDOList = lazyNettyServerPermeateServerMappingList.stream().map(LazyInternalNetworkServerPermeateServerMappingConverter.INSTANCE::fromLazyInternalNetworkServerPermeateMapping).collect(Collectors.toList()); + List lazyNettyServerPermeateServerMappingDOList = lazyNettyServerPermeateServerMappingList.stream().map(LazyNettyServerPermeateServerMappingConverter.INSTANCE::fromLazyInternalNetworkServerPermeateMapping).collect(Collectors.toList()); lazyLambdaStream.upsert(lazyNettyServerPermeateServerMappingDOList); return ResultFactory.successOf(); } @@ -73,7 +73,7 @@ public class LazyNettyServerPermeateServerMappingRepositoryImpl implements LazyN @Override public Result findOne(LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping) { - LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyInternalNetworkServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); + LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyNettyServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMappingOne = lazyLambdaStream.selectOne(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateServerMappingDO), LazyNettyServerPermeateServerMapping.class); return ResultFactory.successOf(lazyNettyServerPermeateServerMappingOne); } @@ -90,7 +90,7 @@ public class LazyNettyServerPermeateServerMappingRepositoryImpl implements LazyN @Override public Result> findList(LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping) { - LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyInternalNetworkServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); + LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyNettyServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); List lazyNettyServerPermeateServerMappingList = lazyLambdaStream.selectList(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateServerMappingDO), LazyNettyServerPermeateServerMapping.class); return ResultFactory.successOf(lazyNettyServerPermeateServerMappingList); } @@ -109,7 +109,7 @@ public class LazyNettyServerPermeateServerMappingRepositoryImpl implements LazyN @Override public Result> findPage(int size, int current, LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping) { - LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyInternalNetworkServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); + LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyNettyServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); LazyPage lazyPage = new LazyPage<>(current,size); LazyPage lazyInternalNetworkServerPermeateMappingLazyPage = lazyLambdaStream.selectPage(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateServerMappingDO),lazyPage, LazyNettyServerPermeateServerMapping.class); return ResultFactory.successOf(lazyInternalNetworkServerPermeateMappingLazyPage); @@ -127,7 +127,7 @@ public class LazyNettyServerPermeateServerMappingRepositoryImpl implements LazyN @Override public Result remove(LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping) { - LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyInternalNetworkServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); + LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyNettyServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); lazyLambdaStream.delete(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateServerMappingDO)); return ResultFactory.successOf(); } @@ -144,7 +144,7 @@ public class LazyNettyServerPermeateServerMappingRepositoryImpl implements LazyN @Override public Result exists(LazyNettyServerPermeateServerMapping lazyNettyServerPermeateServerMapping) { - LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyInternalNetworkServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); + LazyNettyServerPermeateServerMappingDO lazyNettyServerPermeateServerMappingDO = LazyNettyServerPermeateServerMappingConverter.INSTANCE.fromLazyInternalNetworkServerPermeateMapping(lazyNettyServerPermeateServerMapping); Boolean exists=lazyLambdaStream.exists(LazyWrappers.lambdaWrapperBean(lazyNettyServerPermeateServerMappingDO)); return ResultFactory.successOf(exists); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyProxyFlowRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyProxyFlowRepositoryImpl.java index dcb52cc5..90efd884 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyProxyFlowRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyProxyFlowRepositoryImpl.java @@ -181,7 +181,7 @@ public class LazyProxyFlowRepositoryImpl implements LazyProxyFlowRepository { return lazyLambdaStream.selectList( LazyWrappers.lambdaWrapper() .in(LazyProxyFlowDO::getClientId, clientIdList) - .eq(LazyProxyFlowDO::getServerId, serverId), + .eq(LazyProxyFlowDO::getNamespace, serverId), LazyProxyFlow.class); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyVisitorPortFlowRepositoryImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyVisitorPortFlowRepositoryImpl.java index 753da409..84dc19a1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyVisitorPortFlowRepositoryImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/persistence/LazyVisitorPortFlowRepositoryImpl.java @@ -172,18 +172,18 @@ public class LazyVisitorPortFlowRepositoryImpl implements LazyVisitorPortFlowRep * 根据客户端ID查询出 客户端所有的进出口流量 * * @param clientIdList 客户端ID - * @param serverId 服务端ID + * @param namespace namespace * @return 客户端所有的进出口流量 */ @Override - public List findListByClientIds(List clientIdList, String serverId) { + public List findListByClientIds(List clientIdList, String namespace) { if (ObjectUtils.isEmpty(clientIdList)) { return new ArrayList<>(); } return lazyLambdaStream.selectList( LazyWrappers.lambdaWrapper() .in(LazyVisitorPortFlowDO::getClientId, clientIdList) - .eq(LazyVisitorPortFlowDO::getServerId, serverId), + .eq(LazyVisitorPortFlowDO::getNamespace, namespace), LazyVisitorPortFlow.class); } } \ No newline at end of file