Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
This commit is contained in:
commit
215dc8d254
|
@ -15,10 +15,10 @@ func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, requestId,
|
||||||
}
|
}
|
||||||
combineTakesTime := "cache"
|
combineTakesTime := "cache"
|
||||||
uploadCombineImageTakesTime := "cache"
|
uploadCombineImageTakesTime := "cache"
|
||||||
if debugData.DiffTimeLogoCombine > 0 {
|
if debugData != nil && debugData.DiffTimeLogoCombine > 0 {
|
||||||
combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
|
combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
|
||||||
}
|
}
|
||||||
if debugData.DiffTimeUploadFile > 0 {
|
if debugData != nil && debugData.DiffTimeUploadFile > 0 {
|
||||||
uploadCombineImageTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeUploadFile)
|
uploadCombineImageTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeUploadFile)
|
||||||
}
|
}
|
||||||
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
|
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user