xiugai

src/jfw/front/websocket.go

@@ -174,10 +174,18 @@ func ServeWss(w http.ResponseWriter, r *http.Request) {
 func QrToLabWss(w http.ResponseWriter, r *http.Request) {
 	defer qutil.Catch()
 	conn, err := upgrader.Upgrade(w, r, nil)
+	if err != nil {
+		log.Println(err)
+		return
+	}
+	if conn == nil {
+		return
+	}
 	var receive, userId string
 	var qrToLab_ok, qrToLab_open_ok bool
 	//接收消息
 	go func() {
+		defer qutil.Catch()
 		for {
 			//err := websocket.Message.Receive(ws, &receive)
 			_, msgData, err := conn.ReadMessage()
@@ -240,8 +248,4 @@ func QrToLabWss(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-	if err != nil {
-		log.Println(err)
-		return
-	}
 }