From 29f53fe2e9e25d3cd9e766d2994ec0e1db344104 Mon Sep 17 00:00:00 2001
From: ZJY <764763903@qq.com>
Date: Thu, 9 Sep 2021 16:34:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=81=9A=E4=BA=86=E4=B8=80=E5=B1=82?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/available.go | 45 ++++++++++++++++++++++++---------------------
 readme.txt          |  7 ++++---
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/models/available.go b/models/available.go
index 02fec4b..b332b5c 100644
--- a/models/available.go
+++ b/models/available.go
@@ -220,31 +220,34 @@ func CookieOK(ck *JdCookie) bool {
 				ck.Push(fmt.Sprintf("失效账号，%s", ck.PtPin))
 				//临时使用别人代码
 				JdCookie{}.Push(fmt.Sprintf("失效账号，%s", ck.Nickname))
-				var pinky = fmt.Sprintf("pin=%s;wskey=%s;", ck.PtPin, ck.WsKey)
-				msg1 := cmd(fmt.Sprintf(`python3 test.py "%s"`, pinky), &Sender{})
-				JdCookie{}.Push(fmt.Sprintf("自动转换wskey---%s", msg1))
-				ss := regexp.MustCompile(`pt_key=([^;=\s]+);pt_pin=([^;=\s]+)`).FindAllStringSubmatch(msg1, -1)
-				if len(ss) > 0 {
-					for _, s := range ss {
-						ck := JdCookie{
-							PtKey: s[1],
-							PtPin: s[2],
-						}
-						if nck, err := GetJdCookie(ck.PtPin); err == nil {
-							nck.InPool(ck.PtKey)
-							msg := fmt.Sprintf("更新账号，%s", ck.PtPin)
-							(&JdCookie{}).Push(msg)
-							logs.Info(msg)
-						} else {
-							if Cdle {
-								ck.Hack = True
+				if len(ck.WsKey) > 0 {
+					var pinky = fmt.Sprintf("pin=%s;wskey=%s;", ck.PtPin, ck.WsKey)
+					msg1 := cmd(fmt.Sprintf(`python3 test.py "%s"`, pinky), &Sender{})
+					JdCookie{}.Push(fmt.Sprintf("自动转换wskey---%s", msg1))
+					ss := regexp.MustCompile(`pt_key=([^;=\s]+);pt_pin=([^;=\s]+)`).FindAllStringSubmatch(msg1, -1)
+					if len(ss) > 0 {
+						for _, s := range ss {
+							ck := JdCookie{
+								PtKey: s[1],
+								PtPin: s[2],
+							}
+							if nck, err := GetJdCookie(ck.PtPin); err == nil {
+								nck.InPool(ck.PtKey)
+								msg := fmt.Sprintf("更新账号，%s", ck.PtPin)
+								(&JdCookie{}).Push(msg)
+								logs.Info(msg)
+							} else {
+								if Cdle {
+									ck.Hack = True
+								}
+								(&JdCookie{}).Push("转换失败")
 							}
-							(&JdCookie{}).Push("转换失败")
 						}
-					}
 
-					return false
+						return false
+					}
 				}
+
 			}
 			return false
 		}
diff --git a/readme.txt b/readme.txt
index 44b889c..5797dbe 100644
--- a/readme.txt
+++ b/readme.txt
@@ -13,18 +13,19 @@
  10.解决%!(EXTRA 错误
 11.手动指令更新
 12.可替换失效wskey
-13wskey失效检测 等待开发
-Whiskey更新 修改为这个更新
+13wskey失效检测
+Whiskey更新
 新增删除账号指令
 清理过期账号指令
 合并详细查询功能
 
-以上是做完了 以下是待开发
 14 找猫咪偷一下CK模糊检测
 15 写入失败问题 不知道啥原因
 16 wskey失效两次转换
 17 wskey过期提示
 
+以上是做完了 以下是待开发
+
 编码问题参考
 https://blog.csdn.net/qq_29499107/article/details/83583983
 /usr/lib64/python3.6/http