zhangdeman/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复full url 构建的BUG

Browse Source
This commit is contained in:
白茶清欢 2023-03-10 16:29:19 +08:00
parent 64d697d972
commit d521e69229
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
curl/define.go
View File

@ -72,8 +72,8 @@ type ApiRequestConfig struct {
// //
// Date : 15:02 2022/5/2 // Date : 15:02 2022/5/2
type Timeout struct { type Timeout struct {
Connect int64 `json:"connect"` // 连接超时 Connect int `json:"connect"` // 连接超时
Read int64 `json:"read"` // 读取超时时间 Read int `json:"read"` // 读取超时时间
} }
// ApiResponse 接口响应结果 // ApiResponse 接口响应结果

12
curl/request.go
View File

@ -163,8 +163,8 @@ func getHttpClient(apiConfig *ApiRequestConfig, header map[string]string) *httpc
} }
fullHeader["content-type"] = apiConfig.ContentType fullHeader["content-type"] = apiConfig.ContentType
return httpclient.NewHttpClient().WithHeaders(fullHeader). return httpclient.NewHttpClient().WithHeaders(fullHeader).
WithOption(httpclient.OPT_CONNECTTIMEOUT_MS, time.Duration(apiConfig.Timeout.Connect)*time.Millisecond). WithOption(httpclient.OPT_CONNECTTIMEOUT_MS, apiConfig.Timeout.Connect).
WithOption(httpclient.OPT_TIMEOUT_MS, time.Duration(apiConfig.Timeout.Read)*time.Millisecond) WithOption(httpclient.OPT_TIMEOUT_MS, apiConfig.Timeout.Read)
} }
// buildRequestURLAndParam 构建完整请求URL与请求参数 // buildRequestURLAndParam 构建完整请求URL与请求参数
@ -202,7 +202,13 @@ func buildRequestURLAndParam(apiConfig *ApiRequestConfig, header map[string]stri
apiConfig.URI = apiConfig.URI + "?" + strings.Join(paramPair, "&") apiConfig.URI = apiConfig.URI + "?" + strings.Join(paramPair, "&")
} }
} }
apiConfig.FullURL = strings.ReplaceAll(apiConfig.Domain+"/"+apiConfig.URI, "//", "/") if strings.HasSuffix(apiConfig.Domain, "/") {
apiConfig.Domain = strings.TrimRight(apiConfig.Domain, "/")
}
if !strings.HasPrefix(apiConfig.URI, "/") {
apiConfig.URI = "/" + apiConfig.URI
}
apiConfig.FullURL = apiConfig.Domain + apiConfig.URI
} }
// send 发送请求 // send 发送请求