fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
eson 2023-08-29 14:19:55 +08:00
commit 75909fa9e4
3 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/home-user-auth/internal/types/types.go
View File

@ -6,7 +6,7 @@ import (
) )
type UserInfoSetReq struct { type UserInfoSetReq struct {
Module string `form:"module,options=[merchant_category]"` // json格式字符串 Module string `form:"module,options=[merchant_category,logo_merchant_category]"` // json格式字符串
Metadata string `form:"metadata"` // json格式字符串 Metadata string `form:"metadata"` // json格式字符串
} }

17
server/websocket/internal/logic/ws_render_image.go
View File

@ -186,15 +186,6 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
logx.Info("合成刀版图成功,合成刀版图数据:", combineReq, ",logo图片:", renderImageData.RenderData.Logo, " 刀版图：", *res.ResourceUrl) logx.Info("合成刀版图成功,合成刀版图数据:", combineReq, ",logo图片:", renderImageData.RenderData.Logo, " 刀版图：", *res.ResourceUrl)
//获取唯一id //获取唯一id
taskId := w.genRenderTaskId(renderImageData, model3dInfo, productTemplate, element) taskId := w.genRenderTaskId(renderImageData, model3dInfo, productTemplate, element)
//记录刀版图合成消耗时间跟上传刀版图时间
w.modifyRenderTaskProperty(renderImageControlChanItem{
option: 2,
taskId: taskId,
taskProperty: renderTask{
combineTakesTime: res.DiffTimeLogoCombine,
uploadCombineImageTakesTime: res.DiffTimeUploadFile,
},
})
//查询有没有缓存的资源,有就返回###################### //查询有没有缓存的资源,有就返回######################
resource, err := w.logic.svcCtx.AllModels.FsResource.FindOneById(w.logic.ctx, taskId) resource, err := w.logic.svcCtx.AllModels.FsResource.FindOneById(w.logic.ctx, taskId)
if err != nil { if err != nil {
@ -227,11 +218,13 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
taskId: taskId, taskId: taskId,
renderId: renderImageData.RenderId, renderId: renderImageData.RenderId,
}) })
//记录刀版图 //记录刀版图合成消耗时间跟上传刀版图时间以及刀版图
w.modifyRenderTaskProperty(renderImageControlChanItem{ w.modifyRenderTaskProperty(renderImageControlChanItem{
option: 2, option: 2,
taskId: taskId, taskId: taskId,
taskProperty: renderTask{ taskProperty: renderTask{
combineTakesTime: res.DiffTimeLogoCombine,
uploadCombineImageTakesTime: res.DiffTimeUploadFile,
combineImage: combineImage, combineImage: combineImage,
}, },
}) })
@ -460,7 +453,7 @@ func (w *wsConnectItem) operationRenderTask() {
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{ w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{
RenderId: taskData.renderId, RenderId: taskData.renderId,
Image: data.renderNotifyImageUrl, Image: data.renderNotifyImageUrl,
CombineImage: data.taskProperty.combineImage, CombineImage: taskData.combineImage,
RenderProcessTime: websocket_data.RenderProcessTime{ RenderProcessTime: websocket_data.RenderProcessTime{
CombineTakesTime: CombineTakesTime, CombineTakesTime: CombineTakesTime,
UnityRenderTakesTime: UnityRenderTakesTime, UnityRenderTakesTime: UnityRenderTakesTime,
@ -476,7 +469,7 @@ func (w *wsConnectItem) operationRenderTask() {
renderId: data.renderId, renderId: data.renderId,
} }
case 2: //修改(耗时)属性 case 2: //修改任务属性
if taskData, ok := w.extendRenderProperty.renderImageTask[data.taskId]; ok { if taskData, ok := w.extendRenderProperty.renderImageTask[data.taskId]; ok {
//合图耗时 //合图耗时
if data.taskProperty.combineTakesTime != 0 { if data.taskProperty.combineTakesTime != 0 {

2
server_api/home-user-auth.api
View File

@ -71,7 +71,7 @@ service home-user-auth {
type ( type (
UserInfoSetReq { UserInfoSetReq {
Module string `form:"module,options=[merchant_category]"` // json格式字符串 Module string `form:"module,options=[merchant_category,logo_merchant_category]"` // json格式字符串
Metadata string `form:"metadata"` // json格式字符串 Metadata string `form:"metadata"` // json格式字符串
} }
) )