Merge branch 'develop' into feature/auth

server/websocket/internal/logic/datatransferlogic.go

@@ -89,14 +89,14 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 		return
 	}
 	defer conn.Close()
-	//鉴权不成功10秒后断开
+	//鉴权不成功后断开
 	/*var (
 		userInfo *auth.UserInfo
 		isAuth   bool
 	)
 	isAuth, userInfo = l.checkAuth(svcCtx, r)
 	if !isAuth {
-		time.Sleep(time.Second) //兼容下火狐
+		time.Sleep(time.Second * 4) //兼容下火狐
 		rsp := websocket_data.DataTransferData{
 			T: constants.WEBSOCKET_UNAUTH,
 			D: nil,
@@ -132,10 +132,12 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 	//保存连接
 	mapConnPool.Store(uniqueId, ws)
 	defer ws.close()
-	//把连接成功消息发回去
-	time.Sleep(time.Second) //兼容下火狐
-	b := ws.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, uniqueId)
-	_ = conn.WriteMessage(websocket.TextMessage, b)
+	go func() {
+		//把连接成功消息发回去
+		time.Sleep(time.Second * 4) //兼容下火狐
+		b := ws.respondDataFormat(constants.WEBSOCKET_CONNECT_SUCCESS, uniqueId)
+		_ = conn.WriteMessage(websocket.TextMessage, b)
+	}()
 	//循环读客户端信息
 	go ws.readLoop()
 	//循环把数据发送给客户端

server/websocket/internal/logic/ws_render_image_logic.go

@@ -60,6 +60,7 @@ func (w *wsConnectItem) renderImage(data []byte) {
 		renderImageData.RenderData.Logo = "https://s3.us-west-1.amazonaws.com/storage.fusenpack.com/f5ccd11365099fa47a6316b1cd639f6dd6064dcd2d37c8d2fcd0a322160b33cc"
 	} else {
 		renderImageData.RenderData.Logo = *userMaterial.ResourceUrl
+		renderImageData.RenderData.UserMaterialId = userMaterial.Id
 	}
 	//用户id赋值
 	renderImageData.RenderData.UserId = w.userId