Skip to content

Commit d6e4df7

Browse files
bububabububa
committed
Merge branch 'release/v1.9.6'
2 parents 9a516a9 + 0287e07 commit d6e4df7

File tree

220 files changed

+1261
-699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+1261
-699
lines changed

‎.github/workflows/go.yml

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ name: Go
22

33
on:
44
push:
5-
branches: [ master, main ]
5+
branches: [master, main]
66
pull_request:
7-
branches: [ master, main ]
7+
branches: [master, main]
88

99
jobs:
10-
1110
build:
1211
runs-on: ubuntu-latest
1312
env:
@@ -17,28 +16,28 @@ jobs:
1716
run:
1817
working-directory: ${{ env.GOPATH }}/${{ env.package }}
1918
steps:
20-
- uses: actions/checkout@v3
21-
with:
22-
path: ${{ env.GOPATH }}/${{ env.package }}
19+
- uses: actions/checkout@v4
20+
with:
21+
path: ${{ env.GOPATH }}/${{ env.package }}
2322

24-
- name: Set up Go
25-
uses: actions/setup-go@v4
26-
with:
27-
go-version: '1.20'
28-
cache-dependency-path: |
29-
${{ env.GOPATH }}/${{ env.package }}/go.mod
30-
${{ env.GOPATH }}/${{ env.package }}/go.sum
23+
- name: Set up Go
24+
uses: actions/setup-go@v5
25+
with:
26+
go-version: ">=1.21.0"
27+
cache-dependency-path: |
28+
${{ env.GOPATH }}/${{ env.package }}/go.mod
29+
${{ env.GOPATH }}/${{ env.package }}/go.sum
3130
32-
- name: Dependencies
33-
run: go mod download
31+
- name: Dependencies
32+
run: go mod download
3433

35-
- name: Build
36-
working-directory: ${{ env.GOPATH }}/${{ env.package }}
37-
run: |
38-
go build -v ./...
34+
- name: Build
35+
working-directory: ${{ env.GOPATH }}/${{ env.package }}
36+
run: |
37+
go build -v ./...
3938
40-
- name: Test
41-
env:
42-
APPKEY: ${{ secrets.APPKEY }}
43-
SECRET: ${{ secrets.APP_SECRET }}
44-
run: go test -v ./...
39+
- name: Test
40+
env:
41+
APPKEY: ${{ secrets.APPKEY }}
42+
SECRET: ${{ secrets.APP_SECRET }}
43+
run: go test -v ./...

‎.github/workflows/goreleaser.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: goreleaser
33
on:
44
push:
55
tags:
6-
- '*'
6+
- "*"
77

88
jobs:
99
goreleaser:
@@ -12,16 +12,16 @@ jobs:
1212
cache: ${{ github.workspace }}/go.sum
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
1818
- name: Set up Go
19-
uses: actions/setup-go@v4
19+
uses: actions/setup-go@v5
2020
with:
21-
go-version: '1.20'
21+
go-version: ">=1.21.0"
2222
cache-dependency-path: ${{ env.cache }}
2323
- name: Run GoReleaser
24-
uses: goreleaser/goreleaser-action@v4
24+
uses: goreleaser/goreleaser-action@v6
2525
with:
2626
# either 'goreleaser' (default) or 'goreleaser-pro'
2727
distribution: goreleaser

‎.goreleaser.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ before:
1010
builds:
1111
- skip: true
1212
archives:
13-
- id: "kwai-marketing-api"
13+
- id: "kwai-marketing-api"
1414
name_template: >-
1515
{{ .ProjectName }}_
1616
{{- title .Os }}_
1717
{{- if eq .Arch "amd64" }}x86_64
1818
{{- else if eq .Arch "386" }}i386
1919
{{- else }}{{ .Arch }}{{ end }}
2020
checksum:
21-
name_template: 'checksums.txt'
21+
name_template: "checksums.txt"
2222
snapshot:
23-
name_template: "{{ .Tag }}-next"
23+
version_template: "{{ .Tag }}-next"
2424
changelog:
2525
sort: asc
2626
filters:
2727
exclude:
28-
- '^docs:'
29-
- '^test:'
28+
- "^docs:"
29+
- "^test:"

‎README.md

Lines changed: 177 additions & 177 deletions
Large diffs are not rendered by default.

‎api/adcompass/advertisers.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package adcompass
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/adcompass"
68
)
79

