From e3f668c100c71d989b6fe751957600b1ae631aba Mon Sep 17 00:00:00 2001
From: Mmx <1624045573@qq.com>
Date: Sun, 11 Jul 2021 12:02:42 +0800
Subject: [PATCH] =?UTF-8?q?style:=E5=8C=85=E5=90=8D=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Global/global.go                   |  5 ---
 global/global.go                   |  5 +++
 main.go                            | 56 +++++++++++++++---------------
 {Modles => modles}/config.go       |  3 +-
 {Modles => modles}/login.go        |  2 +-
 {Modles => modles}/util/reflect.go |  0
 {Request => request}/request.go    |  6 ++--
 {Util => util}/XBase64.go          |  2 +-
 {Util => util}/XEncode.go          |  2 +-
 {Util => util}/checker.go          |  2 +-
 {Util => util}/file.go             |  2 +-
 {Util => util}/init.go             |  6 ++--
 {Util => util}/log.go              |  4 +--
 {Util => util}/util.go             |  6 ++--
 14 files changed, 51 insertions(+), 50 deletions(-)
 delete mode 100644 Global/global.go
 create mode 100644 global/global.go
 rename {Modles => modles}/config.go (96%)
 rename {Modles => modles}/login.go (97%)
 rename {Modles => modles}/util/reflect.go (100%)
 rename {Request => request}/request.go (91%)
 rename {Util => util}/XBase64.go (98%)
 rename {Util => util}/XEncode.go (99%)
 rename {Util => util}/checker.go (97%)
 rename {Util => util}/file.go (99%)
 rename {Util => util}/init.go (91%)
 rename {Util => util}/log.go (94%)
 rename {Util => util}/util.go (91%)

