From 4fd7f651342008919cc67d3b86871b0a5e0e0f2e Mon Sep 17 00:00:00 2001
From: ZJY <764763903@qq.com>
Date: Mon, 6 Sep 2021 16:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=8D=A2=E5=BA=93=20?=
 =?UTF-8?q?=E6=AD=A4=E5=BA=93=E5=B0=86=E4=BA=8E9-08=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/bot.go | 62 +++++++++++++++++++++++++--------------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/models/bot.go b/models/bot.go
index a861d15..290e3d3 100644
--- a/models/bot.go
+++ b/models/bot.go
@@ -100,40 +100,38 @@ var handleMessage = func(msgs ...interface{}) interface{} {
 								PtKey: rsp,
 								WsKey: s[2],
 							}
-						if sender.IsQQ() {
-							ck.QQ = sender.UserID
-						} else if sender.IsTG() {
-							ck.Telegram = sender.UserID
-						}
-						if nck, err := GetJdCookie(ck.PtPin); err == nil {
-							nck.InPool(ck.PtKey)
-							if nck.WsKey == "" || len(nck.WsKey) == 0 {
-								nck.Updates(JdCookie{
-									WsKey: ck.WsKey,
-								})
-								msg := fmt.Sprintf("写入WsKey，并更新账号%s", ck.PtPin)
-								if sender.IsQQ(){
-								ck.Update(QQ, ck.QQ)
+
+							ss := regexp.MustCompile(`pt_key=([^;=\s]+);pt_pin=([^;=\s]+)`).FindAllStringSubmatch(rsp, -1)
+							for _, s1 := range ss {
+								ck.PtPin = s1[2]
+								ck.PtKey = s1[1]
+							}
+
+							if sender.IsQQ() {
+								ck.QQ = sender.UserID
+							} else if sender.IsTG() {
+								ck.Telegram = sender.UserID
+							}
+							if nck, err := GetJdCookie(ck.PtPin); err == nil {
+								nck.InPool(ck.PtKey)
+								if nck.WsKey == "" || len(nck.WsKey) == 0 {
+									nck.Updates(JdCookie{
+										WsKey: ck.WsKey,
+									})
+									msg := fmt.Sprintf("写入WsKey，并更新账号%s", ck.PtPin)
+									(&JdCookie{}).Push(msg)
+									logs.Info(msg)
+								} else {
+									msg := fmt.Sprintf("重复写入")
+									(&JdCookie{}).Push(msg)
+									logs.Info(msg)
 								}
-								sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID)))
-								(&JdCookie{}).Push(msg)
-								logs.Info(msg)
 							} else {
 								NewJdCookie(&ck)
 								msg := fmt.Sprintf("添加账号，%s", ck.PtPin)
 								sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID)))
 								logs.Info(msg)
 							}
-						} else {
-							NewJdCookie(&ck)
-							msg := fmt.Sprintf("添加账号，%s", ck.PtPin)
-							if sender.IsQQ(){
-								ck.Update(QQ, ck.QQ)
-								}
-							sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID)))
-							logs.Info(msg)
-						}
-
 
 						}
 						go func() {
@@ -186,10 +184,10 @@ 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)
+								if sender.IsQQ() {
+									ck.Update(QQ, ck.QQ)
 								}
-								sender.Reply(fmt.Sprintf(msg,AddCoin(sender.UserID)))
+								sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID)))
 								(&JdCookie{}).Push(msg)
 								logs.Info(msg)
 							} else {
@@ -198,8 +196,8 @@ var handleMessage = func(msgs ...interface{}) interface{} {
 								}
 								NewJdCookie(&ck)
 								msg := fmt.Sprintf("添加账号，%s", ck.PtPin)
-								if sender.IsQQ(){
-								ck.Update(QQ, ck.QQ)
+								if sender.IsQQ() {
+									ck.Update(QQ, ck.QQ)
 								}
 								sender.Reply(fmt.Sprintf(msg, AddCoin(sender.UserID)))
 								logs.Info(msg)