From a3818952ba2bd6c30f5f793afb49bddf21740809 Mon Sep 17 00:00:00 2001
From: Song <quanpengsong@gmail.com>
Date: Sun, 13 Jun 2021 18:50:21 +0800
Subject: [PATCH] :bug: bug fix

---
 client/README.md | 2 +-
 client/main.go   | 2 +-
 common/token.js  | 2 +-
 routers/user.js  | 5 -----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/client/README.md b/client/README.md
index fb17ed7..246365e 100644
--- a/client/README.md
+++ b/client/README.md
@@ -2,7 +2,7 @@
 ## 描述
 该客户端用于支持 `client` 消息推送方式。
 
-注意，为防止未授权的 WebSocket 连接，使用该消息推送方式你**必须**设置 ACCESS_TOKEN。
+注意，为防止未授权的 WebSocket 连接，使用该消息推送方式你应设置 ACCESS_TOKEN。
 
 ## 原理
 客户端启动后与 message-pusher 服务器建立一个 WebSocket 连接，通过该连接接受要推送消息，并调用系统的消息通知接口进行消息通知。
diff --git a/client/main.go b/client/main.go
index 5ac5e65..71462ec 100644
--- a/client/main.go
+++ b/client/main.go
@@ -38,10 +38,10 @@ func main() {
 	for {
 		var message = new(Message)
 		err = c.ReadJSON(message)
-		log.Println("Get new message")
 		if err != nil {
 			log.Println("Error occurred when read message:", err)
 		} else {
+			log.Println("Get new message")
 			Notify(message)
 		}
 	}
diff --git a/common/token.js b/common/token.js
index 5cf748d..c8452b2 100644
--- a/common/token.js
+++ b/common/token.js
@@ -91,7 +91,7 @@ function checkPrefix(prefix) {
 
 function registerWebSocket(prefix, token, ws) {
   let user = tokenStore.get(prefix);
-  if (user && user.accessToken !== '' && user.accessToken === token) {
+  if (user && user.accessToken === token) {
     updateTokenStore(prefix, 'ws', ws);
   } else {
     ws.terminate();
diff --git a/routers/user.js b/routers/user.js
index ab04b2d..81c3c87 100644
--- a/routers/user.js
+++ b/routers/user.js
@@ -21,11 +21,6 @@ router.all('/:userPrefix/verify', (req, res, next) => {
   }
 });
 
-router.get('/ws/:userPrefix/:token', async (ws, req) => {
-  const userPrefix = req.params.userPrefix;
-  const token = req.params.token;
-});
-
 router.all('/:userPrefix/:description', async (req, res, next) => {
   const userPrefix = req.params.userPrefix;
   let message = {