增加获取返回的header信息功能

王聪 · 王聪 · commit 4474b5feb650 · 2019-09-04T14:29:17.000+08:00
diff --git a/go.mod b/go.mod
@@ -0,0 +1,8 @@
+module github.com/kplcloud/request
+
+go 1.12
+
+require (
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297
+	gopkg.in/yaml.v2 v2.2.2
+)
diff --git a/go.sum b/go.sum
@@ -0,0 +1,10 @@
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/request.go b/request.go
@@ -53,6 +53,7 @@ type Result struct {
 	contentType string
 	err         error
 	statusCode  int
+	headers     map[string][]string
 
 	decoder Decoder
 }
@@ -103,6 +104,10 @@ func (r Result) HttpStatusCode() int {
 	return r.statusCode
 }
 
+func (r Result) Headers() map[string][]string {
+	return r.headers
+}
+
 // StatusCode returns the HTTP status code of the request. (Only valid if no
 // error was returned.)
 func (r Result) StatusCode(statusCode *int) Result {
@@ -447,6 +452,7 @@ func (r *Request) transformResponse(resp *http.Response, req *http.Request) Resu
 			statusCode:  resp.StatusCode,
 			decoder:     decoder,
 			err:         r.transformUnstructuredResponseError(resp, req, body),
+			headers:     resp.Header,
 		}
 	}
 
@@ -455,6 +461,7 @@ func (r *Request) transformResponse(resp *http.Response, req *http.Request) Resu
 		contentType: contentType,
 		statusCode:  resp.StatusCode,
 		decoder:     decoder,
+		headers:     resp.Header,
 	}
 }
 
diff --git a/request_test.go b/request_test.go
@@ -27,6 +27,11 @@ func TestRequest_Do(t *testing.T) {
 		t.Error("err", err.Error())
 	}
 	t.Log("success", res)
+
+	resp := NewRequest("https://www.iphpt.com/", "POST").
+		Body([]byte(body)).Do()
+	t.Log(resp.headers)
+
 }
 
 func TestRequest_HttpClient(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ type Result struct {`
`53`	`53`	`contentType string`
`54`	`54`	`err error`
`55`	`55`	`statusCode int`
	`56`	`+ headers map[string][]string`
`56`	`57`
`57`	`58`	`decoder Decoder`
`58`	`59`	`}`
`@@ -103,6 +104,10 @@ func (r Result) HttpStatusCode() int {`
`103`	`104`	`return r.statusCode`
`104`	`105`	`}`
`105`	`106`
	`107`	`+func (r Result) Headers() map[string][]string {`
	`108`	`+ return r.headers`
	`109`	`+}`
	`110`	`+`
`106`	`111`	`// StatusCode returns the HTTP status code of the request. (Only valid if no`
`107`	`112`	`// error was returned.)`
`108`	`113`	`func (r Result) StatusCode(statusCode *int) Result {`
`@@ -447,6 +452,7 @@ func (r Request) transformResponse(resp http.Response, req *http.Request) Resu`
`447`	`452`	`statusCode: resp.StatusCode,`
`448`	`453`	`decoder: decoder,`
`449`	`454`	`err: r.transformUnstructuredResponseError(resp, req, body),`
	`455`	`+ headers: resp.Header,`
`450`	`456`	`}`
`451`	`457`	`}`
`452`	`458`
`@@ -455,6 +461,7 @@ func (r Request) transformResponse(resp http.Response, req *http.Request) Resu`
`455`	`461`	`contentType: contentType,`
`456`	`462`	`statusCode: resp.StatusCode,`
`457`	`463`	`decoder: decoder,`
	`464`	`+ headers: resp.Header,`
`458`	`465`	`}`
`459`	`466`	`}`
`460`	`467`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,11 @@ func TestRequest_Do(t *testing.T) {`
`27`	`27`	`t.Error("err", err.Error())`
`28`	`28`	`}`
`29`	`29`	`t.Log("success", res)`
	`30`	`+`
	`31`	`+ resp := NewRequest("https://www.iphpt.com/", "POST").`
	`32`	`+ Body([]byte(body)).Do()`
	`33`	`+ t.Log(resp.headers)`
	`34`	`+`
`30`	`35`	`}`
`31`	`36`
`32`	`37`	`func TestRequest_HttpClient(t *testing.T) {`