format

Author: Jerry

alipay/v3/client.go

@@ -4,7 +4,6 @@ import (
 	"crypto/rsa"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/go-pay/crypto/xpem"
 	"github.com/go-pay/crypto/xrsa"
@@ -29,7 +28,6 @@ type ClientV3 struct {
 	DebugSwitch        gopay.DebugSwitch
 	logger             xlog.XLogger
 	requestIdFunc      xhttp.RequestIdHandler
-	location           *time.Location
 	hc                 *xhttp.Client
 }
 

alipay/v3/sign.go

@@ -9,11 +9,8 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"os"
-	"strings"
 	"time"
 
-	"github.com/go-pay/crypto/xpem"
 	"github.com/go-pay/gopay"
 	"github.com/go-pay/util"
 	"github.com/go-pay/util/convert"
@@ -89,39 +86,6 @@ func (a *ClientV3) rsaSign(str string) (string, error) {
 	return base64.StdEncoding.EncodeToString(result), nil
 }
 
-// =============================== 获取SignData ===============================
-
-// 需注意的是，公钥签名模式和公钥证书签名模式的不同之处
-// 验签文档：https://opendocs.alipay.com/open/200/106120
-func (a *ClientV3) getSignData(bs []byte, alipayCertSN string) (signData string, err error) {
-	var (
-		str        = string(bs)
-		indexStart = strings.Index(str, `_response":`)
-		indexEnd   int
-	)
-	indexStart = indexStart + 11
-	bsLen := len(str)
-	if alipayCertSN != "" {
-		// 公钥证书模式
-		if alipayCertSN != a.AliPayPublicCertSN {
-			return gopay.NULL, fmt.Errorf("[%w], 当前使用的支付宝公钥证书SN[%s]与网关响应报文中的SN[%s]不匹配", gopay.CertNotMatchErr, a.AliPayPublicCertSN, alipayCertSN)
-		}
-		indexEnd = strings.Index(str, `,"alipay_cert_sn":`)
-		if indexEnd > indexStart && bsLen > indexStart {
-			signData = str[indexStart:indexEnd]
-			return
-		}
-		return gopay.NULL, fmt.Errorf("[%w], value: %s", gopay.GetSignDataErr, str)
-	}
-	// 普通公钥模式
-	indexEnd = strings.Index(str, `,"sign":`)
-	if indexEnd > indexStart && bsLen > indexStart {
-		signData = str[indexStart:indexEnd]
-		return
-	}
-	return gopay.NULL, fmt.Errorf("[%w], value: %s", gopay.GetSignDataErr, str)
-}
-
 // =============================== 同步验签 ===============================
 
 func (a *ClientV3) autoVerifySignByCert(res *http.Response, body []byte) (err error) {
@@ -142,48 +106,3 @@ func (a *ClientV3) autoVerifySignByCert(res *http.Response, body []byte) (err er
 	}
 	return nil
 }
-
-// =============================== 通用底层验签方法 ===============================
-
-func verifySign(signData, sign, alipayPublicKey string) (err error) {
-	publicKey, err := xpem.DecodePublicKey([]byte(alipayPublicKey))
-	if err != nil {
-		return err
-	}
-	signBytes, _ := base64.StdEncoding.DecodeString(sign)
-
-	h := sha256.New()
-	h.Write([]byte(signData))
-	if err = rsa.VerifyPKCS1v15(publicKey, crypto.SHA256, h.Sum(nil), signBytes); err != nil {
-		return fmt.Errorf("[%w]: %v", gopay.VerifySignatureErr, err)
-	}
-	return nil
-}
-
-func verifySignCert(signData, sign string, alipayPublicKeyCert any) (err error) {
-	var (
-		bytes []byte
-	)
-	if v, ok := alipayPublicKeyCert.(string); ok {
-		if bytes, err = os.ReadFile(v); err != nil {
-			return fmt.Errorf("支付宝公钥文件读取失败: %w", err)
-		}
-	} else {
-		bytes, ok = alipayPublicKeyCert.([]byte)
-		if !ok {
-			return fmt.Errorf("支付宝公钥读取失败: %w", err)
-		}
-	}
-	publicKey, err := xpem.DecodePublicKey(bytes)
-	if err != nil {
-		return err
-	}
-	signBytes, _ := base64.StdEncoding.DecodeString(sign)
-
-	h := sha256.New()
-	h.Write([]byte(signData))
-	if err = rsa.VerifyPKCS1v15(publicKey, crypto.SHA256, h.Sum(nil), signBytes); err != nil {
-		return fmt.Errorf("[%w]: %v", gopay.VerifySignatureErr, err)
-	}
-	return nil
-}

wechat/v3/client.go

@@ -5,7 +5,6 @@ import (
 	"crypto/rsa"
 	"errors"
 	"strings"
-	"sync"
 
 	"github.com/go-pay/crypto/xpem"
 	"github.com/go-pay/gopay"
@@ -22,7 +21,6 @@ type ClientV3 struct {
 	WxSerialNo    string
 	proxyHost     string // 代理host地址
 	autoSign      bool
-	rwMu          sync.RWMutex
 	hc            *xhttp.Client
 	privateKey    *rsa.PrivateKey
 	wxPublicKey   *rsa.PublicKey