From f258b010b968398ff1ba23903cdfad26720ea636 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Sun, 20 Dec 2020 19:11:08 +0800 Subject: [PATCH 1/2] websocket not found method --- server/websocket.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/websocket.go b/server/websocket.go index 468c2b3..db22aee 100644 --- a/server/websocket.go +++ b/server/websocket.go @@ -333,6 +333,16 @@ func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) { c.Lock() defer c.Unlock() _ = c.WriteJSON(ret) + } else { + ret := global.MSG{ + "status": "failed", + "retcode": 1404, + "data": nil, + } + if j.Get("echo").Exists() { + ret["echo"] = j.Get("echo").Value() + } + _ = c.WriteJSON(ret) } } From 73774681af5ec8fb3cbbd099fb2dcc8d971d099c Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Sun, 20 Dec 2020 19:14:42 +0800 Subject: [PATCH 2/2] fix lock --- server/websocket.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/websocket.go b/server/websocket.go index db22aee..75b3701 100644 --- a/server/websocket.go +++ b/server/websocket.go @@ -334,14 +334,12 @@ func (c *websocketConn) handleRequest(bot *coolq.CQBot, payload []byte) { defer c.Unlock() _ = c.WriteJSON(ret) } else { - ret := global.MSG{ - "status": "failed", - "retcode": 1404, - "data": nil, - } + ret := coolq.Failed(1404,"API_NOT_FOUND","API不存在") if j.Get("echo").Exists() { ret["echo"] = j.Get("echo").Value() } + c.Lock() + defer c.Unlock() _ = c.WriteJSON(ret) } }