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

修复一波不兼容逻辑

Browse Source
This commit is contained in:
白茶清欢
2025-03-31 12:24:19 +08:00
parent 17703d2521
commit f14401a39f
2 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
httpclient/validate/request_config.go
View File

@ -8,8 +8,9 @@
package validate
import (
"git.zhangdeman.cn/zhangdeman/network/httpclient/define"
"fmt"
"git.zhangdeman.cn/zhangdeman/consts"
"git.zhangdeman.cn/zhangdeman/network/httpclient/define"
"net/http"
"net/url"
"strings"
@ -49,18 +50,23 @@ func (rc *requestConfig) initDefaultConfig(reqConfig *define.Request) {
}
}
if nil == reqConfig.Header {
reqConfig.Header = map[string]string{}
reqConfig.Header = map[string]any{}
}
if len(reqConfig.ContentType) > 0 {
reqConfig.Header[consts.HeaderKeyContentType.String()] = reqConfig.ContentType
} else {
if len(reqConfig.Header[consts.HeaderKeyContentType.String()]) == 0 {
if val, exist := reqConfig.Header[consts.HeaderKeyContentType.String()]; exist {
if val == nil || fmt.Sprintf("%v", val) == "" {
// 没配置Content-Type, 默认JSON
reqConfig.Header[consts.HeaderKeyContentType.String()] = consts.MimeTypeJson
}
} else {
// 没配置Content-Type, 默认JSON
reqConfig.Header[consts.HeaderKeyContentType.String()] = consts.MimeTypeJson
}
}
if nil == reqConfig.Cookie {
reqConfig.Cookie = map[string]string{}
reqConfig.Cookie = map[string]any{}
}
if reqConfig.ConnectTimeout <= 0 {
reqConfig.ConnectTimeout = define.DefaultConnectTimeout