From 71234f6b4831b4fc75e4bc2bfeb378a5aea61a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 5 Jun 2023 14:38:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E6=8E=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=AF=BB=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/event/event_tcp.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index b980e9cfc..b6a0b1340 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -10,6 +10,7 @@ import ( "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/globals" "io" + "io/ioutil" "net" "strings" "time" @@ -84,9 +85,11 @@ func handleConn(c net.Conn, t *TcpClient) error { for { var ( printNo string //打印机编号 - buffer = make([]byte, 1024) + //buffer = make([]byte, 1024) ) - n, err := c.Read(buffer) + //n, err := c.Read(buffer) + //io.ReadFull(c, buffer) + buffer, err := ioutil.ReadAll(c) if err != nil { if err == io.EOF { fmt.Println("connection close") @@ -98,12 +101,12 @@ func handleConn(c net.Conn, t *TcpClient) error { } //看是心跳还是打印回调 - data := hex.EncodeToString(buffer[:n]) - if strings.Contains(string(buffer[0:n]), "print_no_clear") { // 清理缓存 + data := hex.EncodeToString(buffer[:len(buffer)]) + if strings.Contains(string(buffer[0:len(buffer)]), "print_no_clear") { // 清理缓存 param := struct { PrintNoClear json.Number `json:"print_no_clear"` }{} - if err := json.Unmarshal(buffer[0:n], ¶m); err != nil { + if err := json.Unmarshal(buffer[0:len(buffer)], ¶m); err != nil { c.Write([]byte(err.Error())) return err }