From 974caf74d90bb95e6d36d0fa2e0787b08f6b6274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E5=87=89?= <927625802@qq.com> Date: Fri, 9 Apr 2021 10:38:57 +0800 Subject: [PATCH] =?UTF-8?q?:fire:=20=E5=8F=AA=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E4=B8=80=E6=AC=A1client?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alidrive/post_json.go | 9 +-------- bootstrap/client.go | 6 +++++- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/alidrive/post_json.go b/alidrive/post_json.go index 157d568f..bc77e180 100644 --- a/alidrive/post_json.go +++ b/alidrive/post_json.go @@ -10,7 +10,6 @@ import ( "net/http" "strings" "time" - "crypto/tls" ) // convert body to json @@ -62,13 +61,8 @@ func DoPost(url string, request interface{}, auth string) (body []byte, err erro req.Header.Add("Accept-Language", "zh-CN,zh;q=0.8,en-US;q=0.5,en;q=0.3") req.Header.Add("Connection", "keep-alive") - tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, - } - client := &http.Client{Transport: tr} - for retryCount := 3; retryCount >= 0; retryCount-- { - if resp, err = client.Do(req); err != nil && strings.Contains(err.Error(), "timeout") { + if resp, err = conf.Client.Do(req); err != nil && strings.Contains(err.Error(), "timeout") { <-time.After(time.Second) } else { break @@ -84,4 +78,3 @@ func DoPost(url string, request interface{}, auth string) (body []byte, err erro log.Debugf("请求返回信息:%s", string(body)) return } - diff --git a/bootstrap/client.go b/bootstrap/client.go index 2b9f3f99..4aedadb9 100644 --- a/bootstrap/client.go +++ b/bootstrap/client.go @@ -1,6 +1,7 @@ package bootstrap import ( + "crypto/tls" "github.com/Xhofe/alist/conf" log "github.com/sirupsen/logrus" "net/http" @@ -9,5 +10,8 @@ import ( // init request client func InitClient() { log.Infof("初始化client...") - conf.Client = &http.Client{} + tr := &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + } + conf.Client = &http.Client{Transport: tr} }