Commit 08372808 authored by Administrator's avatar Administrator

Update client.go

parent 3f8fd14e
...@@ -46,7 +46,7 @@ type ( ...@@ -46,7 +46,7 @@ type (
Post(ctx *context.UlfsaarContext, path string, headers http.Header, payload interface{}) (respHeader http.Header, statusCode int, body []byte, err error) Post(ctx *context.UlfsaarContext, path string, headers http.Header, payload interface{}) (respHeader http.Header, statusCode int, body []byte, err error)
PostFormData(ctx *context.UlfsaarContext, path string, headers http.Header, payload map[string]string) (respHeader http.Header, statusCode int, body []byte, err error) PostFormData(ctx *context.UlfsaarContext, path string, headers http.Header, payload map[string]string) (respHeader http.Header, statusCode int, body []byte, err error)
PostFormDataWithProxy(ctx *context.UlfsaarContext, path, ip, port, username, password string, headers http.Header, payload map[string]string) (respHeader http.Header, statusCode int, body []byte, err error) PostFormDataWithProxy(ctx *context.UlfsaarContext, path, ip, port, username, password string, headers http.Header, payload map[string]string) (respHeader http.Header, statusCode int, body []byte, err error)
PostMultipartFormFilesAndData(ctx *context.UlfsaarContext, path string, headers http.Header, formData []*MultipartField, formFiles []MultipartFileRequest) (respHeader http.Header, statusCode int, body []byte, err error) PostMultipartFormFilesAndData(ctx *context.UlfsaarContext, path string, headers http.Header, formData []*MultipartField, formFiles []MultipartFileRequest, proxyUrl *string) (respHeader http.Header, statusCode int, body []byte, err error)
PostWithProxy(ctx *context.UlfsaarContext, path, ip, port, username, password string, headers http.Header, payload interface{}) (respHeader http.Header, statusCode int, body []byte, err error) PostWithProxy(ctx *context.UlfsaarContext, path, ip, port, username, password string, headers http.Header, payload interface{}) (respHeader http.Header, statusCode int, body []byte, err error)
Put(ctx *context.UlfsaarContext, path string, headers http.Header, payload interface{}) (respHeader http.Header, statusCode int, body []byte, err error) Put(ctx *context.UlfsaarContext, path string, headers http.Header, payload interface{}) (respHeader http.Header, statusCode int, body []byte, err error)
Get(ctx *context.UlfsaarContext, path string, headers http.Header) (respHeader http.Header, statusCode int, body []byte, err error) Get(ctx *context.UlfsaarContext, path string, headers http.Header) (respHeader http.Header, statusCode int, body []byte, err error)
...@@ -189,7 +189,7 @@ func (c *client) PostWithProxy(ctx *context.UlfsaarContext, uri, ip, port, usern ...@@ -189,7 +189,7 @@ func (c *client) PostWithProxy(ctx *context.UlfsaarContext, uri, ip, port, usern
logger.ToField(processingTimeKey, processingTime(startTime)), logger.ToField(processingTimeKey, processingTime(startTime)),
) )
if statusCode == http.StatusOK { if statusCode/http.StatusOK == 1 {
return respHeader, statusCode, body, nil return respHeader, statusCode, body, nil
} }
...@@ -317,11 +317,18 @@ func (c *client) PostFormData(ctx *context.UlfsaarContext, url string, headers h ...@@ -317,11 +317,18 @@ func (c *client) PostFormData(ctx *context.UlfsaarContext, url string, headers h
return respHeader, statusCode, body, httpErr return respHeader, statusCode, body, httpErr
} }
func (c *client) PostMultipartFormFilesAndData(ctx *context.UlfsaarContext, url string, headers http.Header, formData []*MultipartField, formFiles []MultipartFileRequest) (respHeader http.Header, statusCode int, body []byte, err error) { func (c *client) PostMultipartFormFilesAndData(ctx *context.UlfsaarContext, url string, headers http.Header, formData []*MultipartField, formFiles []MultipartFileRequest, proxyUrl *string) (respHeader http.Header, statusCode int, body []byte, err error) {
//url := c.options.Address + path //url := c.options.Address + path
startTime := time.Now() startTime := time.Now()
request := c.httpClient.R() var request *resty.Request
if proxyUrl != nil && *proxyUrl != "" {
request = c.httpClient.SetProxy(*proxyUrl).R()
}else{
request = c.httpClient.RemoveProxy().R()
}
request.SetMultipartFields(formData...) request.SetMultipartFields(formData...)
for _, val := range formFiles { for _, val := range formFiles {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment