liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-07-30 18:48:03 +08:00
parent e55d4dfd4f
commit 9861e3edc5
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/event/event_tcp.go
View File

@@ -76,7 +76,6 @@ func (t *TcpClient) handleConn(c net.Conn) {
globals.SugarLogger.Debugf("handleConn printno :[%v]", printNo) globals.SugarLogger.Debugf("handleConn printno :[%v]", printNo)
status := printStatus2JxStatus(data[len(data)-8 : len(data)-6]) status := printStatus2JxStatus(data[len(data)-8 : len(data)-6])
if t.Clients[printNo] == nil { if t.Clients[printNo] == nil {
timeoutChan <- 1
t.addConn(c, printNo, status) t.addConn(c, printNo, status)
t.buildCallBackMap(printNo) t.buildCallBackMap(printNo)
t.buildMsgMap(printNo) t.buildMsgMap(printNo)
@@ -219,7 +218,6 @@ func (t *TcpClient) doPrint(key string) (err error) {
} }
} }
} }
case <-timeoutChan:
} }
} }
}() }()

5
business/jxstore/event/event_tcp_utils.go
View File

@@ -241,8 +241,9 @@ func (t *TcpClient) addMsgChan(printMsg *model.PrintMsg) {
func (t *TcpClient) addCallbackChan(key, data string) { func (t *TcpClient) addCallbackChan(key, data string) {
t.Lock() t.Lock()
defer t.Unlock() defer t.Unlock()
if !t.isExistCallback(key) { if t.CallBackMap[key] == nil {
t.buildCallBackMap(key) dataChan := make(chan string, 1024)
t.CallBackMap[key] = dataChan
} }
t.CallBackMap[key] <- data t.CallBackMap[key] <- data
} }