ref[packet]: move IPacket from protocol to net

2026-05-18 15:26:38 +00:00 · 2023-09-03 16:01:46 +08:00
parent 7060fe87f8
commit cbc2f1e900
92 changed files with 79 additions and 96 deletions
@@ -16,6 +16,7 @@ package com.zfoo.net.consumer;
 import com.zfoo.net.NetContext;
 import com.zfoo.net.consumer.balancer.AbstractConsumerLoadBalancer;
 import com.zfoo.net.consumer.balancer.IConsumerLoadBalancer;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.packet.common.Error;
 import com.zfoo.net.router.Router;
 import com.zfoo.net.router.answer.AsyncAnswer;
@@ -27,7 +28,6 @@ import com.zfoo.net.router.exception.NetTimeOutException;
 import com.zfoo.net.router.exception.UnexpectedProtocolException;
 import com.zfoo.net.router.route.SignalBridge;
 import com.zfoo.net.task.TaskBus;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.collection.CollectionUtils;
 import com.zfoo.protocol.registration.ProtocolModule;
@@ -14,9 +14,9 @@
 package com.zfoo.net.consumer;

 import com.zfoo.net.consumer.balancer.IConsumerLoadBalancer;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.answer.AsyncAnswer;
 import com.zfoo.net.router.answer.SyncAnswer;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.registration.ProtocolModule;
 import org.springframework.lang.Nullable;

@@ -15,8 +15,8 @@ package com.zfoo.net.consumer.balancer;

 import com.zfoo.net.NetContext;
 import com.zfoo.net.consumer.registry.RegisterVO;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.registration.ProtocolModule;
 import com.zfoo.protocol.util.StringUtils;
@@ -14,10 +14,10 @@
 package com.zfoo.net.consumer.balancer;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.session.Session;
 import com.zfoo.net.util.ConsistentHash;
 import com.zfoo.net.util.FastTreeMapIntLong;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.collection.CollectionUtils;
 import com.zfoo.protocol.exception.RunException;
@@ -13,9 +13,9 @@

 package com.zfoo.net.consumer.balancer;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.SignalAttachment;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import org.springframework.lang.Nullable;

 /**
@@ -13,8 +13,8 @@

 package com.zfoo.net.consumer.balancer;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.exception.RunException;
 import com.zfoo.protocol.util.RandomUtils;
@@ -13,9 +13,9 @@
 package com.zfoo.net.core.event;

 import com.zfoo.event.model.IEvent;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.IAttachment;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;

 /**
 * @author meiw
@@ -18,8 +18,8 @@ import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.GatewayRouteHandler;
 import com.zfoo.net.handler.codec.tcp.TcpCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;
 import org.springframework.lang.Nullable;
@@ -18,8 +18,8 @@ import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.GatewayRouteHandler;
 import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.IOUtils;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -18,8 +18,8 @@ import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.GatewayRouteHandler;
 import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.IOUtils;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -13,7 +13,7 @@

 package com.zfoo.net.core.gateway.model;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.core.gateway.model;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.core.gateway.model;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.core.gateway.model;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.core.gateway.model;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Map;
@@ -18,8 +18,8 @@ import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.GatewayRouteHandler;
 import com.zfoo.net.handler.codec.jprotobuf.JProtobufTcpCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;
 import org.springframework.lang.Nullable;
@@ -19,6 +19,7 @@ import com.zfoo.net.consumer.balancer.ConsistentHashConsumerLoadBalancer;
 import com.zfoo.net.core.gateway.IGatewayLoadBalancer;
 import com.zfoo.net.core.gateway.model.GatewaySessionInactiveEvent;
 import com.zfoo.net.packet.DecodedPacketInfo;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.packet.common.Heartbeat;
 import com.zfoo.net.packet.common.Ping;
 import com.zfoo.net.packet.common.Pong;
@@ -26,7 +27,6 @@ import com.zfoo.net.router.attachment.GatewayAttachment;
 import com.zfoo.net.router.attachment.IAttachment;
 import com.zfoo.net.session.Session;
 import com.zfoo.net.util.SessionUtils;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.JsonUtils;
 import com.zfoo.protocol.util.StringUtils;
 import com.zfoo.scheduler.util.TimeUtils;
@@ -14,9 +14,9 @@ package com.zfoo.net.handler.codec.http;

 import com.zfoo.net.packet.DecodedPacketInfo;
 import com.zfoo.net.packet.EncodedPacketInfo;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.packet.common.Message;
 import com.zfoo.net.router.attachment.HttpAttachment;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.JsonUtils;
 import com.zfoo.protocol.util.StringUtils;
 import io.netty.channel.ChannelHandlerContext;
@@ -17,9 +17,9 @@ import com.baidu.bjf.remoting.protobuf.Codec;
 import com.baidu.bjf.remoting.protobuf.ProtobufProxy;
 import com.zfoo.net.packet.DecodedPacketInfo;
 import com.zfoo.net.packet.EncodedPacketInfo;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.packet.PacketService;
 import com.zfoo.net.router.attachment.IAttachment;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.buffer.ByteBufUtils;
 import com.zfoo.protocol.util.IOUtils;
@@ -13,8 +13,8 @@

 package com.zfoo.net.handler.codec.json;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.IAttachment;
-import com.zfoo.protocol.IPacket;

 /**
 * @author godotg
@@ -15,8 +15,8 @@ package com.zfoo.net.handler.codec.json;

 import com.zfoo.net.packet.DecodedPacketInfo;
 import com.zfoo.net.packet.EncodedPacketInfo;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.IAttachment;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.buffer.ByteBufUtils;
 import com.zfoo.protocol.util.JsonUtils;
@@ -13,7 +13,6 @@
 package com.zfoo.net.packet;

 import com.zfoo.net.router.attachment.IAttachment;
-import com.zfoo.protocol.IPacket;

 /**
 * @author godotg
@@ -13,7 +13,6 @@
 package com.zfoo.net.packet;

 import com.zfoo.net.router.attachment.IAttachment;
-import com.zfoo.protocol.IPacket;
 import org.springframework.lang.Nullable;

 /**
@@ -1,6 +1,5 @@
 /*
 * Copyright (C) 2020 The zfoo Authors
- *
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 * in compliance with the License. You may obtain a copy of the License at
 *
@@ -11,7 +10,9 @@
 * See the License for the specific language governing permissions and limitations under the License.
 */

