Merge branch 'release/v1.4.0'

.github/workflows/go.yml

@@ -2,12 +2,11 @@ name: Go
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [master, main]
   pull_request:
-    branches: [ master, main ]
+    branches: [master, main]
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     env:
@@ -17,27 +16,27 @@ jobs:
       run:
         working-directory: ${{ env.GOPATH }}/${{ env.package }}
     steps:
-    - uses: actions/checkout@v3
-      with:
-        path: ${{ env.GOPATH }}/${{ env.package }}
+      - uses: actions/checkout@v4
+        with:
+          path: ${{ env.GOPATH }}/${{ env.package }}
 
-    - name: Set up Go
-      uses: actions/setup-go@v4
-      with:
-        go-version: '1.20'
-        cache-dependency-path: |
-          ${{ env.GOPATH }}/${{ env.package }}/go.mod
-          ${{ env.GOPATH }}/${{ env.package }}/go.sum
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ">=1.21.0"
+          cache-dependency-path: |
+            ${{ env.GOPATH }}/${{ env.package }}/go.mod
+            ${{ env.GOPATH }}/${{ env.package }}/go.sum
 
-    - name: Dependencies
-      run: go mod download
+      - name: Dependencies
+        run: go mod download
 
-    - name: Build
-      working-directory: ${{ env.GOPATH }}/${{ env.package }}
-      run: go build -v ./...
+      - name: Build
+        working-directory: ${{ env.GOPATH }}/${{ env.package }}
+        run: go build -v ./...
 
-    - name: Test
-      env:
-        APPKEY: ${{ secrets.APPKEY }}
-        SECRET: ${{ secrets.APP_SECRET }}
-      run: go test -v ./...
+      - name: Test
+        env:
+          APPKEY: ${{ secrets.APPKEY }}
+          SECRET: ${{ secrets.APP_SECRET }}
+        run: go test -v ./...

.github/workflows/goreleaser.yml

@@ -3,7 +3,7 @@ name: goreleaser
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
   goreleaser:
@@ -12,16 +12,16 @@ jobs:
       cache: ${{ github.workspace }}/go.sum
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: ">=1.21.0"
           cache-dependency-path: ${{ env.cache }}
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v6
         with:
           # either 'goreleaser' (default) or 'goreleaser-pro'
           distribution: goreleaser

.goreleaser.yml

@@ -10,20 +10,20 @@ before:
 builds:
   - skip: true
 archives:
-  - id: "baidu-marketing" 
+  - id: "baidu-marketing"
     name_template: >-
       {{ .ProjectName }}_
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
       {{- else }}{{ .Arch }}{{ end }}
 checksum:
-  name_template: 'checksums.txt'
+  name_template: "checksums.txt"
 snapshot:
-  name_template: "{{ .Tag }}-next"
+  version_template: "{{ .Tag }}-next"
 changelog:
   sort: asc
   filters:
     exclude:
-      - '^docs:'
-      - '^test:'
+      - "^docs:"
+      - "^test:"

api/account/balance/getAccountTransferHistory.go

