feat: 更换http工具包

controllers/login.go

@@ -2,11 +2,10 @@ package controllers
 
 import (
 	"autoLogin/global"
-	"autoLogin/request"
 	"autoLogin/util"
 	"encoding/json"
 	"errors"
-	"fmt"
+	"github.com/Mmx233/tool"
 	"time"
 )
 
@@ -22,41 +21,42 @@ func Login(output bool) error {
 
 	util.Log.Println("Step1: 正在获取客户端ip")
 	{
-		body, err := request.Get(G.UrlLoginPage, nil)
+		if _, body, e := tool.HTTP.GetString(&tool.GetRequest{
-		if err != nil {
+			Url:      G.UrlLoginPage,
-			return err
+			Redirect: true,
-		}
+		}); e != nil {
-		G.Ip, err = util.GetIp(body)
+			return e
-		if err != nil {
+		} else if G.Ip, e = util.GetIp(body); e != nil {
-			return err
+			return e
 		}
 	}
 	util.Log.Println("Step2: 正在获取Token")
 	{
-		data, err := request.Get(G.UrlGetChallengeApi, map[string]string{
+		if _, data, e := tool.HTTP.GetString(&tool.GetRequest{
-			"callback": "jsonp1583251661367",
+			Url: G.UrlGetChallengeApi,
-			"username": G.Form.UserName,
+			Query: map[string]interface{}{
-			"ip":       G.Ip,
+				"callback": "jsonp1583251661367",
-		})
+				"username": G.Form.UserName,
-		if err != nil {
+				"ip":       G.Ip,
-			return err
+			},
-		}
+			Redirect: true,
-		G.Token, err = util.GetToken(data)
+		}); e != nil {
-		if err != nil {
+			return e
-			return err
+		} else if G.Token, e = util.GetToken(data); e != nil {
+			return e
 		}
 	}
 	util.Log.Println("Step3: 执行登录…")
 	{
-		info, err := json.Marshal(map[string]string{
+		info, e := json.Marshal(map[string]string{
 			"username": G.Form.UserName,
 			"password": G.Form.PassWord,
 			"ip":       G.Ip,
 			"acid":     G.Meta.Acid,
 			"enc_ver":  G.Meta.Enc,
 		})
-		if err != nil {
+		if e != nil {
-			return err
+			return e
 		}
 		G.EncryptedInfo = "{SRBX1}" + util.Base64(util.XEncode(string(info), G.Token))
 		G.Md5 = util.Md5(G.Token)
@@ -68,33 +68,36 @@ func Login(output bool) error {
 		chkstr += G.Token + G.EncryptedInfo
 		G.EncryptedChkstr = util.Sha1(chkstr)
 
-		res, err := request.Get(G.UrlLoginApi, map[string]string{
+		if _, res, e := tool.HTTP.GetString(&tool.GetRequest{
-			"callback":     "jQuery112401157665",
+			Url: G.UrlLoginApi,
-			"action":       "login",
+			Query: map[string]interface{}{
-			"username":     G.Form.UserName,
+				"callback":     "jQuery112401157665",
-			"password":     G.EncryptedMd5,
+				"action":       "login",
-			"ac_id":        G.Meta.Acid,
+				"username":     G.Form.UserName,
-			"ip":           G.Ip,
+				"password":     G.EncryptedMd5,
-			"info":         G.EncryptedInfo,
+				"ac_id":        G.Meta.Acid,
-			"chksum":       G.EncryptedChkstr,
+				"ip":           G.Ip,
-			"n":            G.Meta.N,
+				"info":         G.EncryptedInfo,
-			"type":         G.Meta.Type,
+				"chksum":       G.EncryptedChkstr,
-			"os":           "Windows 10",
+				"n":            G.Meta.N,
-			"name":         "windows",
+				"type":         G.Meta.Type,
-			"double_stack": "0",
+				"os":           "Windows 10",
-			"_":            fmt.Sprint(time.Now().UnixNano()),
+				"name":         "windows",
-		})
+				"double_stack": 0,
-		if err != nil {
+				"_":            time.Now().UnixNano(),
-			return err
+			},
-		}
+			Redirect: true,
-		G.LoginResult, err = util.GetResult(res)
+		}); e != nil {
-		if err != nil {
+			return e
-			return err
+		} else if G.LoginResult, e = util.GetResult(res); e != nil {
-		}
+			return e
-		util.Log.Println("登录结果: " + G.LoginResult)
+		} else {
-		if global.Config.Settings.DemoMode {
+			util.Log.Println("登录结果: " + G.LoginResult)
-			util.Log.Println(res)
+			if global.Config.Settings.DemoMode {
+				util.Log.Println(res)
+			}
 		}
+
 		if G.LoginResult != "ok" {
 			return errors.New(G.LoginResult)
 		}

go.mod

@@ -1,3 +1,8 @@
 module autoLogin
 
 go 1.16
+
+require (
+	github.com/Mmx233/tool v0.2.2
+	github.com/PuerkitoBio/goquery v1.7.1 // indirect
+)

go.sum

@@ -0,0 +1,14 @@
+github.com/Mmx233/tool v0.2.2 h1:1Sa/f0a4dZoXiCa12W1O3pItsRgl+qLOhItoGNBO8Do=
+github.com/Mmx233/tool v0.2.2/go.mod h1:un5MCoI21lH40fFI5S9++aja8nJb+2sjATak7PnGMZ0=
+github.com/PuerkitoBio/goquery v1.7.1 h1:oE+T06D+1T7LNrn91B4aERsRIeCLJ/oPSa6xB9FPnz4=
+github.com/PuerkitoBio/goquery v1.7.1/go.mod h1:XY0pP4kfraEmmV1O7Uf6XyjoslwsneBbgeDjLYuN8xY=
+github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
+github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
+golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

request/request.go

@@ -1,44 +0,0 @@
-package request
-
-import (
-	"autoLogin/util"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"time"
-)
-
-func Get(Url string, Query map[string]string) (string, error) {
-	req, err := http.NewRequest("GET", Url, nil)
-	if err != nil {
-		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")
-	if Query != nil {
-		q := req.URL.Query()
-		for k, v := range Query {
-			q.Add(k, v)
-		}
-		req.URL.RawQuery = q.Encode()
-	}
-	resp, err := (&http.Client{
-		Transport: &http.Transport{
-			DialContext: (&net.Dialer{
-				Timeout: 5 * time.Second,
-				Resolver: &net.Resolver{
-					PreferGo: true,
-					Dial:     util.NetDailEr(),
-				},
-			}).DialContext,
-		},
-	}).Do(req)
-	if err != nil {
-		log.Println(err)
-		return "", err
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	return string(body), err
-}