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

server/websocket/internal/logic/datatransferlogic.go

@@ -67,13 +67,14 @@ var (
 type wsConnectItem struct {
 	conn           *websocket.Conn //websocket的连接
 	rabbitMq       *initalize.RabbitMqHandle
-	closeChan      chan struct{} //ws连接关闭chan
-	isClose        bool          //是否已经关闭
-	uniqueId       uint64        //ws连接唯一标识
-	inChan         chan []byte   //接受消息缓冲通道
-	outChan        chan []byte   //发送回客户端的消息
-	mutex          sync.Mutex    //互斥锁
-	userId         int64
+	closeChan      chan struct{}  //ws连接关闭chan
+	isClose        bool           //是否已经关闭
+	uniqueId       uint64         //ws连接唯一标识
+	inChan         chan []byte    //接受消息缓冲通道
+	outChan        chan []byte    //发送回客户端的消息
+	mutex          sync.Mutex     //互斥锁
+	userId         int64          //用户id
+	guestId        int64          //游客id
 	renderProperty renderProperty //扩展云渲染属性
 }
 
@@ -86,7 +87,7 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 	}
 	defer conn.Close()
 	//鉴权不成功10秒后断开
-	/*var (
+	var (
 		userInfo *auth.UserInfo
 		isAuth   bool
 	)
@@ -103,10 +104,10 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 		//发送关闭信息
 		_ = conn.WriteMessage(websocket.CloseMessage, nil)
 		return
-	}*/
+	}
 	//测试的目前写死 39
-	var userInfo auth.UserInfo
-	userInfo.UserId = 39
+	/*var userInfo auth.UserInfo
+	userInfo.UserId = 39*/
 	//生成连接唯一标识
 	uniqueId := websocketIdGenerator.Get()
 	ws := wsConnectItem{
@@ -116,16 +117,13 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 		closeChan: make(chan struct{}, 1),
 		inChan:    make(chan []byte, 1000),
 		outChan:   make(chan []byte, 1000),
+		userId:    userInfo.UserId,
+		guestId:   userInfo.GuestId,
 		renderProperty: renderProperty{
 			renderImageTask:        make(map[string]string),
 			renderImageTaskCtlChan: make(chan renderImageControlChanItem, 100),
 		},
 	}
-	if userInfo.UserId > 0 {
-		ws.userId = userInfo.UserId
-	} else {
-		ws.userId = userInfo.GuestId
-	}
 	//保存连接
 	mapConnPool.Store(uniqueId, ws)
 	defer ws.close()

server/websocket/internal/logic/ws_render_image_logic.go

@@ -31,7 +31,9 @@ func (w *wsConnectItem) renderImage(data []byte) {
 		return
 	}
 	logx.Info("收到请求云渲染图片数据：", renderImageData)
+	//用户id赋值
 	renderImageData.RenderData.UserId = w.userId
+	renderImageData.RenderData.GuestId = w.guestId
 	//把需要渲染的图片任务加进去
 	taskId := hash.JsonHashKey(renderImageData.RenderData)
 	w.renderProperty.renderImageTaskCtlChan <- renderImageControlChanItem{