From 66df79e68ff01ff6f1a958d4bc8f9ee4002c30ae Mon Sep 17 00:00:00 2001
From: Mmx <1624045573@qq.com>
Date: Thu, 25 Nov 2021 08:37:53 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8F=98=E6=9B=B4util=E4=B8=8Eglobal?=
 =?UTF-8?q?=E5=B1=82=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/guardian.go |  8 ++++----
 controllers/login.go    |  4 ++--
 global/config.go        |  3 +++
 global/flags.go         |  4 +++-
 global/global.go        |  1 -
 util/checker.go         |  5 ++---
 util/log.go             | 11 ++++++-----
 7 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/controllers/guardian.go b/controllers/guardian.go
index 151fa19..c715b5b 100644
--- a/controllers/guardian.go
+++ b/controllers/guardian.go
@@ -9,7 +9,7 @@ import (
 )
 
 func Guardian(output bool) {
-	global.Status.Output = output
+	util.Log.OutPut = output
 
 	go Daemon.DaemonChan()
 
@@ -19,12 +19,12 @@ func Guardian(output bool) {
 
 	var c = make(chan bool)
 	for {
-		global.Status.Output = output
+		util.Log.OutPut = output
 		go func() {
 			defer func() {
 				_ = recover()
 			}()
-			if !util.Checker.NetOk() {
+			if !util.Checker.NetOk(global.Config.Settings.Timeout) {
 				util.Log.Println("Network down, trying to login")
 				_ = Login(output, true)
 			} else {
@@ -40,7 +40,7 @@ func Guardian(output bool) {
 }
 
 func EnterGuardian() {
-	global.Status.Output = true
+	util.Log.OutPut = true
 	global.Status.Guardian = true
 	util.Log.Println("[Guardian mode]")
 	if global.Config.Settings.Daemon.Enable {
diff --git a/controllers/login.go b/controllers/login.go
index 72ea8d9..5b8be6e 100644
--- a/controllers/login.go
+++ b/controllers/login.go
@@ -10,11 +10,11 @@ import (
 )
 
 func Login(output bool, skipCheck bool) error {
-	global.Status.Output = output
+	util.Log.OutPut = output
 	G := global.Config.Generate()
 	if !skipCheck {
 		util.Log.Println("Step0: 检查状态…")
-		if util.Checker.NetOk() {
+		if util.Checker.NetOk(global.Config.Settings.Timeout) {
 			util.Log.Println("网络 ok")
 			return nil
 		}
diff --git a/global/config.go b/global/config.go
index 61ada96..3f18b26 100644
--- a/global/config.go
+++ b/global/config.go
@@ -2,6 +2,7 @@ package global
 
 import (
 	"github.com/Mmx233/BitSrunLoginGo/models"
+	"github.com/Mmx233/BitSrunLoginGo/util"
 	"github.com/Mmx233/config"
 	"log"
 	"os"
@@ -47,4 +48,6 @@ func init() {
 		log.Println("读取配置文件失败:\n", e.Error())
 		os.Exit(1)
 	}
+
+	util.Log.Demo = Config.Settings.DemoMode
 }
diff --git a/global/flags.go b/global/flags.go
index 7c9667e..7448ab7 100644
--- a/global/flags.go
+++ b/global/flags.go
@@ -1,6 +1,8 @@
 package global
 
-import "flag"
+import (
+	"flag"
+)
 
 var Flags struct {
 	Path   string
diff --git a/global/global.go b/global/global.go
index a94ee73..4becf09 100644
--- a/global/global.go
+++ b/global/global.go
@@ -1,6 +1,5 @@
 package global
 
 var Status struct {
-	Output   bool
 	Guardian bool
 }
diff --git a/util/checker.go b/util/checker.go
index 9fb7bc2..c0b7094 100644
--- a/util/checker.go
+++ b/util/checker.go
@@ -1,7 +1,6 @@
 package util
 
 import (
-	"github.com/Mmx233/BitSrunLoginGo/global"
 	"github.com/Mmx233/tool"
 	"time"
 )
@@ -10,11 +9,11 @@ type checker struct{}
 
 var Checker checker
 
-func (checker) NetOk() bool {
+func (checker) NetOk(timeout uint) bool {
 	h, _, e := tool.HTTP.GetBytes(&tool.GetRequest{
 		Url:      "https://www.baidu.com/",
 		Redirect: false,
-		Timeout:  time.Duration(global.Config.Settings.Timeout) * time.Second,
+		Timeout:  time.Duration(timeout) * time.Second,
 	})
 	if e != nil || h.Get("Location") != "" {
 		return false
diff --git a/util/log.go b/util/log.go
index b72806a..b27cbb0 100644
--- a/util/log.go
+++ b/util/log.go
@@ -2,7 +2,6 @@ package util
 
 import (
 	"fmt"
-	"github.com/Mmx233/BitSrunLoginGo/global"
 	"github.com/Mmx233/tool"
 	"log"
 	"os"
@@ -13,12 +12,14 @@ import (
 
 type loG struct {
 	timeStamp string
+	Demo      bool
+	OutPut    bool
 }
 
 var Log loG
 
-func (*loG) WriteLog(name string, a ...interface{}) {
-	if !global.Config.Settings.DemoMode {
+func (c *loG) WriteLog(name string, a ...interface{}) {
+	if !c.Demo {
 		return
 	}
 	for _, v := range a {
@@ -47,7 +48,7 @@ func (c *loG) genTimeStamp() {
 func (c *loG) Println(a ...interface{}) {
 	c.genTimeStamp()
 	c.WriteLog("Login-"+c.timeStamp+".log", a...)
-	if !global.Status.Output {
+	if !c.OutPut {
 		return
 	}
 	log.Println(a...)
@@ -56,7 +57,7 @@ func (c *loG) Println(a ...interface{}) {
 func (c *loG) Fatalln(a ...interface{}) {
 	c.genTimeStamp()
 	c.WriteLog("LoginError-"+c.timeStamp+".log", a...)
-	if !global.Status.Output {
+	if !c.OutPut {
 		return
 	}
 	log.Fatalln(a...)