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

# Conflicts:
#	app/http/entities/backend/order.go

app/console/command.go

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

app/http/controllers/front/payment_controller.go

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

app/third/paymentService/ali_service.go

@@ -43,10 +43,10 @@ func AliInitClient(aliConfig AliPay) {
 
 	// 自动同步验签（只支持证书模式）
 	// 传入 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 获取已经初始化的支付宝客户端

app/third/paymentService/payment_service.go

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