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

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

Browse Source
This commit is contained in:
momo 2023-10-10 14:58:55 +08:00
commit 3105c29071
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/websocket/internal/logic/rendernotifylogic.go
View File

@ -92,7 +92,7 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *a
ws, ok := value.(wsConnectItem) ws, ok := value.(wsConnectItem)
if !ok { if !ok {
logx.Error("渲染回调断言websocket连接失败") logx.Error("渲染回调断言websocket连接失败")
return resp.SetStatusWithMessage(basic.CodeFileUploadErr, "渲染回调断言websocket连接失败") return resp.SetStatusWithMessage(basic.CodeServiceErr, "渲染回调断言websocket连接失败")
} }
//发送到出口 //发送到出口
ws.sendRenderResultData(websocket_data.RenderImageRspMsg{ ws.sendRenderResultData(websocket_data.RenderImageRspMsg{
@ -106,6 +106,7 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *a
logx.Info("渲染回调成功,渲染结果图片为：", uploadRes.ResourceUrl) logx.Info("渲染回调成功,渲染结果图片为：", uploadRes.ResourceUrl)
return resp.SetStatusWithMessage(basic.CodeOK, "success") return resp.SetStatusWithMessage(basic.CodeOK, "success")
} }
logx.Info("渲染成功但找不到ws连接")
return resp.SetStatusWithMessage(basic.CodeOK, "success：but websocket connect not found") return resp.SetStatusWithMessage(basic.CodeOK, "success：but websocket connect not found")
} }
//渲染失败走下面 //渲染失败走下面
@ -114,10 +115,13 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *a
ws, ok := value.(wsConnectItem) ws, ok := value.(wsConnectItem)
if !ok { if !ok {
logx.Error("渲染回调断言websocket连接失败") logx.Error("渲染回调断言websocket连接失败")
return resp.SetStatusWithMessage(basic.CodeFileUploadErr, "渲染回调断言websocket连接失败") return resp.SetStatusWithMessage(basic.CodeServiceErr, "渲染回调断言websocket连接失败")
} }
//发送错误信息给前端 //发送错误信息给前端
ws.renderErrResponse(renderId, info.TemplateTag, info.TaskId, "unity云渲染错误:"+req.Msg, 0, 0, 0, 0, 0, 0, 0) ws.renderErrResponse(renderId, info.TemplateTag, info.TaskId, "unity云渲染错误:"+req.Msg, 0, 0, 0, 0, 0, 0, 0)
logx.Info("渲染失败且发送了失败信息")
} else {
logx.Info("渲染失败且找不到ws连接")
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success") return resp.SetStatusWithMessage(basic.CodeOK, "success")
} }

2
service/repositories/image_handle.go
View File

@ -345,7 +345,7 @@ func (l *defaultImageHandle) LogoCombine(ctx context.Context, in *LogoCombineReq
RequireTimeout: time.Second * 15, RequireTimeout: time.Second * 15,
}).PostJson(postMap, &resultBLM) }).PostJson(postMap, &resultBLM)
logc.Infof(ctx, "合图--算法请求--合图--结束时间：%v", time.Now().UTC()) //logc.Infof(ctx, "合图--算法请求--合图--结束时间：%v", time.Now().UTC())
endTimeLogoCombine := time.Now().UnixMilli() //合图--处理--开始时间 endTimeLogoCombine := time.Now().UnixMilli() //合图--处理--开始时间
diffTimeLogoCombine := endTimeLogoCombine - startTimeLogoCombine //合图--处理--中间差 diffTimeLogoCombine := endTimeLogoCombine - startTimeLogoCombine //合图--处理--中间差
logc.Infof(ctx, "合图--算法请求--合图--业务耗时：%d", diffTimeLogoCombine) logc.Infof(ctx, "合图--算法请求--合图--业务耗时：%d", diffTimeLogoCombine)