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

improve ghttp.Client

Browse Source
This commit is contained in:
John
2020-03-25 15:17:18 +08:00
parent f89976cad5
commit abb9c88c23
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
net/ghttp/ghttp_client_request.go
View File

@ -97,7 +97,6 @@ func (c *Client) DoRequest(method, url string, data ...interface{}) (resp *Clien
// File uploading request.
buffer := new(bytes.Buffer)
writer := multipart.NewWriter(buffer)
defer writer.Close()
for _, item := range strings.Split(param, "&") {
array := strings.Split(item, "=")
if len(array[1]) > 6 && strings.Compare(array[1][0:6], "@file:") == 0 {
@ -107,10 +106,11 @@ func (c *Client) DoRequest(method, url string, data ...interface{}) (resp *Clien
}
if file, err := writer.CreateFormFile(array[0], path); err == nil {
if f, err := os.Open(path); err == nil {
defer f.Close()
if _, err = io.Copy(file, f); err != nil {
f.Close()
return nil, err
}
f.Close()
} else {
return nil, err
}
@ -118,11 +118,16 @@ func (c *Client) DoRequest(method, url string, data ...interface{}) (resp *Clien
return nil, err
}
} else {
if err := writer.WriteField(array[0], array[1]); err != nil {
if err = writer.WriteField(array[0], array[1]); err != nil {
return nil, err
}
}
}
// Close finishes the multipart message and writes the trailing
// boundary end line to the output.
if err = writer.Close(); err != nil {
return nil, err
}
if req, err = http.NewRequest(method, url, buffer); err != nil {
return nil, err
} else {