[fix] 添加namespace

This commit is contained in:
wujiawei
2025-06-11 16:19:11 +08:00
parent 51b603a6c5
commit 3163987ef7
208 changed files with 1011 additions and 828 deletions

View File

@ -161,7 +161,7 @@ public class LazyNettyClusterNodeRepositoryImpl implements LazyNettyClusterNodeR
// 查询这个节点下客户端注册是否正常
List<LazyNettyClientStateDO> lazyNettyClientStateDOList = lazyLambdaStream.selectList(
LazyWrappers.<LazyNettyClientStateDO>lambdaWrapper()
.eq(LazyNettyClientStateDO::getServerId, clusterNodeId)
.eq(LazyNettyClientStateDO::getNamespace, clusterNodeId)
);
boolean anyMatch = lazyNettyClientStateDOList.stream()
.anyMatch(lazyNettyClientStateDO ->

View File

@ -76,11 +76,12 @@ public class ServerHandleTcpClientConnectSuccessTypeAdvanced extends AbstractHan
public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) {
Channel newChannel = nettyChannelContext.channel();
String clientId = msg.getClientIdString();
String serverId = msg.namespace();
String clientId = msg.clientId();
String appKey = msg.getAppKeyString();
String appSecret = msg.getAppSecretString();
String originalIp = msg.getOriginalIpString();
ChannelContext.push(newChannel, clientId);
ChannelContext.push(newChannel,serverId, clientId);
ChannelAttributeKeyUtils.buildClientId(newChannel, clientId);
ChannelAttributeKeyUtils.buildAppKey(newChannel, appKey);
@ -172,11 +173,13 @@ public class ServerHandleTcpClientConnectSuccessTypeAdvanced extends AbstractHan
.accept(lazyInternalNetworkClientPermeateServerMappingDTOS -> {
for (LazyClientPermeateClientMappingDTO lazyClientPermeateClientMappingDTO : lazyInternalNetworkClientPermeateServerMappingDTOS) {
String selfNamespace = lazyClientPermeateClientMappingDTO.getNamespace();
String permeateTargetIp = lazyClientPermeateClientMappingDTO.getPermeateTargetIp();
Integer permeateTargetPort = lazyClientPermeateClientMappingDTO.getPermeateTargetPort();
Integer visitorPort = lazyClientPermeateClientMappingDTO.getVisitorPort();
String toClientId = lazyClientPermeateClientMappingDTO.getToClientId();
NettyProxyMsg nettyMsg = new NettyProxyMsg();
nettyMsg.setNamespace(selfNamespace);
nettyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT);
nettyMsg.setClientTargetIp(permeateTargetIp);
nettyMsg.setClientTargetPort(permeateTargetPort);

View File

@ -2,9 +2,10 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.permeate.tcp.adv
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
import org.framework.lazy.cloud.network.heartbeat.common.*;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.permeate.tcp.server.AbstractHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType;
import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils;
@ -18,7 +19,8 @@ import org.springframework.stereotype.Component;
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@Slf4j
@Component
public class ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced extends AbstractHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced<NettyProxyMsg> {
public class ServerHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced
extends AbstractHandleTcpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced<NettyProxyMsg> {
/**
* 处理当前数据
*
@ -33,14 +35,15 @@ public class ServerHandleTcpReportClientTransferClientPermeateChannelConnectionS
byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort();
byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp();
byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort();
byte[] clientId = nettyProxyMsg.getClientId();// 目标客户端ID
String clientId = nettyProxyMsg.clientId();// 目标客户端ID
String namespace = nettyProxyMsg.namespace();
ChannelAttributeKeyUtils.buildClientId(transferChannel, clientId);
ChannelAttributeKeyUtils.buildVisitorPort(transferChannel, Integer.parseInt(new String(msgVisitorPort)));
ChannelAttributeKeyUtils.buildVisitorId(transferChannel, msgVisitorId);
// 绑定访客通道
NettyTransferChannelContext.pushVisitor(transferChannel,msgVisitorId);
Channel clientChannel = ChannelContext.getLoadBalance(clientId);
Channel clientChannel = ChannelContext.getLoadBalance(namespace, clientId);
NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg();
clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId);

View File

@ -36,7 +36,7 @@ public class ServerHandleTcpReportClientTransferClientResponseTypeAdvanced exten
byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort();
byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp();
byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort();
String clientId = nettyProxyMsg.getClientIdString();
String clientId = nettyProxyMsg.clientId();
// 下发客户端初始化成功
Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel);

View File

@ -36,7 +36,7 @@ public class ServerHandleTcpReportClientTransferClientTypeAdvanced extends Abstr
byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort();
byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp();
byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort();
String clientId = nettyProxyMsg.getClientIdString();
String clientId = nettyProxyMsg.clientId();
// 下发客户端初始化成功
Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel);
Integer visitorPort = ChannelAttributeKeyUtils.getVisitorPort(channel);

View File

@ -47,9 +47,10 @@ public class ServerHandleTcpReportDisconnectTypeAdvanced extends AbstractHandleT
Channel deathChannel = nettyChannelContext.channel();
log.debug("close the channel with id :{}",deathChannel.id().asLongText());
// 关闭连接通知
String clientId = msg.getClientIdString();
String clientId = msg.clientId();
String serverId = msg.namespace();
log.warn("close client :{} channel", clientId);
Channel deathClientChannelDTO = ChannelContext.getLoadBalance(clientId);
Channel deathClientChannelDTO = ChannelContext.getLoadBalance(serverId,clientId);
String appKey = ChannelAttributeKeyUtils.getAppKey(deathChannel);
String appSecret = ChannelAttributeKeyUtils.getAppSecret(deathChannel);
String originalIp = ChannelAttributeKeyUtils.getOriginalIp(deathChannel);
@ -58,11 +59,12 @@ public class ServerHandleTcpReportDisconnectTypeAdvanced extends AbstractHandleT
LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand();
lazyNettyClientLoginCommand.setClientId(clientId);
lazyNettyClientLoginCommand.setNamespace(serverId);
lazyNettyClientLoginCommand.setAppKey(appKey);
lazyNettyClientLoginCommand.setAppSecret(appSecret);
lazyNettyClientLoginCommand.setOriginalIp(originalIp);
lazyClientStatsChangeApplication.clientOffLine(lazyNettyClientLoginCommand);
ChannelContext.remove(clientId);
ChannelContext.remove(serverId,clientId);
// 通知其他客户端 channelId 关闭了
ChannelContext.getChannels().forEach((existClientId, channels) -> {

View File

@ -43,11 +43,12 @@ public class ServerHandleTcpReportStagingClosedTypeAdvanced extends AbstractHand
String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingClosedChannel);
String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingClosedChannel);
byte[] clientIdBytes = msg.getClientId();
String serverId= msg.namespace();
String clientId = msg.clientId();
// 获取所有通道
List<Channel> stagingOpenedClientChannel = ChannelContext.get(clientIdBytes);
List<Channel> stagingOpenedClientChannel = ChannelContext.get(serverId,clientId);
if (stagingOpenedClientChannel != null) {
String clientId = new String(clientIdBytes);
// 存储当前客户端暂存关闭
LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand();
lazyNettyClientLoginCommand.setClientId(clientId);

View File

@ -42,15 +42,15 @@ public class ServerHandleTcpReportStagingOpenedTypeAdvanced extends AbstractHand
protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) {
Channel stagingOpenedChannel = nettyChannelContext.channel();
// 获取所有通道
byte[] clientIdBytes = msg.getClientId();
String serverId = msg.namespace();
String clientId = msg.clientId();
String appKey = ChannelAttributeKeyUtils.getAppKey(stagingOpenedChannel);
String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingOpenedChannel);
String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingOpenedChannel);
List<Channel> stagingOpenedClientChannel = ChannelContext.get(clientIdBytes);
List<Channel> stagingOpenedClientChannel = ChannelContext.get(serverId,clientId);
// 存储当前客户端暂存关闭
String clientId = new String(clientIdBytes);
LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand();
lazyNettyClientLoginCommand.setClientId(clientId);
lazyNettyClientLoginCommand.setAppKey(appKey);

View File

@ -40,6 +40,7 @@ public class NettyTcpServerPermeateClientVisitorHandler extends SimpleChannelInb
// 生成访客ID
String visitorId = UUID.randomUUID().toString();
String namespace = internalNetworkPenetrationRealClient.getNamespace();
String clientId = internalNetworkPenetrationRealClient.getClientId();
Integer visitorPort = internalNetworkPenetrationRealClient.getVisitorPort();
String clientTargetIp = internalNetworkPenetrationRealClient.getClientTargetIp();
@ -50,6 +51,7 @@ public class NettyTcpServerPermeateClientVisitorHandler extends SimpleChannelInb
ChannelAttributeKeyUtils.buildVisitorId(visitorChannel, visitorId);
ChannelAttributeKeyUtils.buildClientId(visitorChannel, clientId);
NettyProxyMsg nettyProxyMsg = new NettyProxyMsg();
nettyProxyMsg.setNamespace(namespace);
nettyProxyMsg.setType(TcpMessageType.TCP_DISTRIBUTE_SINGLE_CLIENT_REAL_CONNECT);
nettyProxyMsg.setClientId(clientId);
nettyProxyMsg.setVisitorPort(visitorPort);
@ -62,7 +64,7 @@ public class NettyTcpServerPermeateClientVisitorHandler extends SimpleChannelInb
// Channel transferChannel = nettyChannelPool.availableChannel(visitorId);
// if (transferChannel == null) {
// 客户端心跳通道
Channel clientChannel = ChannelContext.getLoadBalance(clientId);
Channel clientChannel = ChannelContext.getLoadBalance(namespace,clientId);
if (clientChannel != null) {
log.info("通过客户端:{},获取通道而后创建连接", clientId);
clientChannel.writeAndFlush(nettyProxyMsg);

View File

@ -106,6 +106,10 @@ public class NettyTcpServerPermeateClientVisitorSocket implements PermeateVisito
public static final class NettyVisitorSocketBuilder {
/**
* 命名空间
*/
private String namespace;
/**
* 客户端ID
*/
@ -140,6 +144,16 @@ public class NettyTcpServerPermeateClientVisitorSocket implements PermeateVisito
return new NettyVisitorSocketBuilder();
}
/**
* 填充客户端
*
* @param clientId 客户端
* @return 返回当前对象
*/
public NettyVisitorSocketBuilder builderNamespace(String namespace) {
this.namespace = namespace;
return this;
}
/**
* 填充客户端
*
@ -207,6 +221,9 @@ public class NettyTcpServerPermeateClientVisitorSocket implements PermeateVisito
}
public NettyTcpServerPermeateClientVisitorSocket build() {
if (namespace == null) {
throw new IllegalArgumentException("namespace must not null");
}
if (clientId == null) {
throw new IllegalArgumentException("clientId must not null");
}
@ -221,6 +238,7 @@ public class NettyTcpServerPermeateClientVisitorSocket implements PermeateVisito
}
InternalNetworkPenetrationRealClient internalNetworkPenetrationRealClient = InternalNetworkPenetrationRealClient
.builder()
.namespace(namespace)
.clientId(clientId)
.clientTargetIp(clientTargetIp)
.clientTargetPort(clientTargetPort)

View File

@ -66,12 +66,12 @@ public class ServerHandleUdpClientConnectSuccessTypeAdvanced extends AbstractHan
@Override
public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) {
Channel newChannel = nettyChannelContext.channel();
String clientId = msg.getClientIdString();
String serverId = msg.namespace();
String clientId = msg.clientId();
String appKey = msg.getAppKeyString();
String appSecret = msg.getAppSecretString();
String originalIp = msg.getOriginalIpString();
ChannelContext.push(newChannel, clientId);
ChannelContext.push(newChannel, serverId,clientId);
ChannelAttributeKeyUtils.buildClientId(newChannel, clientId);
ChannelAttributeKeyUtils.buildAppKey(newChannel, appKey);

View File

@ -3,11 +3,11 @@ package org.framework.lazy.cloud.network.heartbeat.server.netty.permeate.udp.adv
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.permeate.udp.server.AbstractHandleUdpReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType;
import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Role;
@ -30,18 +30,19 @@ public class ServerHandleUdpReportClientTransferClientPermeateChannelConnectionS
protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) {
Channel channel = nettyChannelContext.channel();
// 创建目标地址连接
String namespace = nettyProxyMsg.namespace();
byte[] msgVisitorId = nettyProxyMsg.getVisitorId();
byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort();
byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp();
String msgClientTargetIp = nettyProxyMsg.targetIp();
byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort();
byte[] clientId = nettyProxyMsg.getClientId();// 目标客户端ID
String clientId = nettyProxyMsg.clientId();// 目标客户端ID
ChannelAttributeKeyUtils.buildClientId(channel, clientId);
ChannelAttributeKeyUtils.buildVisitorPort(channel, Integer.parseInt(new String(msgVisitorPort)));
ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId);
// 绑定访客通道
NettyTransferChannelContext.pushVisitor(channel,msgVisitorId);
Channel clientChannel = ChannelContext.getLoadBalance(clientId);
Channel clientChannel = ChannelContext.getLoadBalance(namespace,clientId);
NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg();
clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId);

View File

@ -38,7 +38,7 @@ public class ServerHandleUdpReportClientTransferClientResponseTypeAdvanced exten
byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort();
byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp();
byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort();
String clientId = nettyProxyMsg.getClientIdString();
String clientId = nettyProxyMsg.clientId();
// 下发客户端初始化成功
Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel);

View File

@ -36,7 +36,7 @@ public class ServerHandleUdpReportClientTransferClientTypeAdvanced extends Abstr
byte[] msgVisitorPort = nettyProxyMsg.getVisitorPort();
byte[] msgClientTargetIp = nettyProxyMsg.getClientTargetIp();
byte[] msgClientTargetPort = nettyProxyMsg.getClientTargetPort();
String clientId = nettyProxyMsg.getClientIdString();
String clientId = nettyProxyMsg.clientId();
// 下发客户端初始化成功
Channel nextChannel = ChannelAttributeKeyUtils.getTransferNextChannel(channel);
Integer visitorPort = ChannelAttributeKeyUtils.getVisitorPort(channel);

View File

@ -46,9 +46,10 @@ public class ServerHandleUdpReportDisconnectTypeAdvanced extends AbstractHandleU
public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) {
Channel deathChannel = nettyChannelContext.channel();
// 关闭连接通知
String clientId = msg.getClientIdString();
String clientId = msg.clientId();
String serverId = msg.namespace();
log.warn("close client :{} channel", clientId);
Channel deathClientChannelDTO = ChannelContext.getLoadBalance(clientId);
Channel deathClientChannelDTO = ChannelContext.getLoadBalance(serverId,clientId);
String appKey = ChannelAttributeKeyUtils.getAppKey(deathChannel);
String appSecret = ChannelAttributeKeyUtils.getAppSecret(deathChannel);
String originalIp = ChannelAttributeKeyUtils.getOriginalIp(deathChannel);
@ -61,7 +62,7 @@ public class ServerHandleUdpReportDisconnectTypeAdvanced extends AbstractHandleU
lazyNettyClientLoginCommand.setAppSecret(appSecret);
lazyNettyClientLoginCommand.setOriginalIp(originalIp);
lazyClientStatsChangeApplication.clientOffLine(lazyNettyClientLoginCommand);
ChannelContext.remove(clientId);
ChannelContext.remove(serverId,clientId);
// 通知其他客户端 channelId 关闭了
ChannelContext.getChannels().forEach((existClientId, channels) -> {
@ -87,7 +88,7 @@ public class ServerHandleUdpReportDisconnectTypeAdvanced extends AbstractHandleU
for (NettyUdpServerPermeateClientVisitorSocket visitorSocket : visitorSockets) {
int visitorPort = visitorSocket.getVisitorPort();
visitorSocket.close();
log.warn("client :[{}] visitorPort:[{}] close", new String(clientId), visitorPort);
log.warn("client :[{}] visitorPort:[{}] close", clientId, visitorPort);
}
}

View File

@ -4,9 +4,9 @@ import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.permeate.udp.server.AbstractHandleUdpReportStagingClosedTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.constant.TcpMessageType;
import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils;
import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.LazyClientStatsChangeApplication;
import org.framework.lazy.cloud.network.heartbeat.server.standalone.application.command.lazy.netty.client.state.LazyNettyClientLoginCommand;
@ -42,12 +42,12 @@ public class ServerHandleUdpReportStagingClosedTypeAdvanced extends AbstractHand
String appKey = ChannelAttributeKeyUtils.getAppKey(stagingClosedChannel);
String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingClosedChannel);
String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingClosedChannel);
byte[] clientIdBytes = msg.getClientId();
String serverId = msg.namespace();
String clientId = msg.clientId();
// 获取所有通道
List<Channel> stagingOpenedClientChannel = ChannelContext.get(clientIdBytes);
List<Channel> stagingOpenedClientChannel = ChannelContext.get(serverId, clientId);
if (stagingOpenedClientChannel != null) {
String clientId = new String(clientIdBytes);
// 存储当前客户端暂存关闭
LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand();
lazyNettyClientLoginCommand.setClientId(clientId);

View File

@ -42,15 +42,16 @@ public class ServerHandleUdpReportStagingOpenedTypeAdvanced extends AbstractHand
protected void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg msg) {
Channel stagingOpenedChannel = nettyChannelContext.channel();
// 获取所有通道
byte[] clientIdBytes = msg.getClientId();
String serverId = msg.namespace();
String clientId = msg.clientId();
String appKey = ChannelAttributeKeyUtils.getAppKey(stagingOpenedChannel);
String appSecret = ChannelAttributeKeyUtils.getAppSecret(stagingOpenedChannel);
String originalIp = ChannelAttributeKeyUtils.getOriginalIp(stagingOpenedChannel);
List<Channel> stagingOpenedClientChannel = ChannelContext.get(clientIdBytes);
List<Channel> stagingOpenedClientChannel = ChannelContext.get(serverId,clientId);
// 存储当前客户端暂存关闭
String clientId = new String(clientIdBytes);
LazyNettyClientLoginCommand lazyNettyClientLoginCommand = new LazyNettyClientLoginCommand();
lazyNettyClientLoginCommand.setClientId(clientId);
lazyNettyClientLoginCommand.setAppKey(appKey);

View File

@ -40,6 +40,7 @@ public class NettyUdpServerPermeateClientVisitorHandler extends SimpleChannelInb
// 生成访客ID
String visitorId = UUID.randomUUID().toString();
String namespace = internalNetworkPenetrationRealClient.getNamespace();
String clientId = internalNetworkPenetrationRealClient.getClientId();
Integer visitorPort = internalNetworkPenetrationRealClient.getVisitorPort();
String clientTargetIp = internalNetworkPenetrationRealClient.getClientTargetIp();
@ -54,6 +55,7 @@ public class NettyUdpServerPermeateClientVisitorHandler extends SimpleChannelInb
nettyProxyMsg.setClientId(clientId);
nettyProxyMsg.setVisitorPort(visitorPort);
nettyProxyMsg.setClientTargetIp(clientTargetIp);
nettyProxyMsg.setNamespace(namespace);
nettyProxyMsg.setClientTargetPort(clientTargetPort);
nettyProxyMsg.setVisitorId(visitorId);
@ -62,7 +64,7 @@ public class NettyUdpServerPermeateClientVisitorHandler extends SimpleChannelInb
// Channel transferChannel = nettyChannelPool.availableChannel(visitorId);
// if (transferChannel == null) {
// 客户端心跳通道
Channel clientChannel = ChannelContext.getLoadBalance(clientId);
Channel clientChannel = ChannelContext.getLoadBalance(namespace,clientId);
if (clientChannel != null) {
log.info("通过客户端:{},获取通道而后创建连接", clientId);
clientChannel.writeAndFlush(nettyProxyMsg);

View File

@ -106,6 +106,10 @@ public class NettyUdpServerPermeateClientVisitorSocket implements PermeateVisito
public static final class NettyVisitorSocketBuilder {
/**
* 命名空间
*/
private String namespace;
/**
* 客户端ID
*/
@ -207,6 +211,9 @@ public class NettyUdpServerPermeateClientVisitorSocket implements PermeateVisito
}
public NettyUdpServerPermeateClientVisitorSocket build() {
if (namespace == null) {
throw new IllegalArgumentException("namespace must not null");
}
if (clientId == null) {
throw new IllegalArgumentException("clientId must not null");
}
@ -221,6 +228,7 @@ public class NettyUdpServerPermeateClientVisitorSocket implements PermeateVisito
}
InternalNetworkPenetrationRealClient internalNetworkPenetrationRealClient = InternalNetworkPenetrationRealClient
.builder()
.namespace(namespace)
.clientId(clientId)
.clientTargetIp(clientTargetIp)
.clientTargetPort(clientTargetPort)

View File

@ -48,12 +48,13 @@ public class ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced
public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) {
Channel channel = nettyChannelContext.channel();
// 创建链接、发送数据
String targetPortString = nettyProxyMsg.getTargetPortString();
String targetPortString = nettyProxyMsg.targetPort();
Integer targetPort = Integer.parseInt(targetPortString);
String targetIpString = nettyProxyMsg.getTargetIpString();
String targetIpString = nettyProxyMsg.targetIp();
byte[] data = nettyProxyMsg.getData();
byte[] visitorId = nettyProxyMsg.getVisitorId();
byte[] clientId = nettyProxyMsg.getClientId();
String serverId = nettyProxyMsg.namespace();
String clientId = nettyProxyMsg.clientId();
String msgVisitorId = new String(visitorId);
ChannelAttributeKeyUtils.buildClientId(channel, clientId);
ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId);
@ -66,7 +67,7 @@ public class ServerHandleHttpReportClientProxyClientTransferRequestTypeAdvanced
nettyByteBuf.setData(data);
ChannelAttributeKeyUtils.buildNettyByteBufData(channel, nettyByteBuf);
// 获取客户端心跳通道
Channel loadBalance = ChannelContext.getLoadBalance(clientId);
Channel loadBalance = ChannelContext.getLoadBalance(serverId,clientId);
NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg();
clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId);

View File

@ -50,9 +50,9 @@ public class ServerHandleHttpReportClientProxyClientTransferResponseTypeAdvanced
String targetIp = ChannelAttributeKeyUtils.getTargetIp(transferNextChannel);
Integer targetPort = ChannelAttributeKeyUtils.getTargetPort(transferNextChannel);
String clientId = nettyProxyMsg.getClientIdString();
String clientId = nettyProxyMsg.clientId();
Integer visitorPort = nettyProxyMsg.getVisitorPortInt();
String visitorId = nettyProxyMsg.getVisitorIdString();
String visitorId = nettyProxyMsg.visitorId();
if(ObjectUtils.isNotEmpty(transferNextChannel)) {
log.info("目标客户端返回数据通过服务端下发到原始通道");
NettyProxyMsg responseProxyMsg = new NettyProxyMsg();

View File

@ -51,10 +51,10 @@ public class ServerHandleHttpReportClientProxyServerTransferRequestTypeAdvanced
public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) {
Channel channel = nettyChannelContext.channel();
// 创建链接、发送数据
String targetPortString = nettyProxyMsg.getTargetPortString();
String targetPortString = nettyProxyMsg.targetPort();
int targetPort = Integer.parseInt(targetPortString);
String targetIpString = nettyProxyMsg.getTargetIpString();
String clientIdString = nettyProxyMsg.getClientIdString();
String targetIpString = nettyProxyMsg.targetIp();
String clientIdString = nettyProxyMsg.clientId();
byte[] data = nettyProxyMsg.getData();
byte[] visitorId = nettyProxyMsg.getVisitorId();
String originalIpString = nettyProxyMsg.getOriginalIpString();

View File

@ -45,8 +45,8 @@ public class ServerHandleHttpReportServerProxyClientTransferRequestTypeAdvanced
// 数据下发
byte[] msgVisitorId = nettyProxyMsg.getVisitorId();
String targetIpString = nettyProxyMsg.getTargetIpString();
String targetPortString = nettyProxyMsg.getTargetPortString();
String targetIpString = nettyProxyMsg.targetIp();
String targetPortString = nettyProxyMsg.targetPort();
Integer targetPort = Integer.parseInt(targetPortString);

View File

@ -34,33 +34,34 @@ public class ServerHandleHttpReportServerProxyClientTransferTypeAdvanced
Channel channel = nettyChannelContext.channel();
// 创建链接、发送数据
String targetPortString = nettyProxyMsg.getTargetPortString();
String targetIpString = nettyProxyMsg.getTargetIpString();
String targetPort = nettyProxyMsg.targetPort();
String targetIp = nettyProxyMsg.targetIp();
byte[] data = nettyProxyMsg.getData();
byte[] visitorId = nettyProxyMsg.getVisitorId();
byte[] clientId = nettyProxyMsg.getClientId();
String msgVisitorId = new String(visitorId);
ChannelAttributeKeyUtils.buildClientId(channel, clientId);
ChannelAttributeKeyUtils.buildVisitorId(channel, msgVisitorId);
String visitorId = nettyProxyMsg.visitorId();
String namespace = nettyProxyMsg.namespace();
String clientId = nettyProxyMsg.clientId();
NettyTransferChannelContext.pushVisitor(channel, msgVisitorId);
ChannelAttributeKeyUtils.buildClientId(channel, clientId);
ChannelAttributeKeyUtils.buildVisitorId(channel, visitorId);
NettyTransferChannelContext.pushVisitor(channel, visitorId);
NettyByteBuf nettyByteBuf = new NettyByteBuf();
nettyByteBuf.setData(data);
ChannelAttributeKeyUtils.buildNettyByteBufData(channel, nettyByteBuf);
// 获取客户端心跳通道
Channel loadBalance = ChannelContext.getLoadBalance(clientId);
Channel loadBalance = ChannelContext.getLoadBalance(namespace,clientId);
NettyProxyMsg clientConnectTagetNettyProxyMsg = new NettyProxyMsg();
clientConnectTagetNettyProxyMsg.setVisitorId(msgVisitorId);
clientConnectTagetNettyProxyMsg.setClientTargetIp(targetIpString);
clientConnectTagetNettyProxyMsg.setClientTargetPort(Integer.parseInt(targetPortString));
clientConnectTagetNettyProxyMsg.setVisitorId(visitorId);
clientConnectTagetNettyProxyMsg.setClientTargetIp(targetIp);
clientConnectTagetNettyProxyMsg.setClientTargetPort(Integer.parseInt(targetPort));
clientConnectTagetNettyProxyMsg.setClientId(clientId);
clientConnectTagetNettyProxyMsg.setType(ProxyMessageType.HTTP_DISTRIBUTE_SERVER_PROXY_CLIENT_CONNECTION_SUCCESSFUL_);
if (loadBalance != null) {
// 让客户端主动创建一个数据传输通道
loadBalance.writeAndFlush(clientConnectTagetNettyProxyMsg);
}else {
log.error("can not find target client:【】 nettyChannelContext",clientId);
log.error("can not find target client:【{}】 nettyChannelContext",clientId);
}
}

View File

@ -1,13 +1,7 @@
package org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.advanced;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.codec.socksx.v5.DefaultSocks5CommandResponse;
import io.netty.handler.codec.socksx.v5.Socks5AddressType;
import io.netty.handler.codec.socksx.v5.Socks5CommandStatus;
import io.netty.channel.Channel;
import lombok.extern.slf4j.Slf4j;
import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext;
@ -15,17 +9,12 @@ import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyC
import org.framework.lazy.cloud.network.heartbeat.common.advanced.payload.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.proxy.socks.server.AbstractHandleSocksReportClientProxyClientConnectionTransferTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.constant.ProxyMessageType;
import org.framework.lazy.cloud.network.heartbeat.common.decoder.TransferDecoder;
import org.framework.lazy.cloud.network.heartbeat.common.factory.EventLoopGroupFactory;
import org.framework.lazy.cloud.network.heartbeat.common.utils.ChannelAttributeKeyUtils;
import org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.handler.NettySocksClientProxyServerRealHandler;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Role;
import org.springframework.stereotype.Component;
import org.wu.framework.core.utils.ObjectUtils;
import java.net.InetSocketAddress;
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
@Slf4j
@ -44,11 +33,12 @@ public class ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced
public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) {
Channel transferChannel = nettyChannelContext.channel();
String host = nettyProxyMsg.getTargetIpString();
Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString());
String namespace = nettyProxyMsg.namespace();
String host = nettyProxyMsg.targetIp();
Integer port = Integer.parseInt(nettyProxyMsg.targetPort());
byte[] data = nettyProxyMsg.getData();
byte[] visitorId = nettyProxyMsg.getVisitorId();
byte[] targetClientId = nettyProxyMsg.getClientId();
String targetClientId = nettyProxyMsg.clientId();
String msgVisitorId = new String(visitorId);
ChannelAttributeKeyUtils.buildClientId(transferChannel, targetClientId);
ChannelAttributeKeyUtils.buildVisitorId(transferChannel, msgVisitorId);
@ -58,7 +48,7 @@ public class ServerHandleSocksReportClientProxyClientConnectTransferTypeAdvanced
NettyTransferChannelContext.pushVisitor(transferChannel, msgVisitorId);
// 客户端连接客户端传输通道
Channel loadBalance = ChannelContext.getLoadBalance(targetClientId);
Channel loadBalance = ChannelContext.getLoadBalance(namespace, targetClientId);
if(ObjectUtils.isNotEmpty(loadBalance)) {
// 下发创建新链接指令
NettyProxyMsg otherClientConnectServer = new NettyProxyMsg();

View File

@ -9,7 +9,6 @@ import io.netty.handler.codec.socksx.v5.DefaultSocks5CommandResponse;
import io.netty.handler.codec.socksx.v5.Socks5AddressType;
import io.netty.handler.codec.socksx.v5.Socks5CommandStatus;
import lombok.extern.slf4j.Slf4j;
import org.framework.lazy.cloud.network.heartbeat.client.config.NettyClientProperties;
import org.framework.lazy.cloud.network.heartbeat.common.NettyTransferChannelContext;
import org.framework.lazy.cloud.network.heartbeat.common.adapter.ChannelTypeAdapter;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced;
@ -49,8 +48,8 @@ public class ServerHandleSocksReportClientProxyServerConnectTransferTypeAdvanced
Channel transferChannel = nettyChannelContext.channel();
String host = nettyProxyMsg.getTargetIpString();
Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString());
String host = nettyProxyMsg.targetIp();
Integer port = Integer.parseInt(nettyProxyMsg.targetPort());
byte[] data = nettyProxyMsg.getData();
byte[] visitorId = nettyProxyMsg.getVisitorId();
byte[] clientId = nettyProxyMsg.getClientId();

