fix: 去除守护模式重复的网络检查

Mmx233 · Sep 19, 2021 · 12e9b00 · 12e9b00
1 parent 005e795
commit 12e9b00
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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)