fix

server/websocket/internal/logic/ws_err_response.go

@@ -4,41 +4,43 @@ import "fusenapi/constants"
 
 // 入口数据格式错误
 func (w *wsConnectItem) incomeDataFormatErrResponse(data interface{}) {
-	if w.openDebug {
+	if !w.openDebug {
-		w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, data))
+		return
 	}
+	w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, data))
 }
 
 // 渲染错误通知
 func (w *wsConnectItem) renderErrResponse(renderId, requestId, templateTag, taskId, description string, productId, userId, guestId, templateId, modelId, sizeId, elementModelId int64) {
-	if w.openDebug {
+	if !w.openDebug {
-		data := make(map[string]interface{})
+		return
-		data["render_id"] = renderId
-		data["request_id"] = requestId
-		data["description"] = description
-		data["template_tag"] = templateTag
-		data["product_id"] = productId
-		if taskId != "" {
-			data["task_id"] = taskId
-		}
-		if userId >= 0 {
-			data["user_id"] = userId
-		}
-		if guestId >= 0 {
-			data["guest_id"] = guestId
-		}
-		if templateId > 0 {
-			data["template_id"] = templateId
-		}
-		if modelId > 0 {
-			data["model_id"] = modelId
-		}
-		if sizeId > 0 {
-			data["size_id"] = sizeId
-		}
-		if elementModelId > 0 {
-			data["element_model_id"] = elementModelId
-		}
-		w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE_ERR, data))
 	}
+	data := make(map[string]interface{})
+	data["render_id"] = renderId
+	data["request_id"] = requestId
+	data["description"] = description
+	data["template_tag"] = templateTag
+	data["product_id"] = productId
+	if taskId != "" {
+		data["task_id"] = taskId
+	}
+	if userId >= 0 {
+		data["user_id"] = userId
+	}
+	if guestId >= 0 {
+		data["guest_id"] = guestId
+	}
+	if templateId > 0 {
+		data["template_id"] = templateId
+	}
+	if modelId > 0 {
+		data["model_id"] = modelId
+	}
+	if sizeId > 0 {
+		data["size_id"] = sizeId
+	}
+	if elementModelId > 0 {
+		data["element_model_id"] = elementModelId
+	}
+	w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE_ERR, data))
 }

server/websocket/internal/logic/ws_render_image.go

@@ -467,42 +467,45 @@ func (w *wsConnectItem) genRenderTaskId(combineImage string, renderImageData web
 // ****************************下面的发送消息的*********************************
 // 发送合图完毕阶段通知消息
 func (w *wsConnectItem) sendCombineImageStepResponseMessage(renderId, requestId, combineImage string, sizeId, modelId, templateId, combineTime, uploadTime int64) {
-	if w.openDebug {
+	if !w.openDebug {
-		combineTakesTime := "cache"
+		return
-		uploadCombineImageTakesTime := "cache"
-		if combineTime > 0 {
-			combineTakesTime = fmt.Sprintf("%dms", combineTime)
-		}
-		if uploadTime > 0 {
-			uploadCombineImageTakesTime = fmt.Sprintf("%dms", uploadTime)
-		}
-		w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
-			RenderId:     renderId,
-			RequestId:    requestId,
-			CombineImage: combineImage,
-			SizeId:       sizeId,
-			ModelId:      modelId,
-			TemplateId:   templateId,
-			CombineProcessTime: websocket_data.CombineProcessTime{
-				CombineTakesTime:            combineTakesTime,
-				UploadCombineImageTakesTime: uploadCombineImageTakesTime,
-			},
-		}))
 	}
+	combineTakesTime := "cache"
+	uploadCombineImageTakesTime := "cache"
+	if combineTime > 0 {
+		combineTakesTime = fmt.Sprintf("%dms", combineTime)
+	}
+	if uploadTime > 0 {
+		uploadCombineImageTakesTime = fmt.Sprintf("%dms", uploadTime)
+	}
+	w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_COMBINE_IMAGE, websocket_data.CombineImageRspMsg{
+		RenderId:     renderId,
+		RequestId:    requestId,
+		CombineImage: combineImage,
+		SizeId:       sizeId,
+		ModelId:      modelId,
+		TemplateId:   templateId,
+		CombineProcessTime: websocket_data.CombineProcessTime{
+			CombineTakesTime:            combineTakesTime,
+			UploadCombineImageTakesTime: uploadCombineImageTakesTime,
+		},
+	}))
 }
 
 // 发送组装unity需要的数据完毕消息
 func (w *wsConnectItem) sendAssembleRenderDataStepResponseMessage(renderId string, requestId string) {
-	if w.openDebug {
+	if !w.openDebug {
-		w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_ASSEMBLE_RENDER_DATA, websocket_data.ToUnityRspMsg{RenderId: renderId, RequestId: requestId}))
+		return
 	}
+	w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_ASSEMBLE_RENDER_DATA, websocket_data.ToUnityRspMsg{RenderId: renderId, RequestId: requestId}))
 }
 
 // 发送组装数据到unity完毕阶段通知消息
 func (w *wsConnectItem) sendRenderDataToUnityStepResponseMessage(renderId string, requestId string) {
-	if w.openDebug {
+	if !w.openDebug {
-		w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_SEND_DATA_TO_UNITY, websocket_data.AssembleRenderDataRspMsg{RenderId: renderId, RequestId: requestId}))
+		return
 	}
+	w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_SEND_DATA_TO_UNITY, websocket_data.AssembleRenderDataRspMsg{RenderId: renderId, RequestId: requestId}))
 }
 
 // 发送渲染最终结果数据到前端