From a2b7bfb253d9b8bf86f3bada32b202a423c4e25c Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Fri, 22 Sep 2023 15:52:32 +0800
Subject: [PATCH] fix

---
 .../internal/logic/ws_render_image.go         | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/server/websocket/internal/logic/ws_render_image.go b/server/websocket/internal/logic/ws_render_image.go
index ebd066d0..7f5f0cfb 100644
--- a/server/websocket/internal/logic/ws_render_image.go
+++ b/server/websocket/internal/logic/ws_render_image.go
@@ -49,7 +49,7 @@ func (r *renderProcessor) allocationMessage(w *wsConnectItem, data []byte) {
 		return
 	case w.extendRenderProperty.renderChan <- renderImageData: //发入到缓冲队列
 		return
-	case <- time.After(time.Millisecond * 50)://超过50毫秒丢弃
+	case <-time.After(time.Millisecond * 50): //超过50毫秒丢弃
 		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "渲染队列溢出，请稍后再发", renderImageData.RenderData.ProductId, w.userId, w.guestId, 0, 0, 0, 0)
 		return
 	}
@@ -70,7 +70,9 @@ func (w *wsConnectItem) consumeRenderImageData() {
 		case <-w.closeChan: //已关闭
 			return
 		case data := <-w.extendRenderProperty.renderChan: //消费数据
+			logx.Info("准备执行任务。。。。。")
 			limitChan <- struct{}{}
+			logx.Info("执行任务中。。。。。")
 			go func(d websocket_data.RenderImageReqMsg) {
 				defer func() {
 					if err := recover(); err != nil {
@@ -179,17 +181,11 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
 			Index: renderImageData.RenderData.TemplateTagColor.SelectedColorIndex,
 		},
 	}
-	res := &repositories.LogoCombineRes{}
-	if w.userId == 127{
-		u := "https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/1c4549bea75f9247f8aee5f7f6f3909a551cef97dc7acb0d01568b8bad042a01"
-		res.ResourceUrl = &u
-	}else{
-		res, err = w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
-		if err != nil {
-			w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "合成刀版图失败:"+err.Error(), renderImageData.RenderData.ProductId, w.userId, w.guestId, productTemplate.Id, model3dInfo.Id, productSize.Id, *productTemplate.ElementModelId)
-			logx.Error("合成刀版图失败,合成请求数据:", combineReq, "错误信息:", err)
-			return
-		}
+	res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
+	if err != nil {
+		w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "合成刀版图失败:"+err.Error(), renderImageData.RenderData.ProductId, w.userId, w.guestId, productTemplate.Id, model3dInfo.Id, productSize.Id, *productTemplate.ElementModelId)
+		logx.Error("合成刀版图失败,合成请求数据:", combineReq, "错误信息:", err)
+		return
 	}
 	combineImage := "" //刀版图
 	if res != nil && res.ResourceUrl != nil {