BaseSystem
/
PaymentCenter
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev/dev1.0' into feature/rzy/api_1.0 

# Conflicts:
#	app/http/entities/backend/order.go
This commit is contained in:
Rzy 2024-08-06 17:13:26 +08:00
parent 6cfc7c0c06 2d4d674145
commit 4642ae73fe
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/console/command.go
View File

@ -67,9 +67,9 @@ func closeOrder() {
req.Ali = paymentService.AliPay{ req.Ali = paymentService.AliPay{
AppId: orderInfo.AppId, AppId: orderInfo.AppId,
PrivateKey: ali.PrivateKey, PrivateKey: ali.PrivateKey,
AppPublicCert: []byte(ali.AppPublicCert), AppPublicCert: ali.AppPublicCert,
AlipayRootCert: []byte(ali.AlipayRootCert), AlipayRootCert: ali.AlipayRootCert,
AlipayPublicCert: []byte(ali.AlipayPublicCert), AlipayPublicCert: ali.AlipayPublicCert,
} }
default: default:
utils.Log(nil, "关闭订单,支付渠道不支持", orderInfo.ChannelType) utils.Log(nil, "关闭订单,支付渠道不支持", orderInfo.ChannelType)
@ -149,9 +149,9 @@ func queryOrder() {
query.Ali = paymentService.AliPay{ query.Ali = paymentService.AliPay{
AppId: orderInfo.AppId, AppId: orderInfo.AppId,
PrivateKey: ali.PrivateKey, PrivateKey: ali.PrivateKey,
AppPublicCert: []byte(ali.AppPublicCert), AppPublicCert: ali.AppPublicCert,
AlipayRootCert: []byte(ali.AlipayRootCert), AlipayRootCert: ali.AlipayRootCert,
AlipayPublicCert: []byte(ali.AlipayPublicCert), AlipayPublicCert: ali.AlipayPublicCert,
} }
default: default:
utils.Log(nil, "查询订单,支付渠道不支持", orderInfo.ChannelType) utils.Log(nil, "查询订单,支付渠道不支持", orderInfo.ChannelType)

6
app/http/controllers/front/payment_controller.go
View File

@ -124,9 +124,9 @@ func AliCallback(c *gin.Context) {
} }
aliConfig.AppId = payChannelModel.AppId aliConfig.AppId = payChannelModel.AppId
aliConfig.PrivateKey = aliConfigModel.PrivateKey aliConfig.PrivateKey = aliConfigModel.PrivateKey
aliConfig.AppPublicCert = []byte(aliConfigModel.AppPublicCert) aliConfig.AppPublicCert = aliConfigModel.AppPublicCert
aliConfig.AlipayRootCert = []byte(aliConfigModel.AlipayRootCert) aliConfig.AlipayRootCert = aliConfigModel.AlipayRootCert
aliConfig.AlipayPublicCert = []byte(aliConfigModel.AlipayPublicCert) aliConfig.AlipayPublicCert = aliConfigModel.AlipayPublicCert
notifyReq, err := alipay.ParseNotifyToBodyMap(c.Request) // c.Request 是 gin 框架的写法 notifyReq, err := alipay.ParseNotifyToBodyMap(c.Request) // c.Request 是 gin 框架的写法
if err != nil { if err != nil {

4
app/third/paymentService/ali_service.go
View File

@ -43,10 +43,10 @@ func AliInitClient(aliConfig AliPay) {
// 自动同步验签（只支持证书模式） // 自动同步验签（只支持证书模式）
// 传入 alipayPublicCert.crt 内容 // 传入 alipayPublicCert.crt 内容
aliClient.AutoVerifySign(aliConfig.AlipayPublicCert) aliClient.AutoVerifySign([]byte(aliConfig.AlipayPublicCert))
// 证书内容 // 证书内容
aliClientErr = aliClient.SetCertSnByContent(aliConfig.AppPublicCert, aliConfig.AlipayRootCert, aliConfig.AlipayPublicCert) aliClientErr = aliClient.SetCertSnByContent([]byte(aliConfig.AppPublicCert), []byte(aliConfig.AlipayRootCert), []byte(aliConfig.AlipayPublicCert))
} }
// GetAliClient 获取已经初始化的支付宝客户端 // GetAliClient 获取已经初始化的支付宝客户端

6
app/third/paymentService/payment_service.go
View File

@ -34,9 +34,9 @@ type WxPay struct {
type AliPay struct { type AliPay struct {
AppId string `json:"app_id"` // 应用ID AppId string `json:"app_id"` // 应用ID
PrivateKey string `json:"private_key"` // 应用私钥 PrivateKey string `json:"private_key"` // 应用私钥
AppPublicCert []byte `json:"app_public_cert"` // 应用公钥 AppPublicCert string `json:"app_public_cert"` // 应用公钥
AlipayRootCert []byte `json:"alipay_root_cert"` // 支付宝根证书 AlipayRootCert string `json:"alipay_root_cert"` // 支付宝根证书
AlipayPublicCert []byte `json:"alipay_public_cert"` // 支付宝公钥 AlipayPublicCert string `json:"alipay_public_cert"` // 支付宝公钥
} }
type AliPayA struct { type AliPayA struct {

6
app/third/paymentService/payment_test.go
View File

File diff suppressed because one or more lines are too long