From f3b7e22f23925580aa65e9cec06f38b632b4eef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Fri, 19 Jul 2024 13:30:18 +0800
Subject: [PATCH] 1

---
 business/jxstore/event/event_tcp.go       |  1 +
 business/jxstore/event/event_tcp_utils.go | 10 ----------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/business/jxstore/event/event_tcp.go b/business/jxstore/event/event_tcp.go
index d9081b80a..01e5577b6 100644
--- a/business/jxstore/event/event_tcp.go
+++ b/business/jxstore/event/event_tcp.go
@@ -48,6 +48,7 @@ func ListenTcp() {
 
 			if err := handleConn(c); err != nil {
 				globals.SugarLogger.Debugf("=========err := %v", err)
+				c.Close()
 				Poll.Wait()
 				Poll.Stop()
 				return
diff --git a/business/jxstore/event/event_tcp_utils.go b/business/jxstore/event/event_tcp_utils.go
index 523f9bc2c..c18886ad4 100644
--- a/business/jxstore/event/event_tcp_utils.go
+++ b/business/jxstore/event/event_tcp_utils.go
@@ -636,7 +636,6 @@ func xtob(x string) string {
 
 // Heartbeat 心跳回调
 func Heartbeat(c net.Conn, t *TcpClient, data string, printNo string, printRemoteAddr string) {
-	globals.SugarLogger.Debugf("==================1")
 	//printNoData, _ := hex.DecodeString(data[len(heartText) : len(data)-8])
 	//printNo = string(printNoData)
 	status := printStatus2JxStatus(data[len(data)-8 : len(data)-6])
@@ -648,41 +647,32 @@ 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)
 		buildAllMap(t, printNo)
-		globals.SugarLogger.Debugf("==================3")
 		//t.TimeoutMap[printNo] <- true
 		HandleTcpMessages(t, printNo)
-		globals.SugarLogger.Debugf("==================4")
 		doPrint(t, printNo)
 		if status == printerStatusOnline {
 			//t.printFail()
 		}
-		globals.SugarLogger.Debugf("==================5")
 		changePrinterStatus(printNo, status)
-		globals.SugarLogger.Debugf("==================6")
 		// todo 暂时关闭心跳检测
 		HandleCheckTcpHeart(t, printNo)
 		// todo 证明打印机已经被激活,将激活打印机存入数据库,保证用户不能无限制绑定打印机
-		globals.SugarLogger.Debugf("==================7")
 		if err := dao.NotExistsCreate(printNo); err != nil {
 			globals.SugarLogger.Debugf("监听打印机心跳,不存在则创建 :[%v],printNo[%s]", err, printNo)
 		}
-		globals.SugarLogger.Debugf("==================8")
 
 		PrintObject[printNo] = t
 		PrintAddrAndIp[printRemoteAddr] = printNo
 		PrintIpAndAddr[printNo] = printRemoteAddr
 	} else {
-		globals.SugarLogger.Debugf("==================9")
 		//在加到连接池中已经更新了时间，所以放在else里
 		t.setPrintStatusTime(printNo)
 	}
 	//状态不一致再更新状态（可能缺纸了，过热了等）
 	t.setPrintStatus(printNo, status)
 	changePrinterStatus(printNo, status)
-	globals.SugarLogger.Debugf("==================10")
 }
 
 // Callback 打印成功回调