From 12e9b0032486155a507f9b5da0dd0250c5845373 Mon Sep 17 00:00:00 2001 From: Mmx <1624045573@qq.com> Date: Sun, 19 Sep 2021 23:35:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=AE=88=E6=8A=A4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E9=87=8D=E5=A4=8D=E7=9A=84=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/guardian.go | 2 +- controllers/login.go | 13 +++++++------ main.go | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/controllers/guardian.go b/controllers/guardian.go index 57bfb52..72ef188 100644 --- a/controllers/guardian.go +++ b/controllers/guardian.go @@ -27,7 +27,7 @@ func Guardian(output bool) { }() if !util.Checker.NetOk() { util.Log.Println("Network down, trying to login") - _ = Login(output) + _ = Login(output, true) } else { if global.Config.Settings.DemoMode { util.Log.Println("Network ok") diff --git a/controllers/login.go b/controllers/login.go index 6921209..84bdd31 100644 --- a/controllers/login.go +++ b/controllers/login.go @@ -9,14 +9,15 @@ import ( "time" ) -func Login(output bool) error { +func Login(output bool, skipCheck bool) error { global.Status.Output = output - util.Log.Println("Step0: 检查状态…") G := global.Config.Generate() - - if util.Checker.NetOk() { - util.Log.Println("网络 ok") - return nil + if !skipCheck { + util.Log.Println("Step0: 检查状态…") + if util.Checker.NetOk() { + util.Log.Println("网络 ok") + return nil + } } util.Log.Println("Step1: 正在获取客户端ip") diff --git a/main.go b/main.go index b198430..5088593 100644 --- a/main.go +++ b/main.go @@ -11,7 +11,7 @@ func main() { if global.Config.Settings.Guardian != 0 { controllers.EnterGuardian() - } else if err := controllers.Login(true); err != nil { + } else if err := controllers.Login(true, false); err != nil { util.Log.Println("运行出错,状态异常") if global.Config.Settings.DemoMode { util.Log.Fatalln(err)