Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop
This commit is contained in:
commit
646c04eba9
|
@ -179,11 +179,17 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
|
||||||
Index: renderImageData.RenderData.TemplateTagColor.SelectedColorIndex,
|
Index: renderImageData.RenderData.TemplateTagColor.SelectedColorIndex,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
res, err := w.logic.svcCtx.Repositories.ImageHandle.LogoCombine(w.logic.ctx, &combineReq)
|
res := &repositories.LogoCombineRes{}
|
||||||
if err != nil {
|
if w.userId == 127{
|
||||||
w.renderErrResponse(renderImageData.RenderId, renderImageData.RenderData.TemplateTag, "", "合成刀版图失败:"+err.Error(), renderImageData.RenderData.ProductId, w.userId, w.guestId, productTemplate.Id, model3dInfo.Id, productSize.Id, *productTemplate.ElementModelId)
|
u := "https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/1c4549bea75f9247f8aee5f7f6f3909a551cef97dc7acb0d01568b8bad042a01"
|
||||||
logx.Error("合成刀版图失败,合成请求数据:", combineReq, "错误信息:", err)
|
res.ResourceUrl = &u
|
||||||
return
|
}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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
combineImage := "" //刀版图
|
combineImage := "" //刀版图
|
||||||
if res != nil && res.ResourceUrl != nil {
|
if res != nil && res.ResourceUrl != nil {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user