From ad58547eed1f9c3c305a0e990620a6c633e73c39 Mon Sep 17 00:00:00 2001
From: renzhiyuan <465386466@qq.com>
Date: Mon, 22 Sep 2025 21:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/biz/router.go                  | 10 +++++-----
 internal/entitys/response.go            |  7 ++++---
 internal/pkg/utils_ollama/client.go     |  2 +-
 internal/tools/zltx_order_detail.go     |  4 ++--
 internal/tools/zltx_order_direct_log.go |  2 +-
 internal/tools/zltx_product.go          |  2 +-
 internal/tools/zltx_statistics.go       |  2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/internal/biz/router.go b/internal/biz/router.go
index 9376b4b..93bcde9 100644
--- a/internal/biz/router.go
+++ b/internal/biz/router.go
@@ -78,13 +78,13 @@ func (r *AiRouterBiz) RouteWithSocket(c *websocket.Conn, req *entitys.ChatSockRe
 		if err != nil {
 			entitys.MsgSend(c, entitys.ResponseData{
 				Done:    true,
-				Content: []byte(err.Error()),
+				Content: err.Error(),
 				Type:    entitys.ResponseErr,
 			})
 		}
 		entitys.MsgSend(c, entitys.ResponseData{
 			Done:    true,
-			Content: []byte(err.Error()),
+			Content: "",
 			Type:    entitys.ResponseEnd,
 		})
 		err = r.channelPool.Put(ch)
@@ -130,7 +130,7 @@ func (r *AiRouterBiz) RouteWithSocket(c *websocket.Conn, req *entitys.ChatSockRe
 	log.Info(match.Choices[0].Content)
 	ch <- entitys.ResponseData{
 		Done:    false,
-		Content: []byte(match.Choices[0].Content),
+		Content: match.Choices[0].Content,
 		Type:    entitys.ResponseLog,
 	}
 	var matchJson entitys.Match
@@ -162,7 +162,7 @@ func (r *AiRouterBiz) RouteWithSocket(c *websocket.Conn, req *entitys.ChatSockRe
 func (r *AiRouterBiz) handleOtherTask(c *websocket.Conn, ch chan entitys.ResponseData, matchJson *entitys.Match) (err error) {
 	ch <- entitys.ResponseData{
 		Done:    false,
-		Content: []byte(matchJson.Reasoning),
+		Content: matchJson.Reasoning,
 		Type:    entitys.ResponseText,
 	}
 
@@ -174,7 +174,7 @@ func (r *AiRouterBiz) handleMatch(c *websocket.Conn, ch chan entitys.ResponseDat
 	if !matchJson.IsMatch {
 		ch <- entitys.ResponseData{
 			Done:    false,
-			Content: []byte(matchJson.Reasoning),
+			Content: matchJson.Reasoning,
 			Type:    entitys.ResponseText,
 		}
 		return
diff --git a/internal/entitys/response.go b/internal/entitys/response.go
index 8d98d83..e9ecc18 100644
--- a/internal/entitys/response.go
+++ b/internal/entitys/response.go
@@ -22,15 +22,16 @@ const (
 
 type ResponseData struct {
 	Done    bool
-	Content []byte
+	Content string
 	Type    Response
 }
 
-func MsgSet(msgType Response, msg []byte, done bool) []byte {
+func MsgSet(msgType Response, msg string, done bool) []byte {
 	jsonByte, err := json.Marshal(ResponseData{
 		Done:    done,
 		Content: msg,
-		Type:    msgType,
+
+		Type: msgType,
 	})
 	if err != nil {
 		return nil
diff --git a/internal/pkg/utils_ollama/client.go b/internal/pkg/utils_ollama/client.go
index 730a033..390caa8 100644
--- a/internal/pkg/utils_ollama/client.go
+++ b/internal/pkg/utils_ollama/client.go
@@ -76,7 +76,7 @@ func (c *Client) ChatStream(ctx context.Context, ch chan entitys.ResponseData, m
 			if resp.Message.Content != "" {
 				ch <- entitys.ResponseData{
 					Done:    false,
-					Content: []byte(resp.Message.Content),
+					Content: resp.Message.Content,
 					Type:    entitys.ResponseStream,
 				}
 			}
diff --git a/internal/tools/zltx_order_detail.go b/internal/tools/zltx_order_detail.go
index c37dcba..2b5be0f 100644
--- a/internal/tools/zltx_order_detail.go
+++ b/internal/tools/zltx_order_detail.go
@@ -131,13 +131,13 @@ func (w *ZltxOrderDetailTool) getZltxOrderDetail(ch chan entitys.ResponseData, c
 	}
 	ch <- entitys.ResponseData{
 		Done:    false,
-		Content: res.Content,
+		Content: res.Text,
 		Type:    entitys.ResponseJson,
 	}
 	if resData.Data.Direct != nil && resData.Data.Direct["needAi"].(bool) {
 		ch <- entitys.ResponseData{
 			Done:    false,
-			Content: []byte("正在分析订单日志"),
+			Content: "正在分析订单日志",
 			Type:    entitys.ResponseLoading,
 		}
 
diff --git a/internal/tools/zltx_order_direct_log.go b/internal/tools/zltx_order_direct_log.go
index 95e2d05..51ec941 100644
--- a/internal/tools/zltx_order_direct_log.go
+++ b/internal/tools/zltx_order_direct_log.go
@@ -112,7 +112,7 @@ func (t *ZltxOrderLogTool) getZltxOrderLog(channel chan entitys.ResponseData, c
 	} else {
 		channel <- entitys.ResponseData{
 			Done:    false,
-			Content: res.Content,
+			Content: res.Text,
 			Type:    entitys.ResponseJson,
 		}
 	}
diff --git a/internal/tools/zltx_product.go b/internal/tools/zltx_product.go
index 0e3728a..5f6b266 100644
--- a/internal/tools/zltx_product.go
+++ b/internal/tools/zltx_product.go
@@ -179,7 +179,7 @@ func (z ZltxProductTool) getZltxProduct(channel chan entitys.ResponseData, c *we
 	}
 	channel <- entitys.ResponseData{
 		Done:    false,
-		Content: res.Content,
+		Content: res.Text,
 		Type:    entitys.ResponseJson,
 	}
 	return nil
diff --git a/internal/tools/zltx_statistics.go b/internal/tools/zltx_statistics.go
index ae35c26..1956b9a 100644
--- a/internal/tools/zltx_statistics.go
+++ b/internal/tools/zltx_statistics.go
@@ -105,7 +105,7 @@ func (z ZltxOrderStatisticsTool) getZltxOrderStatistics(channel chan entitys.Res
 	} else {
 		channel <- entitys.ResponseData{
 			Done:    false,
-			Content: res.Content,
+			Content: res.Text,
 			Type:    entitys.ResponseJson,
 		}
 	}