From 94f7062889c92e6dcde82ccf0c420ab02d5edf11 Mon Sep 17 00:00:00 2001
From: eatmoreapple <15055461510@163.com>
Date: Sun, 26 Dec 2021 00:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0resp.ContentLength=20!=3D=200?=
 =?UTF-8?q?=20&&=20resp.Header.Get(Content-Type)=20!=3D=20image/jpeg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store  | Bin 0 -> 8196 bytes
 bot.go     |  15 +++++++++++----
 stroage.go |   1 +
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7071cdc2442348ea1ce917c962240a8c0a4ec2dd
GIT binary patch
literal 8196
zcmeHM%Wl&^6ur|&;xrV31X4F3OKhvs2M-}OY1%F-Q5Fq?1)$(GrZsguQS6XKRg^XS
z1HZtQFX1!Tvx0NS(`xM4-9Zt|RGyoR&l%r2_s&elB_h!p_11`%h{(akwoyk_Q20Jy
zQ)NcC+=dn46Ln}vKE*U3Ifb?jRspMkRlq7>6|f5Y4GLh-=His>`{`X<TLr8F|D^)F
zKDfBpHnp9kRxKT<)DZx74$Z3IGtL2u<7(T~c9L2}MW5;EL1?PbM+}kDao=S)Y*X7w
zYEwFiluklFS?CjrP)`TXRd5o`)Y{rAU=^5FfY0s?>XL_3yPr9~N2+Co4oU8Y@}L{a
zuEG*+!mj*OMRiyKUs6H^SaB<dt!r!tcz#n*$f7Sf);w4v3Miyr))(=q9N8Vm1MT(K
z?jQ`}WOenMn3<iMuT-6?Q+HmskL0+Wc*!VkdBd0d?U|He_w2LReIEGZPUFUwj1n)1
z{GlQQJs*%)FM_Bi$1OREda>fR(;H6BsdXAlCnsy`50~Awjr*s|?#ZL|)n)hI#)H$-
znsf8c-N*Z#<FFsek4irhdQqdr^!s_uqcg_-zCDaW86BdP88tdU+(P{Mc<)lA{tuwc
zNHHUXjy^@j%Fl4$Cc^=?kLbPwtKbPLQlE`nSTyh#$C$IoWY&>s>=%#4Q`u4QJe5x-
zs|HpG|2TugA`exDn2ZW%G>|;1d^WLOMc5eG*Ux62Qp&_SP>6H7kE|~6oM(-=YA98u
zC$vjjv_ns+O*`4%S=S8OLBAdyqyH5()+CE(U2^z6jeo1=ji19KvoiPv^w0A#28-iR
zHi8ev2(ITi9XbL#qMpjgf*u6)%{=wmR1X)d3aogBT?HF4Eb*2VG`+3it)z$C;&rZg
zwy=g-#y+C6N!zps%Ndi;7go_^TtUx1M$h>hz&Bn)%XBb#72qUtY>4@pi<BC*iLC>h
z02!cnj#S}TRJMILVzr=I@`CuXVkW1eJSv`5td)ta0$Z*u>tv!a&1|`J1!hwZmg=xO
z<?sJ5-B0U)Rlq9n`xFp!+wJWZ`ak;_ntv3ZwOw3qaB*SWB(;iyN*%{x)o~p5{2zw+
i>;lT1rnZyRq6OuTzX&MbrR@Hn-KFjRuQK%CtbPIWLpM(V

literal 0
HcmV?d00001

diff --git a/bot.go b/bot.go
index 38a3ab0..382a1fa 100644
--- a/bot.go
+++ b/bot.go
@@ -28,6 +28,7 @@ type Bot struct {
 	self                *Self
 	Storage             *Storage
 	HotReloadStorage    HotReloadStorage
+	uuid                string
 }
 
 // Alive 判断当前用户是否正常在线
@@ -81,10 +82,8 @@ func (b *Bot) HotLogin(storage HotReloadStorage, retry ...bool) error {
 
 	// 如果webInit出错,则说明可能身份信息已经失效
 	// 如果retry为True的话,则进行正常登陆
-	if err = b.WebInit(); err != nil {
-		if len(retry) > 0 && retry[0] {
-			return b.Login()
-		}
+	if err = b.WebInit(); err != nil && (len(retry) > 0 && retry[0]) {
+		err = b.Login()
 	}
 	return err
 }
@@ -102,6 +101,7 @@ func (b *Bot) hotLoginInit(item HotReloadStorageItem) error {
 	b.Storage.LoginInfo = item.LoginInfo
 	b.Storage.Request = item.BaseRequest
 	b.Caller.Client.Domain = item.WechatDomain
+	b.uuid = item.UUID
 	return nil
 }
 
@@ -109,6 +109,7 @@ func (b *Bot) hotLoginInit(item HotReloadStorageItem) error {
 // 该方法会一直阻塞，直到用户扫码登录，或者二维码过期
 func (b *Bot) Login() error {
 	uuid, err := b.Caller.GetLoginUUID()
+	b.uuid = uuid
 	if err != nil {
 		return err
 	}
@@ -336,6 +337,7 @@ func (b *Bot) DumpHotReloadStorage() error {
 		Cookies:      cookies,
 		LoginInfo:    b.Storage.LoginInfo,
 		WechatDomain: b.Caller.Client.Domain,
+		UUID:         b.uuid,
 	}
 
 	return json.NewEncoder(b.HotReloadStorage).Encode(item)
@@ -430,3 +432,8 @@ func open(url string) error {
 func (b *Bot) IsHot() bool {
 	return b.isHot
 }
+
+// UUID returns current uuid of bot
+func (b *Bot) UUID() string {
+	return b.uuid
+}
diff --git a/stroage.go b/stroage.go
index 9e04255..8f01ef9 100644
--- a/stroage.go
+++ b/stroage.go
@@ -20,6 +20,7 @@ type HotReloadStorageItem struct {
 	BaseRequest  *BaseRequest
 	LoginInfo    *LoginInfo
 	WechatDomain WechatDomain
+	UUID         string
 }
 
 // HotReloadStorage 热登陆存储接口