diff --git a/controllers/guardian.go b/controllers/guardian.go index 37733e5..6d02e99 100644 --- a/controllers/guardian.go +++ b/controllers/guardian.go @@ -29,7 +29,7 @@ func Guardian(output bool) { defer func() { _ = recover() }() - if global.Config.Settings.Interfaces == "" { //单网卡 + if global.Config.Settings.Basic.Interfaces == "" { //单网卡 if !util.Checker.NetOk(global.Transports(nil)) { util.Log.Println("Network down, trying to login") e := Login(output, true, nil) @@ -37,7 +37,7 @@ func Guardian(output bool) { util.Log.Println("Error: ", e) } } else { - if global.Config.Settings.DemoMode { + if global.Config.Settings.Basic.DemoMode { util.Log.Println("Network ok") } } diff --git a/controllers/login.go b/controllers/login.go index bbf2a09..9e1c27c 100644 --- a/controllers/login.go +++ b/controllers/login.go @@ -10,7 +10,7 @@ import ( // Login 登录逻辑 func Login(output bool, skipCheck bool, localAddr net.Addr) error { return BitSrun.Login(&srunTransfer.Login{ - Demo: global.Config.Settings.DemoMode, + Demo: global.Config.Settings.Basic.DemoMode, OutPut: output, CheckNet: !skipCheck, LoginInfo: srunTransfer.LoginInfo{ diff --git a/global/config.go b/global/config.go index 5e2cdec..5857e8a 100644 --- a/global/config.go +++ b/global/config.go @@ -27,7 +27,9 @@ func readConfig() error { Enc: "srun_bx1", }) viper.SetDefault("settings", srunModels.Settings{ - Timeout: 5, + Basic: srunModels.Basic{ + Timeout: 5, + }, Daemon: srunModels.Daemon{ Path: ".autoLogin", }, @@ -70,6 +72,6 @@ func init() { os.Exit(1) } - Timeout = time.Duration(Config.Settings.Timeout) * time.Second + Timeout = time.Duration(Config.Settings.Basic.Timeout) * time.Second initTransport() } diff --git a/main.go b/main.go index ee6f90a..0299a06 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( ) func main() { - util.Log.Demo = global.Config.Settings.DemoMode + util.Log.Demo = global.Config.Settings.Basic.DemoMode util.Log.OutPut = true defer util.Log.CatchRecover() @@ -19,10 +19,10 @@ func main() { controllers.EnterGuardian() } else { //单次登录模式 - if global.Config.Settings.Interfaces == "" { //单网卡 + if global.Config.Settings.Basic.Interfaces == "" { //单网卡 if err := controllers.Login(true, false, nil); err != nil { util.Log.Println("运行出错,状态异常") - if global.Config.Settings.DemoMode { + if global.Config.Settings.Basic.DemoMode { util.Log.Fatalln(err) } else { util.Log.Println(err) diff --git a/models/config.go b/models/config.go index 27c79ac..be9567e 100644 --- a/models/config.go +++ b/models/config.go @@ -12,12 +12,16 @@ type Guardian struct { Duration uint `json:"duration"` } -type Settings struct { +type Basic struct { Timeout uint `json:"timeout"` Interfaces string `json:"interfaces"` DemoMode bool `json:"demo_mode"` - Guardian Guardian - Daemon Daemon +} + +type Settings struct { + Basic Basic + Guardian Guardian + Daemon Daemon } type Config struct { diff --git a/util/eth.go b/util/eth.go index e21b4f7..ab77a0e 100644 --- a/util/eth.go +++ b/util/eth.go @@ -15,7 +15,7 @@ func GetInterfaceAddr() ([]srunModels.Eth, error) { if e != nil { return nil, e } - reg, e := regexp.Compile(global.Config.Settings.Interfaces) + reg, e := regexp.Compile(global.Config.Settings.Basic.Interfaces) if e != nil { Log.Println("interfaces设置异常,无法解析") return nil, e