diff --git a/client.go b/client.go index 61aa703..072c7ec 100644 --- a/client.go +++ b/client.go @@ -26,12 +26,14 @@ type ClientConfig struct { MongoClientFun mongoClientFun // 日志配置 Debug bool // 日志开关 ZapLog *golog.ZapLog // 日志服务 + CurrentIp string // 当前ip } // Client 实例 type Client struct { requestClient *gorequest.App // 请求服务 zapLog *golog.ZapLog // 日志服务 + currentIp string // 当前ip config struct { appId string // 小程序或者公众号唯一凭证 appSecret string // 小程序或者公众号唯一凭证密钥 @@ -59,6 +61,8 @@ func NewClient(config *ClientConfig) (*Client, error) { c.zapLog = config.ZapLog + c.currentIp = config.CurrentIp + c.config.appId = config.AppId c.config.appSecret = config.AppSecret c.config.mchId = config.MchId @@ -75,8 +79,9 @@ func NewClient(config *ClientConfig) (*Client, error) { GormClientFun: func() (*dorm.GormClient, string) { return gormClient, logTable }, - Debug: config.Debug, - ZapLog: c.zapLog, + Debug: config.Debug, + ZapLog: c.zapLog, + CurrentIp: c.currentIp, }) if err != nil { return nil, err @@ -91,8 +96,9 @@ func NewClient(config *ClientConfig) (*Client, error) { MongoClientFun: func() (*dorm.MongoClient, string, string) { return mongoClient, databaseName, logTable }, - Debug: config.Debug, - ZapLog: c.zapLog, + Debug: config.Debug, + ZapLog: c.zapLog, + CurrentIp: c.currentIp, }) if err != nil { return nil, err diff --git a/const.go b/const.go index ef4d4d6..34b7697 100644 --- a/const.go +++ b/const.go @@ -3,5 +3,5 @@ package wechatpayapiv3 const ( apiUrl = "https://api.mch.weixin.qq.com" logTable = "wechatpayapiv3" - Version = "1.0.8" + Version = "1.0.9" ) diff --git a/go.mod b/go.mod index dc75268..f619984 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.19 require ( github.com/gin-gonic/gin v1.8.1 go.dtapp.net/dorm v1.0.32 - go.dtapp.net/golog v1.0.68 + go.dtapp.net/golog v1.0.71 go.dtapp.net/gorandom v1.0.1 - go.dtapp.net/gorequest v1.0.28 + go.dtapp.net/gorequest v1.0.29 go.dtapp.net/gotime v1.0.5 ) @@ -66,7 +66,7 @@ require ( github.com/xdg-go/scram v1.1.1 // indirect github.com/xdg-go/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect - go.dtapp.net/goip v1.0.28 // indirect + go.dtapp.net/goip v1.0.29 // indirect go.dtapp.net/gostring v1.0.10 // indirect go.dtapp.net/gotrace_id v1.0.6 // indirect go.dtapp.net/gourl v1.0.0 // indirect @@ -76,9 +76,9 @@ require ( go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect - golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect - golang.org/x/sys v0.0.0-20220907062415-87db552b00fd // indirect + golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect + golang.org/x/sync v0.0.0-20220907140024-f12130a52804 // indirect + golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 5991e55..5a69466 100644 --- a/go.sum +++ b/go.sum @@ -497,14 +497,14 @@ github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxt github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.dtapp.net/dorm v1.0.32 h1:kMU2on0t8e87qDvXEt8DlaM1DJjLBvUOaIGc5fNsgzY= go.dtapp.net/dorm v1.0.32/go.mod h1:ocdIcMoJCLGngRNPSAa/1Hq+Mu1JDTxT0hH2QBlL2ik= -go.dtapp.net/goip v1.0.28 h1:wZt+wbzNhOLRUJnepG4c8HhUr4V9jNXOF6wJ1h7jUvU= -go.dtapp.net/goip v1.0.28/go.mod h1:ZqPPUvpOSzdtB/dEZFiaD0CBRZmvIzjDmm3XkpMC9Bo= -go.dtapp.net/golog v1.0.68 h1:rCXd1PLhfzKRkv+qS/XjERpv2sOHkcw9gPOIb0KCmgk= -go.dtapp.net/golog v1.0.68/go.mod h1:S0LEEBp9Eq7WvXG2LadXsPm6II4pMfv5KOCnrcUIBzI= +go.dtapp.net/goip v1.0.29 h1:yM+9m70EytQr8MzewlnQmb6tcNtADcrlt0Wx6Z2FPZQ= +go.dtapp.net/goip v1.0.29/go.mod h1:ewEUMDUCcNwSUu6l10tnjcSMTCYfjNgxUFRZ1GDHxEs= +go.dtapp.net/golog v1.0.71 h1:8DSnwexaK6CDsNaV9Xvo6CWmSMPgUwA/NtSA+cqcjU0= +go.dtapp.net/golog v1.0.71/go.mod h1:e+FrSgefAoggwcw2Qt8Qil3J1DfT/2heZFO1VbTIwx4= go.dtapp.net/gorandom v1.0.1 h1:IWfMClh1ECPvyUjlqD7MwLq4mZdUusD1qAwAdsvEJBs= go.dtapp.net/gorandom v1.0.1/go.mod h1:ZPdgalKpvFV/ATQqR0k4ns/F/IpITAZpx6WkWirr5Y8= -go.dtapp.net/gorequest v1.0.28 h1:EehFtF5WcvyZ9rB6MAQoI2kJkhR8Wv8tVgpoxXcb3sI= -go.dtapp.net/gorequest v1.0.28/go.mod h1:Nr0BIOXhapY3Es86hL7pN2c2PgjZwImcrWdMpLzHlJE= +go.dtapp.net/gorequest v1.0.29 h1:3crr5h+gFFM/X5/BjY1qf8AY3Lzytnx2Bb70l0TznvM= +go.dtapp.net/gorequest v1.0.29/go.mod h1:bRayjDYWr3Cmj+lXkz6HFHUzbwIxhCloPYdckImI8YY= go.dtapp.net/gostring v1.0.10 h1:eG+1kQehdJUitj9Hfwy79SndMHYOB7ABpWkTs7mDGeQ= go.dtapp.net/gostring v1.0.10/go.mod h1:L4kREy89a9AraMHB5tUjjl+5rxP1gpXkDouRKKuzT50= go.dtapp.net/gotime v1.0.5 h1:12aNgB2ULpP6QgQHEUkLilZ4ASvhpFxMFQkBwn0par8= @@ -594,8 +594,8 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo= -golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI= +golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -606,8 +606,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc= -golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A= +golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -641,8 +641,8 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220907062415-87db552b00fd h1:AZeIEzg+8RCELJYq8w+ODLVxFgLMMigSwO/ffKPEd9U= -golang.org/x/sys v0.0.0-20220907062415-87db552b00fd/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2 h1:wM1k/lXfpc5HdkJJyW9GELpd8ERGdnh8sMGL6Gzq3Ho= +golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pay.transactions.jsapi.notify.gin.go b/pay.transactions.jsapi.notify.gin.go index d7b299e..f651ba1 100644 --- a/pay.transactions.jsapi.notify.gin.go +++ b/pay.transactions.jsapi.notify.gin.go @@ -39,6 +39,7 @@ func (c *Client) PayTransactionsJsapiNotifyGin(ctx context.Context, ginCtx *gin. return validateJson, response, gcm, err } +// PayTransactionsJsapiNotifyGinResponse JSAPI下单 - 回调通知 - 解密后数据 type PayTransactionsJsapiNotifyGinResponse struct { Appid string `json:"appid"` // 应用ID Mchid string `json:"mchid"` // 商户号 diff --git a/refund.domestic.refunds.notify.gin.go b/refund.domestic.refunds.notify.gin.go index 8dccc91..7e3908c 100644 --- a/refund.domestic.refunds.notify.gin.go +++ b/refund.domestic.refunds.notify.gin.go @@ -39,6 +39,7 @@ func (c *Client) RefundDomesticRefundsNotifyGin(ctx context.Context, ginCtx *gin return validateJson, response, gcm, err } +// RefundDomesticRefundsNotifyGinResponse 申请退款API - 回调通知 - 解密后数据 type RefundDomesticRefundsNotifyGinResponse struct { Mchid string `json:"mchid"` // 直连商户号 OutTradeNo string `json:"out_trade_no"` // 商户订单号