1
This commit is contained in:
@@ -58,7 +58,7 @@ func (t *TcpClient) handleConn(c net.Conn) {
|
|||||||
//证明是心跳
|
//证明是心跳
|
||||||
globals.SugarLogger.Debugf("======data %s", data)
|
globals.SugarLogger.Debugf("======data %s", data)
|
||||||
if strings.Contains(data, heartText) || strings.Contains(data, heartTextNew) {
|
if strings.Contains(data, heartText) || strings.Contains(data, heartTextNew) {
|
||||||
globals.SugarLogger.Debugf("======心跳 %s", data)
|
globals.SugarLogger.Debugf("======heartText %s", data)
|
||||||
printNoData, _ := hex.DecodeString(data[len(heartText) : len(data)-8])
|
printNoData, _ := hex.DecodeString(data[len(heartText) : len(data)-8])
|
||||||
printNo = string(printNoData)
|
printNo = string(printNoData)
|
||||||
globals.SugarLogger.Debugf("======printNo %s", printNo)
|
globals.SugarLogger.Debugf("======printNo %s", printNo)
|
||||||
@@ -261,8 +261,10 @@ func (t *TcpClient) doPrint(key string) (err error) {
|
|||||||
//t.delConn(printMsg.PrintNo)
|
//t.delConn(printMsg.PrintNo)
|
||||||
close(t.TimeoutMap[key])
|
close(t.TimeoutMap[key])
|
||||||
} else {
|
} else {
|
||||||
|
globals.SugarLogger.Debugf("=====wait callback1")
|
||||||
//等待回调
|
//等待回调
|
||||||
dataStr := <-t.CallBackMap[printMsg.PrintNo]
|
dataStr := <-t.CallBackMap[printMsg.PrintNo]
|
||||||
|
globals.SugarLogger.Debugf("=====wait callback2 %s", dataStr)
|
||||||
if dataStr != "" {
|
if dataStr != "" {
|
||||||
a, b := getCallbackMsgInfo(dataStr)
|
a, b := getCallbackMsgInfo(dataStr)
|
||||||
t.changePrintMsg(dataStr, a, b)
|
t.changePrintMsg(dataStr, a, b)
|
||||||
|
|||||||
Reference in New Issue
Block a user