From 7fb33328710439f1c92f50f32afe391be367cff8 Mon Sep 17 00:00:00 2001
From: ZJY <764763903@qq.com>
Date: Sat, 18 Sep 2021 23:20:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=B9=8B=E5=89=8D=E8=A2=AB=E4=B8=8D?=
 =?UTF-8?q?=E5=B0=8F=E5=BF=83=E8=A6=86=E7=9B=96=E7=9A=84=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=20=E5=AF=BC=E8=87=B4wskey=E6=97=A0=E6=B3=95=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=86=99=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/bot.go | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/models/bot.go b/models/bot.go
index 81b58d8..b2c7057 100644
--- a/models/bot.go
+++ b/models/bot.go
@@ -130,20 +130,43 @@ var handleMessage = func(msgs ...interface{}) interface{} {
 							}
 							if nck, err := GetJdCookie(ck.PtPin); err == nil {
 								nck.InPool(ck.PtKey)
-								msg := fmt.Sprintf("更新账号，%s", ck.PtPin)
-								if sender.IsQQ() {
-									ck.Update(QQ, ck.QQ)
+								nck.Update(PtKey, ck.PtKey)
+
+								if nck.WsKey == "" || len(nck.WsKey) == 0 {
+									if sender.IsQQ() {
+										ck.Update(QQ, ck.QQ)
+									}
+									nck.Update(WsKey, ck.WsKey)
+									msg := fmt.Sprintf("写入WsKey，并更新账号%s", ck.PtPin)
+									sender.Reply(fmt.Sprintf(msg))
+									(&JdCookie{}).Push(msg)
+									logs.Info(msg)
+								} else {
+									if nck.WsKey == ck.WsKey {
+										msg := fmt.Sprintf("重复写入")
+										sender.Reply(fmt.Sprintf(msg))
+										(&JdCookie{}).Push(msg)
+										logs.Info(msg)
+									} else {
+										nck.Updates(JdCookie{
+											WsKey: ck.WsKey,
+										})
+										msg := fmt.Sprintf("更新WsKey，并更新账号%s", ck.PtPin)
+										sender.Reply(fmt.Sprintf(msg))
+										(&JdCookie{}).Push(msg)
+										logs.Info(msg)
+									}
 								}
-								sender.Reply(fmt.Sprintf(msg))
-								sender.Reply(ck.Query())
-								(&JdCookie{}).Push(msg)
+
 							} else {
 								NewJdCookie(&ck)
 
 								msg := fmt.Sprintf("添加账号，账号名:%s", ck.PtPin)
+
 								if sender.IsQQ() {
 									ck.Update(QQ, ck.QQ)
 								}
+
 								sender.Reply(fmt.Sprintf(msg))
 								sender.Reply(ck.Query())
 								(&JdCookie{}).Push(msg)