Jerry 6 年 前
コミット
b0ae5a8807
4 ファイル変更18 行追加18 行削除
  1. 4 4
      README.md
  2. 1 1
      alipay_client.go
  3. 10 10
      alipay_client_test.go
  4. 3 3
      alipay_params.go

+ 4 - 4
README.md

@@ -403,7 +403,7 @@ privateKey := "MIIEogIBAAKCAQEAy+CRzKw4krA2RzCDTqg5KJg92XkOY0RN3pW4sYInPqnGtHV7Y
 //    isProd:是否是正式环境
 client := gopay.NewAliPayClient("2016091200494382", privateKey, false)
 //配置公共参数
-client.SetCharset("UTF-8").
+client.SetCharset("utf-8").
 	SetSignType("RSA2").
 	//SetAppAuthToken("").
 	//SetReturnUrl("https://www.gopay.ink").
@@ -440,7 +440,7 @@ privateKey := "MIIEogIBAAKCAQEAy+CRzKw4krA2RzCDTqg5KJg92XkOY0RN3pW4sYInPqnGtHV7Y
 //    isProd:是否是正式环境
 client := gopay.NewAliPayClient("2016091200494382", privateKey, false)
 //配置公共参数
-client.SetCharset("UTF-8").
+client.SetCharset("utf-8").
 	SetSignType("RSA2").
 	//SetAppAuthToken("").
 	//SetReturnUrl("https://www.gopay.ink").
@@ -475,7 +475,7 @@ privateKey := "MIIEogIBAAKCAQEAy+CRzKw4krA2RzCDTqg5KJg92XkOY0RN3pW4sYInPqnGtHV7Y
 //    isProd:是否是正式环境
 client := gopay.NewAliPayClient("2016091200494382", privateKey, false)
 //配置公共参数
-client.SetCharset("UTF-8").
+client.SetCharset("utf-8").
 	SetSignType("RSA2").
 	//SetAppAuthToken("").
 	//SetReturnUrl("https://www.gopay.ink").
@@ -512,7 +512,7 @@ privateKey := "MIIEogIBAAKCAQEAy+CRzKw4krA2RzCDTqg5KJg92XkOY0RN3pW4sYInPqnGtHV7Y
 //    isProd:是否是正式环境
 client := gopay.NewAliPayClient("2016091200494382", privateKey, false)
 //配置公共参数
-client.SetCharset("UTF-8").
+client.SetCharset("utf-8").
 	SetSignType("RSA2").
 	//SetAppAuthToken("").
 	//SetReturnUrl("https://www.gopay.ink").

+ 1 - 1
alipay_client.go

@@ -280,7 +280,7 @@ func (this *aliPayClient) doAliPay(body BodyMap, method string) (bytes []byte, e
 		pubBody.Set("return_url", this.ReturnUrl)
 	}
 	if this.Charset == null {
-		pubBody.Set("charset", "UTF-8")
+		pubBody.Set("charset", "utf-8")
 	} else {
 		pubBody.Set("charset", this.Charset)
 	}

+ 10 - 10
alipay_client_test.go

