共用一个http.Client实例

Author: blusewang

http_client.go

@@ -33,8 +33,13 @@ func (m *mt) RoundTrip(req *http.Request) (res *http.Response, err error) {
 	return
 }
 
+var c *http.Client
+
 func client() *http.Client {
-	return &http.Client{Transport: &mt{http.Transport{}}}
+	if c == nil {
+		c = &http.Client{Transport: &mt{}}
+	}
+	return c
 }
 
 func RegisterHook(hook func(req *http.Request, reqBody []byte, res *http.Response, startAt time.Time, stopAt time.Time, err error)) {

mch_req_v3.go

@@ -84,7 +84,7 @@ func (mr *mchReqV3) Do(method string) (err error) {
 	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusAccepted && resp.StatusCode != http.StatusNoContent {
 		var rs mch_api_v3.ErrorResp
 		_ = json.Unmarshal(raw, &rs)
-		return errors.New(fmt.Sprintf("%v | Request-ID:%v", rs.Message, resp.Header.Get("Request-ID")))
+		return errors.New(rs.Message)
 	}
 	if mr.api != mch_api_v3.OtherCertificates {
 		if err = mr.account.VerifyV3(resp.Header, raw); err != nil {

mp_req.go

@@ -71,19 +71,26 @@ func (mp *mpReq) Do() (err error) {
 		mp.account.ServerHost = mp_api.ServerHostUniversal
 	}
 	var apiUrl = fmt.Sprintf("https://%v/%v?%v", mp.account.ServerHost, mp.path, v.Encode())
-	var resp *http.Response
+	var req *http.Request
 	if mp.sendData == nil {
-		resp, err = client().Get(apiUrl)
+		req, err = http.NewRequest(http.MethodGet, apiUrl, nil)
 	} else {
 		var buf = new(bytes.Buffer)
 		var coder = json.NewEncoder(buf)
 		coder.SetEscapeHTML(false)
 		if err = coder.Encode(mp.sendData); err != nil {
 			return
 		}
-		resp, err = client().Post(apiUrl, "application/json", buf)
+		req, err = http.NewRequest(http.MethodPost, apiUrl, buf)
+		req.Header.Set("Content-Type", "application/json")
+	}
+	if err != nil {
+		return
+	}
+	resp, err := client().Do(req)
+	if resp != nil {
+		defer resp.Body.Close()
 	}
-	defer resp.Body.Close()
 	if err != nil {
 		return
 	}