@@ -1,6 +1,7 @@
 package balance
 
 import (
+	"context"
 	"time"
 
 	"github.com/bububa/baidu-marketing/core"
@@ -10,7 +11,7 @@ import (
 
 // GetAccountTransferHistory 查询转账记录
 // 查询MCC账户历史转账记录，仅适用于KA账户
-func GetAccountTransferHistory(clt *core.SDKClient, auth *model.RequestHeader, startTime time.Time, endTime time.Time) (*model.ResponseHeader, []balance.AccountTransferHistory, error) {
+func GetAccountTransferHistory(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, startTime time.Time, endTime time.Time) (*model.ResponseHeader, []balance.AccountTransferHistory, error) {
 	req := &model.Request{
 		Header: auth,
 		Body: &balance.GetAccountTransferHistoryRequest{
@@ -19,6 +20,6 @@ func GetAccountTransferHistory(clt *core.SDKClient, auth *model.RequestHeader, s
 		},
 	}
 	var resp balance.GetAccountTransferHistoryResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/account/balance/getBalanceInfo.go

@@ -1,21 +1,23 @@
 package balance
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/account/balance"
 )
 
 // GetBalanceInfo 查询账户余额成分
 // 支持KA账户&直销客户查询账户余额及余额成分。不同渠道账户使用的资金包不同，详见文档说明
-func GetBalanceInfo(clt *core.SDKClient, auth *model.RequestHeader, productIds []int) (*model.ResponseHeader, []balance.BalanceInfo, error) {
+func GetBalanceInfo(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, productIds []int) (*model.ResponseHeader, []balance.BalanceInfo, error) {
 	req := &model.Request{
 		Header: auth,
 		Body: &balance.GetBalanceInfoRequest{
 			ProductIds: productIds,
 		},
 	}
 	var resp balance.GetBalanceInfoResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/account/balance/getPaymentHistory.go

@@ -1,19 +1,21 @@
 package balance
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/account/balance"
 )
 
 // GetPaymentHistory 查询待加款信息
 // 支持KA账户查询付款记录，此接口仅供KA账户使用
-func GetPaymentHistory(clt *core.SDKClient, auth *model.RequestHeader, reqBody *balance.GetPaymentHistoryRequest) (*model.ResponseHeader, []balance.PaymentHistory, error) {
+func GetPaymentHistory(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, reqBody *balance.GetPaymentHistoryRequest) (*model.ResponseHeader, []balance.PaymentHistory, error) {
 	req := &model.Request{
 		Header: auth,
 		Body:   reqBody,
 	}
 	var resp balance.GetPaymentHistoryResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/account/balance/getPaymentRecord.go

@@ -1,20 +1,22 @@
 package balance
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/account/balance"
 )
 
 // GetPaymentRecord 查询付款信息与待加款信息
 // 查询付款记录接口，支持获取直销客户实际资金流动、直销客户优惠资金流动、KA实际资金流动、KA优惠资金流动、KA待加款记录。
-func GetPaymentRecord(clt *core.SDKClient, auth *model.RequestHeader, reqBody *balance.GetPaymentRecordRequest) (*model.ResponseHeader, *balance.GetPaymentRecordResponse, error) {
+func GetPaymentRecord(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, reqBody *balance.GetPaymentRecordRequest) (*model.ResponseHeader, *balance.GetPaymentRecordResponse, error) {
 	req := &model.Request{
 		Header: auth,
 		Body:   reqBody,
 	}
 	var resp balance.GetPaymentRecordResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	if err != nil && header != nil && header.Status != 1 {
 		return header, nil, err
 	}

api/account/getUserListByMccid.go

@@ -1,19 +1,21 @@
 package account
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/account"
 )
 
 // GetUserListByMccid 账户管家管理
 // 账户管家查询下辖子账户，此接口仅供账户管家权限使用，查询操作账户即账户管家的下辖账户列表，header中的被操作账户可以传子账户中任意一个，对该接口功能无影响
-func GetUserListByMccid(clt *core.SDKClient, auth *model.RequestHeader) (*model.ResponseHeader, []account.MccUser, error) {
+func GetUserListByMccid(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader) (*model.ResponseHeader, []account.MccUser, error) {
 	req := &model.Request{
 		Header: auth,
 		Body:   new(account.GetUserListByMccidRequest),
 	}
 	var resp account.GetUserListByMccidResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/asset/image/getImage.go

@@ -1,18 +1,20 @@
 package image
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/asset/image"
 )
 
 // GetImage 通过图片规格、大小、格式、时间区间等条件，筛选出合适的图片返回
-func GetImage(clt *core.SDKClient, auth *model.RequestHeader, reqBody *image.GetImageRequest) (*model.ResponseHeader, []image.Image, error) {
+func GetImage(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, reqBody *image.GetImageRequest) (*model.ResponseHeader, []image.Image, error) {
 	req := &model.Request{
 		Header: auth,
 		Body:   reqBody,
 	}
 	var resp image.GetImageResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/asset/newimage/uploadImage.go

@@ -1,18 +1,20 @@
 package newimage
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	image2 "github.com/bububa/baidu-marketing/model/asset/newimage"
 )
 
 // UploadImage 图片上传接口，上传后搜索推广与信息流推广可共用。上传时不限制单张图片大小，单次请求不超过10M。
-func UploadImage(clt *core.SDKClient, auth *model.RequestHeader, reqBody *image2.UploadImageRequest) (*model.ResponseHeader, []image2.Image, error) {
+func UploadImage(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, reqBody *image2.UploadImageRequest) (*model.ResponseHeader, []image2.Image, error) {
 	req := &model.Request{
 		Header: auth,
 		Body:   reqBody,
 	}
 	var resp image2.UploadImageResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/asset/video/getVideo.go

@@ -1,18 +1,20 @@
 package video
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/asset/video"
 )
 
 // GetVideo 获取信息流&搜索视频素材信息，括视频id、规格、大小、格式、上传日期、最后修改时间、长度、名称、视频URL等等
-func GetVideo(clt *core.SDKClient, auth *model.RequestHeader, reqBody *video.GetVideoRequest) (*model.ResponseHeader, []video.Video, error) {
+func GetVideo(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, reqBody *video.GetVideoRequest) (*model.ResponseHeader, []video.Video, error) {
 	req := &model.Request{
 		Header: auth,
 		Body:   reqBody,
 	}
 	var resp video.GetVideoResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/feed/account/getAccountFeed.go

@@ -1,20 +1,22 @@
 package account
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/feed/account"
 )
 
 // GetAccountFeed 查询账户
-func GetAccountFeed(clt *core.SDKClient, auth *model.RequestHeader, accountFields []string) (*model.ResponseHeader, []account.Account, error) {
+func GetAccountFeed(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, accountFields []string) (*model.ResponseHeader, []account.Account, error) {
 	req := &model.Request{
 		Header: auth,
 		Body: &account.GetAccountFeedRequest{
 			AccountFeedFields: accountFields,
 		},
 	}
 	var resp account.GetAccountFeedResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/feed/account/updateAccountFeed.go

@@ -1,13 +1,15 @@
 package account
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/feed/account"
 )
 
 // UpdateAccountFeed 更新账户信息
-func UpdateAccountFeed(clt *core.SDKClient, auth *model.RequestHeader, budget float64) (*model.ResponseHeader, []account.Account, error) {
+func UpdateAccountFeed(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, budget float64) (*model.ResponseHeader, []account.Account, error) {
 	req := &model.Request{
 		Header: auth,
 		Body: &account.UpdateAccountFeedRequest{
@@ -17,6 +19,6 @@ func UpdateAccountFeed(clt *core.SDKClient, auth *model.RequestHeader, budget fl
 		},
 	}
 	var resp account.UpdateAccountFeedResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }

api/feed/adgroup/addAdgroup.go

@@ -1,19 +1,21 @@
 package adgroup
 
 import (
+	"context"
+
 	"github.com/bububa/baidu-marketing/core"
 	"github.com/bububa/baidu-marketing/model"
 	"github.com/bububa/baidu-marketing/model/feed/adgroup"
 )
 
 // AddAdgroup 添加单元
 // 新增推广单元
-func AddAdgroup(clt *core.SDKClient, auth *model.RequestHeader, reqBody *adgroup.AddAdgroupRequest) (*model.ResponseHeader, []adgroup.Adgroup, error) {
+func AddAdgroup(ctx context.Context, clt *core.SDKClient, auth *model.RequestHeader, reqBody *adgroup.AddAdgroupRequest) (*model.ResponseHeader, []adgroup.Adgroup, error) {
 	req := &model.Request{
 		Header: auth,
 		Body:   reqBody,
 	}
 	var resp adgroup.AddAdgroupResponse
-	header, err := clt.Do(req, &resp)
+	header, err := clt.Do(ctx, req, &resp)
 	return header, resp.Data, err
 }