diff --git a/httpclient/client.go b/httpclient/client.go index 59eaf22..14ac71c 100644 --- a/httpclient/client.go +++ b/httpclient/client.go @@ -55,47 +55,8 @@ func NewHttpClient(reqConfig *define.Request, reqOption *RequestOption) (*HttpCl if len(reqConfig.SuccessHttpCodeList) == 0 { reqConfig.SuccessHttpCodeList = []int{} } - if len(reqConfig.Static) > 0 { - for loc, valMap := range reqConfig.Static { - if len(valMap) == 0 { - continue - } - l := strings.ToUpper(loc) - switch l { - case consts.RequestDataLocationHeader.String(): - if reqConfig.Header == nil { - reqConfig.Header = make(map[string]any) - } - for k, v := range valMap { - reqConfig.Header[k] = v - } - case consts.RequestDataLocationCookie.String(): - if reqConfig.Cookie == nil { - reqConfig.Cookie = make(map[string]any) - } - for k, v := range valMap { - reqConfig.Cookie[k] = v - } - case consts.RequestDataLocationBody.String(): - if reqConfig.Body == nil { - reqConfig.Body = make(map[string]any) - } - for k, v := range valMap { - reqConfig.Body[k] = v - } - case consts.RequestDataLocationQuery.String(): - if reqConfig.Query == nil { - reqConfig.Query = make(map[string]any) - } - for k, v := range valMap { - reqConfig.Query[k] = v - } - } - } - } - if reqConfig.Header == nil { - reqConfig.Header = make(map[string]any) - } + // 初始化配置 + initRequestConfig(reqConfig) if ua, exist := reqConfig.Header[consts.HeaderKeyUserAgent.String()]; !exist || nil == ua || fmt.Sprintf("%v", ua) == "" { reqConfig.Header[consts.HeaderKeyUserAgent.String()] = "resty-v3@network/httpclient" }