1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 09:00:55 +00:00

Merge pull request #1308 from zhangshuai/master

httplib请求参数支持[]string
This commit is contained in:
astaxie 2015-08-27 22:50:44 +08:00
commit 7aa893612e

View File

@ -94,7 +94,7 @@ func NewBeegoRequest(rawurl, method string) *BeegoHttpRequest {
return &BeegoHttpRequest{
url: rawurl,
req: &req,
params: map[string]string{},
params: map[string][]string{},
files: map[string]string{},
setting: defaultSetting,
resp: &resp,
@ -144,7 +144,7 @@ type BeegoHttpSettings struct {
type BeegoHttpRequest struct {
url string
req *http.Request
params map[string]string
params map[string][]string
files map[string]string
setting BeegoHttpSettings
resp *http.Response
@ -267,7 +267,11 @@ func (b *BeegoHttpRequest) SetProxy(proxy func(*http.Request) (*url.URL, error))
// Param adds query param in to request.
// params build query string as ?key1=value1&key2=value2...
func (b *BeegoHttpRequest) Param(key, value string) *BeegoHttpRequest {
b.params[key] = value
if param, ok := b.params[key]; ok {
b.params[key] = append(param, value)
} else {
b.params[key] = []string{value}
}
return b
}
@ -342,7 +346,9 @@ func (b *BeegoHttpRequest) buildUrl(paramBody string) {
}
}
for k, v := range b.params {
bodyWriter.WriteField(k, v)
for _, vv := range v {
bodyWriter.WriteField(k, vv)
}
}
bodyWriter.Close()
pw.Close()
@ -377,10 +383,12 @@ func (b *BeegoHttpRequest) SendOut() (*http.Response, error) {
if len(b.params) > 0 {
var buf bytes.Buffer
for k, v := range b.params {
buf.WriteString(url.QueryEscape(k))
buf.WriteByte('=')
buf.WriteString(url.QueryEscape(v))
buf.WriteByte('&')
for _, vv := range v {
buf.WriteString(url.QueryEscape(k))
buf.WriteByte('=')
buf.WriteString(url.QueryEscape(vv))
buf.WriteByte('&')
}
}
paramBody = buf.String()
paramBody = paramBody[0 : len(paramBody)-1]