From 9b5590f708a5818b9ee4ee0a658eb1ae758c3852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9A=E5=90=83=E7=82=B9=E8=8B=B9=E6=9E=9C?= <73388495+eatmoreapple@users.noreply.github.com> Date: Fri, 6 Jan 2023 15:10:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20pushlogin=20=E9=87=8D?= =?UTF-8?q?=E8=AF=95=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98=20:bug:?= =?UTF-8?q?=20(#183)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot_login.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bot_login.go b/bot_login.go index 67d4794..d61b658 100644 --- a/bot_login.go +++ b/bot_login.go @@ -120,6 +120,15 @@ type PushLogin struct { // Login 实现了 BotLogin 接口 func (p PushLogin) Login(bot *Bot) error { + err := p.login(bot) + if err != nil && p.opt.withRetry { + scanLogin := SacnLogin{} + return scanLogin.Login(bot) + } + return err +} + +func (p PushLogin) login(bot *Bot) error { if err := p.pushLoginInit(bot); err != nil { return err } @@ -130,12 +139,7 @@ func (p PushLogin) Login(bot *Bot) error { if err = resp.Err(); err != nil { return err } - err = p.checkLogin(bot, resp.UUID) - if err != nil && p.opt.withRetry { - scanLogin := SacnLogin{} - return scanLogin.Login(bot) - } - return err + return p.checkLogin(bot, resp.UUID) } func (p PushLogin) pushLoginInit(bot *Bot) error {