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

fix

Browse Source
This commit is contained in:
laodaming 2023-11-22 16:34:26 +08:00
parent 4f814d7361
commit dd71063cdb
2 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
server/websocket/internal/logic/ws_ok_response.go
View File

@ -10,33 +10,40 @@ import (
// *******************************合图相关begin****************************** // *******************************合图相关begin******************************
// 发送合图完毕阶段通知消息 // 发送合图完毕阶段通知消息
func (w *wsConnectItem) sendCombineImageStepResponseMessage(requestId, combineImage string, sizeId, modelId, templateId int64, debugData *auth.DebugData) { func (w *wsConnectItem) sendCombineImageStepResponseMessage(requestId, combineImage string, sizeId, modelId, templateId int64, debugData *auth.DebugData) {
if w.debug == nil {
return
}
combineTakesTime := "" combineTakesTime := ""
uploadCombineImageTakesTime := "" uploadCombineImageTakesTime := ""
//开了缓存 if w.debug != nil { //开启debug
if w.debug.IsCache != 0 { //开了缓存
combineTakesTime = "cache" if w.debug.IsCache != 0 {
uploadCombineImageTakesTime = "cache" combineTakesTime = "cache"
uploadCombineImageTakesTime = "cache"
}
if debugData != nil && debugData.DiffTimeLogoCombine > 0 {
combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
}
if debugData != nil && debugData.DiffTimeUploadFile > 0 {
uploadCombineImageTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeUploadFile)
}
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
RequestId: requestId,
CombineImage: combineImage,
CombineRelative: &websocket_data.CombineRelative{
SizeId: sizeId,
ModelId: modelId,
TemplateId: templateId,
},
CombineProcessTime: &websocket_data.CombineProcessTime{
CombineTakesTime: combineTakesTime,
UploadCombineImageTakesTime: uploadCombineImageTakesTime,
},
}))
} else {
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
RequestId: requestId,
CombineImage: combineImage,
}))
} }
if debugData != nil && debugData.DiffTimeLogoCombine > 0 {
combineTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeLogoCombine)
}
if debugData != nil && debugData.DiffTimeUploadFile > 0 {
uploadCombineImageTakesTime = fmt.Sprintf("%dms", debugData.DiffTimeUploadFile)
}
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
RequestId: requestId,
CombineImage: combineImage,
SizeId: sizeId,
ModelId: modelId,
TemplateId: templateId,
CombineProcessTime: &websocket_data.CombineProcessTime{
CombineTakesTime: combineTakesTime,
UploadCombineImageTakesTime: uploadCombineImageTakesTime,
},
}))
} }
// 发送组装unity需要的数据完毕消息 // 发送组装unity需要的数据完毕消息

13
utils/websocket_data/render_data.go
View File

@ -35,18 +35,21 @@ type RenderImageRspMsg struct {
type RenderProcessTime struct { type RenderProcessTime struct {
UnityRenderTakesTime string `json:"unity_render_takes_time"` //unity渲染用时 UnityRenderTakesTime string `json:"unity_render_takes_time"` //unity渲染用时
UploadUnityRenderImageTakesTime string `json:"upload_unity_render_image_takes_time"` //上传unity渲染结果图时间 UploadUnityRenderImageTakesTime string `json:"upload_unity_render_image_takes_time"` //上传unity渲染结果图时间
UnityRealTakesTime string `json:"unity_real_takes_time"`//unity真实处理时间 UnityRealTakesTime string `json:"unity_real_takes_time"` //unity真实处理时间
} }
// 合图返回数据 // 合图返回数据
type CombineImageRspMsg struct { type CombineImageRspMsg struct {
RequestId string `json:"request_id"` RequestId string `json:"request_id"`
CombineImage string `json:"combine_image"` //刀版图 CombineImage string `json:"combine_image"` //刀版图
SizeId int64 `json:"size_id"` //尺寸id CombineRelative *CombineRelative `json:"combine_relative"` //合图相关数据
ModelId int64 `json:"model_id"`
TemplateId int64 `json:"template_id"`
CombineProcessTime *CombineProcessTime `json:"combine_process_time"` CombineProcessTime *CombineProcessTime `json:"combine_process_time"`
} }
type CombineRelative struct {
SizeId int64 `json:"size_id"` //尺寸id
ModelId int64 `json:"model_id"`
TemplateId int64 `json:"template_id"`
}
type CombineProcessTime struct { type CombineProcessTime struct {
CombineTakesTime string `json:"combine_takes_time"` //合图时间 CombineTakesTime string `json:"combine_takes_time"` //合图时间
UploadCombineImageTakesTime string `json:"upload_combine_image_takes_time"` //上传刀版图耗时 UploadCombineImageTakesTime string `json:"upload_combine_image_takes_time"` //上传刀版图耗时