From cffad3c660156ab1c5cf72dff7be25797aaf250d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 15 Jul 2024 15:41:05 +0800 Subject: [PATCH] 1 --- business/jxstore/event/event_tcp.go | 3 --- business/jxstore/event/event_tcp_utils.go | 10 ---------- 2 files changed, 13 deletions(-) diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go index eb9c9a60c..b9e7c51a8 100644 --- a/business/jxstore/event/event_tcp.go +++ b/business/jxstore/event/event_tcp.go @@ -92,9 +92,7 @@ func handleConn(c net.Conn) error { callback = true } - globals.SugarLogger.Debugf("======printno := %s", printNo) t, ok := PrintObject[printNo] - globals.SugarLogger.Debugf("======t := %s", utils.Format4Output(t, false)) if !ok { t = NewTcpClient() } @@ -115,7 +113,6 @@ func handleConn(c net.Conn) error { // c.Write([]byte("ok")) // return err //} - globals.SugarLogger.Debugf("=================1") if heartbeat { // 证明是心跳 Heartbeat(c, t, data, printNo, printRemoteAddr) diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go index 51b1cee2e..0d3a10573 100644 --- a/business/jxstore/event/event_tcp_utils.go +++ b/business/jxstore/event/event_tcp_utils.go @@ -647,24 +647,16 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot //5、修改数据库中打印机状态(没在连接池中说明是重新连接的) //6、监听心跳时间,超过1分多钟就clear掉 if t.getClients(printNo) == nil || t == nil { - globals.SugarLogger.Debugf("=================2") addConn(c, t, printNo, status) - globals.SugarLogger.Debugf("=================3") - buildAllMap(t, printNo) - globals.SugarLogger.Debugf("=================4") //t.TimeoutMap[printNo] <- true HandleTcpMessages(t, printNo) - globals.SugarLogger.Debugf("=================5") doPrint(t, printNo) - globals.SugarLogger.Debugf("=================6") if status == printerStatusOnline { //t.printFail() } changePrinterStatus(printNo, status) - globals.SugarLogger.Debugf("=================7") // todo 暂时关闭心跳检测 HandleCheckTcpHeart(t, printNo) - globals.SugarLogger.Debugf("=================8") // todo 证明打印机已经被激活,将激活打印机存入数据库,保证用户不能无限制绑定打印机 if err := dao.NotExistsCreate(printNo); err != nil { globals.SugarLogger.Debugf("监听打印机心跳,不存在则创建 :[%v],printNo[%s]", err, printNo) @@ -673,7 +665,6 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot PrintObject[printNo] = t PrintAddrAndIp[printRemoteAddr] = printNo PrintIpAndAddr[printNo] = printRemoteAddr - globals.SugarLogger.Debugf("=================9") } else { //在加到连接池中已经更新了时间,所以放在else里 t.setPrintStatusTime(printNo) @@ -681,7 +672,6 @@ func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemot //状态不一致再更新状态(可能缺纸了,过热了等) t.setPrintStatus(printNo, status) changePrinterStatus(printNo, status) - globals.SugarLogger.Debugf("=================10") } // Callback 打印成功回调