chore: 变更util与global层依赖关系

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 {

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
 		}

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
 }

global/flags.go

@@ -1,6 +1,8 @@
 package global
 
-import "flag"
+import (
+	"flag"
+)
 
 var Flags struct {
 	Path   string

global/global.go

@@ -1,6 +1,5 @@
 package global
 
 var Status struct {
-	Output   bool
 	Guardian bool
 }

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

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{}) {
+func (c *loG) WriteLog(name string, a ...interface{}) {
-	if !global.Config.Settings.DemoMode {
+	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...)