bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 02:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

add postForm with multi data content type support (#2508)

Browse Source
This commit is contained in:
旺旺碎冰冰
2023-03-14 09:57:22 +08:00
committed by GitHub
parent b742e222d6
commit 80d57ed8f9
2 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
net/gclient/gclient_request.go
View File

@ -13,7 +13,6 @@ import (
"io/ioutil"
"mime/multipart"
"net/http"
"net/url"
"os"
"strings"
"time"
@ -84,26 +83,36 @@ func (c *Client) Trace(ctx context.Context, url string, data ...interface{}) (*R
return c.DoRequest(ctx, http.MethodTrace, url, data...)
}
// PostForm issues a POST to the specified URL,
// with data's keys and values URL-encoded as the request body.
// PostForm is different from net/http.PostForm.
// It's a wrapper of Post method, which sets the Content-Type as "multipart/form-data;".
// and It will automatically set boundary characters for the request body and Content-Type.
//
// The Content-Type header is set to application/x-www-form-urlencoded.
// To set other headers, use NewRequest and Client.Do.
// It's Seem like the following case:
//
// When err is nil, resp always contains a non-nil resp.Body.
// Caller should close resp.Body when done reading from it.
// Content-Type: multipart/form-data; boundary=----Boundarye4Ghaog6giyQ9ncN
//
// See the Client.Do method documentation for details on how redirects
// are handled.
// And form data is like:
// ------Boundarye4Ghaog6giyQ9ncN
// Content-Disposition: form-data; name="checkType"
//
// To make a request with a specified context.Context, use NewRequestWithContext
// and Client.Do.
// Deprecated: use Post instead.
func (c *Client) PostForm(url string, data url.Values) (resp *Response, err error) {
return nil, gerror.NewCode(
gcode.CodeNotSupported,
`PostForm is not supported, please use Post instead`,
)
// none
//
// It's used for sending form data.
// Note that the response object MUST be closed if it'll never be used.
func (c *Client) PostForm(ctx context.Context, url string, data map[string]string) (resp *Response, err error) {
body := new(bytes.Buffer)
w := multipart.NewWriter(body)
for k, v := range data {
err := w.WriteField(k, v)
if err != nil {
return nil, err
}
}
err = w.Close()
if err != nil {
return nil, err
}
return c.ContentType(w.FormDataContentType()).Post(ctx, url, body)
}
// DoRequest sends request with given HTTP method and data and returns the response object.

9
net/gclient/gclient_z_unit_test.go
View File

@ -38,6 +38,9 @@ func Test_Client_Basic(t *testing.T) {
s.BindHandler("/hello", func(r *ghttp.Request) {
r.Response.Write("hello")
})
s.BindHandler("/postForm", func(r *ghttp.Request) {
r.Response.Write(r.Get("key1"))
})
s.SetDumpRouterMap(false)
s.Start()
defer s.Shutdown()
@ -54,8 +57,12 @@ func Test_Client_Basic(t *testing.T) {
_, err := g.Client().Post(ctx, "")
t.AssertNE(err, nil)
_, err = g.Client().PostForm("", nil)
_, err = g.Client().PostForm(ctx, "/postForm", nil)
t.AssertNE(err, nil)
data, _ := g.Client().PostForm(ctx, url+"/postForm", map[string]string{
"key1": "value1",
})
t.Assert(data.ReadAllString(), "value1")
})
}