diff --git a/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpPacketCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpPacketCodecHandler.java index 0ef45430..e0c9e053 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpPacketCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/tcp/TcpPacketCodecHandler.java @@ -16,9 +16,8 @@ package com.zfoo.net.handler.codec.tcp; import com.zfoo.net.NetContext; import com.zfoo.net.packet.model.DecodedPacketInfo; import com.zfoo.net.packet.model.EncodedPacketInfo; +import com.zfoo.net.packet.service.PacketService; import com.zfoo.net.util.SessionUtils; -import com.zfoo.protocol.ProtocolManager; -import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.StringUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; @@ -28,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; -import java.util.Objects; /** * header(4byte) + protocolId(2byte) + packet @@ -44,7 +42,7 @@ public class TcpPacketCodecHandler extends ByteToMessageCodec @Override protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { // 不够读一个int - if (in.readableBytes() <= ProtocolManager.PROTOCOL_HEAD_LENGTH) { + if (in.readableBytes() <= PacketService.PACKET_HEAD_LENGTH) { return; } in.markReaderIndex(); diff --git a/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java b/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java index 5d08982c..4d4c7622 100644 --- a/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java +++ b/net/src/main/java/com/zfoo/net/handler/codec/websocket/WebSocketCodecHandler.java @@ -17,9 +17,8 @@ import com.zfoo.net.NetContext; import com.zfoo.net.handler.codec.tcp.TcpPacketCodecHandler; import com.zfoo.net.packet.model.DecodedPacketInfo; import com.zfoo.net.packet.model.EncodedPacketInfo; +import com.zfoo.net.packet.service.PacketService; import com.zfoo.net.util.SessionUtils; -import com.zfoo.protocol.ProtocolManager; -import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; import io.netty.buffer.ByteBuf; @@ -33,7 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.List; -import java.util.Objects; /** * header(4byte) + protocolId(2byte) + packet @@ -51,7 +49,7 @@ public class WebSocketCodecHandler extends MessageToMessageCodec> protocolClassSet) { ProtocolAnalysis.analyze(protocolClassSet); } @@ -97,7 +99,6 @@ public class ProtocolManager { ProtocolAnalysis.analyze(protocolClassSet, generateOperation); } - public static synchronized void initProtocol(XmlProtocols xmlProtocols, GenerateOperation generateOperation) { ProtocolAnalysis.analyze(xmlProtocols, generateOperation); }