diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java index 8ceb43f4..b460056d 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistribute.java @@ -41,8 +41,8 @@ public class ClientHandleTcpChannelTransferTypeAdvancedHandleDistributeTcpDistri log.debug("接收到服务端需要内网穿透的数据:{}" , nettyProxyMsg); String clientId = nettyClientProperties.getClientId(); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); - byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPort = nettyProxyMsg.getTargetPort(); byte[] visitorId = nettyProxyMsg.getVisitorId(); // 真实服务通道 // Channel realChannel = NettyRealIdContext.getReal(new String(visitorId)); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java index 15e5d792..c960cf32 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced.java @@ -39,8 +39,8 @@ public class ClientHandleTcpDistributeClientPermeateClientInitTypeAdvanced String namespace = nettyProxyMsg.namespace(); byte[] fromClientIdBytes = nettyProxyMsg.getClientId(); byte[] visitorPortBytes = nettyProxyMsg.getVisitorPort(); - byte[] clientTargetIpBytes = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPortBytes = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIpBytes = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPortBytes = nettyProxyMsg.getTargetPort(); byte[] toClientIdBytes = nettyProxyMsg.getData(); String fromClientId = new String(fromClientIdBytes); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced.java index 71a1dc24..2e7085fd 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced.java @@ -43,8 +43,8 @@ public class ClientHandleTcpDistributeClientPermeateServerInitTypeAdvanced exten // 初始化 客户端渗透服务端socket byte[] clientIdBytes = nettyProxyMsg.getClientId(); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); - byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPort = nettyProxyMsg.getTargetPort(); List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); NettyTcpClientPermeateServerVisitorSocket nettyTcpClientPermeateServerVisitorSocket = NettyTcpClientPermeateServerVisitorSocket.NettyVisitorSocketBuilder.builder() diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerTransferTypeAdvanced.java index b3abe460..932ba84e 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientPermeateServerTransferTypeAdvanced.java @@ -34,8 +34,8 @@ public class ClientHandleTcpDistributeClientPermeateServerTransferTypeAdvanced e Channel channel = nettyChannelContext.channel(); log.debug("客户端渗透服务端返回数据:{}" , new String(nettyProxyMsg.getData())); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); - byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPort = nettyProxyMsg.getTargetPort(); byte[] visitorId = nettyProxyMsg.getVisitorId(); // 真实服务通道 // Channel realChannel = NettyRealIdContext.getReal(new String(visitorId)); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java index 8fdcc0c8..421ecd18 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -37,8 +37,8 @@ public class ClientHandleTcpDistributeClientTransferClientPermeateChannelConnect public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { // 创建connect 然后发送创建成功 byte[] msgClientId = nettyProxyMsg.getClientId(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java index 1f729cf6..47a506bf 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java @@ -36,8 +36,8 @@ public class ClientHandleTcpDistributeClientTransferClientPermeateChannelInitSuc Channel channel = nettyChannelContext.channel(); // 连接成功 开启自动读取写 byte[] msgClientId = nettyProxyMsg.getClientId(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanced.java index 3e0a51d7..acd10bc7 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/advanced/ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanced.java @@ -41,8 +41,8 @@ public class ClientHandleTcpDistributeServicePermeateClientRealConnectTypeAdvanc // 创建真实端口监听 byte[] clientIdBytes = msg.getClientId(); byte[] visitorPort = msg.getVisitorPort(); - byte[] clientTargetIp = msg.getClientTargetIp(); - byte[] clientTargetPort = msg.getClientTargetPort(); + byte[] clientTargetIp = msg.getTargetIp(); + byte[] clientTargetPort = msg.getTargetPort(); byte[] visitorIdBytes = msg.getVisitorId(); InternalNetworkPenetrationRealClient internalNetworkPenetrationRealClient = InternalNetworkPenetrationRealClient diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientRealSocket.java index 7073b39e..2edc4b96 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientRealSocket.java @@ -139,8 +139,8 @@ public class NettyTcpClientPermeateClientRealSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setClientId(clientId); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setVisitorPort(visitorPort); nettyProxyMsg.setType(TcpMessageType.TCP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java index 6acac359..91e0f391 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateClientVisitorTransferSocket.java @@ -75,8 +75,8 @@ public class NettyTcpClientPermeateClientVisitorTransferSocket { // other clientId nettyProxyMsg.setClientId(toClientId); nettyProxyMsg.setVisitorPort(visitorPort); - nettyProxyMsg.setClientTargetIp(targetIp); - nettyProxyMsg.setClientTargetPort(targetPort); + nettyProxyMsg.setTargetIp(targetIp); + nettyProxyMsg.setTargetPort(targetPort); nettyProxyMsg.setVisitorId(visitorId); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateServerVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateServerVisitorTransferSocket.java index 57f0b7c0..fc512039 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateServerVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpClientPermeateServerVisitorTransferSocket.java @@ -74,8 +74,8 @@ public class NettyTcpClientPermeateServerVisitorTransferSocket { myMsg.setType(TcpMessageType.TCP_REPORT_CLIENT_TRANSFER_SERVER_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL); myMsg.setClientId(clientId); myMsg.setVisitorPort(visitorPort); - myMsg.setClientTargetIp(targetIp); - myMsg.setClientTargetPort(targetPort); + myMsg.setTargetIp(targetIp); + myMsg.setTargetPort(targetPort); myMsg.setVisitorId(visitorId); ChannelAttributeKeyUtils.buildVisitorId(transferChannel, visitorId); ChannelAttributeKeyUtils.buildClientId(transferChannel, clientId); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpServerPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpServerPermeateClientRealSocket.java index 0268e1bb..f1439ad9 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpServerPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/tcp/socket/NettyTcpServerPermeateClientRealSocket.java @@ -181,8 +181,8 @@ public class NettyTcpServerPermeateClientRealSocket { myMsg.setType(TcpMessageType.TCP_REPORT_SINGLE_CLIENT_REAL_CONNECT); myMsg.setClientId(visitorClientId); myMsg.setVisitorPort(visitorPort); - myMsg.setClientTargetIp(clientTargetIp); - myMsg.setClientTargetPort(clientTargetPort); + myMsg.setTargetIp(clientTargetIp); + myMsg.setTargetPort(clientTargetPort); myMsg.setVisitorId(visitorId); transferChannel.writeAndFlush(myMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute.java index c629bd33..4ce251a1 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute.java @@ -41,8 +41,8 @@ public class ClientHandleUdpChannelTransferTypeAdvancedHandleDistribute extends log.debug("接收到服务端需要内网穿透的数据:{}" , nettyProxyMsg); String clientId = nettyClientProperties.getClientId(); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); - byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPort = nettyProxyMsg.getTargetPort(); byte[] visitorId = nettyProxyMsg.getVisitorId(); // 真实服务通道 // Channel realChannel = NettyRealIdContext.getReal(new String(visitorId)); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateClientInitTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateClientInitTypeAdvanced.java index 4dc93a5b..92960c75 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateClientInitTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateClientInitTypeAdvanced.java @@ -37,8 +37,8 @@ public class ClientHandleUdpDistributeClientPermeateClientInitTypeAdvanced exten // 初始化 客户端渗透服务端socket byte[] fromClientIdBytes = nettyProxyMsg.getClientId(); byte[] visitorPortBytes = nettyProxyMsg.getVisitorPort(); - byte[] clientTargetIpBytes = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPortBytes = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIpBytes = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPortBytes = nettyProxyMsg.getTargetPort(); byte[] toClientIdBytes = nettyProxyMsg.getData(); String fromClientId = new String(fromClientIdBytes); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerInitTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerInitTypeAdvanced.java index e425e353..033e64b5 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerInitTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerInitTypeAdvanced.java @@ -43,8 +43,8 @@ public class ClientHandleUdpDistributeClientPermeateServerInitTypeAdvanced exten // 初始化 客户端渗透服务端socket byte[] clientIdBytes = nettyProxyMsg.getClientId(); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); - byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPort = nettyProxyMsg.getTargetPort(); List handleChannelTypeAdvancedList = new ArrayList<>(SpringContextHolder.getApplicationContext().getBeansOfType(HandleChannelTypeAdvanced.class).values()); NettyUdpClientPermeateServerVisitorSocket nettyTcpClientPermeateServerVisitorSocket = NettyUdpClientPermeateServerVisitorSocket.NettyVisitorSocketBuilder.builder() diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerTransferTypeAdvanced.java index 1c8d48e5..15ce0f53 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientPermeateServerTransferTypeAdvanced.java @@ -34,8 +34,8 @@ public class ClientHandleUdpDistributeClientPermeateServerTransferTypeAdvanced e Channel channel = nettyChannelContext.channel(); log.debug("客户端渗透服务端返回数据:{}" , new String(nettyProxyMsg.getData())); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); - byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPort = nettyProxyMsg.getTargetPort(); byte[] visitorId = nettyProxyMsg.getVisitorId(); // 真实服务通道 // Channel realChannel = NettyRealIdContext.getReal(new String(visitorId)); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java index 27e5fe89..ba27b3ba 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -36,8 +36,8 @@ public class ClientHandleUdpDistributeClientTransferClientPermeateChannelConnect public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) { // 创建connect 然后发送创建成功 byte[] msgClientId = nettyProxyMsg.getClientId(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java index 567e9f15..e24551fe 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java @@ -36,8 +36,8 @@ public class ClientHandleUdpDistributeClientTransferClientPermeateChannelInitSuc Channel channel = nettyChannelContext.channel(); // 连接成功 开启自动读取写 byte[] msgClientId = nettyProxyMsg.getClientId(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeServicePermeateClientRealConnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeServicePermeateClientRealConnectTypeAdvanced.java index f8d4f948..1506a632 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeServicePermeateClientRealConnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/advanced/ClientHandleUdpDistributeServicePermeateClientRealConnectTypeAdvanced.java @@ -40,8 +40,8 @@ public class ClientHandleUdpDistributeServicePermeateClientRealConnectTypeAdvanc // 创建真实端口监听 byte[] clientIdBytes = msg.getClientId(); byte[] visitorPort = msg.getVisitorPort(); - byte[] clientTargetIp = msg.getClientTargetIp(); - byte[] clientTargetPort = msg.getClientTargetPort(); + byte[] clientTargetIp = msg.getTargetIp(); + byte[] clientTargetPort = msg.getTargetPort(); byte[] visitorIdBytes = msg.getVisitorId(); InternalNetworkPenetrationRealClient internalNetworkPenetrationRealClient = InternalNetworkPenetrationRealClient diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateClientRealSocket.java index 37ef30e2..20249e4e 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateClientRealSocket.java @@ -139,8 +139,8 @@ public class NettyUdpClientPermeateClientRealSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setClientId(clientId); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setVisitorPort(visitorPort); nettyProxyMsg.setType(UdpMessageType.UDP_REPORT_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateClientVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateClientVisitorTransferSocket.java index a762d355..69e91db3 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateClientVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateClientVisitorTransferSocket.java @@ -75,8 +75,8 @@ public class NettyUdpClientPermeateClientVisitorTransferSocket { nettyProxyMsg.setNamespace(namespace); nettyProxyMsg.setClientId(toClientId); nettyProxyMsg.setVisitorPort(visitorPort); - nettyProxyMsg.setClientTargetIp(targetIp); - nettyProxyMsg.setClientTargetPort(targetPort); + nettyProxyMsg.setTargetIp(targetIp); + nettyProxyMsg.setTargetPort(targetPort); nettyProxyMsg.setVisitorId(visitorId); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateServerVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateServerVisitorTransferSocket.java index 9d35e832..fe6d99ba 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateServerVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpClientPermeateServerVisitorTransferSocket.java @@ -74,8 +74,8 @@ public class NettyUdpClientPermeateServerVisitorTransferSocket { myMsg.setType(UdpMessageType.UDP_REPORT_CLIENT_TRANSFER_SERVER_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL); myMsg.setClientId(clientId); myMsg.setVisitorPort(visitorPort); - myMsg.setClientTargetIp(targetIp); - myMsg.setClientTargetPort(targetPort); + myMsg.setTargetIp(targetIp); + myMsg.setTargetPort(targetPort); myMsg.setVisitorId(visitorId); ChannelAttributeKeyUtils.buildVisitorId(transferChannel, visitorId); ChannelAttributeKeyUtils.buildClientId(transferChannel, clientId); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpServerPermeateClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpServerPermeateClientRealSocket.java index 8e171904..ae5d08d3 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpServerPermeateClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/permeate/udp/socket/NettyUdpServerPermeateClientRealSocket.java @@ -182,8 +182,8 @@ public class NettyUdpServerPermeateClientRealSocket { myMsg.setType(UdpMessageType.UDP_REPORT_SINGLE_CLIENT_REAL_CONNECT); myMsg.setClientId(visitorClientId); myMsg.setVisitorPort(visitorPort); - myMsg.setClientTargetIp(clientTargetIp); - myMsg.setClientTargetPort(clientTargetPort); + myMsg.setTargetIp(clientTargetIp); + myMsg.setTargetPort(clientTargetPort); myMsg.setVisitorId(visitorId); transferChannel.writeAndFlush(myMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyClientConnectionTransferSuccessfulAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyClientConnectionTransferSuccessfulAdvanced.java index cb874dc3..c3a45d21 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyClientConnectionTransferSuccessfulAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpClientProxyClientConnectionTransferSuccessfulAdvanced.java @@ -36,8 +36,8 @@ public class ClientHandleDistributeHttpClientProxyClientConnectionTransferSucces // 客户端主动连接服务端创建一个传输通道 byte[] msgClientId = nettyProxyMsg.getClientId(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); String clientId = new String(msgClientId); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpServerProxyClientConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpServerProxyClientConnectionSuccessfulTypeAdvanced.java index 7b3842af..27a30831 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpServerProxyClientConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/advanced/ClientHandleDistributeHttpServerProxyClientConnectionSuccessfulTypeAdvanced.java @@ -31,8 +31,8 @@ public class ClientHandleDistributeHttpServerProxyClientConnectionSuccessfulType // 创建一个传输通道 byte[] msgClientId = nettyProxyMsg.getClientId(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); String clientId = new String(msgClientId); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientProxySocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientProxySocket.java index c6cae239..d969b898 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientProxySocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientProxySocket.java @@ -74,8 +74,8 @@ public class NettyHttpClientProxyClientProxySocket { nettyProxyMsg.setNamespace(namespace); // other clientId nettyProxyMsg.setClientId(targetClientId); - nettyProxyMsg.setClientTargetIp(targetIp); - nettyProxyMsg.setClientTargetPort(targetPort); + nettyProxyMsg.setTargetIp(targetIp); + nettyProxyMsg.setTargetPort(targetPort); nettyProxyMsg.setData(data); nettyProxyMsg.setVisitorId(visitorId); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientRealSocket.java index dad6aa2f..6a7a0c28 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyClientRealSocket.java @@ -139,8 +139,8 @@ public class NettyHttpClientProxyClientRealSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setClientId(clientId); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setType(ProxyMessageType.HTTP_REPORT_CLIENT_PROXY_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL_); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyServerProxySocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyServerProxySocket.java index 7ab0d266..3eda5899 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyServerProxySocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpClientProxyServerProxySocket.java @@ -79,8 +79,8 @@ public class NettyHttpClientProxyServerProxySocket { String hostAddress = InetAddress.getLocalHost().getHostAddress(); nettyProxyMsg.setOriginalIpString(hostAddress); - nettyProxyMsg.setClientTargetIp(targetIp); - nettyProxyMsg.setClientTargetPort(targetPort); + nettyProxyMsg.setTargetIp(targetIp); + nettyProxyMsg.setTargetPort(targetPort); nettyProxyMsg.setData(data); nettyProxyMsg.setVisitorId(visitorId); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpServerProxyClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpServerProxyClientRealSocket.java index ffb788cf..09b2f010 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpServerProxyClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/http/socket/NettyHttpServerProxyClientRealSocket.java @@ -139,8 +139,8 @@ public class NettyHttpServerProxyClientRealSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setClientId(clientId); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setType(ProxyMessageType.HTTP_REPORT_SERVER_PROXY_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL_); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientRealSocket.java index dda4c58c..0f95178b 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientRealSocket.java @@ -134,8 +134,8 @@ public class NettySocksClientProxyClientRealSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setClientId(clientId); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setType(ProxyMessageType.SOCKS_REPORT_CLIENT_PROXY_CLIENT_OTHER_TRANSFER_CONNECTION_SUCCESS_); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientVisitorTransferSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientVisitorTransferSocket.java index 25eb4b63..fc7e13b2 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientVisitorTransferSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksClientProxyClientVisitorTransferSocket.java @@ -9,7 +9,6 @@ import lombok.extern.slf4j.Slf4j; import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties; import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.socks.NettySocksClientProxyClient; import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.socks.filter.NettySocksClientProxyClientVisitorTransferFilter; -import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.socks.filter.NettySocksClientProxyServerTransferFilter; import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter; import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg; import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType; @@ -72,8 +71,8 @@ public class NettySocksClientProxyClientVisitorTransferSocket { nettyProxyMsg.setType(ProxyMessageType.SOCKS_REPORT_CLIENT_PROXY_CLIENT_TRANSFER_CONNECTION_); nettyProxyMsg.setNamespace(namespace); // other clientId - nettyProxyMsg.setClientTargetIp(targetIp); - nettyProxyMsg.setClientTargetPort(targetPort); + nettyProxyMsg.setTargetIp(targetIp); + nettyProxyMsg.setTargetPort(targetPort); nettyProxyMsg.setClientId(targetClientId); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setData(new byte[]{socks5AddressTypeByteValue}); 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 309420ce..75e3b9c9 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 @@ -69,8 +69,8 @@ public class NettySocksClientProxyServerSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setType(ProxyMessageType.SOCKS_REPORT_CLIENT_PROXY_SERVER_TRANSFER_CONNECTION_); // other clientId - nettyProxyMsg.setClientTargetIp(targetIp); - nettyProxyMsg.setClientTargetPort(targetPort); + nettyProxyMsg.setTargetIp(targetIp); + nettyProxyMsg.setTargetPort(targetPort); nettyProxyMsg.setClientId(clientId); nettyProxyMsg.setVisitorId(visitorId); diff --git a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksServerProxyClientRealSocket.java b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksServerProxyClientRealSocket.java index 3c4f1f9f..46309eb1 100644 --- a/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksServerProxyClientRealSocket.java +++ b/wu-lazy-cloud-heartbeat-client/src/main/java/org/framework/lazy/cloud/network/heartbeat/client/netty/proxy/socks/socket/NettySocksServerProxyClientRealSocket.java @@ -6,8 +6,6 @@ import io.netty.channel.*; 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.proxy.socks.filter.NettySocksClientProxyClientRealFilter; -import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.socks.filter.NettySocksClientProxyClientTransferFilter; import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.socks.filter.NettySocksServerProxyClientRealFilter; import org.framework.lazy.cloud.network.heartbeat.client.netty.proxy.socks.filter.NettySocksServerProxyClientTransferFilter; import org.framework.lazy.cloud.network.heartbeat.common.NettyRealIdContext; @@ -135,8 +133,8 @@ public class NettySocksServerProxyClientRealSocket { NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setClientId(clientId); - nettyProxyMsg.setClientTargetIp(targetIp); - nettyProxyMsg.setClientTargetPort(targetPort); + nettyProxyMsg.setTargetIp(targetIp); + nettyProxyMsg.setTargetPort(targetPort); nettyProxyMsg.setType(ProxyMessageType.SOCKS_REPORT_SERVER_PROXY_CLIENT_CONNECTION_SUCCESS_); transferChannel.writeAndFlush(nettyProxyMsg); diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/payload/NettyProxyMsg.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/payload/NettyProxyMsg.java index 4ab967b0..7ede6e6c 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/payload/NettyProxyMsg.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/advanced/payload/NettyProxyMsg.java @@ -15,7 +15,7 @@ import java.nio.charset.StandardCharsets; @Setter @Getter public class NettyProxyMsg { - // body 长度 type 1 isSsl 1 appKey 4 appSecret 4 clientId 4 namespace 4 originalIp 4 clientTargetIp 4 clientTargetPort 4 visitorPort 4 visitorId 4 data 4 + // body 长度 type 1 isSsl 1 appKey 4 appSecret 4 clientId 4 namespace 4 originalIp 4 targetIp 4 targetPort 4 visitorPort 4 visitorId 4 data 4 public static final int bodyLength = 1 + 1 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4; @@ -70,13 +70,13 @@ public class NettyProxyMsg { * 客户端目标地址 * byte[] 长度 4 */ - private byte[] clientTargetIp; + private byte[] targetIp; /** * 客户端目标端口 * byte[] 长度 4 */ - private byte[] clientTargetPort; + private byte[] targetPort; /** * 客户端目使用的代理端口 * byte[] 长度 4 @@ -98,8 +98,8 @@ public class NettyProxyMsg { public String toString() { return "NettyProxyMsg [type=" + type + ",clientId=" + (clientId == null ? null : new String(clientId)) + - ",clientTargetIp=" + (clientTargetIp == null ? null : new String(clientTargetIp)) + - ",clientTargetPort=" + (clientTargetPort == null ? null : new String(clientTargetPort)) + + ",targetIp=" + (targetIp == null ? null : new String(targetIp)) + + ",targetPort=" + (targetPort == null ? null : new String(targetPort)) + ",visitorPort=" + (visitorPort == null ? null : new String(visitorPort)) + "]"; } @@ -208,10 +208,10 @@ public class NettyProxyMsg { * @return 客户端目标地址 */ public String targetIp() { - if (ObjectUtils.isEmpty(clientTargetIp)) { + if (ObjectUtils.isEmpty(targetIp)) { return null; } - return new String(clientTargetIp, StandardCharsets.UTF_8); + return new String(targetIp, StandardCharsets.UTF_8); } /** * 客户端目标端口 @@ -219,10 +219,10 @@ public class NettyProxyMsg { * @return 客户端目标端口 */ public String targetPort() { - if (ObjectUtils.isEmpty(clientTargetPort)) { + if (ObjectUtils.isEmpty(targetPort)) { return null; } - return new String(clientTargetPort, StandardCharsets.UTF_8); + return new String(targetPort, StandardCharsets.UTF_8); } /** @@ -243,20 +243,20 @@ public class NettyProxyMsg { return Integer.valueOf(new String(visitorPort, StandardCharsets.UTF_8)); } - public void setClientTargetIp(byte[] clientTargetIp) { - this.clientTargetIp = clientTargetIp; + public void setTargetIp(byte[] targetIp) { + this.targetIp = targetIp; } - public void setClientTargetIp(String clientTargetIp) { - this.clientTargetIp = clientTargetIp.getBytes(StandardCharsets.UTF_8); + public void setTargetIp(String clientTargetIp) { + this.targetIp = clientTargetIp.getBytes(StandardCharsets.UTF_8); } - public void setClientTargetPort(Integer clientTargetPort) { - this.clientTargetPort = String.valueOf(clientTargetPort).getBytes(StandardCharsets.UTF_8); + public void setTargetPort(Integer targetPort) { + this.targetPort = String.valueOf(targetPort).getBytes(StandardCharsets.UTF_8); } - public void setClientTargetPort(byte[] clientTargetPort) { - this.clientTargetPort = clientTargetPort; + public void setTargetPort(byte[] targetPort) { + this.targetPort = targetPort; } public void setVisitorPort(byte[] visitorPort) { diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/decoder/NettyProxyMsgDecoder.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/decoder/NettyProxyMsgDecoder.java index 9b019cbf..04527e2a 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/decoder/NettyProxyMsgDecoder.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/decoder/NettyProxyMsgDecoder.java @@ -143,13 +143,13 @@ public class NettyProxyMsgDecoder extends LengthFieldBasedFrameDecoder { int clientTargetIpLength = in.readInt(); byte[] clientTargetIpBytes = new byte[clientTargetIpLength]; in.readBytes(clientTargetIpBytes); - nettyProxyMsg.setClientTargetIp(clientTargetIpBytes); + nettyProxyMsg.setTargetIp(clientTargetIpBytes); int clientTargetPortLength = in.readInt(); byte[] clientTargetPortBytes = new byte[clientTargetPortLength]; in.readBytes(clientTargetPortBytes); - nettyProxyMsg.setClientTargetPort(clientTargetPortBytes); + nettyProxyMsg.setTargetPort(clientTargetPortBytes); int visitorPortLength = in.readInt(); byte[] visitorPortBytes = new byte[visitorPortLength]; diff --git a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/encoder/NettyProxyMsgEncoder.java b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/encoder/NettyProxyMsgEncoder.java index 52040051..bdfe5de3 100644 --- a/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/encoder/NettyProxyMsgEncoder.java +++ b/wu-lazy-cloud-heartbeat-common/src/main/java/org/framework/lazy/cloud/network/heartbeat/common/encoder/NettyProxyMsgEncoder.java @@ -30,8 +30,8 @@ public class NettyProxyMsgEncoder extends MessageToByteEncoder { byte[] originalIp = msg.getOriginalIp(); byte[] namespace = msg.getNamespace(); byte[] clientIdBytes = msg.getClientId(); - byte[] clientTargetIpBytes = msg.getClientTargetIp(); - byte[] clientTargetPortBytes = msg.getClientTargetPort(); + byte[] clientTargetIpBytes = msg.getTargetIp(); + byte[] clientTargetPortBytes = msg.getTargetPort(); byte[] visitorPortBytes = msg.getVisitorPort(); byte[] visitorIdBytes = msg.getVisitorId(); byte[] msgDataBytes = msg.getData(); diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyHttpProxyHandler.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyHttpProxyHandler.java index 709da075..dd76d9f3 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyHttpProxyHandler.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettyHttpProxyHandler.java @@ -92,14 +92,14 @@ public class NettyHttpProxyHandler extends ChannelInboundHandlerAdapter { if(ObjectUtils.isEmpty(route)){ // 本地代理 proxyMsg.setType(ProxyMessageType.HTTP_LOCAL_PROXY); - proxyMsg.setClientTargetIp(originHost); - proxyMsg.setClientTargetPort(originPort); + proxyMsg.setTargetIp(originHost); + proxyMsg.setTargetPort(originPort); }else { // 远程代理 String targetIp = route.getTargetIp(); String targetPort = NormalUsedString.ASTERISK.equals(route.getTargetPort())?String.valueOf(originPort):route.getTargetPort(); - proxyMsg.setClientTargetIp(targetIp); - proxyMsg.setClientTargetPort(Integer.valueOf(targetPort)); + proxyMsg.setTargetIp(targetIp); + proxyMsg.setTargetPort(Integer.valueOf(targetPort)); if(RouteType.LOCAL.equals(route.getRouteType())){ proxyMsg.setType(ProxyMessageType.HTTP_LOCAL_PROXY); }else if (RouteType.CLIENT_PROXY_CLIENT.equals(route.getRouteType())){ diff --git a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettySocks5CommandRequestHandler.java b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettySocks5CommandRequestHandler.java index 0e4a4591..cee90b15 100644 --- a/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettySocks5CommandRequestHandler.java +++ b/wu-lazy-cloud-heartbeat-protocol-proxy/src/main/java/org/framework/lazy/cloud/network/heartbeat/protocol/handler/NettySocks5CommandRequestHandler.java @@ -67,14 +67,14 @@ public class NettySocks5CommandRequestHandler extends SimpleChannelInboundHandle if(ObjectUtils.isEmpty(route)){ // 未查询到路由信息、本地代理 proxyMsg.setType(ProxyMessageType.SOCKS_LOCAL_PROXY); - proxyMsg.setClientTargetIp(originHost); - proxyMsg.setClientTargetPort(originPort); + proxyMsg.setTargetIp(originHost); + proxyMsg.setTargetPort(originPort); }else { // 其他路由代理 String targetIp = route.getTargetIp(); String targetPort = NormalUsedString.ASTERISK.equals(route.getTargetPort())?String.valueOf(originPort):route.getTargetPort(); - proxyMsg.setClientTargetIp(targetIp); - proxyMsg.setClientTargetPort(Integer.parseInt(targetPort)); + proxyMsg.setTargetIp(targetIp); + proxyMsg.setTargetPort(Integer.parseInt(targetPort)); if(RouteType.LOCAL.equals(route.getRouteType())){ proxyMsg.setType(ProxyMessageType.SOCKS_LOCAL_PROXY); }else if (RouteType.CLIENT_PROXY_CLIENT.equals(route.getRouteType())){ diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpClientConnectSuccessTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpClientConnectSuccessTypeAdvanced.java index 4cdc5e2c..1b0d199a 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpClientConnectSuccessTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpClientConnectSuccessTypeAdvanced.java @@ -157,8 +157,8 @@ public class ServerHandleTcpClientConnectSuccessTypeAdvanced extends AbstractHan Integer visitorPort = lazyClientPermeateServerMappingDTO.getVisitorPort(); NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_SERVER_INIT); - nettyMsg.setClientTargetIp(permeateTargetIp); - nettyMsg.setClientTargetPort(permeateTargetPort); + nettyMsg.setTargetIp(permeateTargetIp); + nettyMsg.setTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); newChannel.writeAndFlush(nettyMsg); } @@ -181,8 +181,8 @@ public class ServerHandleTcpClientConnectSuccessTypeAdvanced extends AbstractHan NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setNamespace(selfNamespace); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT); - nettyMsg.setClientTargetIp(permeateTargetIp); - nettyMsg.setClientTargetPort(permeateTargetPort); + nettyMsg.setTargetIp(permeateTargetIp); + nettyMsg.setTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); nettyMsg.setClientId(clientId); nettyMsg.setData(toClientId.getBytes(StandardCharsets.UTF_8)); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java index 21d861ea..597136a8 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -33,8 +33,8 @@ public class ServerHandleTcpReportClientTransferClientPermeateChannelConnectionS // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); String clientId = nettyProxyMsg.clientId();// 目标客户端ID String namespace = nettyProxyMsg.namespace(); @@ -48,14 +48,14 @@ public class ServerHandleTcpReportClientTransferClientPermeateChannelConnectionS NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); clientConnectTagetNettyProxyMsg.setVisitorPort(msgVisitorPort); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL); if (clientChannel != null) { clientChannel.writeAndFlush(clientConnectTagetNettyProxyMsg); }else { - log.error("can not find the client:【】 channel",clientId); + log.error("can not find the client:【{}】 channel",clientId); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java index b6fccfea..9cfea51f 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java @@ -31,8 +31,8 @@ public class ServerHandleTcpReportClientTransferClientPermeateChannelInitSuccess // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] clientId = nettyProxyMsg.getClientId(); ChannelAttributeKeyUtils.buildVisitorPort(transferChannel, Integer.parseInt(new String(msgVisitorPort))); @@ -48,8 +48,8 @@ public class ServerHandleTcpReportClientTransferClientPermeateChannelInitSuccess NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); clientConnectTagetNettyProxyMsg.setVisitorPort(msgVisitorPort); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL); if (nextChannel != null) { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientResponseTypeAdvanced.java index 06f43381..291138d5 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientResponseTypeAdvanced.java @@ -34,8 +34,8 @@ public class ServerHandleTcpReportClientTransferClientResponseTypeAdvanced exten // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); String clientId = nettyProxyMsg.clientId(); // 下发客户端初始化成功 Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); @@ -44,8 +44,8 @@ public class ServerHandleTcpReportClientTransferClientResponseTypeAdvanced exten NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); clientConnectTagetNettyProxyMsg.setVisitorPort(msgVisitorPort); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setData(nettyProxyMsg.getData()); clientConnectTagetNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_RESPONSE); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientTypeAdvanced.java index e9ff73f1..4cb70188 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferClientTypeAdvanced.java @@ -34,8 +34,8 @@ public class ServerHandleTcpReportClientTransferClientTypeAdvanced extends Abstr // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); String clientId = nettyProxyMsg.clientId(); // 下发客户端初始化成功 Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); @@ -45,8 +45,8 @@ public class ServerHandleTcpReportClientTransferClientTypeAdvanced extends Abstr NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); clientConnectTagetNettyProxyMsg.setVisitorPort(msgVisitorPort); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setData(nettyProxyMsg.getData()); clientConnectTagetNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java index a8da2910..e476d212 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -28,8 +28,8 @@ public class ServerHandleTcpReportClientTransferServerPermeateChannelConnectionS // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] msgClientId = nettyProxyMsg.getClientId(); String clientId = new String(msgClientId); // 绑定客户端ID diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportServicePermeateClientRealConnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportServicePermeateClientRealConnectTypeAdvanced.java index 69a4ee41..eef242b3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportServicePermeateClientRealConnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/advanced/ServerHandleTcpReportServicePermeateClientRealConnectTypeAdvanced.java @@ -32,8 +32,8 @@ public class ServerHandleTcpReportServicePermeateClientRealConnectTypeAdvanced e Channel transferChannel = nettyChannelContext.channel(); // 客户端绑定端口成功 byte[] clientId = nettyProxyMsg.getClientId(); - byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPort = nettyProxyMsg.getTargetPort(); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); byte[] visitorId = nettyProxyMsg.getVisitorId(); log.info("客户端:{},绑定真实服务ip:{},port:{},成功", new String(clientId), new String(clientTargetIp), new String(clientTargetPort)); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerPermeateClientVisitorHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerPermeateClientVisitorHandler.java index c6bf4ba6..15bb2784 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerPermeateClientVisitorHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/handler/NettyTcpServerPermeateClientVisitorHandler.java @@ -55,8 +55,8 @@ public class NettyTcpServerPermeateClientVisitorHandler extends SimpleChannelInb nettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_SINGLE_CLIENT_REAL_CONNECT); nettyProxyMsg.setClientId(clientId); nettyProxyMsg.setVisitorPort(visitorPort); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setVisitorId(visitorId); @@ -105,8 +105,8 @@ public class NettyTcpServerPermeateClientVisitorHandler extends SimpleChannelInb NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_TRANSFER); nettyProxyMsg.setClientId(clientId); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setVisitorPort(visitorPort); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setData(bytes); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/socket/NettyTcpClientPermeateServerConnectRealSocket.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/socket/NettyTcpClientPermeateServerConnectRealSocket.java index d0a4dfc5..5f02b4c3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/socket/NettyTcpClientPermeateServerConnectRealSocket.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/tcp/socket/NettyTcpClientPermeateServerConnectRealSocket.java @@ -66,8 +66,8 @@ public class NettyTcpClientPermeateServerConnectRealSocket { myMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_TRANSFER_SERVER_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL); myMsg.setVisitorId(visitorId); myMsg.setVisitorPort(visitorPort); - myMsg.setClientTargetIp(targetIp); - myMsg.setClientTargetPort(targetPort); + myMsg.setTargetIp(targetIp); + myMsg.setTargetPort(targetPort); transferChannel.writeAndFlush(myMsg); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpClientConnectSuccessTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpClientConnectSuccessTypeAdvanced.java index 618bfcc6..ab61bb0e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpClientConnectSuccessTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpClientConnectSuccessTypeAdvanced.java @@ -147,8 +147,8 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan Integer visitorPort = lazyClientPermeateServerMappingDTO.getVisitorPort(); NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_SERVER_INIT); - nettyMsg.setClientTargetIp(permeateTargetIp); - nettyMsg.setClientTargetPort(permeateTargetPort); + nettyMsg.setTargetIp(permeateTargetIp); + nettyMsg.setTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); newChannel.writeAndFlush(nettyMsg); } @@ -169,8 +169,8 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan String toClientId = lazyClientPermeateClientMappingDTO.getToClientId(); NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT); - nettyMsg.setClientTargetIp(permeateTargetIp); - nettyMsg.setClientTargetPort(permeateTargetPort); + nettyMsg.setTargetIp(permeateTargetIp); + nettyMsg.setTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); nettyMsg.setClientId(clientId); nettyMsg.setData(toClientId.getBytes(StandardCharsets.UTF_8)); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java index a9394dfc..69a651b3 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -34,7 +34,7 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelConnectionS byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); String msgClientTargetIp = nettyProxyMsg.targetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); String clientId = nettyProxyMsg.clientId();// 目标客户端ID ChannelAttributeKeyUtils.buildClientId(channel, clientId); @@ -47,8 +47,8 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelConnectionS NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); clientConnectTagetNettyProxyMsg.setVisitorPort(msgVisitorPort); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL); if (clientChannel != null) { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java index 58226195..fd068bf1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced.java @@ -31,8 +31,8 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccess // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] clientId = nettyProxyMsg.getClientId(); ChannelAttributeKeyUtils.buildVisitorPort(channel, Integer.parseInt(new String(msgVisitorPort))); @@ -48,8 +48,8 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelInitSuccess NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); clientConnectTagetNettyProxyMsg.setVisitorPort(msgVisitorPort); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_CHANNEL_INIT_SUCCESSFUL); if (nextChannel != null) { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientResponseTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientResponseTypeAdvanced.java index 405ba9de..f9ff0e46 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientResponseTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientResponseTypeAdvanced.java @@ -36,8 +36,8 @@ public class ServerHandleUdpReportClientTransferClientResponseTypeAdvanced exten // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); String clientId = nettyProxyMsg.clientId(); // 下发客户端初始化成功 Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); @@ -46,8 +46,8 @@ public class ServerHandleUdpReportClientTransferClientResponseTypeAdvanced exten NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); clientConnectTagetNettyProxyMsg.setVisitorPort(msgVisitorPort); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setData(nettyProxyMsg.getData()); clientConnectTagetNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_RESPONSE); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientTypeAdvanced.java index 3c5a1b51..252b51d4 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferClientTypeAdvanced.java @@ -34,8 +34,8 @@ public class ServerHandleUdpReportClientTransferClientTypeAdvanced extends Abstr // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); String clientId = nettyProxyMsg.clientId(); // 下发客户端初始化成功 Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel); @@ -45,8 +45,8 @@ public class ServerHandleUdpReportClientTransferClientTypeAdvanced extends Abstr NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); clientConnectTagetNettyProxyMsg.setVisitorPort(msgVisitorPort); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setData(nettyProxyMsg.getData()); clientConnectTagetNettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_TRANSFER_REQUEST); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java index 06d28200..f82df153 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportClientTransferServerPermeateChannelConnectionSuccessfulTypeAdvanced.java @@ -28,8 +28,8 @@ public class ServerHandleUdpReportClientTransferServerPermeateChannelConnectionS // 创建目标地址连接 byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] msgClientId = nettyProxyMsg.getClientId(); String clientId = new String(msgClientId); // 绑定客户端ID diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced.java index 113015fe..93301cb5 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/advanced/ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced.java @@ -32,8 +32,8 @@ public class ServerHandleUdpReportServicePermeateClientRealConnectTypeAdvanced e Channel channel = nettyChannelContext.channel(); // 客户端绑定端口成功 byte[] clientId = nettyProxyMsg.getClientId(); - byte[] clientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] clientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] clientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] clientTargetPort = nettyProxyMsg.getTargetPort(); byte[] visitorPort = nettyProxyMsg.getVisitorPort(); byte[] visitorId = nettyProxyMsg.getVisitorId(); log.info("客户端:{},绑定真实服务ip:{},port:{},成功", new String(clientId), new String(clientTargetIp), new String(clientTargetPort)); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/handler/NettyUdpServerPermeateClientVisitorHandler.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/handler/NettyUdpServerPermeateClientVisitorHandler.java index 2488b74c..b89f5dac 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/handler/NettyUdpServerPermeateClientVisitorHandler.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/handler/NettyUdpServerPermeateClientVisitorHandler.java @@ -54,9 +54,9 @@ public class NettyUdpServerPermeateClientVisitorHandler extends SimpleChannelInb nettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_SINGLE_CLIENT_REAL_CONNECT); nettyProxyMsg.setClientId(clientId); nettyProxyMsg.setVisitorPort(visitorPort); - nettyProxyMsg.setClientTargetIp(clientTargetIp); + nettyProxyMsg.setTargetIp(clientTargetIp); nettyProxyMsg.setNamespace(namespace); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setVisitorId(visitorId); @@ -105,8 +105,8 @@ public class NettyUdpServerPermeateClientVisitorHandler extends SimpleChannelInb NettyProxyMsg nettyProxyMsg = new NettyProxyMsg(); nettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_TRANSFER); nettyProxyMsg.setClientId(clientId); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setVisitorPort(visitorPort); nettyProxyMsg.setVisitorId(visitorId); nettyProxyMsg.setData(bytes); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/socket/NettyUdpClientPermeateServerConnectRealSocket.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/socket/NettyUdpClientPermeateServerConnectRealSocket.java index d58c7976..b4f0a7aa 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/socket/NettyUdpClientPermeateServerConnectRealSocket.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/permeate/udp/socket/NettyUdpClientPermeateServerConnectRealSocket.java @@ -66,8 +66,8 @@ public class NettyUdpClientPermeateServerConnectRealSocket { myMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_TRANSFER_SERVER_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL); myMsg.setVisitorId(visitorId); myMsg.setVisitorPort(visitorPort); - myMsg.setClientTargetIp(targetIp); - myMsg.setClientTargetPort(targetPort); + myMsg.setTargetIp(targetIp); + myMsg.setTargetPort(targetPort); transferChannel.writeAndFlush(myMsg); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfulTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfulTypeAdvanced.java index 5f1cc5cb..7558796e 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfulTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfulTypeAdvanced.java @@ -38,8 +38,8 @@ public class ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfu Channel channel = nettyChannelContext.channel(); byte[] msgVisitorId = nettyProxyMsg.getVisitorId(); - byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp(); - byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort(); + byte[] msgClientTargetIp = nettyProxyMsg.getTargetIp(); + byte[] msgClientTargetPort = nettyProxyMsg.getTargetPort(); byte[] clientId = nettyProxyMsg.getClientId(); @@ -56,8 +56,8 @@ public class ServerHandleHttpReportClientProxyClientTransferChannelInitSuccessfu NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); - clientConnectTagetNettyProxyMsg.setClientTargetIp(msgClientTargetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(msgClientTargetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(msgClientTargetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(msgClientTargetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setData(nettyByteBufData.getData()); 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 1fc9c021..87d0aef1 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 @@ -71,8 +71,8 @@ public class ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); - clientConnectTagetNettyProxyMsg.setClientTargetIp(targetIpString); - clientConnectTagetNettyProxyMsg.setClientTargetPort(targetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(targetIpString); + clientConnectTagetNettyProxyMsg.setTargetPort(targetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setType(ProxyMessageType.HTTP_DISTRIBUTE_CLIENT_PROXY_CLIENT_TRANSFER_CONNECTION_SUCCESSFUL_); if (loadBalance != null) { 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 b803a129..ebe1b574 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 @@ -72,8 +72,8 @@ public class ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId); - clientConnectTagetNettyProxyMsg.setClientTargetIp(targetIpString); - clientConnectTagetNettyProxyMsg.setClientTargetPort(targetPort); + clientConnectTagetNettyProxyMsg.setTargetIp(targetIpString); + clientConnectTagetNettyProxyMsg.setTargetPort(targetPort); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setData(nettyByteBufData.getData()); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferTypeAdvanced.java index 7cbdf490..3a4c3aea 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/http/advanced/ServerHandleHttpReportServerProxyClientTransferTypeAdvanced.java @@ -53,8 +53,8 @@ public class ServerHandleHttpReportServerProxyClientTransferTypeAdvanced NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg(); clientConnectTagetNettyProxyMsg.setVisitorId(visitorId); - clientConnectTagetNettyProxyMsg.setClientTargetIp(targetIp); - clientConnectTagetNettyProxyMsg.setClientTargetPort(Integer.parseInt(targetPort)); + clientConnectTagetNettyProxyMsg.setTargetIp(targetIp); + clientConnectTagetNettyProxyMsg.setTargetPort(Integer.parseInt(targetPort)); clientConnectTagetNettyProxyMsg.setClientId(clientId); clientConnectTagetNettyProxyMsg.setType(ProxyMessageType.HTTP_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_SUCCESSFUL_); if (loadBalance != null) { diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced.java index 6959a44f..083569ad 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced.java @@ -53,8 +53,8 @@ public class ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced // 下发创建新链接指令 NettyProxyMsg otherClientConnectServer = new NettyProxyMsg(); otherClientConnectServer.setData(data); - otherClientConnectServer.setClientTargetIp(host); - otherClientConnectServer.setClientTargetPort(port); + otherClientConnectServer.setTargetIp(host); + otherClientConnectServer.setTargetPort(port); otherClientConnectServer.setVisitorId(visitorId); otherClientConnectServer.setClientId(targetClientId); otherClientConnectServer.setType(ProxyMessageType.SOCKS_DISTRIBUTE_CLIENT_PROXY_CLIENT_OTHER_TRANSFER_CONNECTION_); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientTypeAdvanced.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientTypeAdvanced.java index 126cc64d..fc483c70 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientTypeAdvanced.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/netty/proxy/socks/advanced/ServerHandleSocksReportServerProxyClientTypeAdvanced.java @@ -61,8 +61,8 @@ public class ServerHandleSocksReportServerProxyClientTypeAdvanced // 下发创建新链接指令 NettyProxyMsg otherClientConnectServer = new NettyProxyMsg(); // data ---》Socks5AddressType - otherClientConnectServer.setClientTargetIp(host); - otherClientConnectServer.setClientTargetPort(port); + otherClientConnectServer.setTargetIp(host); + otherClientConnectServer.setTargetPort(port); otherClientConnectServer.setVisitorId(visitorId); otherClientConnectServer.setClientId(targetClientId); otherClientConnectServer.setType(ProxyMessageType.SOCKS_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_INIT_); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateClientMappingApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateClientMappingApplicationImpl.java index 0e830bf8..7df6af4b 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateClientMappingApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateClientMappingApplicationImpl.java @@ -165,8 +165,8 @@ public class LazyClientPermeateClientMappingApplicationImpl implements LazyClien Integer visitorPort = lazyNettyClientPermeateClientMapping.getVisitorPort(); NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_CLOSE); - nettyMsg.setClientTargetIp(permeateTargetIp); - nettyMsg.setClientTargetPort(permeateTargetPort); + nettyMsg.setTargetIp(permeateTargetIp); + nettyMsg.setTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); clientChannel.writeAndFlush(nettyMsg); } @@ -189,8 +189,8 @@ public class LazyClientPermeateClientMappingApplicationImpl implements LazyClien Integer visitorPort = lazyNettyClientPermeateClientMapping.getVisitorPort(); NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT); - nettyMsg.setClientTargetIp(permeateTargetIp); - nettyMsg.setClientTargetPort(permeateTargetPort); + nettyMsg.setTargetIp(permeateTargetIp); + nettyMsg.setTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); nettyMsg.setClientId(fromClientId); nettyMsg.setNamespace(namespace); diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateServerMappingApplicationImpl.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateServerMappingApplicationImpl.java index 9ad20098..d46f0c96 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateServerMappingApplicationImpl.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/application/impl/LazyClientPermeateServerMappingApplicationImpl.java @@ -178,8 +178,8 @@ public class LazyClientPermeateServerMappingApplicationImpl implements LazyClien Integer visitorPort = lazyNettyClientPermeateServerMapping.getVisitorPort(); NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_SERVER_CLOSE); - nettyMsg.setClientTargetIp(permeateTargetIp); - nettyMsg.setClientTargetPort(permeateTargetPort); + nettyMsg.setTargetIp(permeateTargetIp); + nettyMsg.setTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); clientChannel.writeAndFlush(nettyMsg); } @@ -201,8 +201,8 @@ public class LazyClientPermeateServerMappingApplicationImpl implements LazyClien Integer visitorPort = lazyNettyClientPermeateServerMapping.getVisitorPort(); NettyProxyMsg nettyMsg = new NettyProxyMsg(); nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_SERVER_INIT); - nettyMsg.setClientTargetIp(permeateTargetIp); - nettyMsg.setClientTargetPort(permeateTargetPort); + nettyMsg.setTargetIp(permeateTargetIp); + nettyMsg.setTargetPort(permeateTargetPort); nettyMsg.setVisitorPort(visitorPort); clientChannel.writeAndFlush(nettyMsg); } diff --git a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/controller/LazyChannelController.java b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/controller/LazyChannelController.java index 86f4e724..0df874e1 100644 --- a/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/controller/LazyChannelController.java +++ b/wu-lazy-cloud-heartbeat-server/src/main/java/org/framework/lazy/cloud/network/heartbeat/server/standalone/controller/LazyChannelController.java @@ -95,8 +95,8 @@ public class LazyChannelController { nettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_TRANSFER); nettyProxyMsg.setClientId(clientId); nettyProxyMsg.setVisitorPort(visitorPort); - nettyProxyMsg.setClientTargetIp(clientTargetIp); - nettyProxyMsg.setClientTargetPort(clientTargetPort); + nettyProxyMsg.setTargetIp(clientTargetIp); + nettyProxyMsg.setTargetPort(clientTargetPort); nettyProxyMsg.setData(data.getBytes(StandardCharsets.UTF_8)); for (Channel channel : channels) { channel.writeAndFlush(nettyProxyMsg);