diff --git a/Global/global.go b/Global/global.go
deleted file mode 100644
index 3a376cb..0000000
--- a/Global/global.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package Global
-
-import "Mmx/Modles"
-
-var Config *Modles.Config
diff --git a/global/global.go b/global/global.go
new file mode 100644
index 0000000..80aa849
--- /dev/null
+++ b/global/global.go
@@ -0,0 +1,5 @@
+package global
+
+import "Mmx/Modles"
+
+var Config *modles.Config
diff --git a/main.go b/main.go
index 16a566e..86c1749 100644
--- a/main.go
+++ b/main.go
@@ -14,39 +14,39 @@ import (
 func main() {
 	defer func() {
 		if e := recover(); e != nil {
-			Util.Log.Println(e)
+			util.Log.Println(e)
 			var buf [4096]byte
-			Util.Log.Println(string(buf[:runtime.Stack(buf[:], false)]))
+			util.Log.Println(string(buf[:runtime.Stack(buf[:], false)]))
 			os.Exit(1)
 		}
 	}()
-	Util.Log.Println("Step0: 检查状态…")
-	G := Global.Config.Generate()
+	util.Log.Println("Step0: 检查状态…")
+	G := global.Config.Generate()
 
-	if Global.Config.Settings.QuitIfNetOk && Util.Checker.NetOk() {
-		Util.Log.Println("网络正常，程序退出")
+	if global.Config.Settings.QuitIfNetOk && util.Checker.NetOk() {
+		util.Log.Println("网络正常，程序退出")
 		return
 	}
 
-	Util.Log.Println("Step1: 正在获取客户端ip")
+	util.Log.Println("Step1: 正在获取客户端ip")
 	{
-		body, err := Request.Get(G.UrlLoginPage, nil)
-		Util.ErrHandler(err)
-		G.Ip, err = Util.GetIp(body)
-		Util.ErrHandler(err)
+		body, err := request.Get(G.UrlLoginPage, nil)
+		util.ErrHandler(err)
+		G.Ip, err = util.GetIp(body)
+		util.ErrHandler(err)
 	}
-	Util.Log.Println("Step2: 正在获取Token")
+	util.Log.Println("Step2: 正在获取Token")
 	{
-		data, err := Request.Get(G.UrlGetChallengeApi, map[string]string{
+		data, err := request.Get(G.UrlGetChallengeApi, map[string]string{
 			"callback": "jsonp1583251661367",
 			"username": G.Form.UserName,
 			"ip":       G.Ip,
 		})
-		Util.ErrHandler(err)
-		G.Token, err = Util.GetToken(data)
-		Util.ErrHandler(err)
+		util.ErrHandler(err)
+		G.Token, err = util.GetToken(data)
+		util.ErrHandler(err)
 	}
-	Util.Log.Println("Step3: 执行登录…")
+	util.Log.Println("Step3: 执行登录…")
 	{
 		info, err := json.Marshal(map[string]string{
 			"username": G.Form.UserName,
@@ -55,18 +55,18 @@ func main() {
 			"acid":     G.Meta.Acid,
 			"enc_ver":  G.Meta.Enc,
 		})
-		Util.ErrHandler(err)
-		G.EncryptedInfo = "{SRBX1}" + Util.Base64(Util.XEncode(string(info), G.Token))
-		G.Md5 = Util.Md5(G.Token)
+		util.ErrHandler(err)
+		G.EncryptedInfo = "{SRBX1}" + util.Base64(util.XEncode(string(info), G.Token))
+		G.Md5 = util.Md5(G.Token)
 		G.EncryptedMd5 = "{MD5}" + G.Md5
 
 		var chkstr = G.Token + G.Form.UserName + G.Token + G.Md5
 		chkstr += G.Token + G.Meta.Acid + G.Token + G.Ip
 		chkstr += G.Token + G.Meta.N + G.Token + G.Meta.Type
 		chkstr += G.Token + G.EncryptedInfo
-		G.EncryptedChkstr = Util.Sha1(chkstr)
+		G.EncryptedChkstr = util.Sha1(chkstr)
 
-		res, err := Request.Get(G.UrlLoginApi, map[string]string{
+		res, err := request.Get(G.UrlLoginApi, map[string]string{
 			"callback":     "jQuery112401157665",
 			"action":       "login",
 			"username":     G.Form.UserName,
@@ -82,12 +82,12 @@ func main() {
 			"double_stack": "0",
 			"_":            fmt.Sprint(time.Now().UnixNano()),
 		})
-		Util.ErrHandler(err)
-		G.LoginResult, err = Util.GetResult(res)
-		Util.ErrHandler(err)
-		Util.Log.Println("登录结果: " + G.LoginResult)
-		if Global.Config.Settings.DemoMode {
-			Util.Log.Println(res)
+		util.ErrHandler(err)
+		G.LoginResult, err = util.GetResult(res)
+		util.ErrHandler(err)
+		util.Log.Println("登录结果: " + G.LoginResult)
+		if global.Config.Settings.DemoMode {
+			util.Log.Println(res)
 		}
 	}
 }
diff --git a/Modles/config.go b/modles/config.go
similarity index 96%
rename from Modles/config.go
rename to modles/config.go
index 4f84efe..eae30ee 100644
--- a/Modles/config.go
+++ b/modles/config.go
@@ -1,4 +1,4 @@
-package Modles
+package modles
 
 import (
 	"Mmx/Modles/util"
@@ -9,6 +9,7 @@ type Settings struct {
 	QuitIfNetOk bool   `json:"quit_if_net_ok"`
 	DemoMode    bool   `json:"demo_mode"`
 	Dns         string `json:"dns"`
+	Daemon      uint   `json:"daemon"`
 }
 
 type Config struct {
diff --git a/Modles/login.go b/modles/login.go
similarity index 97%
rename from Modles/login.go
rename to modles/login.go
index e4dd423..24de6c9 100644
--- a/Modles/login.go
+++ b/modles/login.go
@@ -1,4 +1,4 @@
-package Modles
+package modles
 
 type LoginForm struct {
 	Domain   string `json:"domain"`
diff --git a/Modles/util/reflect.go b/modles/util/reflect.go
similarity index 100%
rename from Modles/util/reflect.go
rename to modles/util/reflect.go
diff --git a/Request/request.go b/request/request.go
similarity index 91%
rename from Request/request.go
rename to request/request.go
index 2bd6f7b..a85bbb8 100644
--- a/Request/request.go
+++ b/request/request.go
@@ -1,4 +1,4 @@
-package Request
+package request
 
 import (
 	"Mmx/Util"
@@ -26,10 +26,10 @@ func Get(Url string, Query map[string]string) (string, error) {
 	resp, err := (&http.Client{
 		Transport: &http.Transport{
 			DialContext: (&net.Dialer{
-				Timeout: 10 * time.Second,
+				Timeout: 5 * time.Second,
 				Resolver: &net.Resolver{
 					PreferGo: true,
-					Dial:     Util.NetDailEr(),
+					Dial:     util.NetDailEr(),
 				},
 			}).DialContext,
 		},
diff --git a/Util/XBase64.go b/util/XBase64.go
similarity index 98%
rename from Util/XBase64.go
rename to util/XBase64.go
index 56b4916..efd70e7 100644
--- a/Util/XBase64.go
+++ b/util/XBase64.go
@@ -1,4 +1,4 @@
-package Util
+package util
 
 func getbyte(a byte) int {
 	x := int(a)
diff --git a/Util/XEncode.go b/util/XEncode.go
similarity index 99%
rename from Util/XEncode.go
rename to util/XEncode.go
index 2ec94ec..3f0c64f 100644
--- a/Util/XEncode.go
+++ b/util/XEncode.go
@@ -1,4 +1,4 @@
-package Util
+package util
 
 import (
 	"math"
diff --git a/Util/checker.go b/util/checker.go
similarity index 97%
rename from Util/checker.go
rename to util/checker.go
index 53d77d8..3a94d91 100644
--- a/Util/checker.go
+++ b/util/checker.go
@@ -1,4 +1,4 @@
-package Util
+package util
 
 import (
 	"context"
diff --git a/Util/file.go b/util/file.go
similarity index 99%
rename from Util/file.go
rename to util/file.go
index 09b092c..b65115d 100644
--- a/Util/file.go
+++ b/util/file.go
@@ -1,4 +1,4 @@
-package Util
+package util
 
 import (
 	"bufio"
diff --git a/Util/init.go b/util/init.go
similarity index 91%
rename from Util/init.go
rename to util/init.go
index f695ba8..ba8c0c5 100644
--- a/Util/init.go
+++ b/util/init.go
@@ -1,4 +1,4 @@
-package Util
+package util
 
 import (
 	"Mmx/Global"
@@ -10,7 +10,7 @@ import (
 func init() {
 	//配置文件初始化
 	Path := "Config.json"
-	var c Modles.Config
+	var c modles.Config
 	if !File.Exists(Path) {
 		if err := File.WriteJson(
 			Path,
@@ -30,5 +30,5 @@ func init() {
 
 	_ = File.WriteJson(Path, c.FillDefault())
 
-	Global.Config = &c
+	global.Config = &c
 }
diff --git a/Util/log.go b/util/log.go
similarity index 94%
rename from Util/log.go
rename to util/log.go
index 0b9d5f5..ae2c694 100644
--- a/Util/log.go
+++ b/util/log.go
@@ -1,4 +1,4 @@
-package Util
+package util
 
 import (
 	"Mmx/Global"
@@ -40,7 +40,7 @@ func (c *loG) genTimeStamp() {
 
 func (c *loG) Println(a ...interface{}) {
 	c.genTimeStamp()
-	if Global.Config.Settings.DemoMode {
+	if global.Config.Settings.DemoMode {
 		c.WriteLog("Login-"+c.timeStamp+".log", a...)
 	}
 	log.Println(a...)
diff --git a/Util/util.go b/util/util.go
similarity index 91%
rename from Util/util.go
rename to util/util.go
index f49eec9..393851f 100644
--- a/Util/util.go
+++ b/util/util.go
@@ -1,4 +1,4 @@
-package Util
+package util
 
 import (
 	"Mmx/Global"
@@ -54,7 +54,7 @@ func Sha1(content string) string {
 func ErrHandler(err error) {
 	if err != nil {
 		Log.Println("运行出错，状态异常")
-		if Global.Config.Settings.DemoMode {
+		if global.Config.Settings.DemoMode {
 			Log.Fatalln(err)
 		}
 		os.Exit(1)
@@ -66,6 +66,6 @@ func NetDailEr() func(ctx context.Context, network, address string) (net.Conn, e
 		d := net.Dialer{
 			Timeout: 5 * time.Second,
 		}
-		return d.DialContext(ctx, "udp", Global.Config.Settings.Dns+":53")
+		return d.DialContext(ctx, "udp", global.Config.Settings.Dns+":53")
 	}
 }