Skip to content

Commit 7485422

Browse files
committed
update method
1 parent 834105f commit 7485422

File tree

7 files changed

+17
-10
lines changed

7 files changed

+17
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ require (
88
github.com/go-pay/util v0.0.4
99
github.com/go-pay/xlog v0.0.3
1010
github.com/go-pay/xtime v0.0.2
11-
golang.org/x/crypto v0.27.0
11+
golang.org/x/crypto v0.28.0
1212
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ github.com/go-pay/xlog v0.0.3 h1:avyMhCL/JgBHreoGx/am/kHxfs1udDOAeVqbmzP/Yes=
88
github.com/go-pay/xlog v0.0.3/go.mod h1:mH47xbobrdsSHWsmFtSF5agWbMHFP+tK0ZbVCk5OAEw=
99
github.com/go-pay/xtime v0.0.2 h1:7YR4/iuELsEHpJ6LUO0SVK80hQxDO9MLCfuVYIiTCRM=
1010
github.com/go-pay/xtime v0.0.2/go.mod h1:W1yRbJaSt4CSBcdAtLBQ8xajiN/Pl5hquGczUcUE9xE=
11-
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
12-
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
11+
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
12+
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=

pkg/xhttp/client.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,20 @@ func NewClient() (client *Client) {
4040
return defaultClient()
4141
}
4242

43-
func (c *Client) SetTransport(transport *http.Transport) (client *Client) {
43+
func (c *Client) SetTransport(transport http.RoundTripper) (client *Client) {
4444
c.HttpClient.Transport = transport
4545
return c
4646
}
4747

48-
func (c *Client) SetTLSConfig(tlsCfg *tls.Config) (client *Client) {
49-
c.HttpClient.Transport.(*http.Transport).TLSClientConfig = tlsCfg
48+
func (c *Client) SetHttpTransport(transport *http.Transport) (client *Client) {
49+
c.HttpClient.Transport = transport
50+
return c
51+
}
52+
53+
func (c *Client) SetHttpTLSConfig(tlsCfg *tls.Config) (client *Client) {
54+
if ht, ok := c.HttpClient.Transport.(*http.Transport); ok {
55+
ht.TLSClientConfig = tlsCfg
56+
}
5057
return c
5158
}
5259

qq/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func (q *Client) PostQQAPISelf(ctx context.Context, bm gopay.BodyMap, url string
9797
}
9898
httpClient := xhttp.NewClient()
9999
if q.IsProd && tlsConfig != nil {
100-
httpClient.SetTLSConfig(tlsConfig)
100+
httpClient.SetHttpTLSConfig(tlsConfig)
101101
}
102102
res, bs, err := httpClient.Req(xhttp.TypeXML).Post(url).SendString(req).EndBytes(ctx)
103103
if err != nil {

qq/param.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (q *Client) AddCertFilePath(certFilePath, keyFilePath, pkcs12FilePath any)
3232
if err != nil {
3333
return
3434
}
35-
q.tlsHc.SetTLSConfig(config)
35+
q.tlsHc.SetHttpTLSConfig(config)
3636
return nil
3737
}
3838

wechat/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ func (w *Client) doProdPostSelf(ctx context.Context, bm gopay.BodyMap, path stri
259259
}
260260
httpClient := xhttp.NewClient()
261261
if w.IsProd && tlsConfig != nil {
262-
httpClient.SetTLSConfig(tlsConfig)
262+
httpClient.SetHttpTLSConfig(tlsConfig)
263263
}
264264
res, bs, err := httpClient.Req(xhttp.TypeXML).Post(url).SendString(req).EndBytes(ctx)
265265
if err != nil {

wechat/param.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (w *Client) addCertFileContentOrPath(certFile, keyFile, pkcs12File any) (er
8080
if err != nil {
8181
return
8282
}
83-
w.tlsHc.SetTLSConfig(config)
83+
w.tlsHc.SetHttpTLSConfig(config)
8484
return
8585
}
8686

0 commit comments

Comments
 (0)