From 599bb7c3e5a69909cadc3fb49fd43a8e35ab5199 Mon Sep 17 00:00:00 2001
From: Mmx <1624045573@qq.com>
Date: Wed, 17 Mar 2021 18:11:52 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E5=B0=86=E6=89=80=E6=9C=89=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=8F=90=E7=A4=BA=E6=9B=BF=E6=8D=A2=E4=B8=BA=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Util/config.go |  6 +++---
 Util/util.go   |  2 +-
 main.go        | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Util/config.go b/Util/config.go
index c5545fd..3b0864f 100644
--- a/Util/config.go
+++ b/Util/config.go
@@ -43,16 +43,16 @@ func (a *config) Init() *Modles.LoginInfo {
 				Enc:   "srun_bx1",
 			},
 		}); err != nil {
-			fmt.Println("Create 'Config.json' error:\n", err.Error())
+			fmt.Println("创建配置文件失败:\n", err.Error())
 			os.Exit(3)
 		}
-		fmt.Println("Please edit 'Config.json' and try again.")
+		fmt.Println("已生成配置文件，请编辑 'Config.json' 然后重试")
 		os.Exit(1)
 	}
 
 	var c Modles.Config
 	if err := File.Read(a.Path, &c); err != nil {
-		fmt.Println("Read config failed:\n", err.Error())
+		fmt.Println("读取配置文件失败:\n", err.Error())
 		os.Exit(3)
 	}
 
diff --git a/Util/util.go b/Util/util.go
index 5aa01b0..e7c1105 100644
--- a/Util/util.go
+++ b/Util/util.go
@@ -50,7 +50,7 @@ func Sha1(content string) string {
 
 func ErrHandler(err error) {
 	if err != nil {
-		fmt.Println("Error occurred")
+		fmt.Println("运行出错，状态异常")
 		if Global.Config.Settings.DemoMode {
 			panic(err)
 		}
diff --git a/main.go b/main.go
index d1d2972..c9a5e3f 100644
--- a/main.go
+++ b/main.go
@@ -9,21 +9,22 @@ import (
 )
 
 func main() {
+	fmt.Println("Step0: 检查状态…")
 	G := Util.Config.Init()
 
 	if Global.Config.Settings.QuitIfNetOk && Util.Checker.NetOk() {
-		fmt.Println("There's no need to login")
+		fmt.Println("网络正常，程序退出")
 		return
 	}
 
-	fmt.Println("Step1: Get local ip returned from srun server.")
+	fmt.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: Get token by resolving challenge result.")
+	fmt.Println("Step2: 正在获取Token")
 	{
 		data, err := Request.Get(G.UrlGetChallengeApi, map[string]string{
 			"callback": "jsonp1583251661367",
@@ -34,7 +35,7 @@ func main() {
 		G.Token, err = Util.GetToken(data)
 		Util.ErrHandler(err)
 	}
-	fmt.Println("Step3: Login and resolve response.")
+	fmt.Println("Step3: 执行登录…")
 	{
 		info, err := json.Marshal(map[string]string{
 			"username": G.Form.UserName,
@@ -48,13 +49,9 @@ func main() {
 		G.Md5 = Util.Md5(G.Token)
 		G.EncryptedMd5 = "{MD5}" + G.Md5
 
-		var chkstr string
-		chkstr = G.Token + G.Form.UserName
-		chkstr += G.Token + G.Md5
-		chkstr += G.Token + G.Meta.Acid
-		chkstr += G.Token + G.Ip
-		chkstr += G.Token + G.Meta.N
-		chkstr += G.Token + G.Meta.VType
+		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.VType
 		chkstr += G.Token + G.EncryptedInfo
 		G.EncryptedChkstr = Util.Sha1(chkstr)
 
@@ -77,6 +74,9 @@ func main() {
 		Util.ErrHandler(err)
 		G.LoginResult, err = Util.GetResult(res)
 		Util.ErrHandler(err)
+		fmt.Println("登录结果: " + G.LoginResult)
+		if Global.Config.Settings.DemoMode {
+			fmt.Println(res)
+		}
 	}
-	fmt.Println("The login result is: " + G.LoginResult)
 }