From ca87968469cc2378654cd1d565c7a403179584b4 Mon Sep 17 00:00:00 2001 From: wujiawei <12345678> Date: Sat, 7 Jun 2025 01:25:08 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=20=E4=BF=AE=E6=94=B9=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E7=B4=A2=E5=BC=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../socket/NettySocksClientProxyServerSocket.java | 1 + ...ClientProxyServerConnectTransferTypeAdvanced.java | 7 ++++++- .../infrastructure/entity/LazyProxyFlowDO.java | 12 ++++++------ .../src/main/resources/application-dev.yml | 8 ++++---- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyServerSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyServerSocket.java index 0bd86a0..309420c 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyServerSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyServerSocket.java @@ -72,6 +72,7 @@ public class NettySocksClientProxyServerSocket { nettyProxyMsg.setClientTargetIp(targetIp); nettyProxyMsg.setClientTargetPort(targetPort); + nettyProxyMsg.setClientId(clientId); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setData(new byte[]{socks5AddressTypeByteValue}); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced.java index ad27f88..905d1d2 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; +import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced; 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.socks.server.AbstractHandleSocksReportClientProxyServerConnectionTransferTypeAdvanced; @@ -26,6 +27,8 @@ import org.springframework.stereotype.Component; import org.wu.framework.spring.utils.SpringContextHolder; import java.net.InetSocketAddress; +import java.util.ArrayList; +import java.util.List; @Role(BeanDefinition.ROLE_INFRASTRUCTURE) @@ -61,7 +64,9 @@ public class ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced Socks5AddressType socks5AddressType = Socks5AddressType.valueOf(data[0]); - ChannelTypeAdapter channelTypeAdapter = SpringContextHolder.getBean(ChannelTypeAdapter.class); + List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); + + ChannelTypeAdapter channelTypeAdapter = new ChannelTypeAdapter(handleChannelTypeAdvancedList); // 创建真实代理链接 EventLoopGroup group = EventLoopGroupFactory.createClientWorkGroup(); Bootstrap b = new Bootstrap(); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java index edafd42..4c2a73d 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/infrastructure/entity/LazyProxyFlowDO.java @@ -37,7 +37,7 @@ public class LazyProxyFlowDO { * 客户端ID */ @Schema(description ="客户端ID",name ="clientId",example = "") - @LazyTableField(name="client_id",comment="客户端ID",notNull=true,columnType="varchar(50)") + @LazyTableFieldUnique(name="client_id",comment="客户端ID",notNull=true,columnType="varchar(50)") private String clientId; /** @@ -69,7 +69,7 @@ public class LazyProxyFlowDO { * 目标ip */ @Schema(description ="目标ip",name ="ip",example = "") - @LazyTableField(name="ip",comment="目标ip",columnType="varchar(255)") + @LazyTableFieldUnique(name="ip",comment="目标ip",columnType="varchar(25)") private String ip; /** @@ -93,7 +93,7 @@ public class LazyProxyFlowDO { * 目标端口 */ @Schema(description ="目标端口",name ="port",example = "") - @LazyTableField(name="port",comment="目标端口",columnType="int") + @LazyTableFieldUnique(name="port",comment="目标端口",columnType="int") private Integer port; /** @@ -101,7 +101,7 @@ public class LazyProxyFlowDO { * 协议类型 */ @Schema(description ="协议类型",name ="protocolType",example = "") - @LazyTableField(name="protocol_type",comment="协议类型",columnType="varchar(255)") + @LazyTableFieldUnique(name="protocol_type",comment="协议类型",columnType="varchar(25)") private ChannelProtocolType protocolType; /** @@ -109,7 +109,7 @@ public class LazyProxyFlowDO { * 代理类型 */ @Schema(description ="代理类型",name ="proxyType",example = "") - @LazyTableField(name="proxy_type",comment="代理类型",columnType="varchar(255)") + @LazyTableFieldUnique(name="proxy_type",comment="代理类型",columnType="varchar(25)") private ChannelProxyType proxyType; /** @@ -117,7 +117,7 @@ public class LazyProxyFlowDO { * 服务端ID */ @Schema(description ="服务端ID",name ="serverId",example = "") - @LazyTableField(name="server_id",comment="服务端ID",notNull=true,columnType="varchar(255)") + @LazyTableFieldUnique(name="server_id",comment="服务端ID",notNull=true,columnType="varchar(25)") private String serverId; /** diff --git a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application-dev.yml b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application-dev.yml index 0f1cc86..c682a27 100644 --- a/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application-dev.yml +++ b/wu-lazy-cloud-heartbeat-start/wu-lazy-cloud-heartbeat-client-start/src/main/resources/application-dev.yml @@ -4,10 +4,10 @@ spring: client: # inet-host: 124.222.48.62 # inet-port: 30676 - inet-host: 124.222.152.160 - inet-port: 30560 -# inet-host: 127.0.0.1 -# inet-port: 7001 +# inet-host: 124.222.152.160 +# inet-port: 30560 + inet-host: 127.0.0.1 + inet-port: 7001 inet-path: wu-lazy-cloud-heartbeat-server client-id: socks-local-proxy # 客户端ID app-key: a4bf4415-25aa-4007-914b-31ec77d1292f