diff --git a/const.go b/const.go index fe02477..eb94fdd 100644 --- a/const.go +++ b/const.go @@ -8,4 +8,4 @@ const ( logTable = "jd" ) -const Version = "1.0.2" +const Version = "1.0.3" diff --git a/go.mod b/go.mod index dfbd275..c6545b8 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module go.dtapp.net/jd go 1.19 require ( - go.dtapp.net/dorm v1.0.14 - go.dtapp.net/golog v1.0.21 + go.dtapp.net/dorm v1.0.17 + go.dtapp.net/golog v1.0.22 go.dtapp.net/gorequest v1.0.24 go.dtapp.net/gostring v1.0.6 gorm.io/gorm v1.23.8 @@ -68,14 +68,14 @@ require ( go.dtapp.net/gotime v1.0.5 // indirect go.dtapp.net/goxml v1.0.1 // indirect go.mongodb.org/mongo-driver v1.10.1 // indirect - go.uber.org/atomic v1.9.0 // indirect + go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.22.0 // indirect golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect + golang.org/x/net v0.0.0-20220811182439-13a9a731de15 // indirect golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect - golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect + golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // 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 532feb3..62d97d4 100644 --- a/go.sum +++ b/go.sum @@ -499,14 +499,14 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -go.dtapp.net/dorm v1.0.14 h1:HDsaMwKGlKFKt59Y3hPI9aVnSjfXOyjoHw2uoXErKEo= -go.dtapp.net/dorm v1.0.14/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM= +go.dtapp.net/dorm v1.0.17 h1:3VQKUl05CDxFg3T1c/M8wYf2I+H+oVGBDh4NCV30nn0= +go.dtapp.net/dorm v1.0.17/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM= go.dtapp.net/goip v1.0.24 h1:62k3xt9I/YLUwA5tLp7YC8XPskkswc4RJrvxRRxjwIY= go.dtapp.net/goip v1.0.24/go.mod h1:tps0yoq5kSykLGDb01vuai47hzAQ6nYUPFWLdlQA2Oo= go.dtapp.net/gojson v1.0.1 h1:MHeSGlq1KxzL7rCkm18fhwW4GNORHohdDMmxY5PupKY= go.dtapp.net/gojson v1.0.1/go.mod h1:TkkpTNxHBKxul0e7gC5MrL1K4ICFB9mQ7wHzjBah3/k= -go.dtapp.net/golog v1.0.21 h1:pSGmDz3SJTH7M/NvVLZb+YJd8uNl5g18aORibuaY2JU= -go.dtapp.net/golog v1.0.21/go.mod h1:Wxm2Kh77JN5zFDZ72el9E9c/YkoJnOvHVusB7SqvoC8= +go.dtapp.net/golog v1.0.22 h1:sOJr5f/iLk/6irT/RuwTQSTwvL2DR8SIhzMsKdHo0Ic= +go.dtapp.net/golog v1.0.22/go.mod h1:sbn2WQXmlukcZ4T3Kz9iWOSznL8H3RCkD+1nicZHMfI= 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.24 h1:N2RJOpCXPWbsjfQ8iYJI1EYC2se3I4QhK1l94DSJsuE= @@ -529,8 +529,8 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= @@ -601,8 +601,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced h1:3dYNDff0VT5xj+mbj2XucFst9WKk6PdGOrb9n+SbIvw= -golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220811182439-13a9a731de15 h1:cik0bxZUSJVDyaHf1hZPSDsU8SZHGQZQMeueXCE7yBQ= +golang.org/x/net v0.0.0-20220811182439-13a9a731de15/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= @@ -647,8 +647,8 @@ golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= -golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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/jd.union.open.activity.query.go b/jd.union.open.activity.query.go index ed0e36a..6a4f5c2 100644 --- a/jd.union.open.activity.query.go +++ b/jd.union.open.activity.query.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -61,11 +62,11 @@ func newUnionOpenActivityQueryResult(responce UnionOpenActivityQueryResultRespon // UnionOpenActivityQuery 活动查询接口 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.activity.query -func (c *Client) UnionOpenActivityQuery(notMustParams ...Params) *UnionOpenActivityQueryResult { +func (c *Client) UnionOpenActivityQuery(ctx context.Context, notMustParams ...Params) *UnionOpenActivityQueryResult { // 参数 params := NewParamsWithType("jd.union.open.activity.query", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenActivityQueryResultResponse var result UnionOpenActivityQueryQueryResult diff --git a/jd.union.open.category.goods.get.go b/jd.union.open.category.goods.get.go index 2db8ee9..da6f3bf 100644 --- a/jd.union.open.category.goods.get.go +++ b/jd.union.open.category.goods.get.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -38,11 +39,11 @@ func newUnionOpenCategoryGoodsGetResult(responce UnionOpenCategoryGoodsGetResult // UnionOpenCategoryGoodsGet 商品类目查询接口 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.category.goods.get -func (c *Client) UnionOpenCategoryGoodsGet(notMustParams ...Params) *UnionOpenCategoryGoodsGetResult { +func (c *Client) UnionOpenCategoryGoodsGet(ctx context.Context, notMustParams ...Params) *UnionOpenCategoryGoodsGetResult { // 参数 params := NewParamsWithType("jd.union.open.category.goods.get", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenCategoryGoodsGetResultResponse var result UnionOpenCategoryGoodsGetQueryResult diff --git a/jd.union.open.goods.bigfield.query.go b/jd.union.open.goods.bigfield.query.go index 2ddc23d..424f520 100644 --- a/jd.union.open.goods.bigfield.query.go +++ b/jd.union.open.goods.bigfield.query.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -58,11 +59,11 @@ func newUnionOpenGoodsBigfieldQueryResult(responce UnionOpenGoodsBigfieldQueryRe // UnionOpenGoodsBigfieldQuery 商品详情查询接口 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.goods.bigfield.query -func (c *Client) UnionOpenGoodsBigfieldQuery(notMustParams ...Params) *UnionOpenGoodsBigfieldQueryResult { +func (c *Client) UnionOpenGoodsBigfieldQuery(ctx context.Context, notMustParams ...Params) *UnionOpenGoodsBigfieldQueryResult { // 参数 params := NewParamsWithType("jd.union.open.goods.bigfield.query", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenGoodsBigfieldQueryResultResponse var result UnionOpenGoodsBigfieldQueryQueryResult diff --git a/jd.union.open.goods.jingfen.query.go b/jd.union.open.goods.jingfen.query.go index f21e989..84dbf9f 100644 --- a/jd.union.open.goods.jingfen.query.go +++ b/jd.union.open.goods.jingfen.query.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -122,11 +123,11 @@ func newUnionOpenGoodsJIngFenQueryResult(responce UnionOpenGoodsJIngFenQueryResu // UnionOpenGoodsJIngFenQuery 京粉精选商品查询接口 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.goods.jingfen.query -func (c *Client) UnionOpenGoodsJIngFenQuery(notMustParams ...Params) *UnionOpenGoodsJIngFenQueryResult { +func (c *Client) UnionOpenGoodsJIngFenQuery(ctx context.Context, notMustParams ...Params) *UnionOpenGoodsJIngFenQueryResult { // 参数 params := NewParamsWithType("jd.union.open.goods.jingfen.query", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenGoodsJIngFenQueryResultResponse var result UnionOpenGoodsJIngFenQueryQueryResult diff --git a/jd.union.open.goods.material.query.go b/jd.union.open.goods.material.query.go index a45c725..f0d32be 100644 --- a/jd.union.open.goods.material.query.go +++ b/jd.union.open.goods.material.query.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -119,11 +120,11 @@ func newUnionOpenGoodsMaterialQueryResult(responce UnionOpenGoodsMaterialQueryRe // UnionOpenGoodsMaterialQuery 猜你喜欢商品推荐 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.goods.material.query -func (c *Client) UnionOpenGoodsMaterialQuery(notMustParams ...Params) *UnionOpenGoodsMaterialQueryResult { +func (c *Client) UnionOpenGoodsMaterialQuery(ctx context.Context, notMustParams ...Params) *UnionOpenGoodsMaterialQueryResult { // 参数 params := NewParamsWithType("jd.union.open.goods.material.query", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenGoodsMaterialQueryResultResponse var result UnionOpenGoodsMaterialQueryQueryResult diff --git a/jd.union.open.goods.promotiongoodsinfo.query.go b/jd.union.open.goods.promotiongoodsinfo.query.go index 4092232..3f65444 100644 --- a/jd.union.open.goods.promotiongoodsinfo.query.go +++ b/jd.union.open.goods.promotiongoodsinfo.query.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -57,11 +58,11 @@ func newUnionOpenGoodsPromotionGoodsInfoQueryResult(responce UnionOpenGoodsPromo // UnionOpenGoodsPromotionGoodsInfoQuery 根据skuid查询商品信息接口 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.goods.promotiongoodsinfo.query -func (c *Client) UnionOpenGoodsPromotionGoodsInfoQuery(notMustParams ...Params) *UnionOpenGoodsPromotionGoodsInfoQueryResult { +func (c *Client) UnionOpenGoodsPromotionGoodsInfoQuery(ctx context.Context, notMustParams ...Params) *UnionOpenGoodsPromotionGoodsInfoQueryResult { // 参数 params := NewParamsWithType("jd.union.open.goods.promotiongoodsinfo.query", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenGoodsPromotionGoodsInfoQueryResultResponse var result UnionOpenGoodsPromotionGoodsInfoQueryQueryResult diff --git a/jd.union.open.order.query.go b/jd.union.open.order.query.go index fd69f08..ab00742 100644 --- a/jd.union.open.order.query.go +++ b/jd.union.open.order.query.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -82,11 +83,11 @@ func newUnionOpenOrderQueryResult(responce UnionOpenOrderQueryResultResponse, re // UnionOpenOrderQuery 订单查询接口 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.order.query -func (c *Client) UnionOpenOrderQuery(notMustParams ...Params) *UnionOpenOrderQueryResult { +func (c *Client) UnionOpenOrderQuery(ctx context.Context, notMustParams ...Params) *UnionOpenOrderQueryResult { // 参数 params := NewParamsWithType("jd.union.open.order.query", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenOrderQueryResultResponse var result UnionOpenOrderQueryQueryResult diff --git a/jd.union.open.order.row.query.go b/jd.union.open.order.row.query.go index 347a54c..0aca60a 100644 --- a/jd.union.open.order.row.query.go +++ b/jd.union.open.order.row.query.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -91,11 +92,11 @@ func newUnionOpenOrderRowQueryResult(responce UnionOpenOrderRowQueryResultRespon // UnionOpenOrderRowQuery 订单行查询接口 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.order.row.query -func (c *Client) UnionOpenOrderRowQuery(notMustParams ...Params) *UnionOpenOrderRowQueryResult { +func (c *Client) UnionOpenOrderRowQuery(ctx context.Context, notMustParams ...Params) *UnionOpenOrderRowQueryResult { // 参数 params := NewParamsWithType("jd.union.open.order.row.query", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenOrderRowQueryResultResponse var result UnionOpenOrderRowQueryQueryResult diff --git a/jd.union.open.promotion.bysubunionid.get.go b/jd.union.open.promotion.bysubunionid.get.go index 44970cc..5957b0b 100644 --- a/jd.union.open.promotion.bysubunionid.get.go +++ b/jd.union.open.promotion.bysubunionid.get.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -36,11 +37,11 @@ func newUnionOpenPromotionBySubUnionIdGetResult(responce UnionOpenPromotionBySub // UnionOpenPromotionBySubUnionIdGet 社交媒体获取推广链接接口【申请】 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.promotion.bysubunionid.get -func (c *Client) UnionOpenPromotionBySubUnionIdGet(notMustParams ...Params) *UnionOpenPromotionBySubUnionIdGetResult { +func (c *Client) UnionOpenPromotionBySubUnionIdGet(ctx context.Context, notMustParams ...Params) *UnionOpenPromotionBySubUnionIdGetResult { // 参数 params := NewParamsWithType("jd.union.open.promotion.bysubunionid.get", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenPromotionBySubUnionIdGetResultResponse var result UnionOpenPromotionBySubUnionIdGetGetResult diff --git a/jd.union.open.promotion.common.get.go b/jd.union.open.promotion.common.get.go index d881d53..01584c1 100644 --- a/jd.union.open.promotion.common.get.go +++ b/jd.union.open.promotion.common.get.go @@ -1,6 +1,7 @@ package jd import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -36,11 +37,11 @@ func newUnionOpenPromotionCommonGetResult(responce UnionOpenPromotionCommonGetRe // UnionOpenPromotionCommonGet 网站/APP获取推广链接接口 // https://union.jd.com/openplatform/api/v2?apiName=jd.union.open.promotion.common.get -func (c *Client) UnionOpenPromotionCommonGet(notMustParams ...Params) *UnionOpenPromotionCommonGetResult { +func (c *Client) UnionOpenPromotionCommonGet(ctx context.Context, notMustParams ...Params) *UnionOpenPromotionCommonGetResult { // 参数 params := NewParamsWithType("jd.union.open.promotion.common.get", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var responce UnionOpenPromotionCommonGetResultResponse var result UnionOpenPromotionCommonGetGetResult diff --git a/request.go b/request.go index 41942de..2c08462 100644 --- a/request.go +++ b/request.go @@ -1,12 +1,13 @@ package jd import ( + "context" "go.dtapp.net/gorequest" "go.dtapp.net/gostring" ) // 请求接口 -func (c *Client) request(params map[string]interface{}) (gorequest.Response, error) { +func (c *Client) request(ctx context.Context, params map[string]interface{}) (gorequest.Response, error) { // 签名 c.Sign(params) @@ -28,7 +29,7 @@ func (c *Client) request(params map[string]interface{}) (gorequest.Response, err // 日志 if c.config.PgsqlDb != nil { - go c.log.GormMiddlewareCustom(gostring.ToString(params["method"]), request, Version) + go c.log.GormMiddlewareCustom(ctx, gostring.ToString(params["method"]), request, Version) } if c.config.MongoDb != nil { go c.log.MongoMiddlewareCustom(gostring.ToString(params["method"]), request)