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

wxpay.NewWithCertificate支持文件名与二进制流

Browse Source
This commit is contained in:
gazebo
2019-11-21 09:44:47 +08:00
parent 39c5845b2f
commit 3f8d69090a
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
platformapi/wxpay/wxpay.go
View File

@@ -11,6 +11,7 @@ import (
"strings" "strings"
"time" "time"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/platformapi" "git.rosy.net.cn/baseapi/platformapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"github.com/clbanning/mxj" "github.com/clbanning/mxj"
@@ -224,8 +225,14 @@ func New(appID, appKey, mchID string, config ...*platformapi.APIConfig) *API {
} }
} }
func NewWithCertificate(appID, appKey, mchID string, certPEMBlock, keyPEMBlock []byte, config ...*platformapi.APIConfig) (a *API) { func NewWithCertificate(appID, appKey, mchID string, certPEMBlock, keyPEMBlock interface{}, config ...*platformapi.APIConfig) (a *API) {
certs, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock) var certs tls.Certificate
var err error
if binCertPEMBlock, ok := certPEMBlock.([]byte); ok {
certs, err = tls.X509KeyPair(binCertPEMBlock, keyPEMBlock.([]byte))
} else {
certs, err = tls.LoadX509KeyPair(certPEMBlock.(string), keyPEMBlock.(string))
}
if err == nil { if err == nil {
a = New(appID, appKey, mchID, config...) a = New(appID, appKey, mchID, config...)
a.client.Transport = &http.Transport{ a.client.Transport = &http.Transport{
@@ -233,6 +240,8 @@ func NewWithCertificate(appID, appKey, mchID string, certPEMBlock, keyPEMBlock [
Certificates: []tls.Certificate{certs}, Certificates: []tls.Certificate{certs},
}, },
} }
} else {
baseapi.SugarLogger.Warnf("NewWithCertificate failed with err:%v", err)
} }
return a return a
} }