From b33afff40c05b1dd42d097a1d46a842af18a46e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E8=8C=B6=E6=B8=85=E6=AC=A2?= Date: Mon, 31 Mar 2025 21:09:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6statis?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=AE=9E=E9=99=85=E8=BF=87=E6=99=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=8F=82=E6=95=B0=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- httpclient/client.go | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/httpclient/client.go b/httpclient/client.go index fbaacab..513c512 100644 --- a/httpclient/client.go +++ b/httpclient/client.go @@ -9,6 +9,10 @@ package httpclient import ( "fmt" + "net/http" + "strings" + "time" + "git.zhangdeman.cn/zhangdeman/consts" "git.zhangdeman.cn/zhangdeman/network/httpclient/cache" "git.zhangdeman.cn/zhangdeman/network/httpclient/define" @@ -17,9 +21,6 @@ import ( "git.zhangdeman.cn/zhangdeman/serialize" "github.com/go-resty/resty/v2" "github.com/tidwall/gjson" - "net/http" - "strings" - "time" ) // NewHttpClient 获取http client @@ -35,17 +36,6 @@ func NewHttpClient(reqConfig *define.Request, cacheInstance cache.ICache) (*Http if err := validate.RequestConfig(reqConfig); nil != err { return nil, err } - restyClient, restyRequest := NewRestyClient(reqConfig) - hc := &HttpClient{ - Client: restyClient, - request: restyRequest, - reqConfig: reqConfig, - http4xxHandler: make([]define.Http4xxHandler, 0), - http5xxHandler: make([]define.Http5xxHandler, 0), - httpBusinessErrorHandler: make([]define.HttpBusinessErrorHandler, 0), - requestFinishHandler: make([]define.RequestFinishHandler, 0), - cacheInstance: cacheInstance, - } if len(reqConfig.Static) > 0 { for loc, valMap := range reqConfig.Static { if len(valMap) == 0 { @@ -84,6 +74,17 @@ func NewHttpClient(reqConfig *define.Request, cacheInstance cache.ICache) (*Http } } } + restyClient, restyRequest := NewRestyClient(reqConfig) + hc := &HttpClient{ + Client: restyClient, + request: restyRequest, + reqConfig: reqConfig, + http4xxHandler: make([]define.Http4xxHandler, 0), + http5xxHandler: make([]define.Http5xxHandler, 0), + httpBusinessErrorHandler: make([]define.HttpBusinessErrorHandler, 0), + requestFinishHandler: make([]define.RequestFinishHandler, 0), + cacheInstance: cacheInstance, + } return hc, nil }