1
0
mirror of https://github.com/silenceper/wechat.git synced 2026-02-23 13:42:25 +08:00

[新增]支持设置httpClient

This commit is contained in:
wuhb
2023-12-28 10:01:03 +08:00
parent a5e674bf10
commit 7874d95add
2 changed files with 18 additions and 11 deletions

View File

@@ -22,6 +22,8 @@ type URIModifier func(uri string) string
var uriModifier URIModifier var uriModifier URIModifier
var DefaultHTTPClient = http.DefaultClient
// SetURIModifier 设置URI修改器 // SetURIModifier 设置URI修改器
func SetURIModifier(fn URIModifier) { func SetURIModifier(fn URIModifier) {
uriModifier = fn uriModifier = fn
@@ -41,7 +43,7 @@ func HTTPGetContext(ctx context.Context, uri string) ([]byte, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
response, err := http.DefaultClient.Do(request) response, err := DefaultHTTPClient.Do(request)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -73,7 +75,7 @@ func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[st
request.Header.Set(key, value) request.Header.Set(key, value)
} }
response, err := http.DefaultClient.Do(request) response, err := DefaultHTTPClient.Do(request)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -102,7 +104,7 @@ func PostJSONContext(ctx context.Context, uri string, obj interface{}) ([]byte,
return nil, err return nil, err
} }
req.Header.Set("Content-Type", "application/json;charset=utf-8") req.Header.Set("Content-Type", "application/json;charset=utf-8")
response, err := http.DefaultClient.Do(req) response, err := DefaultHTTPClient.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -129,7 +131,7 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
return nil, "", err return nil, "", err
} }
response, err := http.Post(uri, "application/json;charset=utf-8", jsonBuf) response, err := DefaultHTTPClient.Post(uri, "application/json;charset=utf-8", jsonBuf)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
@@ -205,7 +207,7 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
contentType := bodyWriter.FormDataContentType() contentType := bodyWriter.FormDataContentType()
bodyWriter.Close() bodyWriter.Close()
resp, e := http.Post(uri, contentType, bodyBuf) resp, e := DefaultHTTPClient.Post(uri, contentType, bodyBuf)
if e != nil { if e != nil {
err = e err = e
return return
@@ -229,7 +231,7 @@ func PostXML(uri string, obj interface{}) ([]byte, error) {
} }
body := bytes.NewBuffer(xmlData) body := bytes.NewBuffer(xmlData)
response, err := http.Post(uri, "application/xml;charset=utf-8", body) response, err := DefaultHTTPClient.Post(uri, "application/xml;charset=utf-8", body)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -252,11 +254,10 @@ func httpWithTLS(rootCa, key string) (*http.Client, error) {
config := &tls.Config{ config := &tls.Config{
Certificates: []tls.Certificate{cert}, Certificates: []tls.Certificate{cert},
} }
tr := &http.Transport{ trans := (DefaultHTTPClient.Transport.(*http.Transport)).Clone()
TLSClientConfig: config, trans.TLSClientConfig = config
DisableCompression: true, trans.DisableCompression = true
} client = &http.Client{Transport: trans}
client = &http.Client{Transport: tr}
return client, nil return client, nil
} }

View File

@@ -1,6 +1,8 @@
package wechat package wechat
import ( import (
"github.com/silenceper/wechat/v2/util"
"net/http"
"os" "os"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@@ -81,3 +83,7 @@ func (wc *Wechat) GetWork(cfg *workConfig.Config) *work.Work {
} }
return work.NewWork(cfg) return work.NewWork(cfg)
} }
func (wc *Wechat) SetHttpClient(client *http.Client) {
util.DefaultHTTPClient = client
}