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

fix

Browse Source
This commit is contained in:
laodaming 2023-08-23 15:54:02 +08:00
parent 2ae6c0cf85
commit 70544827cd
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/websocket/internal/logic/datatransferlogic.go
View File

@ -5,8 +5,8 @@ import (
"bytes" "bytes"
"encoding/json" "encoding/json"
"fusenapi/constants" "fusenapi/constants"
"fusenapi/server/websocket/internal/websocket_data"
"fusenapi/utils/auth" "fusenapi/utils/auth"
"fusenapi/utils/websocket_data"
"net/http" "net/http"
"sync" "sync"
"time" "time"

11
server/websocket/internal/logic/ws_render_image_logic.go
View File

@ -7,11 +7,10 @@ import (
"errors" "errors"
"fmt" "fmt"
"fusenapi/constants" "fusenapi/constants"
websocket_data2 "fusenapi/server/websocket/internal/websocket_data"
"fusenapi/service/repositories" "fusenapi/service/repositories"
"fusenapi/utils/curl" "fusenapi/utils/curl"
"fusenapi/utils/hash" "fusenapi/utils/hash"
"fusenapi/utils/websocket_data"
"github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/core/logx"
"gorm.io/gorm" "gorm.io/gorm"
"strconv" "strconv"
@ -76,7 +75,7 @@ func (w *wsConnectItem) renderImage() {
// 消费渲染缓冲数据 // 消费渲染缓冲数据
func (w *wsConnectItem) consumeRenderCache(data []byte) { func (w *wsConnectItem) consumeRenderCache(data []byte) {
logx.Info("消费渲染数据:", string(data)) logx.Info("消费渲染数据:", string(data))
var renderImageData websocket_data.RenderImageReqMsg var renderImageData websocket_data2.RenderImageReqMsg
if err := json.Unmarshal(data, &renderImageData); err != nil { if err := json.Unmarshal(data, &renderImageData); err != nil {
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, "invalid format of websocket render image message:"+string(data))) w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_ERR_DATA_FORMAT, "invalid format of websocket render image message:"+string(data)))
logx.Error("invalid format of websocket render image message", err) logx.Error("invalid format of websocket render image message", err)
@ -142,7 +141,7 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
} }
} else { } else {
//返回给客户端 //返回给客户端
b := w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{ b := w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data2.RenderImageRspMsg{
RenderId: renderImageData.RenderId, RenderId: renderImageData.RenderId,
Image: *resource.ResourceUrl, Image: *resource.ResourceUrl,
CombineTakesTime: "耗时0秒(缓存)", CombineTakesTime: "耗时0秒(缓存)",
@ -167,7 +166,7 @@ func (w *wsConnectItem) consumeRenderCache(data []byte) {
} }
// 组装数据发送给unity // 组装数据发送给unity
func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data.RenderImageReqMsg) error { func (w *wsConnectItem) assembleRenderData(taskId string, info websocket_data2.RenderImageReqMsg) error {
//获取产品第一个尺寸 //获取产品第一个尺寸
productFirstSize, err := w.logic.svcCtx.AllModels.FsProductSize.GetProductFirstSize(w.logic.ctx, info.RenderData.ProductId) productFirstSize, err := w.logic.svcCtx.AllModels.FsProductSize.GetProductFirstSize(w.logic.ctx, info.RenderData.ProductId)
if err != nil { if err != nil {
@ -429,7 +428,7 @@ func (w *wsConnectItem) operationRenderTask() {
UnityRenderTakesTime = fmt.Sprintf("耗时%d秒", taskData.UnityRenderEndTime-taskData.UnityRenderBeginTime) UnityRenderTakesTime = fmt.Sprintf("耗时%d秒", taskData.UnityRenderEndTime-taskData.UnityRenderBeginTime)
} }
//发送到出口 //发送到出口
w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data.RenderImageRspMsg{ w.sendToOutChan(w.respondDataFormat(constants.WEBSOCKET_RENDER_IMAGE, websocket_data2.RenderImageRspMsg{
RenderId: taskData.RenderId, RenderId: taskData.RenderId,
Image: data.RenderNotifyImageUrl, Image: data.RenderNotifyImageUrl,
CombineTakesTime: CombineTakesTime, CombineTakesTime: CombineTakesTime,

2
utils/websocket_data/render_data.go → server/websocket/internal/websocket_data/render_data.go
View File

@ -2,7 +2,7 @@ package websocket_data
import "fusenapi/constants" import "fusenapi/constants"
// websocket数据交互 // websocket数据交互基本数据类型
type DataTransferData struct { type DataTransferData struct {
T constants.Websocket `json:"t"` //消息类型 T constants.Websocket `json:"t"` //消息类型
D interface{} `json:"d"` //传递的消息 D interface{} `json:"d"` //传递的消息