From 655b67739c127935156fe17e2df606f0d2673e22 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Fri, 21 Jun 2024 15:47:37 +0000
Subject: [PATCH] =?utf8?q?Fix=20=E6=97=A0=E6=B3=95=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 F/api.go              | 18 ++++++++++--------
 F/biliApiInterface.go |  2 +-
 go.mod                |  2 +-
 go.sum                |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/F/api.go b/F/api.go
index 52bd7d4..800bfad 100644
--- a/F/api.go
+++ b/F/api.go
@@ -929,9 +929,9 @@ func (t *GetFunc) Get_cookie() (missKey []string) {
 				`DedeUserID`,
 			}); len(miss) == 0 {
 				biliApi.SetCookies(reqf.Cookies_String_2_List(cookieString))
-				if e, _ := biliApi.GetNav(); e != nil {
+				if e, res := biliApi.GetNav(); e != nil {
 					apilog.L(`E: `, e)
-				} else {
+				} else if res.IsLogin {
 					apilog.L(`I: `, `已登录`)
 					return
 				}
@@ -1025,16 +1025,18 @@ func (t *GetFunc) Get_cookie() (missKey []string) {
 				return
 			}
 
-			if err := biliApi.LoginQrPoll(oauth); err != nil {
+			if err, code := biliApi.LoginQrPoll(oauth); err != nil {
 				apilog.L(`E: `, err)
 				return
-			} else if cookies := biliApi.GetCookies(); len(cookies) != 0 {
-				if err := save_cookie(cookies, t.Common); err != nil {
-					apilog.L(`E: `, err)
+			} else if code == 0 {
+				if cookies := biliApi.GetCookies(); len(cookies) != 0 {
+					if err := save_cookie(cookies, t.Common); err != nil {
+						apilog.L(`E: `, err)
+						return
+					}
+					apilog.L(`I: `, `登录,并保存了cookie`)
 					return
 				}
-				apilog.L(`I: `, `登录,并保存了cookie`)
-				return
 			}
 		}
 		apilog.L(`W: `, `扫码超时`)
diff --git a/F/biliApiInterface.go b/F/biliApiInterface.go
index b3942fd..ef51c6b 100644
--- a/F/biliApiInterface.go
+++ b/F/biliApiInterface.go
@@ -16,7 +16,7 @@ type biliApiInter interface {
 	GetCookie(name string) (error, string)
 
 	LoginQrCode() (err error, imgUrl string, QrcodeKey string)
-	LoginQrPoll(QrcodeKey string) (err error)
+	LoginQrPoll(QrcodeKey string) (err error, code int)
 	GetOtherCookies() (err error)
 	GetLiveBuvid(Roomid int) (err error)
 	GetRoomBaseInfo(Roomid int) (err error, res struct {
diff --git a/go.mod b/go.mod
index dfb4905..b0bd66f 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/qydysky/biliApi v0.0.0-20240606223920-b89663690249
+	github.com/qydysky/biliApi v0.0.0-20240621154030-402fd30c5a23
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
 )
 
diff --git a/go.sum b/go.sum
index 60b0dbb..cba6b00 100644
--- a/go.sum
+++ b/go.sum
@@ -44,8 +44,8 @@ github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdh
 github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/qydysky/biliApi v0.0.0-20240606223920-b89663690249 h1:23brRdaCzZbh4aH3TWevi/B3MVWbQY3qKcqjEiSmRiA=
-github.com/qydysky/biliApi v0.0.0-20240606223920-b89663690249/go.mod h1:om024vfxALQ5vxsbaGoMm8IS0esLYBnEOpJI8FsGoDg=
+github.com/qydysky/biliApi v0.0.0-20240621154030-402fd30c5a23 h1:xMqDxMA6K4CAFqwenaSlSJjJ7xSAtFmpojpkO7latMM=
+github.com/qydysky/biliApi v0.0.0-20240621154030-402fd30c5a23/go.mod h1:om024vfxALQ5vxsbaGoMm8IS0esLYBnEOpJI8FsGoDg=
 github.com/qydysky/part v0.28.20240617114802 h1:cmDWin7303nKFQ7HAL2+Ur87vkh8d67xVqudvpXp96E=
 github.com/qydysky/part v0.28.20240617114802/go.mod h1:dgagZnPYRFZDbt7XJf7nADOJLoYwlebD9B8Z8g5aHhI=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
-- 
2.39.2