blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 03:05:05 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix/4193-2

Browse Source
This commit is contained in:
hailaz 2025-03-27 10:54:40 +08:00 committed by GitHub
commit 15bbcc8f53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ghttp/ghttp_request.go
View File

@ -151,8 +151,13 @@ func (r *Request) IsExited() bool {
}
// GetHeader retrieves and returns the header value with given `key`.
func (r *Request) GetHeader(key string) string {
return r.Header.Get(key)
// It returns the optional `def` parameter if the header does not exist.
func (r *Request) GetHeader(key string, def ...string) string {
value := r.Header.Get(key)
if value == "" && len(def) > 0 {
value = def[0]
}
return value
}
// GetHost returns current request host name, which might be a domain or an IP without port.

14
net/ghttp/ghttp_z_unit_feature_request_test.go
View File

@ -363,7 +363,11 @@ func Test_Params_Basic(t *testing.T) {
func Test_Params_Header(t *testing.T) {
s := g.Server(guid.S())
s.BindHandler("/header", func(r *ghttp.Request) {
r.Response.Write(r.GetHeader("test"))
r.Response.Write(map[string]interface{}{
"without-def": r.GetHeader("no-header"),
"with-def": r.GetHeader("no-header", "my-default"),
"x-custom-with": r.GetHeader("x-custom", "my-default"),
})
})
s.SetDumpRouterMap(false)
s.Start()
@ -374,8 +378,14 @@ func Test_Params_Header(t *testing.T) {
prefix := fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())
client := g.Client()
client.SetPrefix(prefix)
client.SetHeader("x-custom", "custom-value")
t.Assert(client.Header(g.MapStrStr{"test": "123456"}).GetContent(ctx, "/header"), "123456")
resp := client.GetContent(ctx, "/header")
t.Assert(gjson.New(resp).Map(), g.Map{
"without-def": "",
"with-def": "my-default",
"x-custom-with": "custom-value",
})
})
}