liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shezhi

Browse Source
This commit is contained in:
苏尹岚
2020-11-17 11:15:57 +08:00
parent 9e178e0673
commit 3e870f57a1
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platformapi/wxpayapi/wxpayapi.go
View File

@@ -6,7 +6,6 @@ import (
"crypto/md5" "crypto/md5"
"crypto/sha256" "crypto/sha256"
"crypto/tls" "crypto/tls"
"crypto/x509"
"encoding/xml" "encoding/xml"
"fmt" "fmt"
"net/http" "net/http"
@@ -397,7 +396,7 @@ func New(appID, appKey, mchID string, config ...*platformapi.APIConfig) *API {
} }
} }
func NewWithCertificate(appID, appKey, mchID string, certPEMBlock, keyPEMBlock, rootCa interface{}, config ...*platformapi.APIConfig) (a *API) { func NewWithCertificate(appID, appKey, mchID string, certPEMBlock, keyPEMBlock interface{}, config ...*platformapi.APIConfig) (a *API) {
var certs tls.Certificate var certs tls.Certificate
var err error var err error
if binCertPEMBlock, ok := certPEMBlock.([]byte); ok { if binCertPEMBlock, ok := certPEMBlock.([]byte); ok {
@@ -406,12 +405,12 @@ func NewWithCertificate(appID, appKey, mchID string, certPEMBlock, keyPEMBlock,
certs, err = tls.LoadX509KeyPair(certPEMBlock.(string), keyPEMBlock.(string)) certs, err = tls.LoadX509KeyPair(certPEMBlock.(string), keyPEMBlock.(string))
} }
if err == nil { if err == nil {
pool := x509.NewCertPool() // pool := x509.NewCertPool()
pool.AppendCertsFromPEM(rootCa.([]byte)) // pool.AppendCertsFromPEM(rootCa.([]byte))
a = New(appID, appKey, mchID, config...) a = New(appID, appKey, mchID, config...)
a.client.Transport = &http.Transport{ a.client.Transport = &http.Transport{
TLSClientConfig: &tls.Config{ TLSClientConfig: &tls.Config{
RootCAs: pool, // RootCAs: pool,
Certificates: []tls.Certificate{certs}, Certificates: []tls.Certificate{certs},
}, },
} }

2
platformapi/wxpayapi/wxpayapi_test.go
View File

@@ -23,7 +23,7 @@ func init() {
baseapi.Init(sugarLogger) baseapi.Init(sugarLogger)
certPEMBlock, _ := ioutil.ReadFile("1390686702_20190115_cert/apiclient_cert.pem") certPEMBlock, _ := ioutil.ReadFile("1390686702_20190115_cert/apiclient_cert.pem")
keyPEMBlock, _ := ioutil.ReadFile("1390686702_20190115_cert/apiclient_key.pem") keyPEMBlock, _ := ioutil.ReadFile("1390686702_20190115_cert/apiclient_key.pem")
api = NewWithCertificate("wx70d0943e61e0d15c", "XKJPOIHJ233adf01KJIXlIeQDSDKFJAD", "1603491062", certPEMBlock, keyPEMBlock, nil) api = NewWithCertificate("wx70d0943e61e0d15c", "XKJPOIHJ233adf01KJIXlIeQDSDKFJAD", "1603491062", certPEMBlock, keyPEMBlock)
// api = New("wx4b5930c13f8b1170", "XKJPOIHJ233adf01KJIXlIeQDSDKFJAD", "1390686702") // api = New("wx4b5930c13f8b1170", "XKJPOIHJ233adf01KJIXlIeQDSDKFJAD", "1390686702")
} }