-package com.zfoo.protocol;
+package com.zfoo.net.packet;
+
+import com.zfoo.protocol.ProtocolManager;

 /**
 * 所有协议类都必须实现这个接口，协议类必须是简单的javabean，不能继承任何其它的类，但是可以继承接口
@@ -13,7 +13,6 @@
 package com.zfoo.net.packet;

 import com.zfoo.net.router.attachment.IAttachment;
-import com.zfoo.protocol.IPacket;
 import io.netty.buffer.ByteBuf;
 import org.springframework.lang.Nullable;

@@ -15,7 +15,6 @@ package com.zfoo.net.packet;
 import com.zfoo.net.NetContext;
 import com.zfoo.net.router.attachment.IAttachment;
 import com.zfoo.net.router.route.PacketBus;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.buffer.ByteBufUtils;
 import com.zfoo.protocol.collection.CollectionUtils;
@@ -15,7 +15,7 @@ package com.zfoo.net.packet.common;

 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.anno.Protocol;
 import org.slf4j.helpers.FormattingTuple;
@@ -14,7 +14,7 @@
 package com.zfoo.net.packet.common;

 import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -14,7 +14,7 @@
 package com.zfoo.net.packet.common;

 import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.anno.Protocol;

@@ -15,7 +15,7 @@ package com.zfoo.net.packet.common;

 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -15,7 +15,7 @@ package com.zfoo.net.packet.common;

 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -15,7 +15,7 @@ package com.zfoo.net.packet.common;

 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.common;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -14,7 +14,7 @@
 package com.zfoo.net.packet.common;

 import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -15,7 +15,7 @@ package com.zfoo.net.packet.common;

 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
 import com.baidu.bjf.remoting.protobuf.annotation.ProtobufClass;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -15,7 +15,7 @@ package com.zfoo.net.packet.common;

 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -15,7 +15,7 @@ package com.zfoo.net.packet.common;

 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -15,7 +15,7 @@ package com.zfoo.net.packet.common;

 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.common;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,11 +13,11 @@

 package com.zfoo.net.router;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.answer.AsyncAnswer;
 import com.zfoo.net.router.answer.SyncAnswer;
 import com.zfoo.net.router.attachment.IAttachment;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import org.springframework.lang.Nullable;

 /**
@@ -20,6 +20,7 @@ import com.zfoo.net.core.gateway.model.AuthUidToGatewayCheck;
 import com.zfoo.net.core.gateway.model.AuthUidToGatewayConfirm;
 import com.zfoo.net.core.gateway.model.AuthUidToGatewayEvent;
 import com.zfoo.net.packet.EncodedPacketInfo;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.packet.common.Error;
 import com.zfoo.net.packet.common.Heartbeat;
 import com.zfoo.net.router.answer.AsyncAnswer;
@@ -35,7 +36,6 @@ import com.zfoo.net.router.route.SignalBridge;
 import com.zfoo.net.session.Session;
 import com.zfoo.net.task.PacketReceiverTask;
 import com.zfoo.net.task.TaskBus;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.exception.ExceptionUtils;
 import com.zfoo.protocol.util.JsonUtils;
 import com.zfoo.protocol.util.StringUtils;
@@ -13,8 +13,8 @@

 package com.zfoo.net.router.answer;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.SignalAttachment;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.ThreadUtils;

 import java.util.ArrayList;
@@ -13,7 +13,7 @@

 package com.zfoo.net.router.answer;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;

 import java.util.function.Consumer;

@@ -13,8 +13,8 @@

 package com.zfoo.net.router.answer;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.SignalAttachment;
-import com.zfoo.protocol.IPacket;

 /**
 * @author godotg
@@ -13,8 +13,8 @@

 package com.zfoo.net.router.answer;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.SignalAttachment;
-import com.zfoo.protocol.IPacket;

 /**
 * @author godotg
@@ -12,7 +12,7 @@

 package com.zfoo.net.router.attachment;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;

 /**
 * @author godotg
@@ -13,7 +13,7 @@
 package com.zfoo.net.router.attachment;

 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 import com.zfoo.scheduler.util.TimeUtils;

@@ -13,9 +13,9 @@

 package com.zfoo.net.router.receiver;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.IAttachment;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.StringUtils;
 import com.zfoo.protocol.util.UuidUtils;
 import javassist.*;
@@ -13,9 +13,9 @@

 package com.zfoo.net.router.receiver;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.IAttachment;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;

 /**
 * @author godotg
@@ -13,9 +13,9 @@

 package com.zfoo.net.router.receiver;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.IAttachment;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.ReflectionUtils;

 import java.lang.reflect.Method;
@@ -13,6 +13,7 @@

 package com.zfoo.net.router.route;

+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.packet.PacketService;
 import com.zfoo.net.router.attachment.GatewayAttachment;
 import com.zfoo.net.router.attachment.IAttachment;
@@ -22,7 +23,6 @@ import com.zfoo.net.router.receiver.IPacketReceiver;
 import com.zfoo.net.router.receiver.PacketReceiver;
 import com.zfoo.net.router.receiver.PacketReceiverDefinition;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.collection.ArrayUtils;
 import com.zfoo.protocol.exception.RunException;
@@ -13,9 +13,9 @@
 package com.zfoo.net.task;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.net.router.attachment.IAttachment;
 import com.zfoo.net.session.Session;
-import com.zfoo.protocol.IPacket;

 /**
 * @author godotg
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Arrays;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.List;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.List;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.List;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -13,7 +13,6 @@

 package com.zfoo.net.packet;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.csharp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.List;
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.csharp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.csharp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.gateway;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.gateway;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.http;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.http;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@
 package com.zfoo.net.packet.jprotobuf;

 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@
 package com.zfoo.net.packet.jprotobuf;

 import com.baidu.bjf.remoting.protobuf.annotation.Protobuf;
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.json;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.json;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.provider;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.provider;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.tcp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.tcp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.tcp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.tcp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.tcp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.tcp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.udp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.udp;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.websocket;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.websocket;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.Objects;
@@ -13,7 +13,7 @@

 package com.zfoo.net.packet.websocket;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 import java.util.List;
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.websocket;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -12,7 +12,7 @@

 package com.zfoo.net.packet.websocket;

-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 import com.zfoo.protocol.anno.Protocol;

 /**
@@ -200,7 +200,6 @@ public class ProtocolAnalysis {
        for (var moduleDefinition : xmlProtocols.getModules()) {
            var module = modules[moduleDefinition.getId()];
            var packetClazzList = moduleDefinitionClassMap.get(moduleDefinition.getId());
-            ;
            if (CollectionUtils.isEmpty(packetClazzList)) {
                continue;
            }
@@ -12,7 +12,6 @@

 package com.zfoo.storage.export;

-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.ProtocolManager;
 import com.zfoo.protocol.buffer.ByteBufUtils;
 import com.zfoo.protocol.generate.GenerateOperation;
@@ -45,7 +44,7 @@ import java.util.Map;
@Ignore
 public class ExportBinaryTest {

-    public static class User implements IPacket {
+    public static class User {

        public String id;
        public String name;
@@ -55,7 +54,7 @@ public class ExportBinaryTest {
    }

    @Storage
-    public static class StudentResource implements IPacket {
+    public static class StudentResource {

        @Id
        public int id;
@@ -71,7 +70,7 @@ public class ExportBinaryTest {
    }


-    public static class ResourceData implements IPacket {
+    public static class ResourceData {

        public Map<Integer, StudentResource> studentResources;