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

server/websocket/internal/logic/ws_render_image.go

@@ -191,6 +191,10 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
 	w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
 		RenderId:     renderImageData.RenderId,
 		CombineImage: combineImage,
+		CombineProcessTime: websocket_data.CombineProcessTime{
+			CombineTakesTime:            fmt.Sprintf("%dms", res.DiffTimeLogoCombine),
+			UploadCombineImageTakesTime: fmt.Sprintf("%dms", res.DiffTimeUploadFile),
+		},
 	}))
 	//如果是传入了指定尺寸，则不走unity
 	if renderImageData.RenderData.SizeId > 0 {

utils/websocket_data/render_data.go

@@ -43,4 +43,9 @@ type RenderProcessTime struct {
 type CombineImageRspMsg struct {
 	RenderId           string             `json:"render_id"`     //渲染id
 	CombineImage       string             `json:"combine_image"` //刀版图
+	CombineProcessTime CombineProcessTime `json:"combine_process_time"`
+}
+type CombineProcessTime struct {
+	CombineTakesTime            string `json:"combine_takes_time"`              //合图时间
+	UploadCombineImageTakesTime string `json:"upload_combine_image_takes_time"` //上传刀版图耗时
 }