From 43e377283ca0a96cc7539c76b7752e21db136070 Mon Sep 17 00:00:00 2001 From: Mmx233 Date: Fri, 21 Oct 2022 13:11:31 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- v1/login.go | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/v1/login.go b/v1/login.go index 27a5861..d7685b0 100644 --- a/v1/login.go +++ b/v1/login.go @@ -25,6 +25,7 @@ func Login(c *srunTransfer.Login) error { { log.Debugln("正在检查登录状态") + res, e := api.GetUserInfo() if e != nil { return e @@ -36,21 +37,25 @@ func Login(c *srunTransfer.Login) error { } log.Infoln("检测到用户未登录,开始尝试登录...") - log.Debugln("正在获取客户端 IP") - var ip interface{} - ip, ok = res["client_ip"] - if !ok { - ip, ok = res["online_ip"] + { + log.Debugln("正在获取客户端 IP") + + var ip interface{} + ip, ok = res["client_ip"] if !ok { - return ErrResultCannotFound + ip, ok = res["online_ip"] + if !ok { + return ErrResultCannotFound + } } + G.Ip = ip.(string) + log.Debugln("ip: ", G.Ip) } - G.Ip = ip.(string) - log.Debugln("ip: ", G.Ip) } - log.Debugln("正在获取 Token") { + log.Debugln("正在获取 Token") + res, e := api.GetChallenge(G.Form.UserName, G.Ip) if e != nil { return e @@ -64,8 +69,9 @@ func Login(c *srunTransfer.Login) error { log.Debugln("token: ", G.Token) } - log.Debugln("发送登录请求") { + log.Debugln("发送登录请求") + info, e := json.Marshal(map[string]string{ "username": G.Form.UserName, "password": G.Form.PassWord,