diff --git a/common/socket/ServerEvent.go b/common/socket/ServerEvent.go index c63ba3972..95962dfed 100644 --- a/common/socket/ServerEvent.go +++ b/common/socket/ServerEvent.go @@ -175,6 +175,7 @@ func (s *Server) handleTcp(conn gnet.Conn) (action gnet.Action) { if data != nil { //client := conn.RemoteAddr().String() + //cool.Loger.Debug(context.Background(), "数据", hex.EncodeToString(data)) _ = s.workerPool.Submit(func() { //TODO 这里可能存在顺序执行问题,待修复 //todo 这里待实现注入player实体 s.handler.Handle(conn, data) diff --git a/common/socket/codec/SocketCodec_Tomee.go b/common/socket/codec/SocketCodec_Tomee.go index 5dbf9c419..94e5189ab 100644 --- a/common/socket/codec/SocketCodec_Tomee.go +++ b/common/socket/codec/SocketCodec_Tomee.go @@ -49,6 +49,7 @@ func (codec TomeeSocketCodec) Decode(c gnet.Conn) ([]byte, error) { // handle(c) // 先读取4字节的包长度 lenBuf, err := c.Peek(4) + if err != nil { if errors.Is(err, io.ErrShortBuffer) { return nil, ErrIncompletePacket @@ -75,7 +76,7 @@ func (codec TomeeSocketCodec) Decode(c gnet.Conn) ([]byte, error) { copy(body, buf) // 从缓冲区中丢弃已读取的数据 - _, _ = c.Discard(4 + int(bodyLen)) + _, _ = c.Discard(int(bodyLen)) return body, nil }