【fix】修复流量计费bug

This commit is contained in:
wujiawei
2024-09-22 18:13:51 +08:00
parent 4f58a675d0
commit c04ba09763
21 changed files with 603 additions and 65 deletions

View File

@ -95,6 +95,12 @@ public class MessageType {
*/
public static final byte REPORT_CLUSTER_NODE_REGISTER_MESSAGE = 0X11;
/**
* 客户端渗透服务端类型------------------------------------------------------------------------------------
*
*/
/**
* 上报 客户端渗透服务端数据传输通道连接成功
*
@ -117,21 +123,45 @@ public class MessageType {
* @see AbstractHandleReportClientPermeateServerCloseTypeAdvanced
*/
public static final byte REPORT_CLIENT_PERMEATE_SERVER_CLOSE = 0X14;
/**
* 上报 客户端渗透服务端通信通道关闭
*
* @see MessageTypeEnums#REPORT_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE
* @see AbstractHandleReportClientPermeateServerTransferCloseTypeAdvanced
*/
public static final byte REPORT_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE = 0X15;
/**
* 上报 客户端渗透服务端通信传输
*
* @see MessageTypeEnums#REPORT_CLIENT_PERMEATE_SERVER_TRANSFER
* @see AbstractHandleReportClientPermeateServerTransferTypeAdvanced
*/
public static final byte REPORT_CLIENT_PERMEATE_SERVER_TRANSFER = 0X16;
/**
* 客户端渗透客户端类型------------------------------------------------------------------------------------
* 60~90
*/
/**
* 上报 客户端渗透客户端init信息
*
* @see MessageTypeEnums#REPORT_CLIENT_PERMEATE_CLIENT_INIT
* @see AbstractHandleReportClientPermeateClientInitTypeAdvanced
*/
public static final byte REPORT_CLIENT_PERMEATE_CLIENT_INIT = 0X15;
public static final byte REPORT_CLIENT_PERMEATE_CLIENT_INIT = 0X19;
/**
* 上报 客户端渗透客户端init close 信息
*
* @see MessageTypeEnums#REPORT_CLIENT_PERMEATE_CLIENT_CLOSE
* @see AbstractHandleReportClientPermeateClientCloseTypeAdvanced
*/
public static final byte REPORT_CLIENT_PERMEATE_CLIENT_CLOSE = 0X16;
public static final byte REPORT_CLIENT_PERMEATE_CLIENT_CLOSE = 0X20;
/**
* 上报 客户端渗透客户端数据传输通道连接成功
*
@ -139,7 +169,7 @@ public class MessageType {
* @see AbstractHandleReportClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced
* @see MessageType#DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL
*/
public static final byte REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL = 0X17;
public static final byte REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL = 0X21;
/**
@ -149,7 +179,7 @@ public class MessageType {
* @see AbstractHandleReportClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced
* @see MessageType#DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_INIT_SUCCESSFUL
*/
public static final byte REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_INIT_SUCCESSFUL = 0X18;
public static final byte REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_INIT_SUCCESSFUL = 0X22;
/**
* 上报客户端渗透客户端数据传输请求
*
@ -157,7 +187,7 @@ public class MessageType {
* @see AbstractHandleReportClientTransferClientTypeAdvanced
* @see MessageType#DISTRIBUTE_CLIENT_TRANSFER_CLIENT_REQUEST
*/
public static final byte REPORT_CLIENT_TRANSFER_CLIENT_REQUEST = 0X19;
public static final byte REPORT_CLIENT_TRANSFER_CLIENT_REQUEST = 0X23;
/**
* 上报客户端渗透客户端数据传输结果
@ -166,7 +196,7 @@ public class MessageType {
* @see AbstractHandleReportClientTransferClientResponseTypeAdvanced
* @see MessageType#DISTRIBUTE_CLIENT_TRANSFER_CLIENT_RESPONSE
*/
public static final byte REPORT_CLIENT_TRANSFER_CLIENT_RESPONSE = 0X20;
public static final byte REPORT_CLIENT_TRANSFER_CLIENT_RESPONSE = 0X24;
/**
* 下发 客户端接收连接成功通知
@ -277,13 +307,29 @@ public class MessageType {
*/
public static final byte DISTRIBUTE_CLIENT_PERMEATE_SERVER_CLOSE = -0X14;
/**
* 下发 客户端渗透服务端通信通道关闭
*
* @see MessageTypeEnums#DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE
* @see AbstractHandleDistributeClientPermeateServerTransferCloseTypeAdvanced
*/
public static final byte DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE = -0X15;
/**
* 下发 客户端渗透服务端通信传输
*
* @see MessageTypeEnums#DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER
* @see AbstractHandleDistributeClientPermeateServerTransferTypeAdvanced
*/
public static final byte DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER = -0X16;
/**
* 下发 客户端渗透客户端init信息
*
* @see MessageTypeEnums#DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT
* @see AbstractHandleDistributeClientPermeateClientInitTypeAdvanced
*/
public static final byte DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT = -0X15;
public static final byte DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT = -0X19;
/**
* 下发 客户端渗透客户端init close信息
@ -291,7 +337,7 @@ public class MessageType {
* @see MessageTypeEnums#DISTRIBUTE_CLIENT_PERMEATE_CLIENT_CLOSE
* @see AbstractHandleDistributeClientPermeateClientCloseTypeAdvanced
*/
public static final byte DISTRIBUTE_CLIENT_PERMEATE_CLIENT_CLOSE = -0X16;
public static final byte DISTRIBUTE_CLIENT_PERMEATE_CLIENT_CLOSE = -0X20;
@ -302,7 +348,7 @@ public class MessageType {
* @see AbstractHandleDistributeClientTransferClientPermeateChannelConnectionSuccessfulTypeAdvanced
* @see MessageType#REPORT_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL
*/
public static final byte DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL = -0X17;
public static final byte DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_CONNECTION_SUCCESSFUL = -0X21;
/**
@ -312,7 +358,7 @@ public class MessageType {
* @see AbstractHandleDistributeClientTransferClientPermeateChannelInitSuccessfulTypeAdvanced
* @see MessageType#DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_INIT_SUCCESSFUL
*/
public static final byte DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_INIT_SUCCESSFUL = -0X18;
public static final byte DISTRIBUTE_CLIENT_TRANSFER_CLIENT_PERMEATE_CHANNEL_INIT_SUCCESSFUL = -0X22;
/**
* 下发 客户端渗透客户端数据传输请求
@ -321,7 +367,7 @@ public class MessageType {
* @see AbstractHandleDistributeClientTransferClientRequestTypeAdvanced
* @see MessageType#REPORT_CLIENT_TRANSFER_CLIENT_REQUEST
*/
public static final byte DISTRIBUTE_CLIENT_TRANSFER_CLIENT_REQUEST = -0X19;
public static final byte DISTRIBUTE_CLIENT_TRANSFER_CLIENT_REQUEST = -0X23;
/**
* 下发客户端渗透客户端数据传输响应
*
@ -329,5 +375,5 @@ public class MessageType {
* @see AbstractHandleDistributeClientTransferClientResponseTypeAdvanced
* @see MessageType#REPORT_CLIENT_TRANSFER_CLIENT_RESPONSE
*/
public static final byte DISTRIBUTE_CLIENT_TRANSFER_CLIENT_RESPONSE = -0X20;
public static final byte DISTRIBUTE_CLIENT_TRANSFER_CLIENT_RESPONSE = -0X24;
}

View File

@ -0,0 +1,28 @@
package org.framework.lazy.cloud.network.heartbeat.common.advanced.client;
import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.AbstractHandleChannelTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.enums.MessageTypeEnums;
/**
* 下发 客户端渗透服务端通信通道关闭
*
* @see MessageTypeEnums#DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE
*/
public abstract class AbstractHandleDistributeClientPermeateServerTransferCloseTypeAdvanced<MSG> extends AbstractHandleChannelTypeAdvanced<NettyProxyMsg> implements HandleChannelTypeAdvanced {
/**
* 是否支持当前类型
*
* @param msg 通道数据
* @return 布尔类型 是、否
*/
@Override
public boolean doSupport(NettyProxyMsg msg) {
return MessageTypeEnums.DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE.getTypeByte() == msg.getType();
}
}

View File

@ -0,0 +1,28 @@
package org.framework.lazy.cloud.network.heartbeat.common.advanced.client;
import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.AbstractHandleChannelTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.enums.MessageTypeEnums;
/**
* 下发 客户端渗透服务端通信传输
*
* @see MessageTypeEnums#DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER
*/
public abstract class AbstractHandleDistributeClientPermeateServerTransferTypeAdvanced<MSG> extends AbstractHandleChannelTypeAdvanced<NettyProxyMsg> implements HandleChannelTypeAdvanced {
/**
* 是否支持当前类型
*
* @param msg 通道数据
* @return 布尔类型 是、否
*/
@Override
public boolean doSupport(NettyProxyMsg msg) {
return MessageTypeEnums.DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER.getTypeByte() == msg.getType();
}
}

View File

@ -0,0 +1,27 @@
package org.framework.lazy.cloud.network.heartbeat.common.advanced.server;
import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.AbstractHandleChannelTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.enums.MessageTypeEnums;
/**
* 上报 客户端渗透服务端通信通道关闭
* REPORT_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE
*/
public abstract class AbstractHandleReportClientPermeateServerTransferCloseTypeAdvanced<MSG> extends AbstractHandleChannelTypeAdvanced<NettyProxyMsg> implements HandleChannelTypeAdvanced {
/**
* 是否支持当前类型
*
* @param msg 通道数据
* @return 布尔类型 是、否
*/
@Override
public boolean doSupport(NettyProxyMsg msg) {
return MessageTypeEnums.REPORT_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE.getTypeByte() == msg.getType();
}
}

View File

@ -0,0 +1,27 @@
package org.framework.lazy.cloud.network.heartbeat.common.advanced.server;
import org.framework.lazy.cloud.network.heartbeat.common.NettyProxyMsg;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.AbstractHandleChannelTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.advanced.HandleChannelTypeAdvanced;
import org.framework.lazy.cloud.network.heartbeat.common.enums.MessageTypeEnums;
/**
* 上报 客户端渗透服务端通信
* REPORT_CLIENT_PERMEATE_SERVER_TRANSFER
*/
public abstract class AbstractHandleReportClientPermeateServerTransferTypeAdvanced<MSG> extends AbstractHandleChannelTypeAdvanced<NettyProxyMsg> implements HandleChannelTypeAdvanced {
/**
* 是否支持当前类型
*
* @param msg 通道数据
* @return 布尔类型 是、否
*/
@Override
public boolean doSupport(NettyProxyMsg msg) {
return MessageTypeEnums.REPORT_CLIENT_PERMEATE_SERVER_TRANSFER.getTypeByte() == msg.getType();
}
}

View File

@ -71,7 +71,21 @@ public enum MessageTypeEnums {
* @see AbstractHandleReportClientPermeateServerCloseTypeAdvanced
*/
REPORT_CLIENT_PERMEATE_SERVER_CLOSE(MessageType.REPORT_CLIENT_PERMEATE_SERVER_CLOSE, "上报 客户端渗透服务端init close 信息"),
/**
/**
* 上报 客户端渗透服务端通信通道关闭
* @see AbstractHandleReportClientPermeateServerTransferCloseTypeAdvanced
*/
REPORT_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE(MessageType.REPORT_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE, "上报 客户端渗透服务端通信通道关闭"),
/**
* 上报 客户端渗透服务端通信传输
* @see AbstractHandleReportClientPermeateServerTransferTypeAdvanced
*/
REPORT_CLIENT_PERMEATE_SERVER_TRANSFER(MessageType.REPORT_CLIENT_PERMEATE_SERVER_TRANSFER, "上报 客户端渗透服务端通信传输"),
/**
* @see AbstractHandleReportClientPermeateClientInitTypeAdvanced
*/
REPORT_CLIENT_PERMEATE_CLIENT_INIT(MessageType.REPORT_CLIENT_PERMEATE_CLIENT_INIT, "上报 客户端渗透客户端init信息"),
@ -161,11 +175,21 @@ public enum MessageTypeEnums {
* @see AbstractHandleDistributeClientPermeateServerCloseTypeAdvanced
*/
DISTRIBUTE_CLIENT_PERMEATE_SERVER_CLOSE(MessageType.DISTRIBUTE_CLIENT_PERMEATE_SERVER_CLOSE, "下发 客户端渗透服务端init close信息"),
/**
/**
* @see AbstractHandleDistributeClientPermeateServerTransferCloseTypeAdvanced
*/
DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE(MessageType.DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER_CLOSE, "下发 客户端渗透服务端通信通道关闭"),
/**
* @see AbstractHandleDistributeClientPermeateServerTransferTypeAdvanced
*/
DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER(MessageType.DISTRIBUTE_CLIENT_PERMEATE_SERVER_TRANSFER, "下发 客户端渗透服务端通信传输"),
/**
* @see AbstractHandleDistributeClientPermeateClientInitTypeAdvanced
*/
DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT(MessageType.DISTRIBUTE_CLIENT_PERMEATE_CLIENT_INIT, "下发 客户端渗透客户端init信息"),
/**
* @see AbstractHandleDistributeClientPermeateClientCloseTypeAdvanced
*/