v1.5.1

.travis.yml

@@ -4,7 +4,7 @@ go:
   - tip
 
 install:
-  - go get github.com/iGoogle-ink/gopay/v2
+  - go get github.com/iGoogle-ink/gopay
 
 script:
   - go test ./...

README.md

@@ -14,7 +14,7 @@ QQ、微信、支付宝的Golang版本SDK
 # 一、安装
 
 ```bash
-$ go get github.com/iGoogle-ink/gopay/v2
+$ go get github.com/iGoogle-ink/gopay
 ```
 
 * #### 查看 GoPay 版本
@@ -23,7 +23,7 @@ $ go get github.com/iGoogle-ink/gopay/v2
 import (
     "fmt"
 
-    "github.com/iGoogle-ink/gopay/v2"
+    "github.com/iGoogle-ink/gopay"
 )
 
 func main() {
@@ -162,7 +162,7 @@ QQ群：
 微信官方文档：[官方文档](https://pay.weixin.qq.com/wiki/doc/api/index.html)
 ```go
 import (
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 // 初始化微信客户端
@@ -198,7 +198,7 @@ client.AddCertFilePath()
 
 ```go
 import (
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 // 初始化支付宝客户端
@@ -230,7 +230,7 @@ err := client.SetCertSnByPath("appCertPublicKey.crt", "alipayRootCert.crt", "ali
 具体参数请根据不同接口查看：[微信支付接口文档](https://pay.weixin.qq.com/wiki/doc/api/index.html)
 ```go
 import (
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 // 初始化 BodyMap
@@ -340,7 +340,7 @@ APP支付官方文档：[APP端调起支付的参数列表文档](https://pay.we
 微信内H5支付官方文档：[微信内H5支付文档](https://pay.weixin.qq.com/wiki/doc/api/external/jsapi.php?chapter=7_7&index=6)
 ```go
 import (
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 // ====微信小程序 paySign====
@@ -392,8 +392,8 @@ paySign := wechat.GetH5PaySign(AppID, wxRsp.NonceStr, packages, wechat.SignType_
 * #### 微信
 ```go
 import (
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 // ====同步返回参数验签Sign====
@@ -440,7 +440,7 @@ return c.String(http.StatusOK, rsp.ToXmlString())   // 此写法是 echo 框架
 支付宝支付后的同步/异步通知验签文档：[支付结果通知](https://docs.open.alipay.com/200/106120)
 ```go
 import (
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 // ====同步返回参数验签Sign====
@@ -480,7 +480,7 @@ button按钮获取手机号码：[button组件文档](https://developers.weixin.
 微信解密算法文档：[解密算法文档](https://developers.weixin.qq.com/miniprogram/dev/framework/open-ability/signature.html)
 ```go
 import (
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 // 获取微信小程序用户的OpenId、SessionKey、UnionId
@@ -538,7 +538,7 @@ fmt.Println("WeChatUserPhone:", bm)
 支付宝加解密文档：[AES配置文档](https://docs.alipay.com/mini/introduce/aes)，[AES加解密文档](https://docs.open.alipay.com/common/104567)
 ```go
 import (
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 // 换取授权访问令牌（默认使用utf-8，RSA2）

alipay/client.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 type Client struct {

alipay/client_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 var (

alipay/param.go

@@ -16,7 +16,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 //	AppId      string `json:"app_id"`      //支付宝分配给开发者的应用ID

alipay/service_api.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 // 允许进行 sn 提取的证书签名算法

constant.go

@@ -7,5 +7,5 @@ const (
 	SUCCESS    = "SUCCESS"
 	FAIL       = "FAIL"
 	OK         = "OK"
-	Version    = "2.0.5"
+	Version    = "1.5.1"
 )

examples/alipay/alipay_FundTransToaccountTransfer.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func FundTransToaccountTransfer() {

examples/alipay/alipay_OpenAuthTokenApp.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func OpenAuthTokenApp() {

examples/alipay/alipay_ServiceApi.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func FormatPrivateKey() {

examples/alipay/alipay_SystemOauthToken.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func SystemOauthToken() {

examples/alipay/alipay_TradeAppPay.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeAppPay() {

examples/alipay/alipay_TradeCancel.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeCancel() {

examples/alipay/alipay_TradeClose.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeClose() {

examples/alipay/alipay_TradeCreate.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeCreate() {

examples/alipay/alipay_TradeFastPayRefundQuery.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeFastPayRefundQuery() {

examples/alipay/alipay_TradeOrderSettle.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeOrderSettle() {

examples/alipay/alipay_TradePagePay.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradePagePay() {

examples/alipay/alipay_TradePay.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradePay() {

examples/alipay/alipay_TradePrecreate.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradePrecreate() {

examples/alipay/alipay_TradeQuery.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeQuery() {

examples/alipay/alipay_TradeRefund.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeRefund() {

examples/alipay/alipay_TradeWapPay.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func TradeWapPay() {

examples/alipay/alipay_UserCertifyOpenCertify.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func UserCertifyOpenCertify() {

examples/alipay/alipay_UserCertifyOpenInit.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func UserCertifyOpenInit() {

examples/alipay/alipay_UserCertifyOpenQuery.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func UserCertifyOpenQuery() {

examples/alipay/alipay_UserInfoShare.go

@@ -3,7 +3,7 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func UserInfoShare() {

examples/alipay/alipay_ZhimaCreditScoreGet.go

@@ -3,8 +3,8 @@ package alipay
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/alipay"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/alipay"
 )
 
 func ZhimaCreditScoreGet() {

examples/wechat/wx_BatchQueryComment.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func BatchQueryComment() {

examples/wechat/wx_CloseOrder.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func CloseOrder() {

examples/wechat/wx_DownloadBill.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func DownloadBill() {

examples/wechat/wx_DownloadFundFlow.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func DownloadFundFlow() {

examples/wechat/wx_Micropay.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func Micropay() {

examples/wechat/wx_QueryOrder.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func QueryOrder() {

examples/wechat/wx_QueryRefund.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func QueryRefund() {

examples/wechat/wx_Refund.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func Refund() {

examples/wechat/wx_Reverse.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func Reverse() {

examples/wechat/wx_ServiceApi.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func Code2Session() {

examples/wechat/wx_Transfer.go

@@ -3,8 +3,8 @@ package wechat
 import (
 	"fmt"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func Transfer() {

examples/wechat/wx_UnifiedOrder.go

@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/iGoogle-ink/gopay/v2"
-	"github.com/iGoogle-ink/gopay/v2/wechat"
+	"github.com/iGoogle-ink/gopay"
+	"github.com/iGoogle-ink/gopay/wechat"
 )
 
 func UnifiedOrder() {

go.mod

@@ -1,3 +1,3 @@
-module github.com/iGoogle-ink/gopay/v2
+module github.com/iGoogle-ink/gopay
 
 go 1.13

qq/client.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 type Client struct {

qq/client_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 var (

qq/param.go

@@ -14,7 +14,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 // 添加QQ证书 Path 路径

qq/service_api.go

@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 // 解析QQ支付异步通知的结果到BodyMap

release_note.txt

@@ -1,3 +1,8 @@
+版本号：Release 1.5.1
+发布时间：2020/01/03 17:32
+修改记录：
+   (1) 由于下载包需要 /v2 的问题，替换版本号到 1.x，代码不变，只改变版本号记录
+
 版本号：Release 2.0.5
 发布时间：2020/01/01 22:55
 修改记录：

wechat/client.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 type Client struct {

wechat/client_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 var (

wechat/param.go

@@ -14,7 +14,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 type Country int

wechat/service_api.go

@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/iGoogle-ink/gopay/v2"
+	"github.com/iGoogle-ink/gopay"
 )
 
 // 获取微信支付所需参数里的Sign值（通过支付参数计算Sign值）