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

server/websocket/internal/logic/rendernotifylogic.go

@@ -8,6 +8,7 @@ import (
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 	"fusenapi/utils/file"
+	"strings"
 	"time"
 
 	"github.com/zeromicro/go-zero/core/logx"
@@ -38,6 +39,7 @@ func NewRenderNotifyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Rend
 
 func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *auth.UserInfo) (resp *basic.Response) {
 	logx.Info("收到unity返回消息----")
+	req.TaskId = strings.Trim(req.TaskId, " ")
 	if req.TaskId == "" {
 		logx.Error("渲染回调参数错误：任务标识")
 		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid param task_id")
@@ -47,6 +49,15 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *a
 		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid param image")
 	}
 	unityRenderEndTime := time.Now().UTC().UnixMilli()
+	//解析出真的taskId跟wid
+	splitSlice := strings.Split(req.TaskId, " ")
+	if len(splitSlice) != 2 {
+		logx.Error("渲染回调参数错误：task_id拆分得不到合理结果")
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid param task_id！！")
+	}
+	//重新赋值（很重要）
+	req.TaskId = splitSlice[0]
+	wid := splitSlice[1]
 	//存base64打印测试
 	/*	f, _ := os.Create("b.txt")
 		defer f.Close()
@@ -73,13 +84,12 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *a
 		return resp.SetStatusWithMessage(basic.CodeFileUploadErr, "failed to upload render resource image")
 	}
 	uploadUnityRenderImageTakesTime := time.Now().UTC().UnixMilli() - unityRenderEndTime
-	//遍历websocket链接把数据传进去
-	mapConnPool.Range(func(key, value any) bool {
+	if value, ok := mapConnPool.Load(wid); ok {
 		//断言连接
 		ws, ok := value.(wsConnectItem)
 		if !ok {
 			logx.Error("渲染回调断言websocket连接失败")
-			return true
+			return resp.SetStatusWithMessage(basic.CodeFileUploadErr, "渲染回调断言websocket连接失败")
 		}
 		//记录收到unity渲染结果时间以及上传渲染图耗时时间
 		ws.modifyRenderTaskProperty(renderImageControlChanItem{
@@ -96,8 +106,7 @@ func (l *RenderNotifyLogic) RenderNotify(req *types.RenderNotifyReq, userinfo *a
 			taskId:               req.TaskId,
 			renderNotifyImageUrl: uploadRes.ResourceUrl,
 		})
-		return true
-	})
+	}
 	logx.Info("渲染回调成功,渲染结果图片为：", uploadRes.ResourceUrl)
 	return resp.SetStatusWithMessage(basic.CodeOK, "success")
 }

server/websocket/internal/logic/ws_render_image.go

@@ -368,7 +368,7 @@ func (w *wsConnectItem) assembleRenderDataToUnity(taskId string, combineImage st
 	//发送运行阶段消息(组装数据)
 	w.sendAssembleRenderDataStepResponseMessage(info.RenderId)
 	sendData := map[string]interface{}{
-		"id":               taskId,
+		"id":               taskId + " " + w.uniqueId, //空格分开
 		"order_id":         0,
 		"user_id":          info.RenderData.UserId,
 		"guest_id":         info.RenderData.GuestId,

server/websocket/internal/types/types.go

@@ -6,7 +6,7 @@ import (
 )
 
 type RenderNotifyReq struct {
-	TaskId  string `json:"task_id"` //任务id
+	TaskId  string `json:"task_id"` //任务id + " " + wid的结合字符串
 	UserId  int64  `json:"user_id"`
 	GuestId int64  `json:"guest_id"`
 	Image   string `json:"image"`

server_api/websocket.api

@@ -22,7 +22,7 @@ service websocket {
 
 //渲染完了通知接口
 type RenderNotifyReq {
-	TaskId  string `json:"task_id"` //任务id
+	TaskId  string `json:"task_id"` //任务id + " " + wid的结合字符串
 	UserId  int64  `json:"user_id"`
 	GuestId int64  `json:"guest_id"`
 	Image   string `json:"image"`