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

server/websocket/internal/logic/datatransferlogic.go

@@ -87,14 +87,14 @@ func (l *DataTransferLogic) DataTransfer(svcCtx *svc.ServiceContext, w http.Resp
 		return
 	}
 	defer conn.Close()
-	//鉴权不成功10秒后断开
-	/*var (
+	//鉴权不成功后断开
+	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,
@@ -105,10 +105,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{
@@ -130,10 +130,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()
 	//循环把数据发送给客户端