From e4d617a590ca4321e0ff0b43f3aac4f993673939 Mon Sep 17 00:00:00 2001 From: dengbiao Date: Thu, 28 Nov 2024 19:59:23 +0800 Subject: [PATCH] =?UTF-8?q?update=20gopay=20=E4=BE=9D=E8=B5=96=E5=8C=85?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/alipay/init.go | 5 ++--- app/lib/wxpay/api.go | 10 +++++----- go.mod | 12 +++++------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/lib/alipay/init.go b/app/lib/alipay/init.go index fd7df1f..f0e96f3 100644 --- a/app/lib/alipay/init.go +++ b/app/lib/alipay/init.go @@ -5,9 +5,9 @@ import ( "applet/app/utils/cache" "code.fnuoos.com/EggPlanet/egg_models.git/src/implement" "code.fnuoos.com/EggPlanet/egg_system_rules.git/enum" + "github.com/go-pay/gopay" "github.com/go-pay/gopay/alipay" - "github.com/iGoogle-ink/gopay" - "github.com/iGoogle-ink/gopay/pkg/xlog" + "github.com/go-pay/xlog" ) type InitStruct struct { @@ -38,7 +38,6 @@ func Init(initData *InitStruct) (client *alipay.Client, err error) { AppPublicContent: []byte(sysCfgMap[enum.AppPublicContent]), } } - client, err = alipay.NewClient(initData.AlipayAppId, initData.AlipayPrivateKey, initData.IsProd) if err != nil { xlog.Error(err) diff --git a/app/lib/wxpay/api.go b/app/lib/wxpay/api.go index 16d5408..29490d3 100644 --- a/app/lib/wxpay/api.go +++ b/app/lib/wxpay/api.go @@ -4,10 +4,10 @@ import ( "applet/app/utils" "applet/app/utils/logx" "fmt" - "github.com/iGoogle-ink/gopay" - "github.com/iGoogle-ink/gopay/pkg/util" - "github.com/iGoogle-ink/gopay/wechat" - v3 "github.com/iGoogle-ink/gopay/wechat/v3" + "github.com/go-pay/gopay" + "github.com/go-pay/gopay/pkg/util" + "github.com/go-pay/gopay/wechat" + v3 "github.com/go-pay/gopay/wechat/v3" "strconv" "time" ) @@ -204,7 +204,7 @@ func TradeAppPayV3(client *v3.ClientV3, subject, orderID, amount, notifyUrl stri return nil, nil } -//// TradeJSAPIPay is 微信JSAPI支付 +// // TradeJSAPIPay is 微信JSAPI支付 func TradeJSAPIPay(client *wechat.Client, subject, orderID, amount, notifyUrl, openid string) (map[string]string, error) { // 初始化 BodyMap bm := make(gopay.BodyMap) diff --git a/go.mod b/go.mod index 69e466b..098d5ba 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,6 @@ require ( github.com/go-playground/validator/v10 v10.20.0 github.com/go-redis/redis v6.15.9+incompatible github.com/gomodule/redigo v2.0.0+incompatible - github.com/iGoogle-ink/gopay v1.5.36 github.com/makiuchi-d/gozxing v0.0.0-20210324052758-57132e828831 github.com/qiniu/api.v7/v7 v7.8.2 github.com/robfig/cron/v3 v3.0.1 @@ -33,14 +32,14 @@ require ( ) require ( - code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241128093644-212e906d846c - code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241128103224-bc1f94e24dd9 + code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241128102555-fc839292d728 + code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241128115447-7e6ca58dd32a code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20241118083738-0f22da9ba0be code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5 github.com/360EntSecGroup-Skylar/excelize v1.4.1 github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible github.com/gin-contrib/sessions v1.0.1 - github.com/go-pay/gopay v1.5.106 + github.com/go-pay/gopay v1.5.98 github.com/go-pay/xlog v0.0.3 github.com/go-sql-driver/mysql v1.8.1 github.com/gocolly/colly v1.2.0 @@ -70,8 +69,6 @@ require ( github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/spec v0.20.11 // indirect github.com/go-openapi/swag v0.19.15 // indirect - github.com/go-pay/crypto v0.0.1 // indirect - github.com/go-pay/xtime v0.0.2 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -88,6 +85,7 @@ require ( github.com/leodido/go-urn v1.4.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect @@ -105,7 +103,7 @@ require ( go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.27.0 // indirect + golang.org/x/crypto v0.23.0 // indirect golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/sync v0.8.0 // indirect