From 7ceb7169e5a62939bcd19815777e2b41d6909291 Mon Sep 17 00:00:00 2001 From: Mmx <1624045573@qq.com> Date: Mon, 3 May 2021 14:30:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Request/request.go | 6 +++--- Util/XBase64.go | 6 +++--- Util/file.go | 11 ++++++++++- Util/init.go | 22 ++++++++-------------- Util/util.go | 8 ++++---- main.go | 15 ++++++++------- 6 files changed, 36 insertions(+), 32 deletions(-) diff --git a/Request/request.go b/Request/request.go index 5a17ac2..1ec4336 100644 --- a/Request/request.go +++ b/Request/request.go @@ -1,15 +1,15 @@ package Request import ( - "fmt" "io/ioutil" + "log" "net/http" ) func Get(Url string, Query map[string]string) (string, error) { req, err := http.NewRequest("GET", Url, nil) if err != nil { - fmt.Println(err) + log.Println(err) return "", err } req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.26 Safari/537.36") @@ -22,7 +22,7 @@ func Get(Url string, Query map[string]string) (string, error) { } resp, err := (&http.Client{}).Do(req) if err != nil { - fmt.Println(err) + log.Println(err) return "", err } defer resp.Body.Close() diff --git a/Util/XBase64.go b/Util/XBase64.go index f41049f..4ba8fd6 100644 --- a/Util/XBase64.go +++ b/Util/XBase64.go @@ -1,15 +1,15 @@ package Util import ( - "fmt" + "log" "os" ) func getbyte(a byte) int { x := int(a) if x > 255 { - fmt.Println("INVALID_CHARACTER_ERR: DOM Exception 5") - os.Exit(3) + log.Println("INVALID_CHARACTER_ERR: DOM Exception 5") + os.Exit(1) } return x } diff --git a/Util/file.go b/Util/file.go index c2e642e..1eb1ea5 100644 --- a/Util/file.go +++ b/Util/file.go @@ -4,6 +4,7 @@ import ( "encoding/json" "io/ioutil" "os" + "path/filepath" ) type file struct { @@ -35,5 +36,13 @@ func (*file) Write(path string, receiver interface{}) error { if err != nil { return err } - return ioutil.WriteFile(path, data, 777) + return ioutil.WriteFile(path, data, 700) +} + +func (*file) GetRootPath() string { + t, err := os.Executable() + if err != nil { + ErrHandler(err) + } + return filepath.Dir(t) } diff --git a/Util/init.go b/Util/init.go index 5ec327c..895cc0f 100644 --- a/Util/init.go +++ b/Util/init.go @@ -3,19 +3,13 @@ package Util import ( "Mmx/Global" "Mmx/Modles" - "fmt" + "log" "os" - "path/filepath" ) func init() { //配置文件初始化 - Path := "Config.json" - if t, err := os.Executable(); err != nil { - ErrHandler(err) - } else { - Path = filepath.Dir(t) + "/" + Path - } + Path := File.GetRootPath() + "/Config.json" if !File.Exists(Path) { if err := File.Write(Path, &Modles.Config{ //默认值 From: Modles.LoginForm{ @@ -30,17 +24,17 @@ func init() { Enc: "srun_bx1", }, }); err != nil { - fmt.Println("创建配置文件失败:\n", err.Error()) - os.Exit(3) + log.Println("创建配置文件失败:\n", err.Error()) + os.Exit(1) } - fmt.Println("已生成配置文件，请编辑 'Config.json' 然后重试") - os.Exit(1) + log.Println("已生成配置文件，请编辑 'Config.json' 然后重试") + os.Exit(0) } var c Modles.Config if err := File.Read(Path, &c); err != nil { - fmt.Println("读取配置文件失败:\n", err.Error()) - os.Exit(3) + log.Println("读取配置文件失败:\n", err.Error()) + os.Exit(1) } Global.Config = &c diff --git a/Util/util.go b/Util/util.go index a9c6725..2d6f6f0 100644 --- a/Util/util.go +++ b/Util/util.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "io" + "log" "os" "regexp" ) @@ -50,11 +51,10 @@ func Sha1(content string) string { func ErrHandler(err error) { if err != nil { - fmt.Println("运行出错，状态异常") + log.Println("运行出错，状态异常") if Global.Config.Settings.DemoMode { - panic(err) + log.Fatalln(err) } - fmt.Println(err) - os.Exit(3) + os.Exit(1) } } diff --git a/main.go b/main.go index cd38846..f4110e8 100644 --- a/main.go +++ b/main.go @@ -6,26 +6,27 @@ import ( "Mmx/Util" "encoding/json" "fmt" + "log" "time" ) func main() { - fmt.Println("Step0: 检查状态…") + log.Println("Step0: 检查状态…") G := Global.Config.Generate() if Global.Config.Settings.QuitIfNetOk && Util.Checker.NetOk(G.UrlCheckApi) { - fmt.Println("网络正常，程序退出") + log.Println("网络正常，程序退出") return } - fmt.Println("Step1: 正在获取客户端ip") + log.Println("Step1: 正在获取客户端ip") { body, err := Request.Get(G.UrlLoginPage, nil) Util.ErrHandler(err) G.Ip, err = Util.GetIp(body) Util.ErrHandler(err) } - fmt.Println("Step2: 正在获取Token") + log.Println("Step2: 正在获取Token") { data, err := Request.Get(G.UrlGetChallengeApi, map[string]string{ "callback": "jsonp1583251661367", @@ -36,7 +37,7 @@ func main() { G.Token, err = Util.GetToken(data) Util.ErrHandler(err) } - fmt.Println("Step3: 执行登录…") + log.Println("Step3: 执行登录…") { info, err := json.Marshal(map[string]string{ "username": G.Form.UserName, @@ -75,9 +76,9 @@ func main() { Util.ErrHandler(err) G.LoginResult, err = Util.GetResult(res) Util.ErrHandler(err) - fmt.Println("登录结果: " + G.LoginResult) + log.Println("登录结果: " + G.LoginResult) if Global.Config.Settings.DemoMode { - fmt.Println(res) + log.Println(res) } } }