diff --git a/const.go b/const.go index 6378c71..b27c8de 100644 --- a/const.go +++ b/const.go @@ -8,4 +8,4 @@ const ( logTable = "pinduoduo" ) -const Version = "1.0.4" +const Version = "1.0.5" diff --git a/go.mod b/go.mod index cca04b8..d55f750 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module go.dtapp.net/pinduoduo 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 go.dtapp.net/gotime v1.0.5 @@ -69,14 +69,14 @@ require ( go.dtapp.net/gorandom v1.0.1 // 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 cf17e1a..142f349 100644 --- a/go.sum +++ b/go.sum @@ -185,7 +185,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk= github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps= -github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -212,7 +211,6 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= @@ -468,7 +466,6 @@ github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhV github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= @@ -503,14 +500,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= @@ -533,8 +530,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= @@ -605,8 +602,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= @@ -651,8 +648,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/pdd.ddk.cms.prom.url.generate.go b/pdd.ddk.cms.prom.url.generate.go index 20cc0dd..f5c5000 100644 --- a/pdd.ddk.cms.prom.url.generate.go +++ b/pdd.ddk.cms.prom.url.generate.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -62,12 +63,12 @@ func newCmsPromUrlGenerateResult(result CmsPromUrlGenerateResponse, body []byte, // CmsPromUrlGenerate 生成商城-频道推广链接 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.cms.prom.url.generate -func (c *Client) CmsPromUrlGenerate(notMustParams ...Params) *CmsPromUrlGenerateResult { +func (c *Client) CmsPromUrlGenerate(ctx context.Context, notMustParams ...Params) *CmsPromUrlGenerateResult { // 参数 params := NewParamsWithType("pdd.ddk.cms.prom.url.generate", notMustParams...) params.Set("p_id_list", []string{c.config.Pid}) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response CmsPromUrlGenerateResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.goods.detail.go b/pdd.ddk.goods.detail.go index d0bda24..f3a975d 100644 --- a/pdd.ddk.goods.detail.go +++ b/pdd.ddk.goods.detail.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -97,12 +98,12 @@ func newGoodsDetailResult(result GoodsDetailResponse, body []byte, http goreques // GoodsDetail 多多进宝商品详情查询 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.goods.detail -func (c *Client) GoodsDetail(notMustParams ...Params) *GoodsDetailResult { +func (c *Client) GoodsDetail(ctx context.Context, notMustParams ...Params) *GoodsDetailResult { // 参数 params := NewParamsWithType("pdd.ddk.goods.detail", notMustParams...) params.Set("pid", c.config.Pid) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response GoodsDetailResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.goods.pid.generate.go b/pdd.ddk.goods.pid.generate.go index 75f4492..aaa55ac 100644 --- a/pdd.ddk.goods.pid.generate.go +++ b/pdd.ddk.goods.pid.generate.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -30,11 +31,11 @@ func newGoodsPidGenerateResult(result GoodsPidGenerateResponse, body []byte, htt // GoodsPidGenerate 创建多多进宝推广位 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.goods.pid.generate -func (c *Client) GoodsPidGenerate(notMustParams ...Params) *GoodsPidGenerateResult { +func (c *Client) GoodsPidGenerate(ctx context.Context, notMustParams ...Params) *GoodsPidGenerateResult { // 参数 params := NewParamsWithType("pdd.ddk.goods.pid.generate", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response GoodsPidGenerateResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.goods.promotion.url.generate.go b/pdd.ddk.goods.promotion.url.generate.go index cf7ef68..b6bdc70 100644 --- a/pdd.ddk.goods.promotion.url.generate.go +++ b/pdd.ddk.goods.promotion.url.generate.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -50,12 +51,12 @@ func newGoodsPromotionUrlGenerateResult(result GoodsPromotionUrlGenerateResponse // GoodsPromotionUrlGenerate 多多进宝推广链接生成 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.goods.promotion.url.generate -func (c *Client) GoodsPromotionUrlGenerate(notMustParams ...Params) *GoodsPromotionUrlGenerateResult { +func (c *Client) GoodsPromotionUrlGenerate(ctx context.Context, notMustParams ...Params) *GoodsPromotionUrlGenerateResult { // 参数 params := NewParamsWithType("pdd.ddk.goods.promotion.url.generate", notMustParams...) params.Set("p_id", c.config.Pid) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response GoodsPromotionUrlGenerateResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.goods.recommend.get.go b/pdd.ddk.goods.recommend.get.go index d1cffe9..0adfe0a 100644 --- a/pdd.ddk.goods.recommend.get.go +++ b/pdd.ddk.goods.recommend.get.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -79,12 +80,12 @@ func newGoodsRecommendGetResult(result GoodsRecommendGetResponse, body []byte, h // GoodsRecommendGet 多多进宝商品推荐API // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.goods.recommend.get -func (c *Client) GoodsRecommendGet(notMustParams ...Params) *GoodsRecommendGetResult { +func (c *Client) GoodsRecommendGet(ctx context.Context, notMustParams ...Params) *GoodsRecommendGetResult { // 参数 params := NewParamsWithType("pdd.ddk.goods.recommend.get", notMustParams...) params.Set("pid", c.config.Pid) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response GoodsRecommendGetResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.goods.search.go b/pdd.ddk.goods.search.go index d407e35..39eee2a 100644 --- a/pdd.ddk.goods.search.go +++ b/pdd.ddk.goods.search.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -93,12 +94,12 @@ func newGoodsSearchResult(result GoodsSearchResponse, body []byte, http goreques // GoodsSearch 多多进宝商品查询 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.goods.search -func (c *Client) GoodsSearch(notMustParams ...Params) *GoodsSearchResult { +func (c *Client) GoodsSearch(ctx context.Context, notMustParams ...Params) *GoodsSearchResult { // 参数 params := NewParamsWithType("pdd.ddk.goods.search", notMustParams...) params.Set("pid", c.config.Pid) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response GoodsSearchResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.member.authority.query.go b/pdd.ddk.member.authority.query.go index 5419dde..42c6071 100644 --- a/pdd.ddk.member.authority.query.go +++ b/pdd.ddk.member.authority.query.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -25,12 +26,12 @@ func newMemberAuthorityQueryResult(result MemberAuthorityQueryResponse, body []b // MemberAuthorityQuery 查询是否绑定备案 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.goods.search -func (c *Client) MemberAuthorityQuery(notMustParams ...Params) *MemberAuthorityQueryResult { +func (c *Client) MemberAuthorityQuery(ctx context.Context, notMustParams ...Params) *MemberAuthorityQueryResult { // 参数 params := NewParamsWithType("pdd.ddk.member.authority.query", notMustParams...) params.Set("pid", c.config.Pid) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response MemberAuthorityQueryResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.order.detail.get.go b/pdd.ddk.order.detail.get.go index 593cbb9..5e63545 100644 --- a/pdd.ddk.order.detail.get.go +++ b/pdd.ddk.order.detail.get.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -66,13 +67,13 @@ func newOrderDetailGetResult(result OrderDetailGetResponse, body []byte, http go } // OrderDetailGet 多多进宝商品查询 https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.order.detail.get -func (c *Client) OrderDetailGet(orderSn string) *OrderDetailGetResult { +func (c *Client) OrderDetailGet(ctx context.Context, orderSn string) *OrderDetailGetResult { // 参数 param := NewParams() param.Set("order_sn", orderSn) params := NewParamsWithType("pdd.ddk.order.detail.get", param) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response OrderDetailGetResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.order.list.increment.get.go b/pdd.ddk.order.list.increment.get.go index 7985cbd..45ed230 100644 --- a/pdd.ddk.order.list.increment.get.go +++ b/pdd.ddk.order.list.increment.get.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -71,11 +72,11 @@ func newOrderListIncrementGetResult(result OrderListIncrementGetResponse, body [ // OrderListIncrementGet 最后更新时间段增量同步推广订单信息 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.order.list.increment.get -func (c *Client) OrderListIncrementGet(notMustParams ...Params) *OrderListIncrementGetResult { +func (c *Client) OrderListIncrementGet(ctx context.Context, notMustParams ...Params) *OrderListIncrementGetResult { // 参数 params := NewParamsWithType("pdd.ddk.order.list.increment.get", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response OrderListIncrementGetResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.order.list.range.get.go b/pdd.ddk.order.list.range.get.go index 64a1d5e..156d75d 100644 --- a/pdd.ddk.order.list.range.get.go +++ b/pdd.ddk.order.list.range.get.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -71,11 +72,11 @@ func newOrderListRangeGetResult(result OrderListRangeGetResponse, body []byte, h // OrderListRangeGet 用时间段查询推广订单接口 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.order.list.range.get -func (c *Client) OrderListRangeGet(notMustParams ...Params) *OrderListRangeGetResult { +func (c *Client) OrderListRangeGet(ctx context.Context, notMustParams ...Params) *OrderListRangeGetResult { // 参数 params := NewParamsWithType("pdd.ddk.order.list.range.get", notMustParams...) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response OrderListRangeGetResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.resource.url.gen.go b/pdd.ddk.resource.url.gen.go index 015d421..7f1818c 100644 --- a/pdd.ddk.resource.url.gen.go +++ b/pdd.ddk.resource.url.gen.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -51,12 +52,12 @@ func newResourceUrlGenResult(result ResourceUrlGenResponse, body []byte, http go // ResourceUrlGen 生成多多进宝频道推广 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.goods.pid.generate -func (c *Client) ResourceUrlGen(notMustParams ...Params) *ResourceUrlGenResult { +func (c *Client) ResourceUrlGen(ctx context.Context, notMustParams ...Params) *ResourceUrlGenResult { // 参数 params := NewParamsWithType("pdd.ddk.resource.url.gen", notMustParams...) params.Set("pid", c.config.Pid) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response ResourceUrlGenResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.rp.prom.url.generate.go b/pdd.ddk.rp.prom.url.generate.go index f6e70f3..7cfc13c 100644 --- a/pdd.ddk.rp.prom.url.generate.go +++ b/pdd.ddk.rp.prom.url.generate.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -66,12 +67,12 @@ func newRpPromUrlGenerateResult(result RpPromUrlGenerateResponse, body []byte, h // RpPromUrlGenerate 生成营销工具推广链接 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.rp.prom.url.generate -func (c *Client) RpPromUrlGenerate(notMustParams ...Params) *RpPromUrlGenerateResult { +func (c *Client) RpPromUrlGenerate(ctx context.Context, notMustParams ...Params) *RpPromUrlGenerateResult { // 参数 params := NewParamsWithType("pdd.ddk.rp.prom.url.generate", notMustParams...) params.Set("p_id_list", []string{c.config.Pid}) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response RpPromUrlGenerateResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.ddk.top.goods.list.query.go b/pdd.ddk.top.goods.list.query.go index 506b828..e09c962 100644 --- a/pdd.ddk.top.goods.list.query.go +++ b/pdd.ddk.top.goods.list.query.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -59,12 +60,12 @@ func newTopGoodsListQueryResult(result TopGoodsListQueryResponse, body []byte, h // TopGoodsListQuery 多多客获取爆款排行商品接口 // https://jinbao.pinduoduo.com/third-party/api-detail?apiName=pdd.ddk.top.goods.list.query -func (c *Client) TopGoodsListQuery(notMustParams ...Params) *TopGoodsListQueryResult { +func (c *Client) TopGoodsListQuery(ctx context.Context, notMustParams ...Params) *TopGoodsListQueryResult { // 参数 params := NewParamsWithType("pdd.ddk.top.goods.list.query", notMustParams...) params.Set("p_id", c.config.Pid) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response TopGoodsListQueryResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.goods.cats.get.go b/pdd.goods.cats.get.go index 2e87d06..7d82e5d 100644 --- a/pdd.goods.cats.get.go +++ b/pdd.goods.cats.get.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -29,13 +30,13 @@ func newGoodsCatsGetResult(result GoodsCatsGetResponse, body []byte, http gorequ // GoodsCatsGet 商品标准类目接口 // https://open.pinduoduo.com/application/document/api?id=pdd.goods.cats.get -func (c *Client) GoodsCatsGet(parentOptId int) *GoodsCatsGetResult { +func (c *Client) GoodsCatsGet(ctx context.Context, parentOptId int) *GoodsCatsGetResult { // 参数 param := NewParams() param.Set("parent_cat_id", parentOptId) params := NewParamsWithType("pdd.goods.cats.get", param) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response GoodsCatsGetResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/pdd.goods.opt.get.go b/pdd.goods.opt.get.go index cf05cf5..bd0f8ea 100644 --- a/pdd.goods.opt.get.go +++ b/pdd.goods.opt.get.go @@ -1,6 +1,7 @@ package pinduoduo import ( + "context" "encoding/json" "go.dtapp.net/gorequest" ) @@ -29,13 +30,13 @@ func newGoodsOptGetResult(result GoodsOptGetResponse, body []byte, http goreques // GoodsOptGet 查询商品标签列表 // https://open.pinduoduo.com/application/document/api?id=pdd.goods.opt.get -func (c *Client) GoodsOptGet(parentOptId int) *GoodsOptGetResult { +func (c *Client) GoodsOptGet(ctx context.Context, parentOptId int) *GoodsOptGetResult { // 参数 param := NewParams() param.Set("parent_opt_id", parentOptId) params := NewParamsWithType("pdd.goods.opt.get", param) // 请求 - request, err := c.request(params) + request, err := c.request(ctx, params) // 定义 var response GoodsOptGetResponse err = json.Unmarshal(request.ResponseBody, &response) diff --git a/request.go b/request.go index b8eed15..f2872a2 100644 --- a/request.go +++ b/request.go @@ -1,11 +1,12 @@ package pinduoduo 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) @@ -24,7 +25,7 @@ func (c *Client) request(params map[string]interface{}) (gorequest.Response, err // 日志 if c.config.PgsqlDb != nil { - go c.log.GormMiddlewareCustom(gostring.ToString(params["type"]), request, Version) + go c.log.GormMiddlewareCustom(ctx, gostring.ToString(params["type"]), request, Version) } if c.config.MongoDb != nil { go c.log.MongoMiddlewareCustom(gostring.ToString(params["type"]), request)