From ddb709c3a850c9b79d68dea2ac3244cd8e509db1 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Fri, 6 Jun 2025 23:13:01 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20socks=E3=80=81http=E4=BB=A3=E7=90=86=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E9=87=8F=E8=AE=A1=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advanced/flow/proxy/ChannelProxyFlow.java | 12 +++++------ ...TypeEnum.java => ChannelProtocolType.java} | 2 +- ...oxyTypeEnum.java => ChannelProxyType.java} | 2 +- .../config/ServerAutoConfiguration.java | 8 ++++---- .../flow/proxy/ServerChannelProxyFlow.java | 20 +++++++++---------- ...roxyClientTransferRequestTypeAdvanced.java | 8 ++++---- ...oxyClientTransferResponseTypeAdvanced.java | 10 ++++------ ...roxyServerTransferRequestTypeAdvanced.java | 8 ++++---- ...oxyServerTransferResponseTypeAdvanced.java | 8 ++++---- ...roxyClientTransferRequestTypeAdvanced.java | 8 ++++---- ...oxyClientTransferResponseTypeAdvanced.java | 8 ++++---- ...roxyClientTransferRequestTypeAdvanced.java | 8 ++++---- ...oxyClientTransferResponseTypeAdvanced.java | 8 ++++---- ...roxyServerTransferRequestTypeAdvanced.java | 8 ++++---- ...oxyServerTransferResponseTypeAdvanced.java | 9 ++++----- ...tServerProxyClientRequestTypeAdvanced.java | 8 ++++---- ...ServerProxyClientResponseTypeAdvanced.java | 8 ++++---- 17 files changed, 70 insertions(+), 73 deletions(-) rename wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/{ChannelProxyFlowTypeEnum.java => ChannelProtocolType.java} (85%) rename wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/{ChannelProxyTypeEnum.java => ChannelProxyType.java} (92%) diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/flow/proxy/ChannelProxyFlow.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/flow/proxy/ChannelProxyFlow.java index a61302a..093b53c 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/flow/proxy/ChannelProxyFlow.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/flow/proxy/ChannelProxyFlow.java @@ -1,8 +1,8 @@ package org.framework.lazy.cloud.network.heartbeat.common.advanced.flow.proxy; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; public interface ChannelProxyFlow { @@ -36,15 +36,15 @@ public interface ChannelProxyFlow { /** * 代理流量类型 - * @see ChannelProxyFlowTypeEnum + * @see ChannelProtocolType */ - ChannelProxyFlowTypeEnum channelProxyFlowTypeEnum(); + ChannelProtocolType channelProtocolType(); /** * 代理类型 - * @see ChannelProxyTypeEnum + * @see ChannelProxyType */ - ChannelProxyTypeEnum channelProxyTypeEnum(); + ChannelProxyType channelProxyType(); /** * 流量 diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyFlowTypeEnum.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProtocolType.java similarity index 85% rename from wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyFlowTypeEnum.java rename to wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProtocolType.java index bc5d55a..9235cf6 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyFlowTypeEnum.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProtocolType.java @@ -8,7 +8,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum ChannelProxyFlowTypeEnum { +public enum ChannelProtocolType { // HTTP HTTP, diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyTypeEnum.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyType.java similarity index 92% rename from wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyTypeEnum.java rename to wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyType.java index d6d867c..e7876fb 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyTypeEnum.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/enums/ChannelProxyType.java @@ -8,7 +8,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum ChannelProxyTypeEnum { +public enum ChannelProxyType { SERVER_PROXY_SERVER("服务端代理服务端"), SERVER_PROXY_CLIENT("服务端远程客户端"), diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/config/ServerAutoConfiguration.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/config/ServerAutoConfiguration.java index 5807256..a33d017 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/config/ServerAutoConfiguration.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/config/ServerAutoConfiguration.java @@ -312,12 +312,12 @@ public class ServerAutoConfiguration { return new ServerHandleSocksReportServerProxyClientConnectionSuccessTypeAdvanced(); } @Bean - public ServerHandleSocksReportServerProxyClientResponseTypeAdvanced serverHandleSocksReportServerProxyClientResponseTypeAdvanced(){ - return new ServerHandleSocksReportServerProxyClientResponseTypeAdvanced(); + public ServerHandleSocksReportServerProxyClientResponseTypeAdvanced serverHandleSocksReportServerProxyClientResponseTypeAdvanced(ChannelProxyFlowAdapter channelProxyFlowAdapter){ + return new ServerHandleSocksReportServerProxyClientResponseTypeAdvanced(channelProxyFlowAdapter); } @Bean - public ServerHandleSocksReportServerProxyClientRequestTypeAdvanced serverHandleSocksReportServerProxyClientRequestTypeAdvanced(){ - return new ServerHandleSocksReportServerProxyClientRequestTypeAdvanced(); + public ServerHandleSocksReportServerProxyClientRequestTypeAdvanced serverHandleSocksReportServerProxyClientRequestTypeAdvanced(ChannelProxyFlowAdapter channelProxyFlowAdapter){ + return new ServerHandleSocksReportServerProxyClientRequestTypeAdvanced(channelProxyFlowAdapter); } @Bean public ServerHandleSocksReportServerProxyClientTransferCloseTypeAdvanced serverHandleSocksReportServerProxyClientTransferCloseTypeAdvanced(){ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerChannelProxyFlow.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerChannelProxyFlow.java index 47b6d27..f44a4d1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerChannelProxyFlow.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/flow/proxy/ServerChannelProxyFlow.java @@ -4,8 +4,8 @@ import lombok.Builder; import lombok.Data; import org.framework.lazy.cloud.network.heartbeat.common.advanced.flow.proxy.ChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; @Builder @Data @@ -14,8 +14,8 @@ public class ServerChannelProxyFlow implements ChannelProxyFlow { private String ip; private Integer port; private ChannelFlowEnum channelFlowEnum; - private ChannelProxyFlowTypeEnum channelProxyFlowTypeEnum; - private ChannelProxyTypeEnum channelProxyTypeEnum; + private ChannelProtocolType channelProtocolType; + private ChannelProxyType channelProxyType; private Integer flow; /** @@ -62,21 +62,21 @@ public class ServerChannelProxyFlow implements ChannelProxyFlow { /** * 代理流量类型 * - * @see ChannelProxyFlowTypeEnum + * @see ChannelProtocolType */ @Override - public ChannelProxyFlowTypeEnum channelProxyFlowTypeEnum() { - return channelProxyFlowTypeEnum; + public ChannelProtocolType channelProtocolType() { + return channelProtocolType; } /** * 代理类型 * - * @see ChannelProxyTypeEnum + * @see ChannelProxyType */ @Override - public ChannelProxyTypeEnum channelProxyTypeEnum() { - return channelProxyTypeEnum; + public ChannelProxyType channelProxyType() { + return channelProxyType; } /** diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced.java index 4a1c905..0c0725e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced.java @@ -12,8 +12,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyC import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.http.server.AbstractHandleHttpReportClientProxyClientConnectionTransferTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.springframework.beans.factory.config.BeanDefinition; @@ -87,8 +87,8 @@ public class ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced .port(targetPort) .ip(targetIpString) .clientId(new String(clientId)) - .channelProxyTypeEnum(ChannelProxyTypeEnum.CLIENT_PROXY_CLIENT) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.HTTP) + .channelProxyType(ChannelProxyType.CLIENT_PROXY_CLIENT) + .channelProtocolType(ChannelProtocolType.HTTP) .flow(data.length) .build(); channelProxyFlowAdapter.asyncHandler(channel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced.java index 787b210..e13a30b 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced.java @@ -3,17 +3,15 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.http.advan import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; -import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelFlowAdapter; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelProxyFlowAdapter; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.http.server.AbstractHandleHttpReportClientProxyClientTransferResponseTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; -import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.ServerChannelFlow; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Role; @@ -69,8 +67,8 @@ public class ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced .port(targetPort) .ip(targetIp) .clientId(clientId) - .channelProxyTypeEnum(ChannelProxyTypeEnum.CLIENT_PROXY_CLIENT) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.HTTP) + .channelProxyType(ChannelProxyType.CLIENT_PROXY_CLIENT) + .channelProtocolType(ChannelProtocolType.HTTP) .flow(responseProxyMsg.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(channel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced.java index dd470bb..9e27ebf 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced.java @@ -10,8 +10,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelT import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.http.server.AbstractHandleHttpReportClientProxyServerTransferRequestTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.http.NettyHttpClientProxyServerTransfer; @@ -88,8 +88,8 @@ public class ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced .port(targetPort) .ip(targetIpString) .clientId(clientIdString) - .channelProxyTypeEnum(ChannelProxyTypeEnum.CLIENT_PROXY_SEVER) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.HTTP) + .channelProxyType(ChannelProxyType.CLIENT_PROXY_SEVER) + .channelProtocolType(ChannelProtocolType.HTTP) .flow(data.length) .build(); channelProxyFlowAdapter.asyncHandler(channel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferResponseTypeAdvanced.java index c1c42ea..237833a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyServerTransferResponseTypeAdvanced.java @@ -9,8 +9,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyP import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.http.server.AbstractHandleHttpReportClientProxyServerTransferResponseTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.springframework.beans.factory.config.BeanDefinition; @@ -67,8 +67,8 @@ public class ServerHandleHttpReportClientProxyServerTransferResponseTypeAdvanced .port(targetPort) .ip(targetIp) .clientId(clientId) - .channelProxyTypeEnum(ChannelProxyTypeEnum.CLIENT_PROXY_SEVER) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.HTTP) + .channelProxyType(ChannelProxyType.CLIENT_PROXY_SEVER) + .channelProtocolType(ChannelProtocolType.HTTP) .flow(data.length) .build(); channelProxyFlowAdapter.asyncHandler(channel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced.java index a759f21..32d8db9 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced.java @@ -11,8 +11,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyC import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.http.server.AbstractHandleHttpReportServerProxyClientTransferChannelInitSuccessfulTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.springframework.beans.factory.config.BeanDefinition; @@ -88,8 +88,8 @@ public class ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced .port(targetPort) .ip(targetIpString) .clientId(new String(clientId)) - .channelProxyTypeEnum(ChannelProxyTypeEnum.SERVER_PROXY_CLIENT) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.HTTP) + .channelProxyType(ChannelProxyType.SERVER_PROXY_CLIENT) + .channelProtocolType(ChannelProtocolType.HTTP) .flow(nettyByteBufData.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(channel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced.java index e90d676..f944a68 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced.java @@ -9,8 +9,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyP import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.http.server.AbstractHandleHttpReportServerProxyClientTransferResponseTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.springframework.beans.factory.config.BeanDefinition; @@ -62,8 +62,8 @@ public class ServerHandleHttpReportServerProxyClientTransferResponseTypeAdvanced .port(targetPort) .ip(targetIp) .clientId(targetClientId) - .channelProxyTypeEnum(ChannelProxyTypeEnum.SERVER_PROXY_CLIENT) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.HTTP) + .channelProxyType(ChannelProxyType.SERVER_PROXY_CLIENT) + .channelProtocolType(ChannelProtocolType.HTTP) .flow(nettyProxyMsg.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(channel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientTransferRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientTransferRequestTypeAdvanced.java index a565e1c..5a18a51 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientTransferRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientTransferRequestTypeAdvanced.java @@ -9,8 +9,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyP import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.socks.server.AbstractHandleSocksReportClientProxyClientTransferRequestTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.handler.NettySocksClientProxyServerRealHandler; @@ -64,8 +64,8 @@ public class ServerHandleSocksReportClientProxyClientTransferRequestTypeAdvanced .port(targetPort) .ip(targetIp) .clientId(clientId) - .channelProxyTypeEnum(ChannelProxyTypeEnum.CLIENT_PROXY_CLIENT) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.SOCKS) + .channelProxyType(ChannelProxyType.CLIENT_PROXY_CLIENT) + .channelProtocolType(ChannelProtocolType.SOCKS) .flow(nettyProxyMsg.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(transferChannel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientTransferResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientTransferResponseTypeAdvanced.java index b6da7d1..ecc8003 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientTransferResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientTransferResponseTypeAdvanced.java @@ -9,8 +9,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyP import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.socks.server.AbstractHandleSocksReportClientProxyClientTransferResponseTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.handler.NettySocksClientProxyServerRealHandler; @@ -63,8 +63,8 @@ public class ServerHandleSocksReportClientProxyClientTransferResponseTypeAdvance .ip(targetIp) .port(targetPort) .clientId(clientId) - .channelProxyTypeEnum(ChannelProxyTypeEnum.CLIENT_PROXY_CLIENT) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.SOCKS) + .channelProxyType(ChannelProxyType.CLIENT_PROXY_CLIENT) + .channelProtocolType(ChannelProtocolType.SOCKS) .flow(nettyProxyMsg.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(nextChannel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerTransferRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerTransferRequestTypeAdvanced.java index 8913e84..26e0e86 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerTransferRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerTransferRequestTypeAdvanced.java @@ -9,8 +9,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyC import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.socks.server.AbstractHandleSocksReportClientProxyServerTransferRequestTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.handler.NettySocksClientProxyServerRealHandler; @@ -62,8 +62,8 @@ public class ServerHandleSocksReportClientProxyServerTransferRequestTypeAdvanced .port(targetPort) .ip(targetIp) .clientId(clientId) - .channelProxyTypeEnum(ChannelProxyTypeEnum.CLIENT_PROXY_SEVER) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.SOCKS) + .channelProxyType(ChannelProxyType.CLIENT_PROXY_SEVER) + .channelProtocolType(ChannelProtocolType.SOCKS) .flow(nettyProxyMsg.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(transferChannel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerTransferResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerTransferResponseTypeAdvanced.java index 25d94b9..8a3ca57 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerTransferResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerTransferResponseTypeAdvanced.java @@ -7,12 +7,11 @@ import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelProxyFlowAdapter; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; -import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.http.server.AbstractHandleHttpReportClientProxyServerTransferResponseTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.socks.server.AbstractHandleSocksReportClientProxyServerTransferResponseTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.handler.NettySocksClientProxyServerRealHandler; @@ -65,8 +64,8 @@ public class ServerHandleSocksReportClientProxyServerTransferResponseTypeAdvance .ip(targetIp) .port(targetPort) .clientId(clientId) - .channelProxyTypeEnum(ChannelProxyTypeEnum.CLIENT_PROXY_SEVER) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.SOCKS) + .channelProxyType(ChannelProxyType.CLIENT_PROXY_SEVER) + .channelProtocolType(ChannelProtocolType.SOCKS) .flow(nettyProxyMsg.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(nextChannel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientRequestTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientRequestTypeAdvanced.java index 668aa8c..3b52613 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientRequestTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientRequestTypeAdvanced.java @@ -10,8 +10,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyP import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.socks.server.AbstractHandleSocksReportServerProxyClientRequestTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.handler.NettySocksClientProxyServerRealHandler; @@ -63,8 +63,8 @@ public class ServerHandleSocksReportServerProxyClientRequestTypeAdvanced .port(targetPort) .ip(targetIp) .clientId("SERVER") - .channelProxyTypeEnum(ChannelProxyTypeEnum.SERVER_PROXY_CLIENT) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.SOCKS) + .channelProxyType(ChannelProxyType.SERVER_PROXY_CLIENT) + .channelProtocolType(ChannelProtocolType.SOCKS) .flow(nettyProxyMsg.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(channel, serverChannelFlow); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientResponseTypeAdvanced.java index 2b01172..85d8942 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientResponseTypeAdvanced.java @@ -9,8 +9,8 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyC import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.socks.server.AbstractHandleSocksReportServerProxyClientResponseTypeAdvanced; import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelFlowEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyFlowTypeEnum; -import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyTypeEnum; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProtocolType; +import org.framework.lazy.cloud.network.heartbeat.common.enums.ChannelProxyType; import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils; import org.framework.lazy.cloud.network.heartbeat.server.netty.flow.proxy.ServerChannelProxyFlow; import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.handler.NettySocksClientProxyServerRealHandler; @@ -60,8 +60,8 @@ public class ServerHandleSocksReportServerProxyClientResponseTypeAdvanced .ip(targetIp) .port(targetPort) .clientId("SERVER") - .channelProxyTypeEnum(ChannelProxyTypeEnum.SERVER_PROXY_CLIENT) - .channelProxyFlowTypeEnum(ChannelProxyFlowTypeEnum.SOCKS) + .channelProxyType(ChannelProxyType.SERVER_PROXY_CLIENT) + .channelProtocolType(ChannelProtocolType.SOCKS) .flow(nettyProxyMsg.getData().length) .build(); channelProxyFlowAdapter.asyncHandler(nextChannel, serverChannelFlow);