ref[packet]: move IPacket from protocol to net

net/src/main/java/com/zfoo/net/consumer/Consumer.java

@@ -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;

net/src/main/java/com/zfoo/net/consumer/IConsumer.java

@@ -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;
 

net/src/main/java/com/zfoo/net/consumer/balancer/AbstractConsumerLoadBalancer.java

@@ -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;

net/src/main/java/com/zfoo/net/consumer/balancer/ConsistentHashConsumerLoadBalancer.java

@@ -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;

net/src/main/java/com/zfoo/net/consumer/balancer/IConsumerLoadBalancer.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/consumer/balancer/RandomConsumerLoadBalancer.java

@@ -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;

net/src/main/java/com/zfoo/net/core/event/ServerExceptionEvent.java

@@ -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

net/src/main/java/com/zfoo/net/core/gateway/GatewayServer.java

@@ -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;

net/src/main/java/com/zfoo/net/core/gateway/WebsocketGatewayServer.java

@@ -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;

net/src/main/java/com/zfoo/net/core/gateway/WebsocketSslGatewayServer.java

@@ -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;

net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidAsk.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayCheck.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/core/gateway/model/AuthUidToGatewayConfirm.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySessionInactiveAsk.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/core/gateway/model/GatewaySynchronizeSidAsk.java

@@ -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;

net/src/main/java/com/zfoo/net/core/jprotobuf/JProtobufGatewayServer.java

@@ -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;

net/src/main/java/com/zfoo/net/handler/GatewayRouteHandler.java

@@ -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;

net/src/main/java/com/zfoo/net/handler/codec/http/HttpCodecHandler.java

@@ -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;

net/src/main/java/com/zfoo/net/handler/codec/jprotobuf/JProtobufTcpCodecHandler.java

@@ -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;

net/src/main/java/com/zfoo/net/handler/codec/json/JsonPacket.java

@@ -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

net/src/main/java/com/zfoo/net/handler/codec/json/JsonWebSocketCodecHandler.java

@@ -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;

net/src/main/java/com/zfoo/net/packet/DecodedPacketInfo.java

@@ -13,7 +13,6 @@
 package com.zfoo.net.packet;
 
 import com.zfoo.net.router.attachment.IAttachment;
-import com.zfoo.protocol.IPacket;
 
 /**
  * @author godotg

net/src/main/java/com/zfoo/net/packet/EncodedPacketInfo.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/IPacket.java

@@ -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，不能继承任何其它的类，但是可以继承接口

net/src/main/java/com/zfoo/net/packet/IPacketService.java

@@ -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;
 

net/src/main/java/com/zfoo/net/packet/PacketService.java

@@ -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;

net/src/main/java/com/zfoo/net/packet/common/Error.java

@@ -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;

net/src/main/java/com/zfoo/net/packet/common/Heartbeat.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/Message.java

@@ -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;
 

net/src/main/java/com/zfoo/net/packet/common/PairIntLong.java

@@ -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;

net/src/main/java/com/zfoo/net/packet/common/PairLS.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/PairLong.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/PairString.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/Ping.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/Pong.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/TripleLLS.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/TripleLSS.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/TripleLong.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/packet/common/TripleString.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/router/IRouter.java

@@ -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;
 
 /**

net/src/main/java/com/zfoo/net/router/Router.java

@@ -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;

net/src/main/java/com/zfoo/net/router/answer/AsyncAnswer.java

@@ -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;

net/src/main/java/com/zfoo/net/router/answer/IAsyncAnswer.java

@@ -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;
 

net/src/main/java/com/zfoo/net/router/answer/ISyncAnswer.java

@@ -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

net/src/main/java/com/zfoo/net/router/answer/SyncAnswer.java

@@ -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

net/src/main/java/com/zfoo/net/router/attachment/IAttachment.java

@@ -12,7 +12,7 @@
 
 package com.zfoo.net.router.attachment;
 
-import com.zfoo.protocol.IPacket;
+import com.zfoo.net.packet.IPacket;
 
 /**
  * @author godotg

net/src/main/java/com/zfoo/net/router/attachment/SignalAttachment.java

@@ -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;
 

net/src/main/java/com/zfoo/net/router/receiver/EnhanceUtils.java

@@ -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.*;

net/src/main/java/com/zfoo/net/router/receiver/IPacketReceiver.java

@@ -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

net/src/main/java/com/zfoo/net/router/receiver/PacketReceiverDefinition.java

@@ -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;

net/src/main/java/com/zfoo/net/router/route/PacketBus.java

@@ -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;

net/src/main/java/com/zfoo/net/task/PacketReceiverTask.java

@@ -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

net/src/test/java/com/zfoo/net/packet/CM_Array.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.Arrays;

net/src/test/java/com/zfoo/net/packet/CM_Float.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.Objects;

net/src/test/java/com/zfoo/net/packet/CM_Int.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.Objects;

net/src/test/java/com/zfoo/net/packet/CM_List.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.List;

net/src/test/java/com/zfoo/net/packet/CM_Map.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.List;

net/src/test/java/com/zfoo/net/packet/CM_Object.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.Objects;

net/src/test/java/com/zfoo/net/packet/CM_Set.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.List;

net/src/test/java/com/zfoo/net/packet/ObjectA.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.Objects;

net/src/test/java/com/zfoo/net/packet/ObjectB.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.Objects;

net/src/test/java/com/zfoo/net/packet/SM_Float.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 /**

net/src/test/java/com/zfoo/net/packet/SM_Int.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 import java.util.Objects;

net/src/test/java/com/zfoo/net/packet/SM_Object.java

@@ -13,7 +13,6 @@
 
 package com.zfoo.net.packet;
 
-import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.anno.Protocol;
 
 /**

net/src/test/java/com/zfoo/net/packet/csharp/CM_CSharpRequest.java

@@ -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;

net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectA.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/csharp/CSharpObjectB.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderRequest.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/gateway/GatewayToProviderResponse.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/http/HttpHelloRequest.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/http/HttpHelloResponse.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloRequest.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/jprotobuf/JProtobufHelloResponse.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/json/JsonHelloRequest.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/json/JsonHelloResponse.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAnswer.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/provider/ProviderMessAsk.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAnswer.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/tcp/AsyncMessAsk.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAnswer.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/tcp/SyncMessAsk.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloRequest.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/tcp/TcpHelloResponse.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/udp/UdpHelloRequest.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/udp/UdpHelloResponse.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectA.java

@@ -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;

net/src/test/java/com/zfoo/net/packet/websocket/WebSocketObjectB.java

@@ -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;

net/src/test/java/com/zfoo/net/packet/websocket/WebSocketPacketRequest.java

@@ -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;

net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloRequest.java

@@ -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;
 
 /**

net/src/test/java/com/zfoo/net/packet/websocket/WebsocketHelloResponse.java

@@ -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;
 
 /**

protocol/src/main/java/com/zfoo/protocol/registration/ProtocolAnalysis.java

@@ -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;
             }

storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java

@@ -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;