From 2b3c7cb7c228f7d30cdefd3b4195581d00f2d6e3 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Mon, 16 Dec 2024 18:59:02 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=20=E4=BC=98=E5=8C=96tcp=E3=80=81udp?= =?UTF-8?q?=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...yNettyServerPropertiesApplicationImpl.java | 20 +-- .../config/ClientAutoConfiguration.java | 170 +++++++++++++++++- ...andleTcpChannelHeartbeatTypeAdvanced.java} | 2 +- ...dvancedHandleDistributeTcpDistribute.java} | 4 +- ...eClientPermeateClientInitTypeAdvanced.java | 8 +- ...eClientPermeateServerInitTypeAdvanced.java | 6 +- ...meateServerTransferCloseTypeAdvanced.java} | 2 +- ...annelConnectionSuccessfulTypeAdvanced.java | 4 +- ...annelConnectionSuccessfulTypeAdvanced.java | 8 +- ...PermeateClientRealConnectTypeAdvanced.java | 4 +- ...tFilter.java => NettyTcpClientFilter.java} | 14 +- ...ttyTcpClientPermeateClientRealFilter.java} | 6 +- ...cpClientPermeateClientTransferFilter.java} | 8 +- ...ientPermeateClientTransferRealFilter.java} | 8 +- ...TcpClientPermeateClientVisitorFilter.java} | 8 +- ...cpClientPermeateServerTransferFilter.java} | 8 +- ...TcpClientPermeateServerVisitorFilter.java} | 8 +- ...ttyTcpServerPermeateClientRealFilter.java} | 6 +- ...cpServerPermeateClientTransferFilter.java} | 8 +- ...andler.java => NettyTcpClientHandler.java} | 18 +- ...tyTcpClientPermeateClientRealHandler.java} | 5 +- ...pClientPermeateClientTransferHandler.java} | 8 +- ...entPermeateClientTransferRealHandler.java} | 7 +- ...cpClientPermeateClientVisitorHandler.java} | 12 +- ...pClientPermeateServerTransferHandler.java} | 6 +- ...cpClientPermeateServerVisitorHandler.java} | 10 +- ...tyTcpServerPermeateClientRealHandler.java} | 2 +- ...pServerPermeateClientTransferHandler.java} | 4 +- ...er.java => TcpHeartBeatClientHandler.java} | 2 +- ...ttyTcpClientPermeateClientRealSocket.java} | 10 +- ...TcpClientPermeateClientVisitorSocket.java} | 18 +- ...tPermeateClientVisitorTransferSocket.java} | 6 +- ...TcpClientPermeateServerVisitorSocket.java} | 18 +- ...tPermeateServerVisitorTransferSocket.java} | 6 +- ...tSocket.java => NettyTcpClientSocket.java} | 22 +-- ...ttyTcpServerPermeateClientRealSocket.java} | 10 +- .../heartbeat/client/netty/tcp/xx.java | 4 - .../LazyNettyClusterNodeApplicationImpl.java | 20 +-- 38 files changed, 315 insertions(+), 175 deletions(-) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/{ClientTcpHandleChannelHeartbeatTypeAdvanced.java => ClientHandleTcpChannelHeartbeatTypeAdvanced.java} (92%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/{ClientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java => ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java} (87%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/{ClientHandleHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced.java => ClientHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced.java} (85%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyClientFilter.java => NettyTcpClientFilter.java} (78%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyClientPermeateClientRealFilter.java => NettyTcpClientPermeateClientRealFilter.java} (82%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyClientPermeateClientTransferFilter.java => NettyTcpClientPermeateClientTransferFilter.java} (84%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyClientPermeateClientTransferRealFilter.java => NettyTcpClientPermeateClientTransferRealFilter.java} (84%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyClientPermeateClientVisitorFilter.java => NettyTcpClientPermeateClientVisitorFilter.java} (78%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyClientPermeateServerTransferFilter.java => NettyTcpClientPermeateServerTransferFilter.java} (84%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyClientPermeateServerVisitorFilter.java => NettyTcpClientPermeateServerVisitorFilter.java} (78%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyServerPermeateClientRealFilter.java => NettyTcpServerPermeateClientRealFilter.java} (82%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/{NettyServerPermeateClientTransferFilter.java => NettyTcpServerPermeateClientTransferFilter.java} (83%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyClientHandler.java => NettyTcpClientHandler.java} (87%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyClientPermeateClientRealHandler.java => NettyTcpClientPermeateClientRealHandler.java} (92%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyClientPermeateClientTransferHandler.java => NettyTcpClientPermeateClientTransferHandler.java} (85%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyClientPermeateClientTransferRealHandler.java => NettyTcpClientPermeateClientTransferRealHandler.java} (87%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyClientPermeateClientVisitorHandler.java => NettyTcpClientPermeateClientVisitorHandler.java} (91%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyClientPermeateServerTransferHandler.java => NettyTcpClientPermeateServerTransferHandler.java} (93%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyClientPermeateServerVisitorHandler.java => NettyTcpClientPermeateServerVisitorHandler.java} (92%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyServerPermeateClientRealHandler.java => NettyTcpServerPermeateClientRealHandler.java} (97%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{NettyServerPermeateClientTransferHandler.java => NettyTcpServerPermeateClientTransferHandler.java} (93%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/{HeartBeatClientHandler.java => TcpHeartBeatClientHandler.java} (90%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/{NettyClientPermeateClientRealSocket.java => NettyTcpClientPermeateClientRealSocket.java} (95%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/{NettyClientPermeateClientVisitorSocket.java => NettyTcpClientPermeateClientVisitorSocket.java} (91%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/{NettyClientPermeateClientVisitorTransferSocket.java => NettyTcpClientPermeateClientVisitorTransferSocket.java} (94%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/{NettyClientPermeateServerVisitorSocket.java => NettyTcpClientPermeateServerVisitorSocket.java} (89%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/{NettyClientPermeateServerVisitorTransferSocket.java => NettyTcpClientPermeateServerVisitorTransferSocket.java} (94%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/{NettyClientSocket.java => NettyTcpClientSocket.java} (89%) rename wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/{NettyServerPermeateClientRealSocket.java => NettyTcpServerPermeateClientRealSocket.java} (97%) delete mode 100644 wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/xx.java 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 38751f3..50e077d 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 @@ -6,7 +6,7 @@ import org.framework.lazy.cloud.network.heartbeat.client.application.assembler.L import org.framework.lazy.cloud.network.heartbeat.client.application.dto.LazyNettyServerPropertiesDTO; import org.framework.lazy.cloud.network.heartbeat.client.domain.model.lazy.netty.server.properties.LazyNettyServerProperties; import org.framework.lazy.cloud.network.heartbeat.client.domain.model.lazy.netty.server.properties.LazyNettyServerPropertiesRepository; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientSocket; import org.framework.lazy.cloud.network.heartbeat.client.application.LazyNettyServerPropertiesApplication; import org.framework.lazy.cloud.network.heartbeat.client.application.command.lazy.netty.server.properties.*; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; @@ -52,7 +52,7 @@ public class LazyNettyServerPropertiesApplicationImpl implements LazyNettyServer // 缓存连接socket - private final ConcurrentHashMap cacheNettyClientSocketMap = new ConcurrentHashMap<>(); + private final ConcurrentHashMap cacheNettyClientSocketMap = new ConcurrentHashMap<>(); public static final ThreadPoolExecutor NETTY_CLIENT_EXECUTOR = new ThreadPoolExecutor(20, 50, 200, TimeUnit.MILLISECONDS, @@ -189,18 +189,18 @@ public class LazyNettyServerPropertiesApplicationImpl implements LazyNettyServer String appKey = lazyNettyServerProperties.getAppKey(); String appSecret = lazyNettyServerProperties.getAppSecret(); - NettyClientSocket nettyClientSocket = new - NettyClientSocket(inetHost, inetPort, clientId, + NettyTcpClientSocket nettyTcpClientSocket = new + NettyTcpClientSocket(inetHost, inetPort, clientId, NormalUsedString.DEFAULT,appKey,appSecret, clientChangeEvent, handleChannelTypeAdvancedList); - cacheNettyClientSocketMap.put(lazyNettyServerProperties, nettyClientSocket); + cacheNettyClientSocketMap.put(lazyNettyServerProperties, nettyTcpClientSocket); // 更新状态为运行中 lazyNettyServerProperties.setConnectStatus(NettyClientStatus.RUNNING); lazyNettyServerPropertiesRepository.story(lazyNettyServerProperties); Thread thread = new Thread(() -> { try { - nettyClientSocket.newConnect2Server(); + nettyTcpClientSocket.newConnect2Server(); } catch (Exception e) { throw new RuntimeException(e); } @@ -237,7 +237,7 @@ public class LazyNettyServerPropertiesApplicationImpl implements LazyNettyServer @Override public void destroyOneClientSocket(LazyNettyServerProperties needCloseLazyNettyServerProperties) { // 关闭指定socket - cacheNettyClientSocketMap.forEach(((nettyServerProperties, nettyClientSocket) -> { + cacheNettyClientSocketMap.forEach(((nettyServerProperties, nettyTcpClientSocket) -> { String clientId = nettyServerProperties.getClientId(); String inetHost = nettyServerProperties.getInetHost(); Integer inetPort = nettyServerProperties.getInetPort(); @@ -247,7 +247,7 @@ public class LazyNettyServerPropertiesApplicationImpl implements LazyNettyServer if (Objects.equals(clientId, needCloseClientId) && Objects.equals(inetPort, needCloseInetPort) && Objects.equals(inetHost, needCloseInetHost)) { - nettyClientSocket.shutdown(); + nettyTcpClientSocket.shutdown(); // 关闭客户端:{}与服务端连接:{}:{} log.warn("Close client: {} Connect to server: {}: {}", clientId, inetHost, inetPort); } @@ -260,8 +260,8 @@ public class LazyNettyServerPropertiesApplicationImpl implements LazyNettyServer @Override public void destroyClientSocket() { // 关闭socket - cacheNettyClientSocketMap.forEach(((nettyServerProperties, nettyClientSocket) -> { - nettyClientSocket.shutdown(); + cacheNettyClientSocketMap.forEach(((nettyServerProperties, nettyTcpClientSocket) -> { + nettyTcpClientSocket.shutdown(); String clientId = nettyServerProperties.getClientId(); String inetHost = nettyServerProperties.getInetHost(); Integer inetPort = nettyServerProperties.getInetPort(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/ClientAutoConfiguration.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/ClientAutoConfiguration.java index 95391d7..61b469c 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/ClientAutoConfiguration.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/config/ClientAutoConfiguration.java @@ -22,11 +22,11 @@ public class ClientAutoConfiguration { /** * 服务端 处理客户端心跳 * - * @return ClientTcpHandleChannelHeartbeatTypeAdvanced + * @return ClientHandleTcpChannelHeartbeatTypeAdvanced */ @Bean - public ClientTcpHandleChannelHeartbeatTypeAdvanced clientTcpHandleChannelHeartbeatTypeAdvanced() { - return new ClientTcpHandleChannelHeartbeatTypeAdvanced(); + public ClientHandleTcpChannelHeartbeatTypeAdvanced clientHandleTcpChannelHeartbeatTypeAdvanced() { + return new ClientHandleTcpChannelHeartbeatTypeAdvanced(); } /** @@ -90,8 +90,8 @@ public class ClientAutoConfiguration { } @Bean - public ClientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute clientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute(NettyClientProperties nettyClientProperties) { - return new ClientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute(nettyClientProperties); + public ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute clientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute(NettyClientProperties nettyClientProperties) { + return new ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute(nettyClientProperties); } @Bean @@ -168,8 +168,164 @@ public class ClientAutoConfiguration { } @Bean - public ClientHandleHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced clientHandleHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced() { - return new ClientHandleHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced(); + public ClientHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced clientHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced() { + return new ClientHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced(); + } + } + + @Configuration() + static class ClientUdpConfiguration { + /** + * 服务端 处理客户端心跳 + * + * @return ClientUdpHandleChannelHeartbeatTypeAdvanced + */ + @Bean + public ClientUdpHandleChannelHeartbeatTypeAdvanced clientUdpHandleChannelHeartbeatTypeAdvanced() { + return new ClientUdpHandleChannelHeartbeatTypeAdvanced(); + } + + /** + * 处理 客户端代理的真实端口自动读写 + * + * @return ClientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvanced + */ + @Bean + public ClientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvanced clientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvanced() { + return new ClientHandleUdpDistributeSingleClientRealAutoReadConnectTypeAdvanced(); + } + + /** + * 处理 接收服务端发送过来的聊天信息 + * + * @return ClientHandleUdpDistributeSingleClientMessageTypeAdvanced + */ + @Bean + public ClientHandleUdpDistributeSingleClientMessageTypeAdvanced clientHandleUdpDistributeSingleClientMessageTypeAdvanced() { + return new ClientHandleUdpDistributeSingleClientMessageTypeAdvanced(); + } + + /** + * 处理 客户端渗透服务端数据传输通道连接成功 + * + * @return ClientHandleUdpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced + */ + @Bean + public ClientHandleUdpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced clientHandleUdpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced() { + return new ClientHandleUdpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced(); + } + + /** + * 处理 客户端渗透客户端数据传输通道连接成功 + * + * @return ClientHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced + */ + @Bean + public ClientHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced clientHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced() { + return new ClientHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced clientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced() { + return new ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeClientTransferClientRequestTypeAdvanced clientHandleUdpDistributeClientTransferClientRequestTypeAdvanced() { + return new ClientHandleUdpDistributeClientTransferClientRequestTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeServicePermeateClientTransferClientResponseTypeAdvanced clientHandleUdpDistributeServicePermeateClientTransferClientResponseTypeAdvanced() { + return new ClientHandleUdpDistributeServicePermeateClientTransferClientResponseTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeSingleClientRealCloseVisitorTypeAdvanced clientHandleUdpDistributeSingleClientRealCloseVisitorTypeAdvanced() { + return new ClientHandleUdpDistributeSingleClientRealCloseVisitorTypeAdvanced(); + } + + @Bean + public ClientHandleChannelTransferTypeAdvancedHandleDistributeUdpDistribute clientHandleChannelTransferTypeAdvancedHandleDistributeUdpDistribute(NettyClientProperties nettyClientProperties) { + return new ClientHandleChannelTransferTypeAdvancedHandleDistributeUdpDistribute(nettyClientProperties); + } + + @Bean + public ClientHandleUdpDistributeConnectSuccessNotificationTypeAdvancedHandle clientHandleUdpDistributeConnectSuccessNotificationTypeAdvancedHandle(ClientChangeEvent clientChangeEvent) { + return new ClientHandleUdpDistributeConnectSuccessNotificationTypeAdvancedHandle(clientChangeEvent); + } + + @Bean + public ClientHandleUdpClientChannelActiveAdvanced clientHandleUdpClientChannelActiveAdvanced(NettyClientProperties nettyClientProperties) { + return new ClientHandleUdpClientChannelActiveAdvanced(nettyClientProperties); + } + + @Bean + public ClientHandleUdpDistributeDisconnectTypeAdvancedHandle clientHandleUdpDistributeDisconnectTypeAdvancedHandle(ClientChangeEvent clientChangeEvent) { + return new ClientHandleUdpDistributeDisconnectTypeAdvancedHandle(clientChangeEvent); + } + + @Bean + public ClientHandleUdpDistributeStagingClosedTypeAdvanced clientHandleUdpDistributeStagingClosedTypeAdvanced() { + return new ClientHandleUdpDistributeStagingClosedTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeStagingOpenedTypeAdvanced clientHandleUdpDistributeStagingOpenedTypeAdvanced() { + return new ClientHandleUdpDistributeStagingOpenedTypeAdvanced(); + } + + /** + * 处理 客户端渗透服务端init信息 + * + * @return ClientHandleUdpDistributeClientPermeateServerInitTypeAdvanced + */ + @Bean + public ClientHandleUdpDistributeClientPermeateServerInitTypeAdvanced clientHandleUdpDistributeClientPermeateServerInitTypeAdvanced(NettyClientProperties nettyClientProperties) { + return new ClientHandleUdpDistributeClientPermeateServerInitTypeAdvanced(nettyClientProperties); + } + + /** + * 处理 客户端渗透服务端init close 信息 + * + * @return ClientHandleUdpDistributeClientPermeateServerCloseTypeAdvanced + */ + @Bean + public ClientHandleUdpDistributeClientPermeateServerCloseTypeAdvanced clientHandleUdpDistributeClientPermeateServerCloseTypeAdvanced() { + return new ClientHandleUdpDistributeClientPermeateServerCloseTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeClientPermeateServerTransferTypeAdvanced clientHandleUdpDistributeClientPermeateServerTransferTypeAdvanced() { + return new ClientHandleUdpDistributeClientPermeateServerTransferTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeClientPermeateClientCloseTypeAdvanced clientHandleUdpDistributeClientPermeateClientCloseTypeAdvanced() { + return new ClientHandleUdpDistributeClientPermeateClientCloseTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeClientPermeateClientInitTypeAdvanced clientHandleUdpDistributeClientPermeateClientInitTypeAdvanced() { + return new ClientHandleUdpDistributeClientPermeateClientInitTypeAdvanced(); + } + + @Bean + public ClientHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvanced clientHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvanced() { + return new ClientHandleUdpDistributeClientPermeateClientTransferCloseTypeAdvanced(); + } + + + @Bean + public ClientHandleUdpDistributeServicePermeateClientRealConnectTypeAdvanced clientHandleUdpDistributeServicePermeateClientRealConnectTypeAdvanced( + NettyClientProperties nettyClientProperties, + List handleChannelTypeAdvancedList) { + return new ClientHandleUdpDistributeServicePermeateClientRealConnectTypeAdvanced(nettyClientProperties, handleChannelTypeAdvancedList); + } + + @Bean + public ClientHandleHandleUdpDistributeClientPermeateServerTransferCloseTypeAdvanced clientHandleHandleUdpDistributeClientPermeateServerTransferCloseTypeAdvanced() { + return new ClientHandleHandleUdpDistributeClientPermeateServerTransferCloseTypeAdvanced(); } } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientTcpHandleChannelHeartbeatTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpChannelHeartbeatTypeAdvanced.java similarity index 92% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientTcpHandleChannelHeartbeatTypeAdvanced.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpChannelHeartbeatTypeAdvanced.java index 0f2c1ad..4fa2b96 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientTcpHandleChannelHeartbeatTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpChannelHeartbeatTypeAdvanced.java @@ -11,7 +11,7 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.tcp.AbstractTc * 服务端 处理客户端心跳 * TCP_TYPE_HEARTBEAT */ -public class ClientTcpHandleChannelHeartbeatTypeAdvanced extends AbstractTcpHandleChannelHeartbeatTypeAdvanced { +public class ClientHandleTcpChannelHeartbeatTypeAdvanced extends AbstractTcpHandleChannelHeartbeatTypeAdvanced { /** * 处理当前数据 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java similarity index 87% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java index 59f186b..9665afd 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java @@ -17,11 +17,11 @@ import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeK * @see MessageTypeEnums#TCP_DISTRIBUTE_CLIENT_TRANSFER */ @Slf4j -public class ClientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute extends AbstractHandleTcpDistributeServicePermeateClientTransferTypeAdvanced { +public class ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute extends AbstractHandleTcpDistributeServicePermeateClientTransferTypeAdvanced { private final NettyClientProperties nettyClientProperties; - public ClientHandleChannelTransferTypeAdvancedHandleDistributeTcpDistribute(NettyClientProperties nettyClientProperties) { + public ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute(NettyClientProperties nettyClientProperties) { this.nettyClientProperties = nettyClientProperties; } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java index 8f5c87f..f13a471 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java @@ -4,7 +4,7 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.advanced; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientPermeateClientVisitorSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientPermeateClientVisitorSocket; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.advanced.tcp.client.AbstractHandleTcpDistributeClientPermeateClientInitTypeAdvanced; @@ -49,8 +49,8 @@ public class ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced exten NettyClientProperties nettyClientProperties = SpringContextHolder.getBean(NettyClientProperties.class); log.info("client permeate client from client_id:【{}】 to_client_id【{}】with visitor_port【{}】, clientTargetIp:【{}】clientTargetPort:【{}】", fromClientId, toClientId, visitorPort, clientTargetIp, clientTargetPort); - NettyClientPermeateClientVisitorSocket nettyClientPermeateClientVisitorSocket = - NettyClientPermeateClientVisitorSocket.NettyClientPermeateClientVisitorSocketBuilder.builder() + NettyTcpClientPermeateClientVisitorSocket nettyTcpClientPermeateClientVisitorSocket = + NettyTcpClientPermeateClientVisitorSocket.NettyClientPermeateClientVisitorSocketBuilder.builder() .builderClientId(fromClientId) .builderClientTargetIp(clientTargetIp) .builderClientTargetPort(clientTargetPort) @@ -62,7 +62,7 @@ public class ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced exten .build(); try { - nettyClientPermeateClientVisitorSocket.start(); + nettyTcpClientPermeateClientVisitorSocket.start(); } catch (Exception e) { e.printStackTrace(); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced.java index 0007958..3b1fe59 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced.java @@ -4,7 +4,7 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.advanced; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientPermeateServerVisitorSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientPermeateServerVisitorSocket; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.advanced.tcp.client.AbstractHandleTcpDistributeClientPermeateServerInitTypeAdvanced; @@ -44,7 +44,7 @@ public class ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced exten byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); - NettyClientPermeateServerVisitorSocket nettyClientPermeateServerVisitorSocket = NettyClientPermeateServerVisitorSocket.NettyVisitorSocketBuilder.builder() + NettyTcpClientPermeateServerVisitorSocket nettyTcpClientPermeateServerVisitorSocket = NettyTcpClientPermeateServerVisitorSocket.NettyVisitorSocketBuilder.builder() .builderClientId(new String(clientIdBytes)) .builderClientTargetIp(new String(clientTargetIp)) .builderClientTargetPort(Integer.parseInt(new String(clientTargetPort))) @@ -53,7 +53,7 @@ public class ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced exten .builderHandleChannelTypeAdvancedList(handleChannelTypeAdvancedList) .build(); try { - nettyClientPermeateServerVisitorSocket.start(); + nettyTcpClientPermeateServerVisitorSocket.start(); } catch (Exception e) { log.error(e.getMessage(), e); e.printStackTrace(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced.java similarity index 85% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced.java index a694a8a..0dc3c98 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced.java @@ -15,7 +15,7 @@ import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeK * @see MessageTypeEnums#TCP_DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE */ @Slf4j -public class ClientHandleHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced extends AbstractHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced { +public class ClientHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced extends AbstractHandleTcpDistributeClientPermeateServerTransferCloseTypeAdvanced { /** * 处理当前数据 diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java index 17b47ae..80a7e83 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -4,7 +4,7 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.advanced; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientPermeateClientRealSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientPermeateClientRealSocket; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.advanced.tcp.client.AbstractHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced; @@ -46,7 +46,7 @@ public class ClientHandleTcpDistributeClientTransferClientPermeateChannelConnect Integer visitorPort=Integer.parseInt(new String(msgVisitorPort)); NettyClientProperties nettyClientProperties = SpringContextHolder.getBean(NettyClientProperties.class); List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); - NettyClientPermeateClientRealSocket.buildRealServer( + NettyTcpClientPermeateClientRealSocket.buildRealServer( clientId, clientTargetIp, clientTargetPort, diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java index ac77a34..df4f008 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -4,8 +4,8 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.advanced; import io.netty.channel.Channel; import io.netty.channel.ChannelOption; import lombok.extern.slf4j.Slf4j; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyClientPermeateServerVisitorHandler; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientPermeateServerVisitorTransferSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpClientPermeateServerVisitorHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientPermeateServerVisitorTransferSocket; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.tcp.client.AbstractHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.enums.MessageTypeEnums; @@ -14,8 +14,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeK /** * 客户端渗透服务端数据传输通道连接成功 - * @see NettyClientPermeateServerVisitorTransferSocket - * @see NettyClientPermeateServerVisitorHandler + * @see NettyTcpClientPermeateServerVisitorTransferSocket + * @see NettyTcpClientPermeateServerVisitorHandler * * @see MessageTypeEnums#TCP_DISTRIBUTE_CLIENT_TRANSFER_SERVER_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL */ diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanced.java index 1f2af60..4598750 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/advanced/ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanced.java @@ -3,7 +3,7 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.advanced; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyServerPermeateClientRealSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpServerPermeateClientRealSocket; import org.framework.lazy.cloud.network.heartbeat.common.InternalNetworkPenetrationRealClient; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; @@ -50,7 +50,7 @@ public class ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanc .build(); // 绑定真实服务端口 - NettyServerPermeateClientRealSocket.buildRealServer(internalNetworkPenetrationRealClient, nettyClientProperties, handleChannelTypeAdvancedList); + NettyTcpServerPermeateClientRealSocket.buildRealServer(internalNetworkPenetrationRealClient, nettyClientProperties, handleChannelTypeAdvancedList); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientFilter.java similarity index 78% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientFilter.java index 3c2339a..387ab48 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientFilter.java @@ -5,22 +5,22 @@ import io.netty.channel.socket.SocketChannel; import io.netty.handler.codec.string.StringDecoder; import io.netty.handler.codec.string.StringEncoder; import io.netty.handler.timeout.IdleStateHandler; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyClientHandler; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpClientHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientSocket; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.decoder.NettyProxyMsgDecoder; import org.framework.lazy.cloud.network.heartbeat.common.encoder.NettyProxyMsgEncoder; import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInitializer; -public class NettyClientFilter extends DebugChannelInitializer { +public class NettyTcpClientFilter extends DebugChannelInitializer { private final ChannelTypeAdapter channelTypeAdapter; - private final NettyClientSocket nettyClientSocket; + private final NettyTcpClientSocket nettyTcpClientSocket; - public NettyClientFilter(ChannelTypeAdapter channelTypeAdapter, NettyClientSocket nettyClientSocket) { + public NettyTcpClientFilter(ChannelTypeAdapter channelTypeAdapter, NettyTcpClientSocket nettyTcpClientSocket) { this.channelTypeAdapter = channelTypeAdapter; - this.nettyClientSocket = nettyClientSocket; + this.nettyTcpClientSocket = nettyTcpClientSocket; } @Override @@ -40,6 +40,6 @@ public class NettyClientFilter extends DebugChannelInitializer { pipeline.addLast(new IdleStateHandler(0, 4, 0)); pipeline.addLast("decoder", new StringDecoder()); pipeline.addLast("encoder", new StringEncoder()); - pipeline.addLast("doHandler", new NettyClientHandler(channelTypeAdapter, nettyClientSocket)); //客户端的逻辑 + pipeline.addLast("doHandler", new NettyTcpClientHandler(channelTypeAdapter, nettyTcpClientSocket)); //客户端的逻辑 } } \ 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/tcp/filter/NettyClientPermeateClientRealFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientRealFilter.java similarity index 82% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientRealFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientRealFilter.java index 8ca5f39..00a9d06 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientRealFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientRealFilter.java @@ -3,12 +3,12 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter; import io.netty.channel.Channel; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyClientPermeateClientRealHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpClientPermeateClientRealHandler; import org.framework.lazy.cloud.network.heartbeat.common.decoder.TransferDecoder; import org.framework.lazy.cloud.network.heartbeat.common.encoder.TransferEncoder; import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInitializer; -public class NettyClientPermeateClientRealFilter extends DebugChannelInitializer { +public class NettyTcpClientPermeateClientRealFilter extends DebugChannelInitializer { /** * This method will be called once the {@link Channel} was registered. After the method returns this instance * will be removed from the {@link ChannelPipeline} of the {@link Channel}. @@ -21,7 +21,7 @@ public class NettyClientPermeateClientRealFilter extends DebugChannelInitializer // 解码、编码 pipeline.addLast(new TransferDecoder(Integer.MAX_VALUE, 1024 * 1024*10)); pipeline.addLast(new TransferEncoder()); - pipeline.addLast(new NettyClientPermeateClientRealHandler()); + pipeline.addLast(new NettyTcpClientPermeateClientRealHandler()); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientTransferFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientTransferFilter.java similarity index 84% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientTransferFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientTransferFilter.java index 6e49ce6..df88a7b 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientTransferFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientTransferFilter.java @@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyClientPermeateClientTransferHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpClientPermeateClientTransferHandler; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.decoder.NettyProxyMsgDecoder; import org.framework.lazy.cloud.network.heartbeat.common.encoder.NettyProxyMsgEncoder; @@ -14,10 +14,10 @@ import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInit /** * netty 客户端渗透通信通道 */ -public class NettyClientPermeateClientTransferFilter extends DebugChannelInitializer { +public class NettyTcpClientPermeateClientTransferFilter extends DebugChannelInitializer { private final ChannelTypeAdapter channelTypeAdapter; - public NettyClientPermeateClientTransferFilter(ChannelTypeAdapter channelTypeAdapter) { + public NettyTcpClientPermeateClientTransferFilter(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } @@ -41,6 +41,6 @@ public class NettyClientPermeateClientTransferFilter extends DebugChannelInitial pipeline.addLast(new NettyProxyMsgDecoder(Integer.MAX_VALUE, 0, 4, -4, 0)); pipeline.addLast(new NettyProxyMsgEncoder()); - pipeline.addLast(new NettyClientPermeateClientTransferHandler(channelTypeAdapter)); + pipeline.addLast(new NettyTcpClientPermeateClientTransferHandler(channelTypeAdapter)); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientTransferRealFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientTransferRealFilter.java similarity index 84% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientTransferRealFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientTransferRealFilter.java index d8cffc0..fc209f5 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientTransferRealFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientTransferRealFilter.java @@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyClientPermeateClientTransferRealHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpClientPermeateClientTransferRealHandler; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.decoder.NettyProxyMsgDecoder; import org.framework.lazy.cloud.network.heartbeat.common.encoder.NettyProxyMsgEncoder; @@ -14,10 +14,10 @@ import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInit /** * netty 客户端连接真实服服务端访客拦截器 */ -public class NettyClientPermeateClientTransferRealFilter extends DebugChannelInitializer { +public class NettyTcpClientPermeateClientTransferRealFilter extends DebugChannelInitializer { private final ChannelTypeAdapter channelTypeAdapter; - public NettyClientPermeateClientTransferRealFilter(ChannelTypeAdapter channelTypeAdapter) { + public NettyTcpClientPermeateClientTransferRealFilter(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } @@ -41,6 +41,6 @@ public class NettyClientPermeateClientTransferRealFilter extends DebugChannelIni pipeline.addLast(new NettyProxyMsgDecoder(Integer.MAX_VALUE, 0, 4, -4, 0)); pipeline.addLast(new NettyProxyMsgEncoder()); - pipeline.addLast(new NettyClientPermeateClientTransferRealHandler(channelTypeAdapter)); + pipeline.addLast(new NettyTcpClientPermeateClientTransferRealHandler(channelTypeAdapter)); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientVisitorFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientVisitorFilter.java similarity index 78% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientVisitorFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientVisitorFilter.java index 58a4d42..da94231 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateClientVisitorFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateClientVisitorFilter.java @@ -6,14 +6,14 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateClientVisitor; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyClientPermeateClientVisitorHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpClientPermeateClientVisitorHandler; import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInitializer; -public class NettyClientPermeateClientVisitorFilter extends DebugChannelInitializer { +public class NettyTcpClientPermeateClientVisitorFilter extends DebugChannelInitializer { private final InternalNetworkClientPermeateClientVisitor internalNetworkClientPermeateClientVisitor; - public NettyClientPermeateClientVisitorFilter(InternalNetworkClientPermeateClientVisitor internalNetworkClientPermeateClientVisitor) { + public NettyTcpClientPermeateClientVisitorFilter(InternalNetworkClientPermeateClientVisitor internalNetworkClientPermeateClientVisitor) { this.internalNetworkClientPermeateClientVisitor = internalNetworkClientPermeateClientVisitor; } @@ -31,6 +31,6 @@ public class NettyClientPermeateClientVisitorFilter extends DebugChannelInitiali protected void initChannel0(SocketChannel ch) throws Exception { ChannelPipeline pipeline = ch.pipeline(); pipeline.addLast(new ChannelDuplexHandler()); - pipeline.addLast(new NettyClientPermeateClientVisitorHandler(internalNetworkClientPermeateClientVisitor)); + pipeline.addLast(new NettyTcpClientPermeateClientVisitorHandler(internalNetworkClientPermeateClientVisitor)); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateServerTransferFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateServerTransferFilter.java similarity index 84% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateServerTransferFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateServerTransferFilter.java index a9e50fc..572fdd7 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateServerTransferFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateServerTransferFilter.java @@ -5,7 +5,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import io.netty.handler.timeout.IdleStateHandler; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyClientPermeateServerTransferHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpClientPermeateServerTransferHandler; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.decoder.NettyProxyMsgDecoder; import org.framework.lazy.cloud.network.heartbeat.common.encoder.NettyProxyMsgEncoder; @@ -14,10 +14,10 @@ import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInit /** * netty 客户端渗透通信通道 */ -public class NettyClientPermeateServerTransferFilter extends DebugChannelInitializer { +public class NettyTcpClientPermeateServerTransferFilter extends DebugChannelInitializer { private final ChannelTypeAdapter channelTypeAdapter; - public NettyClientPermeateServerTransferFilter(ChannelTypeAdapter channelTypeAdapter) { + public NettyTcpClientPermeateServerTransferFilter(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } @@ -40,6 +40,6 @@ public class NettyClientPermeateServerTransferFilter extends DebugChannelInitial pipeline.addLast(new NettyProxyMsgDecoder(Integer.MAX_VALUE, 0, 4, -4, 0)); pipeline.addLast(new IdleStateHandler(0, 4, 0)); pipeline.addLast(new NettyProxyMsgEncoder()); - pipeline.addLast(new NettyClientPermeateServerTransferHandler(channelTypeAdapter)); + pipeline.addLast(new NettyTcpClientPermeateServerTransferHandler(channelTypeAdapter)); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateServerVisitorFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateServerVisitorFilter.java similarity index 78% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateServerVisitorFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateServerVisitorFilter.java index f237f89..77220f3 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyClientPermeateServerVisitorFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpClientPermeateServerVisitorFilter.java @@ -6,14 +6,14 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateServerVisitor; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyClientPermeateServerVisitorHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpClientPermeateServerVisitorHandler; import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInitializer; -public class NettyClientPermeateServerVisitorFilter extends DebugChannelInitializer { +public class NettyTcpClientPermeateServerVisitorFilter extends DebugChannelInitializer { private final InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor; - public NettyClientPermeateServerVisitorFilter(InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor) { + public NettyTcpClientPermeateServerVisitorFilter(InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor) { this.internalNetworkClientPermeateServerVisitor = internalNetworkClientPermeateServerVisitor; } @@ -31,6 +31,6 @@ public class NettyClientPermeateServerVisitorFilter extends DebugChannelInitiali protected void initChannel0(SocketChannel ch) throws Exception { ChannelPipeline pipeline = ch.pipeline(); pipeline.addLast(new ChannelDuplexHandler()); - pipeline.addLast(new NettyClientPermeateServerVisitorHandler(internalNetworkClientPermeateServerVisitor)); + pipeline.addLast(new NettyTcpClientPermeateServerVisitorHandler(internalNetworkClientPermeateServerVisitor)); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyServerPermeateClientRealFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpServerPermeateClientRealFilter.java similarity index 82% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyServerPermeateClientRealFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpServerPermeateClientRealFilter.java index 1384ffc..d19d7ac 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyServerPermeateClientRealFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpServerPermeateClientRealFilter.java @@ -3,12 +3,12 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter; import io.netty.channel.Channel; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyServerPermeateClientRealHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpServerPermeateClientRealHandler; import org.framework.lazy.cloud.network.heartbeat.common.decoder.TransferDecoder; import org.framework.lazy.cloud.network.heartbeat.common.encoder.TransferEncoder; import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInitializer; -public class NettyServerPermeateClientRealFilter extends DebugChannelInitializer { +public class NettyTcpServerPermeateClientRealFilter extends DebugChannelInitializer { /** * This method will be called once the {@link Channel} was registered. After the method returns this instance * will be removed from the {@link ChannelPipeline} of the {@link Channel}. @@ -21,7 +21,7 @@ public class NettyServerPermeateClientRealFilter extends DebugChannelInitializer // 解码、编码 pipeline.addLast(new TransferDecoder(Integer.MAX_VALUE, 1024 * 1024*10)); pipeline.addLast(new TransferEncoder()); - pipeline.addLast(new NettyServerPermeateClientRealHandler()); + pipeline.addLast(new NettyTcpServerPermeateClientRealHandler()); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyServerPermeateClientTransferFilter.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpServerPermeateClientTransferFilter.java similarity index 83% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyServerPermeateClientTransferFilter.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpServerPermeateClientTransferFilter.java index b8bdbe0..b804da5 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyServerPermeateClientTransferFilter.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/filter/NettyTcpServerPermeateClientTransferFilter.java @@ -4,7 +4,7 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyServerPermeateClientTransferHandler; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler.NettyTcpServerPermeateClientTransferHandler; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.decoder.NettyProxyMsgDecoder; import org.framework.lazy.cloud.network.heartbeat.common.encoder.NettyProxyMsgEncoder; @@ -13,10 +13,10 @@ import org.framework.lazy.cloud.network.heartbeat.common.filter.DebugChannelInit /** * netty 客户端连接真实服服务端访客拦截器 */ -public class NettyServerPermeateClientTransferFilter extends DebugChannelInitializer { +public class NettyTcpServerPermeateClientTransferFilter extends DebugChannelInitializer { private final ChannelTypeAdapter channelTypeAdapter; - public NettyServerPermeateClientTransferFilter(ChannelTypeAdapter channelTypeAdapter) { + public NettyTcpServerPermeateClientTransferFilter(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } @@ -37,6 +37,6 @@ public class NettyServerPermeateClientTransferFilter extends DebugChannelInitial // pipeline.addLast(new NettMsgEncoder()); pipeline.addLast(new NettyProxyMsgDecoder(Integer.MAX_VALUE, 0, 4, -4, 0)); pipeline.addLast(new NettyProxyMsgEncoder()); - pipeline.addLast(new NettyServerPermeateClientTransferHandler(channelTypeAdapter)); + pipeline.addLast(new NettyTcpServerPermeateClientTransferHandler(channelTypeAdapter)); } } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientHandler.java similarity index 87% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientHandler.java index 6df4af8..2b2d7a1 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientHandler.java @@ -7,7 +7,7 @@ import io.netty.channel.SimpleChannelInboundHandler; 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.tcp.socket.NettyClientSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientSocket; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; @@ -23,15 +23,15 @@ import java.util.concurrent.TimeUnit; * @date 2023/09/13 10:29 */ @Slf4j -public class NettyClientHandler extends SimpleChannelInboundHandler { +public class NettyTcpClientHandler extends SimpleChannelInboundHandler { private final ChannelTypeAdapter channelTypeAdapter; - private final NettyClientSocket nettyClientSocket; + private final NettyTcpClientSocket nettyTcpClientSocket; - public NettyClientHandler(ChannelTypeAdapter channelTypeAdapter, NettyClientSocket nettyClientSocket) { + public NettyTcpClientHandler(ChannelTypeAdapter channelTypeAdapter, NettyTcpClientSocket nettyTcpClientSocket) { this.channelTypeAdapter = channelTypeAdapter; - this.nettyClientSocket = nettyClientSocket; + this.nettyTcpClientSocket = nettyTcpClientSocket; } /** @@ -58,7 +58,7 @@ public class NettyClientHandler extends SimpleChannelInboundHandler { try { - nettyClientSocket.newConnect2Server(); + nettyTcpClientSocket.newConnect2Server(); } catch (InterruptedException e) { throw new RuntimeException(e); } @@ -95,7 +95,7 @@ public class NettyClientHandler extends SimpleChannelInboundHandler { +public class NettyTcpClientPermeateClientRealHandler extends SimpleChannelInboundHandler { @Override diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientTransferHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientTransferHandler.java similarity index 85% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientTransferHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientTransferHandler.java index 97ab4d4..c2d57be 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientTransferHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientTransferHandler.java @@ -3,25 +3,21 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOption; import io.netty.channel.SimpleChannelInboundHandler; import lombok.extern.slf4j.Slf4j; -import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; -import org.framework.lazy.cloud.network.heartbeat.common.NettyRealIdContext; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; -import org.wu.framework.core.utils.ObjectUtils; /** * 客户端访客通信通道 处理器 */ @Slf4j -public class NettyClientPermeateClientTransferHandler extends SimpleChannelInboundHandler { +public class NettyTcpClientPermeateClientTransferHandler extends SimpleChannelInboundHandler { private final ChannelTypeAdapter channelTypeAdapter; - public NettyClientPermeateClientTransferHandler(ChannelTypeAdapter channelTypeAdapter) { + public NettyTcpClientPermeateClientTransferHandler(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientTransferRealHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientTransferRealHandler.java similarity index 87% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientTransferRealHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientTransferRealHandler.java index 2763274..84dcccb 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientTransferRealHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientTransferRealHandler.java @@ -3,24 +3,21 @@ package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.handler; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelOption; import io.netty.channel.SimpleChannelInboundHandler; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; -import org.framework.lazy.cloud.network.heartbeat.common.NettyRealIdContext; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; -import org.wu.framework.core.utils.ObjectUtils; /** * 客户端访客通信通道 处理器 */ @Slf4j -public class NettyClientPermeateClientTransferRealHandler extends SimpleChannelInboundHandler { +public class NettyTcpClientPermeateClientTransferRealHandler extends SimpleChannelInboundHandler { private final ChannelTypeAdapter channelTypeAdapter; - public NettyClientPermeateClientTransferRealHandler(ChannelTypeAdapter channelTypeAdapter) { + public NettyTcpClientPermeateClientTransferRealHandler(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientVisitorHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientVisitorHandler.java similarity index 91% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientVisitorHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientVisitorHandler.java index 1f434db..d80d735 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateClientVisitorHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateClientVisitorHandler.java @@ -10,8 +10,8 @@ import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateClientVisitor; import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.advanced.ClientHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientPermeateClientVisitorTransferSocket; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientPermeateServerVisitorTransferSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientPermeateClientVisitorTransferSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientPermeateServerVisitorTransferSocket; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyCommunicationIdContext; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; @@ -21,18 +21,18 @@ import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeK import java.util.UUID; @Slf4j -public class NettyClientPermeateClientVisitorHandler extends SimpleChannelInboundHandler { +public class NettyTcpClientPermeateClientVisitorHandler extends SimpleChannelInboundHandler { private final InternalNetworkClientPermeateClientVisitor internalNetworkClientPermeateClientVisitor; // private final NettyChannelPool nettyChannelPool = new DefaultNettyChannelPool(10); - public NettyClientPermeateClientVisitorHandler(InternalNetworkClientPermeateClientVisitor internalNetworkClientPermeateClientVisitor) { + public NettyTcpClientPermeateClientVisitorHandler(InternalNetworkClientPermeateClientVisitor internalNetworkClientPermeateClientVisitor) { this.internalNetworkClientPermeateClientVisitor = internalNetworkClientPermeateClientVisitor; } /** * @param ctx * @throws Exception - * @see NettyClientPermeateServerVisitorTransferSocket + * @see NettyTcpClientPermeateServerVisitorTransferSocket * @see ClientHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced */ @Override @@ -53,7 +53,7 @@ public class NettyClientPermeateClientVisitorHandler extends SimpleChannelInbou // 判断是否有可用的通道 如果没有创建新的通道 // Channel transferChannel = nettyChannelPool.availableChannel(visitorId); // 创建访客连接客户端通道 - NettyClientPermeateClientVisitorTransferSocket.buildTransferServer(internalNetworkClientPermeateClientVisitor,visitorChannel); + NettyTcpClientPermeateClientVisitorTransferSocket.buildTransferServer(internalNetworkClientPermeateClientVisitor,visitorChannel); log.info("客户端渗透客户端访客:【{}】端口连接成功了",visitorId); super.channelActive(ctx); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateServerTransferHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateServerTransferHandler.java similarity index 93% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateServerTransferHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateServerTransferHandler.java index 9a3fe4a..7336c06 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateServerTransferHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateServerTransferHandler.java @@ -12,16 +12,14 @@ import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; -import java.nio.charset.StandardCharsets; - /** * 客户端访客通信通道 处理器 */ @Slf4j -public class NettyClientPermeateServerTransferHandler extends SimpleChannelInboundHandler { +public class NettyTcpClientPermeateServerTransferHandler extends SimpleChannelInboundHandler { private final ChannelTypeAdapter channelTypeAdapter; - public NettyClientPermeateServerTransferHandler(ChannelTypeAdapter channelTypeAdapter) { + public NettyTcpClientPermeateServerTransferHandler(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateServerVisitorHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateServerVisitorHandler.java similarity index 92% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateServerVisitorHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateServerVisitorHandler.java index 3cd1578..dd83583 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyClientPermeateServerVisitorHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpClientPermeateServerVisitorHandler.java @@ -10,7 +10,7 @@ import io.netty.util.internal.StringUtil; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateServerVisitor; import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.advanced.ClientHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientPermeateServerVisitorTransferSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientPermeateServerVisitorTransferSocket; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; @@ -18,18 +18,18 @@ import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeK import java.util.UUID; @Slf4j -public class NettyClientPermeateServerVisitorHandler extends SimpleChannelInboundHandler { +public class NettyTcpClientPermeateServerVisitorHandler extends SimpleChannelInboundHandler { private final InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor; // private final NettyChannelPool nettyChannelPool = new DefaultNettyChannelPool(10); - public NettyClientPermeateServerVisitorHandler(InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor) { + public NettyTcpClientPermeateServerVisitorHandler(InternalNetworkClientPermeateServerVisitor internalNetworkClientPermeateServerVisitor) { this.internalNetworkClientPermeateServerVisitor = internalNetworkClientPermeateServerVisitor; } /** * @param ctx * @throws Exception - * @see NettyClientPermeateServerVisitorTransferSocket + * @see NettyTcpClientPermeateServerVisitorTransferSocket * @see ClientHandleTcpDistributeClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced */ @Override @@ -48,7 +48,7 @@ public class NettyClientPermeateServerVisitorHandler extends SimpleChannelInboun // 判断是否有可用的通道 如果没有创建新的通道 // Channel transferChannel = nettyChannelPool.availableChannel(visitorId); // 创建访客连接服务端通道 - NettyClientPermeateServerVisitorTransferSocket.buildTransferServer(internalNetworkClientPermeateServerVisitor,visitorChannel); + NettyTcpClientPermeateServerVisitorTransferSocket.buildTransferServer(internalNetworkClientPermeateServerVisitor,visitorChannel); log.debug("客户端渗透服务端访客端口连接成功了,访客ID:{}", visitorId); super.channelActive(ctx); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyServerPermeateClientRealHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpServerPermeateClientRealHandler.java similarity index 97% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyServerPermeateClientRealHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpServerPermeateClientRealHandler.java index 8b29393..09b046e 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyServerPermeateClientRealHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpServerPermeateClientRealHandler.java @@ -16,7 +16,7 @@ import org.wu.framework.core.utils.ObjectUtils; * 来自客户端 真实服务器返回的数据请求 */ @Slf4j -public class NettyServerPermeateClientRealHandler extends SimpleChannelInboundHandler { +public class NettyTcpServerPermeateClientRealHandler extends SimpleChannelInboundHandler { @Override diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyServerPermeateClientTransferHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpServerPermeateClientTransferHandler.java similarity index 93% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyServerPermeateClientTransferHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpServerPermeateClientTransferHandler.java index d30bfb7..be97020 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyServerPermeateClientTransferHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/NettyTcpServerPermeateClientTransferHandler.java @@ -15,10 +15,10 @@ import org.wu.framework.core.utils.ObjectUtils; * 客户端访客通信通道 处理器 */ @Slf4j -public class NettyServerPermeateClientTransferHandler extends SimpleChannelInboundHandler { +public class NettyTcpServerPermeateClientTransferHandler extends SimpleChannelInboundHandler { private final ChannelTypeAdapter channelTypeAdapter; - public NettyServerPermeateClientTransferHandler(ChannelTypeAdapter channelTypeAdapter) { + public NettyTcpServerPermeateClientTransferHandler(ChannelTypeAdapter channelTypeAdapter) { this.channelTypeAdapter = channelTypeAdapter; } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/HeartBeatClientHandler.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/TcpHeartBeatClientHandler.java similarity index 90% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/HeartBeatClientHandler.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/TcpHeartBeatClientHandler.java index 0837f91..4c94424 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/HeartBeatClientHandler.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/handler/TcpHeartBeatClientHandler.java @@ -7,7 +7,7 @@ import io.netty.handler.timeout.IdleStateEvent; import java.util.Date; -public class HeartBeatClientHandler extends ChannelInboundHandlerAdapter { +public class TcpHeartBeatClientHandler extends ChannelInboundHandlerAdapter { private final int lossConnectCount = 0; @Override diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientRealSocket.java similarity index 95% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientRealSocket.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientRealSocket.java index 6ce7ae8..fc244a2 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientRealSocket.java @@ -7,8 +7,8 @@ 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; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyClientPermeateClientRealFilter; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyClientPermeateClientTransferRealFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpClientPermeateClientRealFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpClientPermeateClientTransferRealFilter; import org.framework.lazy.cloud.network.heartbeat.common.*; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; * 客户端连接真实服务 */ @Slf4j -public class NettyClientPermeateClientRealSocket { +public class NettyTcpClientPermeateClientRealSocket { static EventLoopGroup eventLoopGroup = new NioEventLoopGroup(); @@ -46,7 +46,7 @@ public class NettyClientPermeateClientRealSocket { // .option(ChannelOption.SO_BACKLOG, 128)//务端接受连接的队列长度 默认128 // .option(ChannelOption.RCVBUF_ALLOCATOR, new NettyRecvByteBufAllocator(1024 * 1024))//用于Channel分配接受Buffer的分配器 默认AdaptiveRecvByteBufAllocator.DEFAULT .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyClientPermeateClientRealFilter()) + .handler(new NettyTcpClientPermeateClientRealFilter()) ; @@ -113,7 +113,7 @@ public class NettyClientPermeateClientRealSocket { .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyClientPermeateClientTransferRealFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList))) + .handler(new NettyTcpClientPermeateClientTransferRealFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList))) ; String inetHost = nettyClientProperties.getInetHost(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientVisitorSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientVisitorSocket.java similarity index 91% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientVisitorSocket.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientVisitorSocket.java index 95dd9bb..4a4b47f 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientVisitorSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientVisitorSocket.java @@ -8,7 +8,7 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateClientVisitor; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyClientPermeateClientVisitorFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpClientPermeateClientVisitorFilter; import org.framework.lazy.cloud.network.heartbeat.common.NettyClientVisitorContext; import org.framework.lazy.cloud.network.heartbeat.common.NettyVisitorPortContext; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelFlowAdapter; @@ -25,17 +25,17 @@ import java.util.List; * @see NettyClientVisitorContext */ @Slf4j -public class NettyClientPermeateClientVisitorSocket implements PermeateVisitorSocket { +public class NettyTcpClientPermeateClientVisitorSocket implements PermeateVisitorSocket { private final EventLoopGroup bossGroup = new NioEventLoopGroup(); private final EventLoopGroup workerGroup = new NioEventLoopGroup(); - private final NettyClientPermeateClientVisitorFilter nettyClientPermeateClientVisitorFilter; + private final NettyTcpClientPermeateClientVisitorFilter nettyTcpClientPermeateClientVisitorFilter; @Getter private final String clientId; @Getter private final int visitorPort; - public NettyClientPermeateClientVisitorSocket(NettyClientPermeateClientVisitorFilter nettyClientPermeateClientVisitorFilter, String clientId, int visitorPort) { - this.nettyClientPermeateClientVisitorFilter = nettyClientPermeateClientVisitorFilter; + public NettyTcpClientPermeateClientVisitorSocket(NettyTcpClientPermeateClientVisitorFilter nettyTcpClientPermeateClientVisitorFilter, String clientId, int visitorPort) { + this.nettyTcpClientPermeateClientVisitorFilter = nettyTcpClientPermeateClientVisitorFilter; this.clientId = clientId; this.visitorPort = visitorPort; } @@ -68,7 +68,7 @@ public class NettyClientPermeateClientVisitorSocket implements PermeateVisitorSo .childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .childHandler(nettyClientPermeateClientVisitorFilter); + .childHandler(nettyTcpClientPermeateClientVisitorFilter); try { bootstrap.bind(visitorPort).sync().addListener((ChannelFutureListener) future -> { @@ -260,7 +260,7 @@ public class NettyClientPermeateClientVisitorSocket implements PermeateVisitorSo this.toClientId = toClientId; return this; } - public NettyClientPermeateClientVisitorSocket build() { + public NettyTcpClientPermeateClientVisitorSocket build() { if (clientTargetIp == null) { throw new IllegalArgumentException("clientTargetIp must not null"); } @@ -282,8 +282,8 @@ public class NettyClientPermeateClientVisitorSocket implements PermeateVisitorSo internalNetworkClientPermeateClientVisitor.setHandleChannelTypeAdvancedList(handleChannelTypeAdvancedList); - NettyClientPermeateClientVisitorFilter visitorFilter = new NettyClientPermeateClientVisitorFilter(internalNetworkClientPermeateClientVisitor); - return new NettyClientPermeateClientVisitorSocket(visitorFilter, clientId, visitorPort); + NettyTcpClientPermeateClientVisitorFilter visitorFilter = new NettyTcpClientPermeateClientVisitorFilter(internalNetworkClientPermeateClientVisitor); + return new NettyTcpClientPermeateClientVisitorSocket(visitorFilter, clientId, visitorPort); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java similarity index 94% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientVisitorTransferSocket.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java index 31b472f..9e494b6 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateClientVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java @@ -8,7 +8,7 @@ import io.netty.channel.socket.nio.NioSocketChannel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateClientVisitor; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyClientPermeateClientTransferFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpClientPermeateClientTransferFilter; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; * 客户端渗透服务端传输通道 */ @Slf4j -public class NettyClientPermeateClientVisitorTransferSocket { +public class NettyTcpClientPermeateClientVisitorTransferSocket { static EventLoopGroup eventLoopGroup = new NioEventLoopGroup(); /** @@ -43,7 +43,7 @@ public class NettyClientPermeateClientVisitorTransferSocket { // .option(ChannelOption.RCVBUF_ALLOCATOR, new NettyRecvByteBufAllocator(1024 * 1024))//用于Channel分配接受Buffer的分配器 默认AdaptiveRecvByteBufAllocator.DEFAULT .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyClientPermeateClientTransferFilter(new ChannelTypeAdapter(internalNetworkClientPermeateClientVisitor.getHandleChannelTypeAdvancedList()))) + .handler(new NettyTcpClientPermeateClientTransferFilter(new ChannelTypeAdapter(internalNetworkClientPermeateClientVisitor.getHandleChannelTypeAdvancedList()))) ; NettyClientProperties nettyClientProperties = internalNetworkClientPermeateClientVisitor.getNettyClientProperties(); String inetHost = nettyClientProperties.getInetHost(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateServerVisitorSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateServerVisitorSocket.java similarity index 89% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateServerVisitorSocket.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateServerVisitorSocket.java index 3ab9bf2..4aed8a9 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateServerVisitorSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateServerVisitorSocket.java @@ -8,7 +8,7 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateServerVisitor; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyClientPermeateServerVisitorFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpClientPermeateServerVisitorFilter; import org.framework.lazy.cloud.network.heartbeat.common.NettyClientVisitorContext; import org.framework.lazy.cloud.network.heartbeat.common.NettyVisitorPortContext; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; @@ -24,17 +24,17 @@ import java.util.List; * @see NettyClientVisitorContext */ @Slf4j -public class NettyClientPermeateServerVisitorSocket implements PermeateVisitorSocket { +public class NettyTcpClientPermeateServerVisitorSocket implements PermeateVisitorSocket { private final EventLoopGroup bossGroup = new NioEventLoopGroup(); private final EventLoopGroup workerGroup = new NioEventLoopGroup(); - private final NettyClientPermeateServerVisitorFilter nettyClientPermeateServerVisitorFilter; + private final NettyTcpClientPermeateServerVisitorFilter nettyTcpClientPermeateServerVisitorFilter; @Getter private final String clientId; @Getter private final int visitorPort; - public NettyClientPermeateServerVisitorSocket(NettyClientPermeateServerVisitorFilter nettyClientPermeateServerVisitorFilter, String clientId, int visitorPort) { - this.nettyClientPermeateServerVisitorFilter = nettyClientPermeateServerVisitorFilter; + public NettyTcpClientPermeateServerVisitorSocket(NettyTcpClientPermeateServerVisitorFilter nettyTcpClientPermeateServerVisitorFilter, String clientId, int visitorPort) { + this.nettyTcpClientPermeateServerVisitorFilter = nettyTcpClientPermeateServerVisitorFilter; this.clientId = clientId; this.visitorPort = visitorPort; } @@ -67,7 +67,7 @@ public class NettyClientPermeateServerVisitorSocket implements PermeateVisitorSo .childOption(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .childHandler(nettyClientPermeateServerVisitorFilter); + .childHandler(nettyTcpClientPermeateServerVisitorFilter); try { bootstrap.bind(visitorPort).sync().addListener((ChannelFutureListener) future -> { @@ -208,7 +208,7 @@ public class NettyClientPermeateServerVisitorSocket implements PermeateVisitorSo } - public NettyClientPermeateServerVisitorSocket build() { + public NettyTcpClientPermeateServerVisitorSocket build() { if (clientTargetIp == null) { throw new IllegalArgumentException("clientTargetIp must not null"); } @@ -227,8 +227,8 @@ public class NettyClientPermeateServerVisitorSocket implements PermeateVisitorSo internalNetworkClientPermeateServerVisitor.setHandleChannelTypeAdvancedList(handleChannelTypeAdvancedList); - NettyClientPermeateServerVisitorFilter nettyClientPermeateServerVisitorFilter = new NettyClientPermeateServerVisitorFilter(internalNetworkClientPermeateServerVisitor); - return new NettyClientPermeateServerVisitorSocket(nettyClientPermeateServerVisitorFilter, clientId, visitorPort); + NettyTcpClientPermeateServerVisitorFilter nettyTcpClientPermeateServerVisitorFilter = new NettyTcpClientPermeateServerVisitorFilter(internalNetworkClientPermeateServerVisitor); + return new NettyTcpClientPermeateServerVisitorSocket(nettyTcpClientPermeateServerVisitorFilter, clientId, visitorPort); } diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateServerVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateServerVisitorTransferSocket.java similarity index 94% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateServerVisitorTransferSocket.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateServerVisitorTransferSocket.java index 085dfa5..a99446f 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientPermeateServerVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientPermeateServerVisitorTransferSocket.java @@ -8,7 +8,7 @@ import io.netty.channel.socket.nio.NioSocketChannel; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.InternalNetworkClientPermeateServerVisitor; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyClientPermeateServerTransferFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpClientPermeateServerTransferFilter; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; @@ -20,7 +20,7 @@ import java.util.concurrent.TimeUnit; * 客户端渗透服务端传输通道 */ @Slf4j -public class NettyClientPermeateServerVisitorTransferSocket { +public class NettyTcpClientPermeateServerVisitorTransferSocket { static EventLoopGroup eventLoopGroup = new NioEventLoopGroup(); /** @@ -45,7 +45,7 @@ public class NettyClientPermeateServerVisitorTransferSocket { .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyClientPermeateServerTransferFilter(new ChannelTypeAdapter(internalNetworkClientPermeateServerVisitor.getHandleChannelTypeAdvancedList()))) + .handler(new NettyTcpClientPermeateServerTransferFilter(new ChannelTypeAdapter(internalNetworkClientPermeateServerVisitor.getHandleChannelTypeAdvancedList()))) ; NettyClientProperties nettyClientProperties = internalNetworkClientPermeateServerVisitor.getNettyClientProperties(); String inetHost = nettyClientProperties.getInetHost(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientSocket.java similarity index 89% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientSocket.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientSocket.java index 84471e0..acbcb86 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyClientSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpClientSocket.java @@ -8,7 +8,7 @@ import io.netty.channel.socket.nio.NioSocketChannel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.netty.event.ClientChangeEvent; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyClientFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpClientFilter; import org.framework.lazy.cloud.network.heartbeat.common.MessageType; import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.NettyServerContext; @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; * 客户端连接服务端 */ @Slf4j -public class NettyClientSocket { +public class NettyTcpClientSocket { private final EventLoopGroup eventLoopGroup = new NioEventLoopGroup(); /** * 服务端host @@ -53,14 +53,14 @@ public class NettyClientSocket { private final ClientChangeEvent clientChangeEvent; private final List handleChannelTypeAdvancedList; // 处理服务端发送过来的数据类型 - public NettyClientSocket(String inetHost, - int inetPort, - String clientId, - String serverId, - String appKey, - String appSecret, - ClientChangeEvent clientChangeEvent, - List handleChannelTypeAdvancedList) { + public NettyTcpClientSocket(String inetHost, + int inetPort, + String clientId, + String serverId, + String appKey, + String appSecret, + ClientChangeEvent clientChangeEvent, + List handleChannelTypeAdvancedList) { this.inetHost = inetHost; this.inetPort = inetPort; this.clientId = clientId; @@ -88,7 +88,7 @@ public class NettyClientSocket { .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 1000 * 60)//连接超时时间设置为 60 秒 // .childOption(ChannelOption.RCVBUF_ALLOCATOR, new NettyRecvByteBufAllocator(1024 * 1024))//用于Channel分配接受Buffer的分配器 默认AdaptiveRecvByteBufAllocator.DEFAULT .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyClientFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList), this)) + .handler(new NettyTcpClientFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList), this)) ; log.info("use clientId:{} connect to server IP:{},server port :{}", clientId, inetHost, inetPort); ChannelFuture future = bootstrap.connect(inetHost, inetPort); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyServerPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpServerPermeateClientRealSocket.java similarity index 97% rename from wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyServerPermeateClientRealSocket.java rename to wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpServerPermeateClientRealSocket.java index e9cc665..cc0f929 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyServerPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/socket/NettyTcpServerPermeateClientRealSocket.java @@ -7,8 +7,8 @@ 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; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyServerPermeateClientRealFilter; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyServerPermeateClientTransferFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpServerPermeateClientRealFilter; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.filter.NettyTcpServerPermeateClientTransferFilter; import org.framework.lazy.cloud.network.heartbeat.common.*; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; * 客户端连接真实服务 */ @Slf4j -public class NettyServerPermeateClientRealSocket { +public class NettyTcpServerPermeateClientRealSocket { static EventLoopGroup eventLoopGroup = new NioEventLoopGroup(); /** @@ -62,7 +62,7 @@ public class NettyServerPermeateClientRealSocket { // .option(ChannelOption.SO_BACKLOG, 128)//务端接受连接的队列长度 默认128 // .option(ChannelOption.RCVBUF_ALLOCATOR, new NettyRecvByteBufAllocator(1024 * 1024))//用于Channel分配接受Buffer的分配器 默认AdaptiveRecvByteBufAllocator.DEFAULT .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyServerPermeateClientRealFilter()) + .handler(new NettyTcpServerPermeateClientRealFilter()) ; @@ -149,7 +149,7 @@ public class NettyServerPermeateClientRealSocket { .option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(1024 * 1024, 1024 * 1024 * 2)) - .handler(new NettyServerPermeateClientTransferFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList))) + .handler(new NettyTcpServerPermeateClientTransferFilter(new ChannelTypeAdapter(handleChannelTypeAdvancedList))) ; String inetHost = nettyClientProperties.getInetHost(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/xx.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/xx.java deleted file mode 100644 index 93ad16e..0000000 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/tcp/xx.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.framework.lazy.cloud.network.heartbeat.client.netty.tcp; - -public class xx { -} diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/impl/LazyNettyClusterNodeApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/impl/LazyNettyClusterNodeApplicationImpl.java index bae79f8..ace051a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/impl/LazyNettyClusterNodeApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/cluster/application/impl/LazyNettyClusterNodeApplicationImpl.java @@ -2,7 +2,7 @@ package org.framework.lazy.cloud.network.heartbeat.server.cluster.application.im import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.netty.event.ClientChangeEvent; -import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyClientSocket; +import org.framework.lazy.cloud.network.heartbeat.client.netty.tcp.socket.NettyTcpClientSocket; import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.server.cluster.application.dto.LazyNettyClusterNodeDTO; import org.framework.lazy.cloud.network.heartbeat.server.cluster.domain.model.cluster.node.LazyNettyClusterNode; @@ -55,7 +55,7 @@ public class LazyNettyClusterNodeApplicationImpl implements LazyNettyClusterNode ServerNodeProperties serverNodeProperties; // 缓存连接集群 socket - private final ConcurrentHashMap cacheClusterNettyClientSocketMap = new ConcurrentHashMap<>(); + private final ConcurrentHashMap cacheClusterNettyClientSocketMap = new ConcurrentHashMap<>(); public static final ThreadPoolExecutor NETTY_CLUSTER_CLIENT_EXECUTOR = new ThreadPoolExecutor(20, 50, 200, TimeUnit.MILLISECONDS, @@ -180,8 +180,8 @@ public class LazyNettyClusterNodeApplicationImpl implements LazyNettyClusterNode // 当前节点ID String clusterNodeClientId = serverNodeProperties.getNodeId(); - NettyClientSocket nettyClientSocket = new - NettyClientSocket(inetHost, inetPort, clusterNodeClientId, + NettyTcpClientSocket nettyTcpClientSocket = new + NettyTcpClientSocket(inetHost, inetPort, clusterNodeClientId, clusterNodeId,null,null, clientChangeEvent, handleChannelTypeAdvancedList); // 过滤已经存在的 @@ -192,11 +192,11 @@ public class LazyNettyClusterNodeApplicationImpl implements LazyNettyClusterNode log.warn("当前节点注册:{} 已经存在", lazyNettyClusterNode); return; } - cacheClusterNettyClientSocketMap.put(lazyNettyClusterNode, nettyClientSocket); + cacheClusterNettyClientSocketMap.put(lazyNettyClusterNode, nettyTcpClientSocket); Thread thread = new Thread(() -> { try { - nettyClientSocket.newConnect2Server(); + nettyTcpClientSocket.newConnect2Server(); } catch (Exception e) { throw new RuntimeException(e); } @@ -237,7 +237,7 @@ public class LazyNettyClusterNodeApplicationImpl implements LazyNettyClusterNode // 当前节点ID String clusterNodeId = serverNodeProperties.getNodeId(); // 关闭指定socket - cacheClusterNettyClientSocketMap.forEach(((lazyNettyClusterNode, nettyClientSocket) -> { + cacheClusterNettyClientSocketMap.forEach(((lazyNettyClusterNode, nettyTcpClientSocket) -> { String inetHost = lazyNettyClusterNode.getClusterNodeHost(); Integer inetPort = lazyNettyClusterNode.getClusterNodePort(); String needCloseInetHost = needCloseLazyNettyClusterNode.getClusterNodeHost(); @@ -246,7 +246,7 @@ public class LazyNettyClusterNodeApplicationImpl implements LazyNettyClusterNode if (Objects.equals(clusterNodeId, needCloseClientId) && Objects.equals(inetPort, needCloseInetPort) && Objects.equals(inetHost, needCloseInetHost)) { - nettyClientSocket.shutdown(); + nettyTcpClientSocket.shutdown(); // 关闭客户端:{}与服务端连接:{}:{} log.warn("Close client: {} Connect to server: {}: {}", clusterNodeId, inetHost, inetPort); } @@ -259,8 +259,8 @@ public class LazyNettyClusterNodeApplicationImpl implements LazyNettyClusterNode @Override public void destroyClusterNodes() { // 关闭socket - cacheClusterNettyClientSocketMap.forEach(((lazyNettyClusterNode, nettyClientSocket) -> { - nettyClientSocket.shutdown(); + cacheClusterNettyClientSocketMap.forEach(((lazyNettyClusterNode, nettyTcpClientSocket) -> { + nettyTcpClientSocket.shutdown(); String clientId = lazyNettyClusterNode.getClusterNodeId(); String inetHost = lazyNettyClusterNode.getClusterNodeHost(); Integer inetPort = lazyNettyClusterNode.getClusterNodePort();