退款 二进制内容

Author: fideism

go.mod

@@ -3,9 +3,7 @@ module github.com/fideism/golang-wechat
 go 1.14
 
 require (
-	github.com/fatih/structs v1.1.0
 	github.com/gomodule/redigo v1.8.2
 	github.com/sirupsen/logrus v1.6.0
-	github.com/spf13/cast v1.3.1
 	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
 )

pay/base/cert.go

@@ -3,43 +3,50 @@ package base
 import (
 	"crypto/tls"
 	"encoding/pem"
+	"io/ioutil"
+
 	logger "github.com/fideism/golang-wechat/log"
+	"github.com/fideism/golang-wechat/pay/config"
 	"golang.org/x/crypto/pkcs12"
-	"io/ioutil"
 )
 
 // CertTLSConfig 证书 tls
-func CertTLSConfig(mchID, path string) (*tls.Config, error) {
-	certData, err := ioutil.ReadFile(path)
+func CertTLSConfig(mchID string, certCfg config.Cert) (*tls.Config, error) {
+	certData, err := getCertByte(certCfg)
 	if err != nil {
 		return nil, err
 	}
 
 	blocks, err := pkcs12.ToPEM(certData, mchID)
+	if err != nil {
+		return nil, err
+	}
 
 	defer func() {
 		if x := recover(); x != nil {
 			logger.Entry().WithField("recover err", x).Error("recover")
 		}
 	}()
 
-	if err != nil {
-		return nil, err
-	}
-
 	var pemData []byte
 	for _, b := range blocks {
 		pemData = append(pemData, pem.EncodeToMemory(b)...)
 	}
 
-	pem, err := tls.X509KeyPair(pemData, pemData)
+	keyPair, err := tls.X509KeyPair(pemData, pemData)
 	if err != nil {
 		return nil, err
 	}
 
-	config := &tls.Config{
-		Certificates: []tls.Certificate{pem},
+	return &tls.Config{
+		Certificates: []tls.Certificate{keyPair},
+	}, nil
+}
+
+func getCertByte(certCfg config.Cert) ([]byte, error) {
+	if len(certCfg.Content) > 0 {
+		return certCfg.Content, nil
 	}
 
-	return config, nil
+	return ioutil.ReadFile(certCfg.Path)
 }

pay/config/config.go

@@ -8,6 +8,8 @@ type Config struct {
 	Key     string `json:"key"`
 }
 
+// Cert 证书配置优先使用 content 如没有内容则读取path路径文件
 type Cert struct {
-	Path string `json:"path"`
+	Path    string `json:"path"`
+	Content []byte `json:"content"`
 }

pay/refund/refund.go

@@ -17,10 +17,10 @@ func NewRefund(cfg *config.Config) *Refund {
 }
 
 // Refund 退款
-func (refund *Refund) Refund(params util.Params, cert config.Cert) (*base.Response, error) {
+func (refund *Refund) Refund(params util.Params, certCfg config.Cert) (*base.Response, error) {
 	params = base.Sign(params, refund.Config)
 
-	tsl, err := base.CertTLSConfig(refund.Config.MchID, cert.Path)
+	tsl, err := base.CertTLSConfig(refund.Config.MchID, certCfg)
 	if err != nil {
 		return nil, err
 	}

pay/server/server.go

@@ -1,10 +1,11 @@
 package server
 
 import (
+	"strings"
+
 	"github.com/fideism/golang-wechat/pay/base"
 	"github.com/fideism/golang-wechat/pay/config"
 	"github.com/fideism/golang-wechat/util"
-	"strings"
 )
 
 // Server server
@@ -38,10 +39,10 @@ func (server *Server) DownloadBill(params util.Params) (*base.Response, error) {
 }
 
 // DownloadFundFlow 下载资金账单
-func (server *Server) DownloadFundFlow(params util.Params, cert config.Cert) (*base.Response, error) {
+func (server *Server) DownloadFundFlow(params util.Params, certCfg config.Cert) (*base.Response, error) {
 	params = base.Sign(params, server.Config)
 
-	tsl, err := base.CertTLSConfig(server.Config.MchID, cert.Path)
+	tsl, err := base.CertTLSConfig(server.Config.MchID, certCfg)
 	if err != nil {
 		return nil, err
 	}