View File

@ -1,7 +1,7 @@
package org.framework.lazy.cloud.network.heartbeat.server.netty.proxy.socks.advanced;
import io.netty.channel.*;
import io.netty.channel.Channel;
import io.netty.handler.codec.socksx.v5.Socks5AddressType;
import lombok.extern.slf4j.Slf4j;
import org.framework.lazy.cloud.network.heartbeat.common.ChannelContext;
@ -35,13 +35,14 @@ public class ServerHandleSocksReportServerProxyClientTypeAdvanced
public void doHandler(NettyChannelContext nettyChannelContext, NettyProxyMsg nettyProxyMsg) {
NettySocketChannelContext nettySocketChannelContext = (NettySocketChannelContext) nettyChannelContext;
Channel visitorrChannel = nettySocketChannelContext.channel();
String host = nettyProxyMsg.getTargetIpString();
Integer port = Integer.parseInt(nettyProxyMsg.getTargetPortString());
String namespace = nettyProxyMsg.namespace();
String host = nettyProxyMsg.targetIp();
Integer port = Integer.parseInt(nettyProxyMsg.targetPort());
byte[] visitorId = nettyProxyMsg.getVisitorId();
byte[] targetClientId = nettyProxyMsg.getClientId();
String targetClientId = nettyProxyMsg.clientId();
Socks5AddressType socks5AddressType = nettySocketChannelContext.getSocks5AddressType();
byte socks5AddressTypeByte = socks5AddressType.byteValue();
@ -55,7 +56,7 @@ public class ServerHandleSocksReportServerProxyClientTypeAdvanced
NettyTransferChannelContext.pushVisitor(visitorrChannel, msgVisitorId);
// 客户端连接客户端传输通道
Channel loadBalance = ChannelContext.getLoadBalance(targetClientId);
Channel loadBalance = ChannelContext.getLoadBalance(namespace,targetClientId);
if(ObjectUtils.isNotEmpty(loadBalance)) {
// 下发创建新链接指令
NettyProxyMsg otherClientConnectServer = new NettyProxyMsg();

View File

@ -50,8 +50,8 @@ public class LazyNettyClientBlacklistQueryListCommand {
@Schema(description = "更新时间", name = "updateTime", example = "")
private LocalDateTime updateTime;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -50,8 +50,8 @@ public class LazyNettyClientBlacklistQueryOneCommand {
@Schema(description = "更新时间", name = "updateTime", example = "")
private LocalDateTime updateTime;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -50,8 +50,8 @@ public class LazyNettyClientBlacklistRemoveCommand {
@Schema(description = "更新时间", name = "updateTime", example = "")
private LocalDateTime updateTime;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -52,10 +52,11 @@ public class LazyNettyClientBlacklistStoryCommand {
* 更新时间
*/
@Schema(description = "更新时间", name = "updateTime", example = "")
private LocalDateTime updateTime; /**
* 服务端ID
private LocalDateTime updateTime;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -48,10 +48,10 @@ public class LazyNettyClientBlacklistUpdateCommand {
* 更新时间
*/
@Schema(description = "更新时间", name = "updateTime", example = "")
private LocalDateTime updateTime; /**
* 服务端ID
private LocalDateTime updateTime;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingQueryListCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingQueryOneCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingRemoveCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingStoryCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingUpdateCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingQueryListCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingQueryOneCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingRemoveCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingStoryCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingUpdateCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -46,10 +46,10 @@ public class LazyNettyClientLoginCommand {
private String stagingState;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* 令牌key

View File

@ -31,9 +31,9 @@ public class LazyNettyClientMessageCommand {
@Schema(description = "发送的消息", name = "message", example = "")
private String message;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -66,10 +66,11 @@ public class LazyNettyClientStateQueryListCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe; /**
* 服务端ID
private String describe;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -67,9 +67,10 @@ public class LazyNettyClientStateQueryOneCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe; /**
* 服务端ID
private String describe;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -61,10 +61,11 @@ public class LazyNettyClientStateRemoveCommand {
* 修改时间
*/
@Schema(description = "修改时间", name = "updateTime", example = "")
private LocalDateTime updateTime; /**
* 服务端ID
private LocalDateTime updateTime;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -66,10 +66,10 @@ public class LazyNettyClientStateStoryCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe; /**
* 服务端ID
private String describe;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -66,9 +66,10 @@ public class LazyNettyClientStateUpdateCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe; /**
* 服务端ID
private String describe;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -50,11 +50,10 @@ public class LazyNettyClientStateRecordQueryListCommand {
private NettyClientStatus onLineState;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -48,11 +48,10 @@ public class LazyNettyClientStateRecordQueryOneCommand {
private String onLineState;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -48,11 +48,10 @@ public class LazyNettyClientStateRecordRemoveCommand {
private String onLineState;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -48,12 +48,10 @@ public class LazyNettyClientStateRecordStoryCommand {
private String onLineState;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*
* 暂存状态(开启、关闭)

View File

@ -48,11 +48,10 @@ public class LazyNettyClientStateRecordUpdateCommand {
private String onLineState;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -67,11 +67,12 @@ public class LazyServerPermeateClientMappingQueryListCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe; /**
* 服务端ID
private String describe;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* from 客户端 协议类型
*/

View File

@ -66,12 +66,12 @@ public class LazyServerPermeateClientMappingQueryOneCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe;
private String describe;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* from 客户端 协议类型
*/

View File

@ -58,12 +58,12 @@ public class LazyServerPermeateClientMappingRemoveCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe;
private String describe;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* from 客户端 协议类型
*/

View File

@ -52,13 +52,12 @@ public class LazyServerPermeateClientMappingStoryCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe;
private String describe;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* 是否是ssl
*/

View File

@ -57,12 +57,12 @@ public class LazyServerPermeateClientMappingUpdateCommand {
* 描述
*/
@Schema(description = "描述", name = "describe", example = "")
private String describe;
private String describe;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* 是否是ssl

View File

@ -61,9 +61,9 @@ public class LazyNettyServerVisitorQueryListCommand {
@Schema(description = "访客端口池大小", name = "poolSize", example = "")
private Integer poolSize;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -61,8 +61,8 @@ public class LazyNettyServerVisitorQueryOneCommand {
@Schema(description = "访客端口池大小", name = "poolSize", example = "")
private Integer poolSize;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -61,8 +61,8 @@ public class LazyNettyServerVisitorRemoveCommand {
@Schema(description = "访客端口池大小", name = "poolSize", example = "")
private Integer poolSize;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -61,8 +61,8 @@ public class LazyNettyServerVisitorStoryCommand {
@Schema(description = "访客端口池大小", name = "poolSize", example = "")
private Integer poolSize=20;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -61,8 +61,8 @@ public class LazyNettyServerVisitorUpdateCommand {
@Schema(description = "访客端口池大小", name = "poolSize", example = "")
private Integer poolSize;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingQueryListCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingQueryOneCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -68,11 +68,10 @@ public class LazyServerPermeateServerMappingRemoveCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingStoryCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -66,11 +66,10 @@ public class LazyServerPermeateServerMappingUpdateCommand {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -91,11 +91,10 @@ public class LazyProxyFlowQueryListCommand {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -95,11 +95,10 @@ public class LazyProxyFlowQueryOneCommand {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -95,12 +95,10 @@ public class LazyProxyFlowRemoveCommand {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*
*

View File

@ -95,11 +95,10 @@ public class LazyProxyFlowStoryCommand {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -93,13 +93,11 @@ public class LazyProxyFlowUpdateCommand {
*/
@Schema(description ="代理类型",name ="proxyType",example = "")
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -102,11 +102,10 @@ public class LazyProxyPerDayFlowQueryListCommand {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -100,13 +100,11 @@ public class LazyProxyPerDayFlowQueryOneCommand {
*/
@Schema(description ="代理类型",name ="proxyType",example = "")
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -102,11 +102,10 @@ public class LazyProxyPerDayFlowRemoveCommand {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -102,11 +102,10 @@ public class LazyProxyPerDayFlowStoryCommand {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -98,11 +98,10 @@ public class LazyProxyPerDayFlowUpdateCommand {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -66,10 +66,11 @@ public class LazyVisitorPortFlowQueryListCommand {
* 访客端口
*/
@Schema(description = "访客端口", name = "visitorPort", example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -68,8 +68,8 @@ public class LazyVisitorPortFlowQueryOneCommand {
@Schema(description = "访客端口", name = "visitorPort", example = "")
private Integer visitorPort;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -66,10 +66,11 @@ public class LazyVisitorPortFlowRemoveCommand {
* 访客端口
*/
@Schema(description = "访客端口", name = "visitorPort", example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -66,10 +66,11 @@ public class LazyVisitorPortFlowStoryCommand {
* 访客端口
*/
@Schema(description = "访客端口", name = "visitorPort", example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -66,10 +66,11 @@ public class LazyVisitorPortFlowUpdateCommand {
* 访客端口
*/
@Schema(description = "访客端口", name = "visitorPort", example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowQueryListCommand {
* 访客端口
*/
@Schema(description ="访客端口",name ="visitorPort",example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowQueryOneCommand {
* 访客端口
*/
@Schema(description ="访客端口",name ="visitorPort",example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowRemoveCommand {
* 访客端口
*/
@Schema(description ="访客端口",name ="visitorPort",example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowStoryCommand {
* 访客端口
*/
@Schema(description ="访客端口",name ="visitorPort",example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -82,10 +82,11 @@ public class LazyVisitorPortPerDayFlowUpdateCommand {
* 访客端口
*/
@Schema(description ="访客端口",name ="visitorPort",example = "")
private Integer visitorPort; /**
* 服务端ID
private Integer visitorPort;
/**
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateClientMappingDTO {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -73,11 +73,10 @@ public class LazyClientPermeateServerMappingDTO {
private Integer permeateTargetPort;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -84,10 +84,10 @@ public class LazyClientProxyFlowDTO {
private ChannelProxyType proxyType;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -50,8 +50,8 @@ public class LazyNettyClientBlacklistDTO {
@Schema(description = "更新时间", name = "updateTime", example = "")
private LocalDateTime updateTime;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
}

View File

@ -69,10 +69,10 @@ public class LazyNettyClientStateDTO {
@Schema(description = "描述", name = "describe", example = "")
private String describe;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* 原始IP
* byte[] 长度 4

View File

@ -58,10 +58,10 @@ public class LazyNettyClientStateGroupByClientDTO {
@Schema(description = "描述", name = "describe", example = "")
private String describe;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* 客户端数量
*/

View File

@ -51,11 +51,10 @@ public class LazyNettyClientStateRecordDTO {
private String onLineState;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -71,11 +71,10 @@ public class LazyNettyServerPermeatePortPoolDTO {
private Integer poolSize;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -61,10 +61,10 @@ public class LazyNettyServerVisitorDTO {
@Schema(description = "访客端口池大小", name = "poolSize", example = "")
private Integer poolSize;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
* 是否被占用
*/

View File

@ -83,10 +83,10 @@ public class LazyProxyFlowDTO {
private ChannelProxyType proxyType;
/**
* 服务端ID
* 命名空间
*/
@Schema(description = "服务端ID", name = "serverId", example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

View File

@ -102,11 +102,10 @@ public class LazyProxyPerDayFlowDTO {
private ChannelProxyType proxyType;
/**
*
* 服务端ID
* 命名空间
*/
@Schema(description ="服务端ID",name ="serverId",example = "")
private String serverId;
@Schema(description = "命名空间", name = "namespace", example = "")
private String namespace;
/**
*

Some files were not shown because too many files have changed in this diff Show More