refactor(socket): 移除未使用的 cmd 包
- 删除了 common/socket/cmd 目录下的 cmd.go 和 cmd_test.go 文件 - 更新了 TomeeHandler 中的 CMD 字段类型,从 EnumCommandID 改为 uint32 - 移除了 controller 中对 cmd 包的引用 - 重构了 getcmd 函数,返回类型从 EnumCommandID 改为 uint32
This commit is contained in:
@@ -2,7 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"blazing/common/serialize/bytearray"
|
||||
"blazing/common/socket/cmd"
|
||||
|
||||
"bytes"
|
||||
"fmt"
|
||||
"reflect"
|
||||
@@ -13,10 +13,10 @@ import (
|
||||
|
||||
// TomeeHeader 结构体字段定义
|
||||
type TomeeHeader struct {
|
||||
Len uint32 `json:"len"`
|
||||
Version string `json:"version" struc:"[1]byte"`
|
||||
CMD cmd.EnumCommandID `json:"cmdId" struc:"uint32"`
|
||||
UserID uint32 `json:"userId"`
|
||||
Len uint32 `json:"len"`
|
||||
Version string `json:"version" struc:"[1]byte"`
|
||||
CMD uint32 `json:"cmdId" struc:"uint32"`
|
||||
UserID uint32 `json:"userId"`
|
||||
//Error uint32 `json:"error" struc:"[0]pad"`
|
||||
|
||||
Result uint32 `json:"result"`
|
||||
@@ -49,8 +49,8 @@ func (h *TomeeHandler) Handle(c gnet.Conn, data []byte) { //处理接收到的
|
||||
tempdata := bytearray.CreateByteArray(data)
|
||||
header.Len, _ = tempdata.ReadUInt32()
|
||||
header.Version, _ = tempdata.ReadString(1)
|
||||
_CMD, _ := tempdata.ReadUInt32()
|
||||
header.CMD = cmd.EnumCommandID(_CMD)
|
||||
header.CMD, _ = tempdata.ReadUInt32()
|
||||
//header.CMD = cmd.EnumCommandID(_CMD)
|
||||
header.UserID, _ = tempdata.ReadUInt32()
|
||||
|
||||
header.Result, _ = tempdata.ReadUInt32()
|
||||
@@ -114,3 +114,24 @@ func (h *TomeeHeader) Pack(data any) []byte { //组包
|
||||
return by.Bytes()
|
||||
|
||||
}
|
||||
|
||||
// MergeBytes 将多个字节数组合并为一个
|
||||
func MergeBytes(arrays ...[]byte) []byte {
|
||||
// 计算所有数组的总长度
|
||||
totalLen := 0
|
||||
for _, arr := range arrays {
|
||||
totalLen += len(arr)
|
||||
}
|
||||
|
||||
// 创建结果切片
|
||||
result := make([]byte, totalLen)
|
||||
|
||||
// 逐个复制数组内容
|
||||
currentIndex := 0
|
||||
for _, arr := range arrays {
|
||||
copy(result[currentIndex:], arr)
|
||||
currentIndex += len(arr)
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user