From 4c1b3bdd00047976186fb7f27485b63988eb79b2 Mon Sep 17 00:00:00 2001
From: lixiangwuxian <lixiangwuxian@outlook.com>
Date: Mon, 16 Jun 2025 10:59:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20ParseCQMessages=20?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=BB=A5=E7=A7=BB=E9=99=A4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5=E5=B9=B6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=A9=BA=E6=B6=88=E6=81=AF=E6=95=B0=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qq_message/cq_message.go | 7 ++++---
 ws_client/client.go      | 7 +------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/qq_message/cq_message.go b/qq_message/cq_message.go
index 70ee66a..c2d50b1 100644
--- a/qq_message/cq_message.go
+++ b/qq_message/cq_message.go
@@ -48,10 +48,11 @@ func CreateMessage(messageType string) (QQMessage, error) {
 }
 
 // ParseCQMessages 解析消息数组
-func ParseCQMessages(jsonData []byte) ([]QQMessage, error) {
+func ParseCQMessages(jsonData []byte) []QQMessage {
 	var rawMessages []RawMessage
 	if err := json.Unmarshal(jsonData, &rawMessages); err != nil {
-		return nil, fmt.Errorf("解析 JSON 数组失败: %v", err)
+		log.Println("解析 JSON 数组失败:", err)
+		return nil
 	}
 
 	messages := make([]QQMessage, 0, len(rawMessages))
@@ -77,5 +78,5 @@ func ParseCQMessages(jsonData []byte) ([]QQMessage, error) {
 		messages = append(messages, msg)
 	}
 
-	return messages, nil
+	return messages
 }
diff --git a/ws_client/client.go b/ws_client/client.go
index ab0aed8..7518a3d 100644
--- a/ws_client/client.go
+++ b/ws_client/client.go
@@ -72,16 +72,11 @@ func (c *WebSocketClient) receiveMessages() {
 			log.Println("Error unmarshalling message:", err)
 			return
 		}
-		structuredMsg, err := qq_message.ParseCQMessages([]byte(event.RawMessage))
-		if err != nil {
-			log.Println("Error parsing message:", err)
-			return
-		}
 		msg := model.Message{
 			UserId:        event.UserID,
 			OriginMsgId:   event.MessageID,
 			RawMsg:        event.RawMessage,
-			StructuredMsg: structuredMsg,
+			StructuredMsg: qq_message.ParseCQMessages([]byte(event.RawMessage)),
 			UserNickName:  event.Sender.Nickname,
 		}