go mod tidy

v0.0.9

.gitignore

@@ -1 +1,2 @@
 *.pyc
+*.vscode

base.go

@@ -7,33 +7,45 @@ import (
 	"reflect"
 )
 
-func buildBodyRequest(ver, rawurl string, body *Body) *http.Request {
+func buildBodyRequest(wf *Workflow) *http.Request {
 	var req *http.Request
 	var err error
+	contentType := ""
 
-	if body.IOBody == nil {
+	if wf.Body.GetIOBody() == nil {
-		req, err = http.NewRequest(ver, rawurl, nil)
+		req, err = http.NewRequest(wf.Method, wf.GetRawURL(), nil)
 	} else {
 		var bodybuf *bytes.Buffer
-		switch body.IOBody.(type) {
+		switch wf.Body.GetIOBody().(type) {
 		case []byte:
-			bodybuf = bytes.NewBuffer(body.IOBody.([]byte))
+			bodybuf = bytes.NewBuffer(wf.Body.GetIOBody().([]byte))
+		case string:
+			bodybuf = bytes.NewBuffer([]byte(wf.Body.GetIOBody().(string)))
 		case *bytes.Buffer:
-			bodybuf = bytes.NewBuffer(body.IOBody.(*bytes.Buffer).Bytes())
+			bodybuf = bytes.NewBuffer(wf.Body.GetIOBody().(*bytes.Buffer).Bytes())
 		default:
-			panic(errors.New("the type is not exist, type is" + reflect.TypeOf(body.IOBody).String()))
+			panic(errors.New("the type is not exist, type is " + reflect.TypeOf(wf.Body.GetIOBody()).String()))
 		}
-		req, err = http.NewRequest(ver, rawurl, bodybuf)
+		req, err = http.NewRequest(wf.Method, wf.GetRawURL(), bodybuf)
 	}
 
 	if err != nil {
 		panic(err)
 	}
 
-	if body.ContentType == "" {
+	if wf.Body.ContentType() != "" {
-		req.Header.Set(HeaderKeyContentType, TypeURLENCODED)
+		contentType = wf.Body.ContentType()
 	} else {
-		req.Header.Set(HeaderKeyContentType, body.ContentType)
+		contentType = ""
+		if contentType == "" {
+			if wf.Method == "POST" || wf.Method == "PUT" || wf.Method == "PATCH" {
+				contentType = TypeURLENCODED
+			}
+		}
+	}
+
+	if contentType != "" {
+		req.Header.Set(HeaderKeyContentType, contentType)
 	}
 
 	return req

go.mod

@@ -0,0 +1,9 @@
+module requests
+
+go 1.12
+
+require (
+	474420502.top/eson/gjson v1.1.3
+	github.com/tidwall/match v1.0.1 // indirect
+	golang.org/x/net v0.0.0-20190628185345-da137c7871d7
+)

go.sum

@@ -0,0 +1,9 @@
+474420502.top/eson/gjson v1.1.3 h1:SDeD1/SWm1YknuokcPww8ZmsOOguQqFAYLWnQTMMX98=
+474420502.top/eson/gjson v1.1.3/go.mod h1:95mdr7XPHsGvsGZj/FeQ+iT7mggI6LKc3JT/ZnveebI=
+github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
+github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/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/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

multipart.go

@@ -15,16 +15,19 @@ func writeFormUploadFile(mwriter *multipart.Writer, ufile *UploadFile) {
 		log.Panic(err)
 	}
 	io.Copy(part, ufile.FileReaderCloser)
+
+	err = ufile.FileReaderCloser.Close()
+	if err != nil {
+		panic(err)
+	}
 }
 
-func createMultipart(postParams *Body, params []interface{}) {
+func createMultipart(postParams IBody, params []interface{}) {
 	plen := len(params)
 
 	body := &bytes.Buffer{}
 	mwriter := multipart.NewWriter(body)
 
-	defer mwriter.Close()
-
 	for _, iparam := range params[0 : plen-1] {
 		switch param := iparam.(type) {
 		case *UploadFile:
@@ -85,6 +88,11 @@ func createMultipart(postParams *Body, params []interface{}) {
 		}
 	}
 
-	postParams.ContentType = mwriter.FormDataContentType()
+	postParams.AddContentType(mwriter.FormDataContentType())
-	postParams.IOBody = body
+	postParams.SetIOBody(body)
+
+	err := mwriter.Close()
+	if err != nil {
+		panic(err)
+	}
 }

response.go

@@ -9,52 +9,48 @@ import (
 	"net/http"
 )
 
-// Response 响应内容包含http.Response
+// Response 响应内容包含http.Response 已读
 type Response struct {
-	DContent  string
+	readContent  string
-	GResponse *http.Response
+	readResponse *http.Response
 }
 
 // FromHTTPResponse 生成Response 从标准http.Response
 func FromHTTPResponse(resp *http.Response) (*Response, error) {
-
+	var err error
 	// 复制response 返回内容 并且测试是否有解压的需求
 	srcbuf, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 	resp.Body.Close()
 
-	cbuf := bytes.NewBuffer([]byte{})
+	content := ""
-	_, err = io.Copy(cbuf, bytes.NewReader(srcbuf))
-
-	if err != nil {
-		panic(err)
-	}
-
-	resp.Body = ioutil.NopCloser(cbuf)
-
-	content := string(srcbuf)
 	srcReader := bytes.NewReader(srcbuf)
 
-	if r, err := gzip.NewReader(srcReader); err == nil {
+	var reader io.ReadCloser
-		buf, err := ioutil.ReadAll(r)
+	if reader, err = gzip.NewReader(srcReader); err == nil {
+		defer reader.Close()
+		buf, err := ioutil.ReadAll(reader)
 		if err != nil {
-			panic(err)
+			return nil, err
 		}
 		content = string(buf)
-	} else if r, err := zlib.NewReader(srcReader); err == nil {
+	} else if reader, err = zlib.NewReader(srcReader); err == nil {
-		buf, err := ioutil.ReadAll(r)
+		defer reader.Close()
+		buf, err := ioutil.ReadAll(reader)
 		if err != nil {
-			panic(err)
+			return nil, err
 		}
 		content = string(buf)
+	} else {
+		content = string(srcbuf)
 	}
 
-	return &Response{DContent: content, GResponse: resp}, nil
+	return &Response{readContent: content, readResponse: resp}, nil
 }
 
 // Content 返回解压后的内容
 func (gresp *Response) Content() string {
-	return gresp.DContent
+	return gresp.readContent
 }

session.go

@@ -7,6 +7,8 @@ import (
 	"net/http/cookiejar"
 	"net/url"
 	"reflect"
+	"runtime"
+	"strings"
 	"time"
 
 	"golang.org/x/net/publicsuffix"
@@ -15,9 +17,69 @@ import (
 // Body 相关参数结构
 type Body struct {
 	// Query       map[string][]string
-	IOBody interface{}
+	ioBody interface{}
+	// prefix ContentType 前缀
+	prefix string
 	// Files       []UploadFile
-	ContentType string
+	contentTypes map[string]int
+}
+
+// NewBody new body pointer
+func NewBody() *Body {
+	b := &Body{}
+	b.contentTypes = make(map[string]int)
+	return b
+}
+
+// SetIOBody 设置IOBody的值
+func (body *Body) SetIOBody(iobody interface{}) {
+	body.ioBody = iobody
+}
+
+// GetIOBody 获取ioBody值
+func (body *Body) GetIOBody() interface{} {
+	return body.ioBody
+}
+
+// ContentType 获取ContentType
+func (body *Body) ContentType() string {
+	content := body.prefix
+	for kvalue := range body.contentTypes {
+		content += kvalue + ";"
+	}
+	return strings.TrimRight(content, ";")
+}
+
+// SetPrefix SetPrefix 和 AddContentType的顺序会影响到ContentType()的返回结果
+func (body *Body) SetPrefix(ct string) {
+	body.prefix = strings.TrimRight(ct, ";") + ";"
+}
+
+// AddContentType 添加 Add Type类型
+func (body *Body) AddContentType(ct string) {
+	for _, v := range strings.Split(ct, ";") {
+		v = strings.Trim(v, " ")
+		if v != "" {
+			if body.prefix != v {
+				body.contentTypes[v] = 1
+			}
+		}
+	}
+
+}
+
+// IBody 相关参数结构
+type IBody interface {
+	// GetIOBody  获取iobody data
+	GetIOBody() interface{}
+	// SetIOBody  设置iobody data
+	SetIOBody(iobody interface{})
+	// ContentType      返回包括 Prefix 所有的ContentType
+	ContentType() string
+	// AppendContent
+	AddContentType(ct string)
+	// SetPrefix 设置 Prefix;  唯一前缀
+	SetPrefix(ct string)
 }
 
 // BasicAuth 帐号认真结构
@@ -30,27 +92,53 @@ type BasicAuth struct {
 
 // Session 的基本方法
 type Session struct {
-	client    *http.Client
-	transport *http.Transport
-	cookiejar http.CookieJar
-	params    *Body
-	Header    http.Header
 	auth *BasicAuth
+
+	body IBody
+
+	client    *http.Client
+	cookiejar http.CookieJar
+
+	transport *http.Transport
+
+	Header http.Header
+	Query  url.Values
 }
 
 const (
 	// TypeJSON 类型
 	TypeJSON = "application/json"
+
 	// TypeXML 类型
 	TypeXML = "text/xml"
+
+	// TypePlain 类型
+	TypePlain = "text/plain"
+
+	// TypeHTML 类型
+	TypeHTML = "text/html"
+
 	// TypeURLENCODED 类型
 	TypeURLENCODED = "application/x-www-form-urlencoded"
+
+	// TypeForm PostForm类型
+	TypeForm = TypeURLENCODED
+
+	// TypeStream application/octet-stream 只能提交一个二进制流, 很少用
+	TypeStream = "application/octet-stream"
+
 	// TypeFormData 类型
 	TypeFormData = "multipart/form-data"
+
+	// TypeMixed Mixed类型
+	TypeMixed = "multipart/mixed"
+
 	// HeaderKeyHost Host
 	HeaderKeyHost = "Host"
+
 	// HeaderKeyUA User-Agent
 	HeaderKeyUA = "User-Agent"
+
 	// HeaderKeyContentType Content-Type
 	HeaderKeyContentType = "Content-Type"
 )
@@ -60,32 +148,37 @@ type TypeConfig int
 
 const (
 	_ TypeConfig = iota
-	// ConfigRequestTimeout request 包括 dial request redirect 总时间超时
+	// CRequestTimeout request 包括 dial request redirect 总时间超时
-	ConfigRequestTimeout // 支持time.Duration 和 int(秒为单位)
+	CRequestTimeout // 支持time.Duration 和 int(秒为单位)
 
-	// ConfigDialTimeout 一个Connect过程的Timeout
+	// CDialTimeout 一个Connect过程的Timeout
-	ConfigDialTimeout // 支持time.Duration 和 int(秒为单位)
+	CDialTimeout // 支持time.Duration 和 int(秒为单位)
 
-	// ConfigProxy 代理链接
+	// CKeepAlives 默认不KeepAlives, 容易被一直KeepAlives 没关闭链接
-	ConfigProxy // http, https, socks5
+	CKeepAlives
 
-	// ConfigInsecure InsecureSkipVerify
+	// CProxy 代理链接
-	ConfigInsecure // true, false
+	CProxy // http, https, socks5
 
-	// ConfigBasicAuth 帐号认证
+	// CInsecure InsecureSkipVerify
-	ConfigBasicAuth // user pwd
+	CInsecure // true, false
 
-	// ConfigTLS 帐号认证
+	// CBasicAuth 帐号认证
-	ConfigTLS // user pwd
+	CBasicAuth // user pwd
 
-	// ConfigCookiejar 持久化 CookieJar
+	// CTLS 帐号认证
-	ConfigCookiejar // true or false ; default = true
+	CTLS // user pwd
+
+	// CCookiejar 持久化 CookieJar
+	CCookiejar // true or false ; default = true
 )
 
 // NewSession 创建Session
 func NewSession() *Session {
 	client := &http.Client{}
-	transport := &http.Transport{DisableCompression: true}
+	transport := &http.Transport{DisableCompression: true, DisableKeepAlives: true}
+
+	EnsureTransporterFinalized(transport)
 
 	client.Transport = transport
 	cjar, err := cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List})
@@ -94,14 +187,14 @@ func NewSession() *Session {
 	}
 
 	client.Jar = cjar
-	return &Session{client: client, params: &Body{}, transport: transport, auth: nil, cookiejar: client.Jar, Header: make(http.Header)}
+	return &Session{client: client, body: NewBody(), transport: transport, auth: nil, cookiejar: client.Jar, Header: make(http.Header)}
 }
 
 // SetConfig 设置配置
 func (ses *Session) SetConfig(typeConfig TypeConfig, values interface{}) {
 
 	switch typeConfig {
-	case ConfigRequestTimeout:
+	case CRequestTimeout:
 		switch v := values.(type) {
 		case time.Duration:
 			ses.client.Timeout = v
@@ -116,22 +209,20 @@ func (ses *Session) SetConfig(typeConfig TypeConfig, values interface{}) {
 		default:
 			panic(errors.New("error type " + reflect.TypeOf(v).String()))
 		}
-	case ConfigDialTimeout:
+	case CDialTimeout:
 		// 没时间实现这些小细节
-	case ConfigCookiejar:
+	case CKeepAlives:
+		ses.transport.DisableKeepAlives = !values.(bool)
+	case CCookiejar:
 		v := values.(bool)
 		if v {
-			if ses.cookiejar == nil {
+			if ses.client.Jar == nil {
-				j, err := cookiejar.New(nil)
+				ses.client.Jar = ses.cookiejar
-				if err != nil {
-					panic(err)
-				}
-				ses.cookiejar = j
 			}
 		} else {
-			ses.cookiejar = nil
+			ses.client.Jar = nil
 		}
-	case ConfigProxy:
+	case CProxy:
 		switch v := values.(type) {
 		case string:
 			purl, err := (url.Parse(v))
@@ -141,12 +232,14 @@ func (ses *Session) SetConfig(typeConfig TypeConfig, values interface{}) {
 			ses.transport.Proxy = http.ProxyURL(purl)
 		case *url.URL:
 			ses.transport.Proxy = http.ProxyURL(v)
+		case nil:
+			ses.transport.Proxy = nil
 		}
-	case ConfigInsecure:
+	case CInsecure:
-		ses.transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: !values.(bool)}
+		ses.transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: values.(bool)}
-	case ConfigTLS:
+	case CTLS:
 		ses.transport.TLSClientConfig = values.(*tls.Config)
-	case ConfigBasicAuth:
+	case CBasicAuth:
 		if ses.auth == nil {
 			ses.auth = &BasicAuth{}
 		}
@@ -170,13 +263,33 @@ func (ses *Session) SetConfig(typeConfig TypeConfig, values interface{}) {
 	return
 }
 
+// SetQuery 设置url query的持久参数的值
+func (ses *Session) SetQuery(values url.Values) {
+	ses.Query = values
+}
+
+// GetQuery 获取get query的值
+func (ses *Session) GetQuery() url.Values {
+	return ses.Query
+}
+
+// SetHeader 设置set Header的值
+func (ses *Session) SetHeader(header http.Header) {
+	ses.Header = header
+}
+
+// GetHeader 获取get Header的值
+func (ses *Session) GetHeader() http.Header {
+	return ses.Header
+}
+
 // SetCookies 设置Cookies 或者添加Cookies Del
 func (ses *Session) SetCookies(u *url.URL, cookies []*http.Cookie) {
 	ses.cookiejar.SetCookies(u, cookies)
 }
 
-// Cookies 返回 Cookies
+// GetCookies 返回 Cookies
-func (ses *Session) Cookies(u *url.URL) []*http.Cookie {
+func (ses *Session) GetCookies(u *url.URL) []*http.Cookie {
 	return ses.cookiejar.Cookies(u)
 }
 
@@ -191,58 +304,76 @@ func (ses *Session) DelCookies(u *url.URL, name string) {
 	ses.SetCookies(u, cookies)
 }
 
+// ClearCookies 清楚所有cookiejar上的cookies
+func (ses *Session) ClearCookies() {
+	cjar, err := cookiejar.New(&cookiejar.Options{PublicSuffixList: publicsuffix.List})
+	if err != nil {
+		panic(err)
+	}
+	ses.cookiejar = cjar
+	ses.client.Jar = ses.cookiejar
+}
+
+// Head 请求
+func (ses *Session) Head(url string) *Workflow {
+	wf := NewWorkflow(ses, url)
+	wf.Method = "HEAD"
+	return wf
+}
+
 // Get 请求
 func (ses *Session) Get(url string) *Workflow {
-	wf := NewWorkflow(ses)
+	wf := NewWorkflow(ses, url)
 	wf.Method = "GET"
-	wf.SetURL(url)
 	return wf
 }
 
 // Post 请求
 func (ses *Session) Post(url string) *Workflow {
-	wf := NewWorkflow(ses)
+	wf := NewWorkflow(ses, url)
 	wf.Method = "POST"
-	wf.SetURL(url)
 	return wf
 }
 
 // Put 请求
 func (ses *Session) Put(url string) *Workflow {
-	wf := NewWorkflow(ses)
+	wf := NewWorkflow(ses, url)
 	wf.Method = "PUT"
-	wf.SetURL(url)
 	return wf
 }
 
 // Patch 请求
 func (ses *Session) Patch(url string) *Workflow {
-	wf := NewWorkflow(ses)
+	wf := NewWorkflow(ses, url)
 	wf.Method = "PATCH"
-	wf.SetURL(url)
-	return wf
-}
-
-// Delete 请求
-func (ses *Session) Delete(url string) *Workflow {
-	wf := NewWorkflow(ses)
-	wf.Method = "DELETE"
-	wf.SetURL(url)
-	return wf
-}
-
-// Head 请求
-func (ses *Session) Head(url string) *Workflow {
-	wf := NewWorkflow(ses)
-	wf.Method = "HEAD"
-	wf.SetURL(url)
 	return wf
 }
 
 // Options 请求
 func (ses *Session) Options(url string) *Workflow {
-	wf := NewWorkflow(ses)
+	wf := NewWorkflow(ses, url)
 	wf.Method = "OPTIONS"
-	wf.SetURL(url)
 	return wf
 }
+
+// Delete 请求
+func (ses *Session) Delete(url string) *Workflow {
+	wf := NewWorkflow(ses, url)
+	wf.Method = "DELETE"
+	return wf
+}
+
+// // CloseIdleConnections  closes the idle connections that a session client may make use of
+// // 从levigross/grequests 借鉴
+// func (ses *Session) CloseIdleConnections() {
+// 	ses.client.Transport.(*http.Transport).CloseIdleConnections()
+// }
+
+// EnsureTransporterFinalized will ensure that when the HTTP client is GCed
+// the runtime will close the idle connections (so that they won't leak)
+// this function was adopted from Hashicorp's go-cleanhttp package
+func EnsureTransporterFinalized(httpTransport *http.Transport) {
+	runtime.SetFinalizer(&httpTransport, func(transportInt **http.Transport) {
+		(*transportInt).CloseIdleConnections()
+	})
+}

session_test.go

@@ -30,7 +30,6 @@ func TestSession_Get(t *testing.T) {
 		fields fields
 		args   args
 	}{
-		// TODO: Add test cases.
 		{
 			name:   "Get test",
 			fields: fields{client: &http.Client{}},
@@ -77,14 +76,14 @@ func TestSession_Post(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ses := NewSession()
-			got, err := ses.Post("http://httpbin.org/post").SetBodyParams(tt.args.params...).Execute()
+			got, err := ses.Post("http://httpbin.org/post").AutoSetBody(tt.args.params...).Execute()
 
 			if err != nil {
 				t.Errorf("Metchod error = %v", err)
 				return
 			}
 
-			if tt.want.MatchString(got.DContent) == false {
+			if tt.want.MatchString(got.readContent) == false {
 				t.Errorf("Metchod = %v, want %v", got, tt.want)
 			}
 
@@ -107,7 +106,6 @@ func TestSession_Setparams(t *testing.T) {
 		want    *regexp.Regexp
 		wantErr bool
 	}{
-		// TODO: Add test cases.
 		{
 			name: "test Setparams",
 			args: args{params: []interface{}{map[string]string{"a": "1", "b": "2"}}},
@@ -120,7 +118,7 @@ func TestSession_Setparams(t *testing.T) {
 		},
 		{
 			name:   "test xml",
-			fields: fields{client: &http.Client{}, params: &Body{}},
+			fields: fields{client: &http.Client{}, params: NewBody()},
 			args:   args{params: []interface{}{`<request><parameters><password>test</password></parameters></request>`, TypeXML}},
 			want:   regexp.MustCompile(`"data": "<request><parameters><password>test</password></parameters></request>"`),
 		},
@@ -129,13 +127,13 @@ func TestSession_Setparams(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			ses := NewSession()
 
-			got, err := ses.Post("http://httpbin.org/post").SetBodyParams(tt.args.params...).Execute()
+			got, err := ses.Post("http://httpbin.org/post").AutoSetBody(tt.args.params...).Execute()
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Metchod error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 
-			if tt.want.MatchString(got.DContent) == false {
+			if tt.want.MatchString(got.readContent) == false {
 				t.Errorf("Metchod = %v, want %v", got, tt.want)
 			}
 		})
@@ -171,14 +169,14 @@ func TestSession_PostUploadFile(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ses := NewSession()
-			got, err := ses.Post("http://httpbin.org/post").SetBodyParams(tt.args.params, TypeFormData).Execute()
+			got, err := ses.Post("http://httpbin.org/post").AutoSetBody(tt.args.params, TypeFormData).Execute()
 
 			if err != nil {
 				t.Errorf("Metchod error = %v", err)
 				return
 			}
 
-			if tt.want.MatchString(got.DContent) == false {
+			if tt.want.MatchString(got.readContent) == false {
 				t.Errorf("Metchod = %v, want %v", got, tt.want)
 			}
 
@@ -215,14 +213,14 @@ func TestSession_Put(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ses := NewSession()
-			got, err := ses.Put("http://httpbin.org/put").SetBodyParams(tt.args.params, TypeFormData).Execute()
+			got, err := ses.Put("http://httpbin.org/put").AutoSetBody(tt.args.params, TypeFormData).Execute()
 
 			if err != nil {
 				t.Errorf("Metchod error = %v", err)
 				return
 			}
 
-			if tt.want.MatchString(got.DContent) == false {
+			if tt.want.MatchString(got.readContent) == false {
 				t.Errorf("Metchod = %v, want %v", got, tt.want)
 			}
 
@@ -259,14 +257,14 @@ func TestSession_Patch(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			ses := NewSession()
-			got, err := ses.Patch("http://httpbin.org/patch").SetBodyParams(tt.args.params, TypeFormData).Execute()
+			got, err := ses.Patch("http://httpbin.org/patch").AutoSetBody(tt.args.params, TypeFormData).Execute()
 
 			if err != nil {
 				t.Errorf("Metchod error = %v", err)
 				return
 			}
 
-			if tt.want.MatchString(got.DContent) == false {
+			if tt.want.MatchString(got.readContent) == false {
 				t.Errorf("Metchod = %v, want %v", got, tt.want)
 			}
 
@@ -285,22 +283,21 @@ func TestSession_SetConfig(t *testing.T) {
 		args    args
 		wantErr bool
 	}{
-		// TODO: Add test cases.
 		{
 			name:    "test timeout",
-			args:    args{typeConfig: ConfigRequestTimeout, values: 0.01},
+			args:    args{typeConfig: CRequestTimeout, values: 0.01},
 			wantErr: true,
 		},
 
 		{
 			name:    "test not timeout",
-			args:    args{typeConfig: ConfigRequestTimeout, values: 5},
+			args:    args{typeConfig: CRequestTimeout, values: 5},
 			wantErr: false,
 		},
 
 		{
 			name:    "test proxy",
-			args:    args{typeConfig: ConfigProxy, values: "http://474420502.top:7070"},
+			args:    args{typeConfig: CProxy, values: "http://474420502.top:7070"},
 			wantErr: false,
 		},
 	}
@@ -322,7 +319,7 @@ func TestSession_SetConfig(t *testing.T) {
 func TestSession_SetConfigInsecure(t *testing.T) {
 
 	ses := NewSession()
-	ses.SetConfig(ConfigInsecure, false)
+	ses.SetConfig(CInsecure, true)
 
 	for _, badSSL := range []string{
 		"https://self-signed.badssl.com/",
@@ -333,8 +330,8 @@ func TestSession_SetConfigInsecure(t *testing.T) {
 		if err != nil {
 			t.Error("Unable to make request", err)
 		}
-		if resp.GResponse.StatusCode != 200 {
+		if resp.readResponse.StatusCode != 200 {
-			t.Error("Request did not return OK, is ", resp.GResponse.StatusCode)
+			t.Error("Request did not return OK, is ", resp.readResponse.StatusCode)
 		}
 	}
 
@@ -343,28 +340,32 @@ func TestSession_SetConfigInsecure(t *testing.T) {
 func TestSession_Cookies(t *testing.T) {
 	ses := NewSession()
 
+	t.Run("set cookie", func(t *testing.T) {
 		resp, err := ses.Get("http://httpbin.org/cookies/set").AddKVCookie("a", "1").Execute()
 		if err != nil {
 			t.Error("cookies set error", err)
 		}
 
-	if !regexp.MustCompile(`"a": "1"`).MatchString(resp.DContent) {
+		if !regexp.MustCompile(`"a": "1"`).MatchString(resp.readContent) {
-		t.Error(resp.DContent)
+			t.Error(resp.readContent)
 		}
-
+	})
 }
 
 func TestSession_Header(t *testing.T) {
 	chromeua := "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36"
 	ses := NewSession()
+
+	t.Run("ua header test", func(t *testing.T) {
+
 		ses.Header.Add(HeaderKeyUA, chromeua)
 		resp, err := ses.Get("https://www.baidu.com").Execute()
 		if err != nil {
 			t.Error("cookies set error", err)
 		}
 
-	if len(resp.DContent) <= 5000 {
+		if len(resp.readContent) <= 5000 {
-		t.Error(resp.DContent, len(resp.DContent))
+			t.Error(resp.readContent, len(resp.readContent))
 		}
 
 		ses = NewSession()
@@ -373,7 +374,8 @@ func TestSession_Header(t *testing.T) {
 			t.Error("cookies set error", err)
 		}
 
-	if len(resp.DContent) <= 5000 {
+		if len(resp.readContent) <= 5000 {
-		t.Error(resp.DContent, len(resp.DContent))
+			t.Error(resp.readContent, len(resp.readContent))
 		}
+	})
 }

upload_file.go

@@ -17,13 +17,11 @@ type UploadFile struct {
 // UploadFileFromPath 从本地文件获取上传文件
 func UploadFileFromPath(fileName string) (*UploadFile, error) {
 	fd, err := os.Open(fileName)
-
 	if err != nil {
 		return nil, err
 	}
 
 	return &UploadFile{FileReaderCloser: fd, FileName: fileName}, nil
-
 }
 
 // UploadFileFromGlob 根据Glob从本地文件获取上传文件

workflow.go

@@ -4,24 +4,27 @@ import (
 	"net/http"
 	"net/url"
 	"regexp"
+	"strings"
 )
 
-// Workflow 工作流
+// Workflow 工作流 设计点: 这个并不影响Session的属性变化 如 NewWorkflow(ses, url).AddHeader() 对ses没影响
 type Workflow struct {
 	session   *Session
 	ParsedURL *url.URL
 	Method    string
-	Body      *Body
+	Body      IBody
 	Header    http.Header
 	Cookies   map[string]*http.Cookie
 }
 
 // NewWorkflow new and init workflow
-func NewWorkflow(ses *Session) *Workflow {
+func NewWorkflow(ses *Session, urlstr string) *Workflow {
 	wf := &Workflow{}
 	wf.SwitchSession(ses)
 
-	wf.Body = &Body{}
+	wf.SetRawURL(urlstr)
+
+	wf.Body = NewBody()
 	wf.Header = make(http.Header)
 	wf.Cookies = make(map[string]*http.Cookie)
 	return wf
@@ -34,16 +37,33 @@ func (wf *Workflow) SwitchSession(ses *Session) {
 
 // AddHeader 添加头信息  Get方法从Header参数上获取
 func (wf *Workflow) AddHeader(key, value string) *Workflow {
-	wf.Header.Add(key, value)
+	wf.Header[key] = append(wf.Header[key], value)
 	return wf
 }
 
-// SetHeader 设置头信息 这样构造 []string{value} Get方法从Header参数上获取
+// SetHeader 设置完全替换原有Header
-func (wf *Workflow) SetHeader(key, value string) *Workflow {
+func (wf *Workflow) SetHeader(header http.Header) *Workflow {
-	wf.Header.Set(key, value)
+	wf.Header = make(http.Header)
+	for k, HValues := range header {
+		var newHValues []string
+		for _, value := range HValues {
+			newHValues = append(newHValues, value)
+		}
+		wf.Header[k] = newHValues
+	}
 	return wf
 }
 
+// GetHeader 获取Workflow Header
+func (wf *Workflow) GetHeader() http.Header {
+	return wf.Header
+}
+
+// GetCombineHeader 获取后的Header信息
+func (wf *Workflow) GetCombineHeader() http.Header {
+	return mergeMapList(wf.session.Header, wf.Header)
+}
+
 // DelHeader 添加头信息 Get方法从Header参数上获取
 func (wf *Workflow) DelHeader(key string) *Workflow {
 	wf.Header.Del(key)
@@ -56,6 +76,14 @@ func (wf *Workflow) AddCookie(c *http.Cookie) *Workflow {
 	return wf
 }
 
+// AddCookies 添加[]*http.Cookie
+func (wf *Workflow) AddCookies(cookies []*http.Cookie) *Workflow {
+	for _, c := range cookies {
+		wf.AddCookie(c)
+	}
+	return wf
+}
+
 // AddKVCookie 添加 以 key value 的 Cookie
 func (wf *Workflow) AddKVCookie(name, value string) *Workflow {
 	wf.Cookies[name] = &http.Cookie{Name: name, Value: value}
@@ -81,13 +109,25 @@ func (wf *Workflow) DelCookie(name interface{}) *Workflow {
 	return nil
 }
 
-// GetStringURL 获取url的string形式
+// GetParsedURL 获取url的string形式
-func (wf *Workflow) GetStringURL() string {
+func (wf *Workflow) GetParsedURL() *url.URL {
-	return wf.ParsedURL.String()
+	return wf.ParsedURL
 }
 
-// SetURL 设置 url
+// SetParsedURL 获取url的string形式
-func (wf *Workflow) SetURL(srcURL string) *Workflow {
+func (wf *Workflow) SetParsedURL(u *url.URL) *Workflow {
+	wf.ParsedURL = u
+	return wf
+}
+
+// GetRawURL 获取url的string形式
+func (wf *Workflow) GetRawURL() string {
+	u := strings.Split(wf.ParsedURL.String(), "?")[0] + "?" + wf.GetCombineQuery().Encode()
+	return u
+}
+
+// SetRawURL 设置 url
+func (wf *Workflow) SetRawURL(srcURL string) *Workflow {
 	purl, err := url.ParseRequestURI(srcURL)
 	if err != nil {
 		panic(err)
@@ -96,20 +136,26 @@ func (wf *Workflow) SetURL(srcURL string) *Workflow {
 	return wf
 }
 
-// GetURLQuery 获取Query参数
+// GetQuery 获取Query参数
-func (wf *Workflow) GetURLQuery() url.Values {
+func (wf *Workflow) GetQuery() url.Values {
-	if wf.ParsedURL != nil {
 	return wf.ParsedURL.Query()
-	}
+}
 
+// GetCombineQuery 获取Query参数
+func (wf *Workflow) GetCombineQuery() url.Values {
+	if wf.ParsedURL != nil {
+		vs := wf.ParsedURL.Query()
+		return mergeMapList(wf.session.GetQuery(), vs)
+	}
 	return nil
 }
 
-// SetURLQuery 设置Query参数
+// SetQuery 设置Query参数
-func (wf *Workflow) SetURLQuery(query url.Values) *Workflow {
+func (wf *Workflow) SetQuery(query url.Values) *Workflow {
 	if query == nil {
 		return wf
 	}
+	query = (url.Values)(mergeMapList(wf.session.Query, query))
 	wf.ParsedURL.RawQuery = query.Encode()
 	return wf
 }
@@ -147,31 +193,38 @@ func (wf *Workflow) SetURLPath(path []string) *Workflow {
 	return wf
 }
 
-// SetURLRawPath 设置Path参数
+// SetURLRawPath 设置Pa晚上参数
 func (wf *Workflow) SetURLRawPath(path string) *Workflow {
 	wf.ParsedURL.Path = path
 	return wf
 }
 
-// SetBodyParams 参数设置
+// SetBody 参数设置
-func (wf *Workflow) SetBodyParams(params ...interface{}) *Workflow {
+func (wf *Workflow) SetBody(body IBody) *Workflow {
-	if params == nil {
+	wf.Body = body
 	return wf
-	}
+}
 
+// GetBody 参数设置
+func (wf *Workflow) GetBody(body IBody) IBody {
+	return wf.Body
+}
+
+// AutoSetBody 参数设置
+func (wf *Workflow) AutoSetBody(params ...interface{}) *Workflow {
+
+	if params != nil {
 		plen := len(params)
 		defaultContentType := TypeURLENCODED
 
 		if plen >= 2 {
 			t := params[plen-1]
 			defaultContentType = t.(string)
-		wf.Body.ContentType = defaultContentType
-	} else {
-		wf.Body.ContentType = defaultContentType
 		}
 
+		wf.Body.SetPrefix(defaultContentType)
+
 		if defaultContentType == TypeFormData {
-		// TODO: form-data
 			createMultipart(wf.Body, params)
 		} else {
 			var values url.Values
@@ -181,23 +234,28 @@ func (wf *Workflow) SetBodyParams(params ...interface{}) *Workflow {
 				for k, v := range param {
 					values.Set(k, v)
 				}
-			wf.Body.IOBody = []byte(values.Encode())
+				wf.Body.SetIOBody([]byte(values.Encode()))
 			case map[string][]string:
 				values = param
-			wf.Body.IOBody = []byte(values.Encode())
+				wf.Body.SetIOBody([]byte(values.Encode()))
 			case string:
-			wf.Body.IOBody = []byte(param)
+				wf.Body.SetIOBody([]byte(param))
 			case []byte:
-			wf.Body.IOBody = param
+				wf.Body.SetIOBody(param)
+			}
+
 		}
 	}
 	return wf
 }
 
-// setHeaderRequest 设置request的头
+func mergeMapList(headers ...map[string][]string) map[string][]string {
-func setHeaderRequest(req *http.Request, wf *Workflow) {
+
 	set := make(map[string]map[string]int)
-	for key, values := range wf.session.Header {
+	merged := make(map[string][]string)
+
+	for _, header := range headers {
+		for key, values := range header {
 			for _, v := range values {
 				if vs, ok := set[key]; ok {
 					vs[v] = 1
@@ -207,23 +265,25 @@ func setHeaderRequest(req *http.Request, wf *Workflow) {
 				}
 			}
 		}
-	for key, values := range wf.Header {
-		for _, v := range values {
-			if vs, ok := set[key]; ok {
-				vs[v] = 1
-			} else {
-				set[key] = make(map[string]int)
-				set[key][v] = 1
-			}
-		}
 	}
 
 	for key, mvalue := range set {
 		for v := range mvalue {
-			req.Header.Add(key, v)
+			// merged.Add(key, v)
+			if mergeValue, ok := merged[key]; ok {
+				merged[key] = append(mergeValue, v)
+			} else {
+				merged[key] = []string{v}
+			}
 		}
 	}
 
+	return merged
+}
+
+// setHeaderRequest 设置request的头
+func setHeaderRequest(req *http.Request, wf *Workflow) {
+	req.Header = mergeMapList(req.Header, wf.session.Header, wf.Header)
 }
 
 // setHeaderRequest 设置request的临时Cookie, 永久需要在session上设置cookie
@@ -238,14 +298,19 @@ func setTempCookieRequest(req *http.Request, wf *Workflow) {
 // Execute 执行
 func (wf *Workflow) Execute() (*Response, error) {
 
-	req := buildBodyRequest(wf.Method, wf.GetStringURL(), wf.Body)
+	req := buildBodyRequest(wf)
 
 	setHeaderRequest(req, wf)
 	setTempCookieRequest(req, wf)
 
+	if wf.session.auth != nil {
+		req.SetBasicAuth(wf.session.auth.User, wf.session.auth.Password)
+	}
+
 	resp, err := wf.session.client.Do(req)
 	if err != nil {
 		return nil, err
 	}
+
 	return FromHTTPResponse(resp)
 }

workflow_test.go

@@ -0,0 +1,60 @@
+package requests
+
+import (
+	"regexp"
+	"testing"
+
+	"474420502.top/eson/gjson"
+)
+
+func TestWorkflow(t *testing.T) {
+	ses := NewSession()
+
+	t.Run("set cookie", func(t *testing.T) {
+		resp, err := ses.Get("http://httpbin.org/cookies/set").AddKVCookie("a", "1").Execute()
+		if err != nil {
+			t.Error("cookies set error", err)
+		}
+
+		if !regexp.MustCompile(`"a": "1"`).MatchString(resp.readContent) {
+			t.Error(resp.readContent)
+		}
+
+		wf := ses.Get("http://httpbin.org/cookies/set")
+		resp, err = wf.AddKVCookie("b", "2").Execute()
+		if err != nil {
+			t.Error("cookies set error", err)
+		}
+
+		result := gjson.Get(resp.readContent, "cookies.a")
+		if result.Exists() {
+			t.Error(resp.readContent)
+		}
+
+		result = gjson.Get(resp.readContent, "cookies.b")
+		if result.Int() != 2 {
+			t.Error(resp.readContent)
+		}
+
+		resp, err = wf.AddKVCookie("a", "3").Execute()
+		results := gjson.GetMany(resp.readContent, "cookies.a", "cookies.b")
+		if results[0].Int() != 3 {
+			t.Error(resp.readContent)
+		}
+
+		if results[1].Int() != 2 {
+			t.Error(resp.readContent)
+		}
+
+		resp, err = wf.AddHeader("XX", "123").SetRawURL("http://httpbin.org/headers").Execute()
+		if err != nil {
+			t.Error("cookies set error", err)
+		}
+
+		// headers 只能是String 表示
+		result = gjson.Get(resp.readContent, "headers.Xx")
+		if result.String() != "123" {
+			t.Error(resp.readContent)
+		}
+	})
+}