Kaynağa Gözat

v0.0.1开发:调整KqMessage结构

#Suyghur 2 yıl önce
ebeveyn
işleme
e545ae608c

+ 9 - 11
comm/model/message.go

@@ -11,23 +11,21 @@ const (
 )
 
 type KqMessage struct {
-	Opt     int32  `json:"opt"`
-	Payload string `json:"payload"`
-	Ext     string `json:"ext"`
+	Opt        int32  `json:"opt"`
+	CreateTs   int64  `json:"create_ts"`
+	Payload    string `json:"payload"`
+	ReceiverId string `json:"receiver_id"`
+	SenderId   string `json:"sender_id"`
+	GameId     string `json:"game_id"`
+	Uid        string `json:"uid"`
+	Ext        string `json:"ext"`
 }
 type ChatMessage struct {
 	CreateTime string `json:"create_time"`
 	Content    string `json:"content"`
 	Pic        string `json:"pic"`
-	ReceiverId string `json:"receiver_id"`
-	SenderId   string `json:"sender_id"`
-	GameId     string `json:"game_id"`
-	Uid        string `json:"uid"`
 }
 
 type CommandMessage struct {
-	Payload    string `json:"payload"`
-	ReceiverId string `json:"receiver_id"`
-	GameId     string `json:"game_id"`
-	Uid        string `json:"uid"`
+	CmdInfo interface{} `json:"cmd_info"`
 }

+ 12 - 10
core/cmd/rpc/internal/logic/cssendmsglogic.go

@@ -28,22 +28,24 @@ func NewCsSendMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CsSendM
 
 func (l *CsSendMsgLogic) CsSendMsg(in *pb.CsSendMsgReq) (*pb.CsSendMsgResp, error) {
 	// 投递到自己的发件箱
-	message := &model.ChatMessage{
-		CreateTime: time.Now().Format("2006-01-02 15:04:05"),
+	uniqueId := in.GameId + "_" + in.PlayerId
+	t := time.Now()
+	payload, _ := sonic.MarshalString(&model.ChatMessage{
+		CreateTime: t.Format("2006-01-02 15:04:05"),
 		Content:    in.Content,
 		Pic:        in.Pic,
-		ReceiverId: in.GameId + "_" + in.PlayerId,
+	})
+	kMsg, _ := sonic.MarshalString(&model.KqMessage{
+		Opt:        model.CMD_SEND_MESSAGE,
+		CreateTs:   t.Unix(),
+		Payload:    payload,
 		SenderId:   in.CsId,
+		ReceiverId: uniqueId,
 		GameId:     in.GameId,
 		Uid:        in.CsId,
-	}
-	payload, _ := sonic.MarshalString(message)
-	kMsg, _ := sonic.MarshalString(&model.KqMessage{
-		Opt:     model.CMD_SEND_MESSAGE,
-		Payload: payload,
-		Ext:     "",
+		Ext:        "",
 	})
-	_, _, err := l.svcCtx.KqMsgBoxProducer.SendMessage(l.ctx, kMsg, message.SenderId)
+	_, _, err := l.svcCtx.KqMsgBoxProducer.SendMessage(l.ctx, kMsg, in.CsId)
 	if err != nil {
 		return nil, err
 	}

+ 13 - 11
core/cmd/rpc/internal/logic/playersendmsglogic.go

@@ -27,21 +27,23 @@ func NewPlayerSendMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Pla
 
 func (l *PlayerSendMsgLogic) PlayerSendMsg(in *pb.PlayerSendMsgReq) (*pb.PlayerSendMsgResp, error) {
 	// 投递到自己的发件箱
-	message := &model.ChatMessage{
-		CreateTime: time.Now().Format("2006-01-02 15:04:05"),
+	uniqueId := in.GameId + "_" + in.PlayerId
+	t := time.Now()
+	payload, _ := sonic.MarshalString(&model.ChatMessage{
+		CreateTime: t.Format("2006-01-02 15:04:05"),
 		Content:    in.Content,
 		Pic:        in.Pic,
-		SenderId:   in.GameId + "_" + in.PlayerId,
-		GameId:     in.GameId,