From 4c6ce4945538378044b7a50f8413054ae48dc672 Mon Sep 17 00:00:00 2001
From: qydysky <qydysky@foxmail.com>
Date: Sat, 20 Feb 2021 14:32:39 +0800
Subject: [PATCH] =?utf8?q?=E6=89=AB=E7=A0=81=E7=99=BB=E5=BD=95=E5=A4=9A?=
 =?utf8?q?=E6=AC=A1=E8=A7=A6=E5=8F=91=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
 =?utf8?q?=EF=BC=8C=E5=87=8F=E5=B0=91=E6=97=A5=E5=BF=97=E9=A2=91=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 F/api.go      |  4 +++-
 bili_danmu.go | 36 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/F/api.go b/F/api.go
index 4288bf0..0ce4b25 100644
--- a/F/api.go
+++ b/F/api.go
@@ -860,7 +860,9 @@ func Get_cookie() {
 				return
 			} else if !v {
 				if v,ok := p.Json().GetValFromS(res, "message").(string);ok {
-					apilog.L(`W: `,`登录中`,v,max_try,`s`)
+					if max_try < 5 || max_try%5 == 0 {//减少日志频度
+						apilog.L(`W: `,`登录中`,v,max_try)
+					}
 				}
 				continue
 			} else {
diff --git a/bili_danmu.go b/bili_danmu.go
index 5b8f467..6eeda18 100644
--- a/bili_danmu.go
+++ b/bili_danmu.go
@@ -128,33 +128,33 @@ func Demo(roomid ...int) {
 						c.Danmu_Main_mq.Push_tag(`change_room`,nil)
 					}
 				}
-				var cookieString string
+				
 				if !p.Checkfile().IsExist("cookie.txt") {//读取cookie文件
 					go get_cookie()
 					p.Sys().Timeoutf(3)
 				} else {
 					q.File = "cookie.txt"
-					cookieString = p.File().FileWR(q)
-				}
+					cookieString := p.File().FileWR(q)
 
-				if cookieString == `` {//cookie.txt为空
-					danmulog.L(`E: `, `cookie.txt为空`)
-					go get_cookie()
-					p.Sys().Timeoutf(3)
-				} else {
-					for k,v := range p.Cookies_String_2_Map(cookieString){//cookie存入全局变量syncmap
-						c.Cookie.Store(k, v)
-					}
-					if uid,ok := c.Cookie.LoadV(`DedeUserID`).(string);!ok{//cookie中DedeUserID
-						danmulog.L(`E: `, `读取cookie错误,无DedeUserID`)
-						go get_cookie()
-						p.Sys().Timeoutf(3)
-					} else if uid,e := strconv.Atoi(uid);e != nil{
-						danmulog.L(`E: `, e)
+					if cookieString == `` {//cookie.txt为空
+						danmulog.L(`E: `, `cookie.txt为空`)
 						go get_cookie()
 						p.Sys().Timeoutf(3)
 					} else {
-						c.Uid = uid
+						for k,v := range p.Cookies_String_2_Map(cookieString){//cookie存入全局变量syncmap
+							c.Cookie.Store(k, v)
+						}
+						if uid,ok := c.Cookie.LoadV(`DedeUserID`).(string);!ok{//cookie中DedeUserID
+							danmulog.L(`E: `, `读取cookie错误,无DedeUserID`)
+							go get_cookie()
+							p.Sys().Timeoutf(3)
+						} else if uid,e := strconv.Atoi(uid);e != nil{
+							danmulog.L(`E: `, e)
+							go get_cookie()
+							p.Sys().Timeoutf(3)
+						} else {
+							c.Uid = uid
+						}
 					}
 				}
 			}
-- 
2.39.2