diff --git a/server/render/consumer/assemble_render_data.go b/server/render/consumer/assemble_render_data.go index 85fe4079..5334db5b 100644 --- a/server/render/consumer/assemble_render_data.go +++ b/server/render/consumer/assemble_render_data.go @@ -40,11 +40,13 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error { } val := ctx.Value("svcctx") if val == nil { - return errors.New("svcctx is nil") + logx.Error("svcctx is nil") + return nil //不返回错误就删除消息 } svcCtx, ok := val.(*svc.ServiceContext) if !ok { - return errors.New("svcctx is nil!!") + logx.Error("svcctx is nil!!") + return nil //不返回错误就删除消息 } rabbitmq := initalize.RabbitMqHandle{} //获取模板(产品第一个sku的模板) @@ -52,10 +54,10 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error { if err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { logx.Error("template info is not found") - return nil + return nil //不返回错误就删除消息 } logx.Error("failed to get template info:", err) - return err + return nil //不返回错误就删除消息 } combineImage := "" //刀版图 combineHash := hash.JsonHashKey(parseInfo) //区别于云渲染的taskid,这个用获取刀版图缓存 @@ -63,13 +65,13 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error { resource, err := svcCtx.AllModels.FsResource.FindOneById(ctx, combineHash) if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { logx.Error("failed to get resource :", err) - return err + return nil //不返回错误就删除消息 } //如果不存在,则请求生成刀版图 if errors.Is(err, gorm.ErrRecordNotFound) { combineImage, err = getCombineImage(ctx, svcCtx, parseInfo, productTemplate, combineHash) if err != nil { - return err + return nil //不返回错误就删除消息 } } else { combineImage = *resource.ResourceUrl @@ -79,10 +81,10 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error { if err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { logx.Error("element info is not found,model_id = ?", *productTemplate.ModelId) - return nil + return nil //不返回错误就删除消息 } logx.Error("failed to get element list,", err) - return err + return nil //不返回错误就删除消息 } //组装数据 refletion := -1 @@ -94,7 +96,7 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error { if element.Mode != nil && *element.Mode != "" { if err = json.Unmarshal([]byte(*element.Mode), &mode); err != nil { logx.Error("faile to parse element mode json:", err) - return err + return nil //不返回错误就删除消息 } } tempData := make([]map[string]interface{}, 0, 3) @@ -154,7 +156,7 @@ func (m *MqConsumerRenderAssemble) Run(ctx context.Context, data []byte) error { b, _ := json.Marshal(sendData) if err = rabbitmq.SendMsg(constants.RABBIT_MQ_TO_UNITY, b); err != nil { logx.Error("发送渲染组装数据到rabbitmq失败:", err) - return err + return nil //不返回错误就删除消息 } logx.Info("发送渲染组装数据到unity成功") return nil diff --git a/server/websocket/internal/logic/ws_render_image_logic.go b/server/websocket/internal/logic/ws_render_image_logic.go index 6e6f74ae..1aadd993 100644 --- a/server/websocket/internal/logic/ws_render_image_logic.go +++ b/server/websocket/internal/logic/ws_render_image_logic.go @@ -99,10 +99,10 @@ func (w *wsConnectItem) renderImage(data []byte) { d, _ := json.Marshal(tmpData) //发送给对应的流水线组装数据 if err := w.rabbitMq.SendMsg(constants.RABBIT_MQ_ASSEMBLE_RENDER_DATA, d); err != nil { - logx.Error("发送渲染任务数据到MQ失败:", string(data), "err:", err) + logx.Error("发送渲染任务数据到MQ失败:", string(d), "err:", err) return } - logx.Info("发送渲染数据到rabbitmq成功:", string(data)) + logx.Info("发送渲染数据到rabbitmq成功:", string(d)) } // 操作连接中渲染任务的增加/删除