@@ -15,15 +15,15 @@ func TestAliPayClient_AliPayTradePay(t *testing.T) {
 	//    isProd:是否是正式环境
 	client := NewAliPayClient("2016091200494382", privateKey, false)
 	//配置公共参数
-	client.SetCharset("UTF-8").
+	client.SetCharset("utf-8").
 		SetSignType("RSA2").
 		SetNotifyUrl("https://api.iguiyu.com/gy_pay/alipay/notify")
 	//请求参数
 	body := make(BodyMap)
 	body.Set("subject", "条码支付")
 	body.Set("scene", "bar_code")
-	body.Set("auth_code", "282334610638233727")
-	body.Set("out_trade_no", "GYWX201901301040355706100457")
+	body.Set("auth_code", "284680185023768373")
+	body.Set("out_trade_no", "GYWX201901301040355706100458")
 	body.Set("total_amount", "100.00")
 	body.Set("timeout_express", "2m")
 	//条码支付
@@ -44,7 +44,7 @@ func TestAliPayClient_AliPayTradeCreate(t *testing.T) {
 	//    isProd:是否是正式环境
 	client := NewAliPayClient("2016091200494382", privateKey, false)
 	//配置公共参数
-	client.SetCharset("UTF-8").
+	client.SetCharset("utf-8").
 		SetSignType("RSA2").
 		SetNotifyUrl("https://api.iguiyu.com/gy_pay/alipay/notify")
 	//请求参数
@@ -71,7 +71,7 @@ func TestAliPayClient_AliPayTradeClose(t *testing.T) {
 	//    isProd:是否是正式环境
 	client := NewAliPayClient("2016091200494382", privateKey, false)
 	//配置公共参数
-	client.SetCharset("UTF-8").
+	client.SetCharset("utf-8").
 		SetSignType("RSA2").
 		SetNotifyUrl("https://api.iguiyu.com/gy_pay/alipay/notify")
 	//请求参数
@@ -95,7 +95,7 @@ func TestAliPayClient_AliPayTradeCancel(t *testing.T) {
 	//    isProd:是否是正式环境
 	client := NewAliPayClient("2016091200494382", privateKey, false)
 	//配置公共参数
-	client.SetCharset("UTF-8").
+	client.SetCharset("utf-8").
 		SetSignType("RSA2").
 		SetNotifyUrl("https://api.iguiyu.com/gy_pay/alipay/notify")
 	//请求参数
@@ -119,7 +119,7 @@ func TestAliPayClient_AliPayTradeQuery(t *testing.T) {
 	//    isProd:是否是正式环境
 	client := NewAliPayClient("2016091200494382", privateKey, false)
 	//配置公共参数
-	client.SetCharset("UTF-8").
+	client.SetCharset("utf-8").
 		SetSignType("RSA2")
 	//请求参数
 	body := make(BodyMap)
@@ -143,7 +143,7 @@ func TestAliPayClient_AliPayTradeWapPay(t *testing.T) {
 	//    isProd:是否是正式环境
 	client := NewAliPayClient("2016091200494382", privateKey, false)
 	//配置公共参数
-	client.SetCharset("UTF-8").
+	client.SetCharset("utf-8").
 		SetSignType("RSA2").
 		//SetReturnUrl("https://www.gopay.ink").
 		SetNotifyUrl("https://api.iguiyu.com/gy_pay/alipay/notify")
@@ -172,7 +172,7 @@ func TestAliPayClient_AliPayTradeAppPay(t *testing.T) {
 	//    isProd:是否是正式环境
 	client := NewAliPayClient("2016091200494382", privateKey, false)
 	//配置公共参数
-	client.SetCharset("UTF-8").
+	client.SetCharset("utf-8").
 		SetSignType("RSA2").
 		SetNotifyUrl("https://api.iguiyu.com/gy_pay/alipay/notify")
 	//请求参数
@@ -197,7 +197,7 @@ func TestAliPayClient_AliPayTradePagePay(t *testing.T) {
 	//    isProd:是否是正式环境
 	client := NewAliPayClient("2016091200494382", privateKey, false)
 	//配置公共参数
-	client.SetCharset("UTF-8").
+	client.SetCharset("utf-8").
 		SetSignType("RSA2").
 		SetNotifyUrl("https://api.iguiyu.com/gy_pay/alipay/notify")
 	//请求参数

+ 3 - 3
alipay_params.go

@@ -25,7 +25,7 @@ import (
 //	Method     string `json:"method"`      //接口名称
 //	Format     string `json:"format"`      //仅支持 JSON
 //	ReturnUrl  string `json:"return_url"`  //HTTP/HTTPS开头字符串
-//	Charset    string `json:"charset"`     //请求使用的编码格式,如UTF-8,GBK,GB2312等,推荐使用 UTF-8
+//	Charset    string `json:"charset"`     //请求使用的编码格式,如utf-8,gbk,gb2312等,推荐使用 utf-8
 //	SignType   string `json:"sign_type"`   //商户生成签名字符串所使用的签名算法类型,目前支持RSA2和RSA,推荐使用 RSA2
 //	Sign       string `json:"sign"`        //商户请求参数的签名串
 //	Timestamp  string `json:"timestamp"`   //发送请求的时间,格式"yyyy-MM-dd HH:mm:ss"
@@ -45,10 +45,10 @@ func (this *aliPayClient) SetNotifyUrl(url string) (client *aliPayClient) {
 	return this
 }
 
-//设置编码格式,如UTF-8,GBK,GB2312等,推荐使用 UTF-8
+//设置编码格式,如utf-8,gbk,gb2312等,推荐使用 utf-8
 func (this *aliPayClient) SetCharset(charset string) (client *aliPayClient) {
 	if charset == null {
-		this.Charset = "UTF-8"
+		this.Charset = "utf-8"
 	} else {
 		this.Charset = charset
 	}