From e9c89f9ac84d62fbb080d1c3e9756967d733183e 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: Thu, 2 Feb 2023 00:05:26 +0800 Subject: [PATCH] =?UTF-8?q?[style]:=20=E6=94=AF=E6=8C=81=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=87=AA=E5=AE=9A=E4=B9=89uuid=20(#221)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bot.go | 8 +++++--- bot_login.go | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bot.go b/bot.go index a55f688..59c633b 100644 --- a/bot.go +++ b/bot.go @@ -51,6 +51,7 @@ func (b *Bot) Alive() bool { // @description: 设置设备Id // @receiver b // @param deviceId +// TODO ADD INTO LOGIN OPTION func (b *Bot) SetDeviceId(deviceId string) { b.deviceId = deviceId } @@ -84,7 +85,7 @@ func (b *Bot) login(login BotLogin) (err error) { // Login 用户登录 func (b *Bot) Login() error { - scanLogin := &SacnLogin{} + scanLogin := &SacnLogin{UUID: b.loginUUID} return b.login(scanLogin) } @@ -303,7 +304,7 @@ func (b *Bot) IsHot() bool { return b.hotReloadStorage != nil } -// UUID returns current uuid of bot +// UUID returns current UUID of bot func (b *Bot) UUID() string { return b.uuid } @@ -311,7 +312,8 @@ func (b *Bot) UUID() string { // SetUUID // @description: 设置UUID,可以用来手动登录用 // @receiver b -// @param uuid +// @param UUID +// TODO ADD INTO LOGIN OPTION func (b *Bot) SetUUID(uuid string) { b.loginUUID = &uuid } diff --git a/bot_login.go b/bot_login.go index 0ae2568..486c88c 100644 --- a/bot_login.go +++ b/bot_login.go @@ -177,19 +177,21 @@ type BotLogin interface { } // SacnLogin 扫码登录 -type SacnLogin struct{} +type SacnLogin struct { + UUID *string +} // Login 实现了 BotLogin 接口 func (s *SacnLogin) Login(bot *Bot) error { var uuid string - if bot.loginUUID == nil { + if s.UUID == nil { var err error uuid, err = bot.Caller.GetLoginUUID() if err != nil { return err } } else { - uuid = *bot.loginUUID + uuid = *s.UUID } return s.checkLogin(bot, uuid) }