810
// Advertisers 获取罗盘绑定广告主列
9-
func Advertisers(clt *core.SDKClient, accessToken string, advertiserID uint64) ([]adcompass.Advertiser, error) {
11+
func Advertisers(ctx context.Context, clt *core.SDKClient, accessToken string, advertiserID uint64) ([]adcompass.Advertiser, error) {
1012
req := &adcompass.AdvertisersRequest{
1113
AdvertiserID: advertiserID,
1214
}
1315
var resp adcompass.AdvertisersResponse
14-
err := clt.Post(accessToken, req, &resp)
16+
err := clt.Post(ctx, accessToken, req, &resp)
1517
if err != nil {
1618
return nil, err
1719
}

‎api/adcompass/quota_tending.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package adcompass
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/adcompass"
68
)
79

810
// QuotaTending 磁力罗盘对外 quota 腾挪接口
9-
func QuotaTending(clt *core.SDKClient, accessToken string, req *adcompass.QuotaTendingRequest) (string, error) {
11+
func QuotaTending(ctx context.Context, clt *core.SDKClient, accessToken string, req *adcompass.QuotaTendingRequest) (string, error) {
1012
var resp adcompass.QuotaTendingResponse
11-
if err := clt.Post(accessToken, req, &resp); err != nil {
13+
if err := clt.Post(ctx, accessToken, req, &resp); err != nil {
1214
return "", err
1315
}
1416
return resp.Describe, nil

‎api/advertiser/budget_get.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package advertiser
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/advertiser"
68
)
79

810
// BudgetGet 账户日预算查询
9-
func BudgetGet(clt *core.SDKClient, accessToken string, advertiserID uint64) (*advertiser.Budget, error) {
11+
func BudgetGet(ctx context.Context, clt *core.SDKClient, accessToken string, advertiserID uint64) (*advertiser.Budget, error) {
1012
req := &advertiser.BudgetGetRequest{
1113
AdvertiserID: advertiserID,
1214
}
1315
var resp advertiser.Budget
14-
if err := clt.Post(accessToken, req, &resp); err != nil {
16+
if err := clt.Post(ctx, accessToken, req, &resp); err != nil {
1517
return nil, err
1618
}
1719
return &resp, nil

‎api/advertiser/fund_daily_flows.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package advertiser
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/advertiser"
68
)
79

810
// FundDailyFlows 获取广告账户流水信息
9-
func FundDailyFlows(clt *core.SDKClient, accessToken string, req *advertiser.FundDailyFlowsRequest) (*advertiser.FundDailyFlowsResponse, error) {
11+
func FundDailyFlows(ctx context.Context, clt *core.SDKClient, accessToken string, req *advertiser.FundDailyFlowsRequest) (*advertiser.FundDailyFlowsResponse, error) {
1012
var resp advertiser.FundDailyFlowsResponse
11-
err := clt.Post(accessToken, req, &resp)
13+
err := clt.Post(ctx, accessToken, req, &resp)
1214
if err != nil {
1315
return nil, err
1416
}

‎api/advertiser/fund_get.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package advertiser
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/advertiser"
68
)
79

810
// FundGet 获取广告账户余额信息
9-
func FundGet(clt *core.SDKClient, accessToken string, advertiserID uint64) (float64, error) {
11+
func FundGet(ctx context.Context, clt *core.SDKClient, accessToken string, advertiserID uint64) (float64, error) {
1012
req := &advertiser.FundGetRequest{
1113
AdvertiserID: advertiserID,
1214
}
1315
var resp advertiser.FundGetResponse
14-
err := clt.Post(accessToken, req, &resp)
16+
err := clt.Post(ctx, accessToken, req, &resp)
1517
if err != nil {
1618
return 0, err
1719
}

‎api/advertiser/info.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package advertiser
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/advertiser"
68
)
79

810
// Info 获取广告账户信息
9-
func Info(clt *core.SDKClient, accessToken string, advertiserID uint64) (*advertiser.Info, error) {
11+
func Info(ctx context.Context, clt *core.SDKClient, accessToken string, advertiserID uint64) (*advertiser.Info, error) {
1012
req := &advertiser.InfoRequest{
1113
AdvertiserID: advertiserID,
1214
}
1315
var resp advertiser.Info
14-
err := clt.Post(accessToken, req, &resp)
16+
err := clt.Post(ctx, accessToken, req, &resp)
1517
if err != nil {
1618
return nil, err
1719
}

‎api/advertiser/update_budget.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package advertiser
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/advertiser"
68
)
79

810
// UpdateBudget 修改账户预算
9-
func UpdateBudget(clt *core.SDKClient, accessToken string, req *advertiser.UpdateBudgetRequest) error {
10-
return clt.Post(accessToken, req, nil)
11+
func UpdateBudget(ctx context.Context, clt *core.SDKClient, accessToken string, req *advertiser.UpdateBudgetRequest) error {
12+
return clt.Post(ctx, accessToken, req, nil)
1113
}

‎api/advertiser/white_list.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
package advertiser
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/advertiser"
68
)
79

810
// WhiteList 获取可选白名单接口
9-
func WhiteList(clt *core.SDKClient, accessToken string, advertiserID uint64) (*advertiser.WhiteListResponse, error) {
11+
func WhiteList(ctx context.Context, clt *core.SDKClient, accessToken string, advertiserID uint64) (*advertiser.WhiteListResponse, error) {
1012
req := &advertiser.WhiteListRequest{
1113
AdvertiserID: advertiserID,
1214
}
1315
var resp advertiser.WhiteListResponse
14-
err := clt.Get(accessToken, req, &resp)
16+
err := clt.Get(ctx, accessToken, req, &resp)
1517
if err != nil {
1618
return nil, err
1719
}

‎api/appcenter/app/create_android.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package app
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/appcenter/app"
68
)
79

810
// CreateAndroid 创建Android应用
9-
func CreateAndroid(clt *core.SDKClient, accessToken string, req *app.CreateAndroidRequest) (*app.App, error) {
11+
func CreateAndroid(ctx context.Context, clt *core.SDKClient, accessToken string, req *app.CreateAndroidRequest) (*app.App, error) {
1012
var resp app.App
11-
if err := clt.Post(accessToken, req, &resp); err != nil {
13+
if err := clt.Post(ctx, accessToken, req, &resp); err != nil {
1214
return nil, err
1315
}
1416
return &resp, nil

‎api/appcenter/app/create_ios.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package app
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/appcenter/app"
68
)
79

810
// CreateIos 创建iOS应用
9-
func CreateIos(clt *core.SDKClient, accessToken string, req *app.CreateIosRequest) (*app.App, error) {
11+
func CreateIos(ctx context.Context, clt *core.SDKClient, accessToken string, req *app.CreateIosRequest) (*app.App, error) {
1012
var resp app.App
11-
if err := clt.Post(accessToken, req, &resp); err != nil {
13+
if err := clt.Post(ctx, accessToken, req, &resp); err != nil {
1214
return nil, err
1315
}
1416
return &resp, nil

‎api/appcenter/app/detail.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package app
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/appcenter/app"
68
)
79

810
// Detail 【应用中心】获取应用详情
9-
func Detail(clt *core.SDKClient, accessToken string, req *app.DetailRequest) (*app.App, error) {
11+
func Detail(ctx context.Context, clt *core.SDKClient, accessToken string, req *app.DetailRequest) (*app.App, error) {
1012
var resp app.App
11-
if err := clt.Post(accessToken, req, &resp); err != nil {
13+
if err := clt.Post(ctx, accessToken, req, &resp); err != nil {
1214
return nil, err
1315
}
1416
return &resp, nil

‎api/appcenter/app/ios_update.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package app
22

33
import (
4+
"context"
45
"errors"
56

67
"github.com/bububa/kwai-marketing-api/core"
78
"github.com/bububa/kwai-marketing-api/model/appcenter/app"
89
)
910

1011
// IosUpdate iOS 应用上报更新
11-
func IosUpdate(clt *core.SDKClient, accessToken string, req *app.IosUpdateRequest) error {
12+
func IosUpdate(ctx context.Context, clt *core.SDKClient, accessToken string, req *app.IosUpdateRequest) error {
1213
var resp app.IosUpdateResponse
13-
if err := clt.Post(accessToken, req, &resp); err != nil {
14+
if err := clt.Post(ctx, accessToken, req, &resp); err != nil {
1415
return err
1516
}
1617
if !resp.Result {

‎api/appcenter/app/list.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package app
22

33
import (
4+
"context"
5+
46
"github.com/bububa/kwai-marketing-api/core"
57
"github.com/bububa/kwai-marketing-api/model/appcenter/app"
68
)
79

810
// List 【应用中心】获取应用列表
9-
func List(clt *core.SDKClient, accessToken string, req *app.ListRequest) (*app.ListResponse, error) {
11+
func List(ctx context.Context, clt *core.SDKClient, accessToken string, req *app.ListRequest) (*app.ListResponse, error) {
1012
var resp app.ListResponse
11-
if err := clt.Post(accessToken, req, &resp); err != nil {
13+
if err := clt.Post(ctx, accessToken, req, &resp); err != nil {
1214
return nil, err
1315
}
1416
return &resp, nil

0 commit comments

Comments
 (0)