fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
eson 2023-08-30 14:21:13 +08:00
commit 01142adfcb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/websocket/internal/logic/datatransferlogic.go
View File

@ -366,7 +366,7 @@ func (w *wsConnectItem) sendToInChan(data []byte) {
case w.inChan <- data: case w.inChan <- data:
return return
case <-time.After(time.Millisecond * 200): //200豪秒超时丢弃，说明超过消费速度了 case <-time.After(time.Millisecond * 200): //200豪秒超时丢弃，说明超过消费速度了
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_INCOME_CACHE_QUEUE_OVERFLOW, "send message is too frequent,Please reduce the sending speed ,otherwise, the message you sent may be lost")) w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_INCOME_CACHE_QUEUE_OVERFLOW, "send message is too frequent,the message is ignore by system:"+string(data)))
return return
} }
} }
@ -399,6 +399,6 @@ func (w *wsConnectItem) dealwithReciveData(data []byte) {
case constants.WEBSOCKET_REQUEST_REUSE_LAST_CONNECT: case constants.WEBSOCKET_REQUEST_REUSE_LAST_CONNECT:
w.reuseLastConnect(d) w.reuseLastConnect(d)
default: default:
logx.Error("未知消息类型：", parseInfo.T) logx.Error("未知消息类型：uid:", w.userId, "gid:", w.guestId, "data:", string(data))
} }
} }

6
server/websocket/internal/logic/ws_render_image.go
View File

@ -68,14 +68,14 @@ func (w *wsConnectItem) consumeRenderImageData() {
case <-w.closeChan: //已关闭 case <-w.closeChan: //已关闭
return return
case data := <-w.extendRenderProperty.renderChan: case data := <-w.extendRenderProperty.renderChan:
w.consumeRenderCache(data) w.renderImage(data)
} }
} }
} }
// 消费渲染缓冲数据 // 执行渲染任务
func (w *wsConnectItem) consumeRenderCache(data []byte) { func (w *wsConnectItem) renderImage(data []byte) {
logx.Info("消费渲染数据:", string(data)) logx.Info("消费渲染数据:", string(data))
var renderImageData websocket_data.RenderImageReqMsg var renderImageData websocket_data.RenderImageReqMsg
if err := json.Unmarshal(data, &renderImageData); err != nil { if err := json.Unmarshal(data, &renderImageData); err != nil {