Skip to content

Commit 0d7be9a

Browse files
author
盛辉
committedFeb 11, 2025
处理类型别名
1 parent 64029be commit 0d7be9a

13 files changed

+48
-45
lines changed
 

‎alipay/action.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/yiigo/sdk-go/internal"
1312
"github.com/yiigo/sdk-go/internal/value"
1413
)
1514

1615
type Action struct {
1716
method string
1817
params V
19-
bizData internal.X
18+
bizData X
2019
encrypt bool
2120
}
2221

@@ -135,7 +134,7 @@ func WithKVParam(k, v string) ActionOption {
135134
}
136135

137136
// WithBizContent 设置「biz_content」参数
138-
func WithBizContent(data internal.X) ActionOption {
137+
func WithBizContent(data X) ActionOption {
139138
return func(a *Action) {
140139
a.bizData = data
141140
}

‎alipay/client_v3.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (c *ClientV3) url(path string, query url.Values) string {
5252
return builder.String()
5353
}
5454

55-
func (c *ClientV3) do(ctx context.Context, method, path string, query url.Values, params internal.X, header http.Header) (*APIResult, error) {
55+
func (c *ClientV3) do(ctx context.Context, method, path string, query url.Values, params X, header http.Header) (*APIResult, error) {
5656
reqURL := c.url(path, query)
5757

5858
log := internal.NewReqLog(method, reqURL)
@@ -135,7 +135,7 @@ func (c *ClientV3) GetJSON(ctx context.Context, path string, query url.Values, o
135135
}
136136

137137
// PostJSON POST请求JSON数据
138-
func (c *ClientV3) PostJSON(ctx context.Context, path string, params internal.X, options ...V3HeaderOption) (*APIResult, error) {
138+
func (c *ClientV3) PostJSON(ctx context.Context, path string, params X, options ...V3HeaderOption) (*APIResult, error) {
139139
header := http.Header{}
140140
header.Set(internal.HeaderAccept, internal.ContentJSON)
141141
header.Set(HeaderRequestID, uuid.NewString())
@@ -147,7 +147,7 @@ func (c *ClientV3) PostJSON(ctx context.Context, path string, params internal.X,
147147
}
148148

149149
// PostJSON POST加密请求
150-
func (c *ClientV3) PostEncrypt(ctx context.Context, path string, params internal.X, options ...V3HeaderOption) (*APIResult, error) {
150+
func (c *ClientV3) PostEncrypt(ctx context.Context, path string, params X, options ...V3HeaderOption) (*APIResult, error) {
151151
header := http.Header{}
152152
header.Set(HeaderRequestID, uuid.NewString())
153153
header.Set(HeaderEncryptType, "AES")

‎alipay/util.go

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010

1111
type V = value.V
1212

13+
type X map[string]any
14+
1315
const CodeOK = "10000" // API请求成功
1416

1517
const (

‎antchain/client.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ type Client interface {
6262
}
6363

6464
// ChainCallOption 链调用选项
65-
type ChainCallOption func(params internal.X)
65+
type ChainCallOption func(params X)
6666

6767
func WithParam(key string, value any) ChainCallOption {
68-
return func(params internal.X) {
68+
return func(params X) {
6969
params[key] = value
7070
}
7171
}
@@ -85,7 +85,7 @@ func (c *client) shakehand(ctx context.Context) (string, error) {
8585
return "", err
8686
}
8787

88-
params := internal.X{
88+
params := X{
8989
"accessId": c.config.AccessID,
9090
"time": timeStr,
9191
"secret": hex.EncodeToString(sign),
@@ -99,7 +99,7 @@ func (c *client) chainCall(ctx context.Context, method string, options ...ChainC
9999
return "", err
100100
}
101101

102-
params := internal.X{}
102+
params := X{}
103103
for _, f := range options {
104104
f(params)
105105
}
@@ -117,7 +117,7 @@ func (c *client) chainCallForBiz(ctx context.Context, method string, options ...
117117
return "", err
118118
}
119119

120-
params := internal.X{}
120+
params := X{}
121121
for _, f := range options {
122122
f(params)
123123
}
@@ -133,7 +133,7 @@ func (c *client) chainCallForBiz(ctx context.Context, method string, options ...
133133
return c.do(ctx, c.endpoint+CHAIN_CALL_FOR_BIZ, params)
134134
}
135135

136-
func (c *client) do(ctx context.Context, reqURL string, params internal.X) (string, error) {
136+
func (c *client) do(ctx context.Context, reqURL string, params X) (string, error) {
137137
log := internal.NewReqLog(http.MethodPost, reqURL)
138138
defer log.Do(ctx, c.logger)
139139

‎antchain/util.go

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"math/big"
88
)
99

10+
type X map[string]any
11+
1012
const (
1113
CHAIN_CALL_FOR_BIZ = "/api/contract/chainCallForBiz"
1214
CHAIN_CALL = "/api/contract/chainCall"

‎esign/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (c *Client) url(path string, query url.Values) string {
4949
return builder.String()
5050
}
5151

52-
func (c *Client) do(ctx context.Context, method, path string, query url.Values, params internal.X) (gjson.Result, error) {
52+
func (c *Client) do(ctx context.Context, method, path string, query url.Values, params X) (gjson.Result, error) {
5353
reqURL := c.url(path, query)
5454

5555
log := internal.NewReqLog(method, reqURL)
@@ -171,7 +171,7 @@ func (c *Client) GetJSON(ctx context.Context, path string, query url.Values) (gj
171171
}
172172

173173
// PostJSON POST请求JSON数据
174-
func (c *Client) PostJSON(ctx context.Context, path string, params internal.X) (gjson.Result, error) {
174+
func (c *Client) PostJSON(ctx context.Context, path string, params X) (gjson.Result, error) {
175175
return c.do(ctx, http.MethodPost, path, nil, params)
176176
}
177177

‎esign/util.go

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import (
1111

1212
type V = value.V
1313

14+
type X map[string]any
15+
1416
const (
1517
HeaderContentMD5 = "Content-MD5"
1618
HeaderTSignOpenAppID = "X-Tsign-Open-App-Id"

‎internal/util.go

-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ import (
1010
"github.com/tidwall/gjson"
1111
)
1212

13-
// X 类型别名
14-
type X map[string]any
15-
16-
// Form 类型别名
17-
type Form map[string]string
18-
1913
var Fail = func(err error) (gjson.Result, error) { return gjson.Result{}, err }
2014

2115
// Nonce 生成指定长度的随机串 (最好是偶数)

‎wechat/corp.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (c *Corp) url(path string, query url.Values) string {
5555
return builder.String()
5656
}
5757

58-
func (c *Corp) do(ctx context.Context, method, path string, header http.Header, query url.Values, params internal.X) ([]byte, error) {
58+
func (c *Corp) do(ctx context.Context, method, path string, header http.Header, query url.Values, params X) ([]byte, error) {
5959
reqURL := c.url(path, query)
6060

6161
log := internal.NewReqLog(method, reqURL)
@@ -191,7 +191,7 @@ func (c *Corp) GetJSON(ctx context.Context, path string, query url.Values) (gjso
191191
}
192192

193193
// PostJSON POST请求JSON数据
194-
func (c *Corp) PostJSON(ctx context.Context, path string, params internal.X) (gjson.Result, error) {
194+
func (c *Corp) PostJSON(ctx context.Context, path string, params X) (gjson.Result, error) {
195195
token, err := c.getToken()
196196
if err != nil {
197197
return internal.Fail(err)
@@ -238,7 +238,7 @@ func (c *Corp) GetBuffer(ctx context.Context, path string, query url.Values) ([]
238238
}
239239

240240
// PostBuffer POST请求获取buffer (如：获取二维码)
241-
func (c *Corp) PostBuffer(ctx context.Context, path string, params internal.X) ([]byte, error) {
241+
func (c *Corp) PostBuffer(ctx context.Context, path string, params X) ([]byte, error) {
242242
token, err := c.getToken()
243243
if err != nil {
244244
return nil, err
@@ -262,7 +262,7 @@ func (c *Corp) PostBuffer(ctx context.Context, path string, params internal.X) (
262262
}
263263

264264
// Upload 上传媒体资源
265-
func (c *Corp) Upload(ctx context.Context, reqPath, fieldName, filePath string, formData internal.Form, query url.Values) (gjson.Result, error) {
265+
func (c *Corp) Upload(ctx context.Context, reqPath, fieldName, filePath string, formData Form, query url.Values) (gjson.Result, error) {
266266
token, err := c.getToken()
267267
if err != nil {
268268
return internal.Fail(err)
@@ -302,7 +302,7 @@ func (c *Corp) Upload(ctx context.Context, reqPath, fieldName, filePath string,
302302
}
303303

304304
// UploadWithReader 上传媒体资源
305-
func (c *Corp) UploadWithReader(ctx context.Context, reqPath, fieldName, fileName string, reader io.Reader, formData internal.Form, query url.Values) (gjson.Result, error) {
305+
func (c *Corp) UploadWithReader(ctx context.Context, reqPath, fieldName, fileName string, reader io.Reader, formData Form, query url.Values) (gjson.Result, error) {
306306
token, err := c.getToken()
307307
if err != nil {
308308
return internal.Fail(err)

‎wechat/miniprogram.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (mp *MiniProgram) url(path string, query url.Values) string {
7171
return builder.String()
7272
}
7373

74-
func (mp *MiniProgram) do(ctx context.Context, method, path string, header http.Header, query url.Values, params internal.X) ([]byte, error) {
74+
func (mp *MiniProgram) do(ctx context.Context, method, path string, header http.Header, query url.Values, params X) ([]byte, error) {
7575
reqURL := mp.url(path, query)
7676

7777
log := internal.NewReqLog(method, reqURL)
@@ -109,7 +109,7 @@ func (mp *MiniProgram) do(ctx context.Context, method, path string, header http.
109109
return resp.Body(), nil
110110
}
111111

112-
func (mp *MiniProgram) doSafe(ctx context.Context, method, path string, query url.Values, params internal.X) ([]byte, error) {
112+
func (mp *MiniProgram) doSafe(ctx context.Context, method, path string, query url.Values, params X) ([]byte, error) {
113113
reqURL := mp.url(path, query)
114114

115115
log := internal.NewReqLog(method, reqURL)
@@ -177,13 +177,13 @@ func (mp *MiniProgram) doSafe(ctx context.Context, method, path string, query ur
177177
return data, nil
178178
}
179179

180-
func (mp *MiniProgram) encrypt(log *internal.ReqLog, path string, query url.Values, params internal.X, timestamp int64) (internal.X, error) {
180+
func (mp *MiniProgram) encrypt(log *internal.ReqLog, path string, query url.Values, params X, timestamp int64) (X, error) {
181181
if len(mp.sfMode.aeskey) == 0 {
182182
return nil, errors.New("aes-gcm key not found (forgotten configure?)")
183183
}
184184

185185
if params == nil {
186-
params = internal.X{}
186+
params = X{}
187187
}
188188

189189
params["_n"] = base64.StdEncoding.EncodeToString(internal.NonceByte(16))
@@ -219,7 +219,7 @@ func (mp *MiniProgram) encrypt(log *internal.ReqLog, path string, query url.Valu
219219
return nil, err
220220
}
221221

222-
body := internal.X{
222+
body := X{
223223
"iv": base64.StdEncoding.EncodeToString(iv),
224224
"data": base64.StdEncoding.EncodeToString(ct.Data()),
225225
"authtag": base64.StdEncoding.EncodeToString(ct.Tag()),
@@ -365,7 +365,7 @@ func (mp *MiniProgram) AccessToken(ctx context.Context) (gjson.Result, error) {
365365
// [普通模式] access_token有效期内重复调用该接口不会更新access_token，绝大部分场景下使用该模式；
366366
// [强制刷新模式] 会导致上次获取的access_token失效，并返回新的access_token
367367
func (mp *MiniProgram) StableAccessToken(ctx context.Context, forceRefresh bool) (gjson.Result, error) {
368-
params := internal.X{
368+
params := X{
369369
"grant_type": "client_credential",
370370
"appid": mp.appid,
371371
"secret": mp.secret,
@@ -499,7 +499,7 @@ func (mp *MiniProgram) GetBuffer(ctx context.Context, path string, query url.Val
499499
}
500500

501501
// PostJSON POST请求JSON数据
502-
func (mp *MiniProgram) PostJSON(ctx context.Context, path string, params internal.X) (gjson.Result, error) {
502+
func (mp *MiniProgram) PostJSON(ctx context.Context, path string, params X) (gjson.Result, error) {
503503
token, err := mp.getToken()
504504
if err != nil {
505505
return internal.Fail(err)
@@ -523,7 +523,7 @@ func (mp *MiniProgram) PostJSON(ctx context.Context, path string, params interna
523523
}
524524

525525
// PostBuffer POST请求获取buffer (如：获取二维码)
526-
func (mp *MiniProgram) PostBuffer(ctx context.Context, path string, params internal.X) ([]byte, error) {
526+
func (mp *MiniProgram) PostBuffer(ctx context.Context, path string, params X) ([]byte, error) {
527527
token, err := mp.getToken()
528528
if err != nil {
529529
return nil, err
@@ -550,7 +550,7 @@ func (mp *MiniProgram) PostBuffer(ctx context.Context, path string, params inter
550550
//
551551
// [安全鉴权模式](https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/getting_started/api_signature.html)
552552
// [支持的API](https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc)
553-
func (mp *MiniProgram) SafePostJSON(ctx context.Context, path string, params internal.X) (gjson.Result, error) {
553+
func (mp *MiniProgram) SafePostJSON(ctx context.Context, path string, params X) (gjson.Result, error) {
554554
token, err := mp.getToken()
555555
if err != nil {
556556
return internal.Fail(err)
@@ -574,7 +574,7 @@ func (mp *MiniProgram) SafePostJSON(ctx context.Context, path string, params int
574574
//
575575
// [安全鉴权模式](https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/getting_started/api_signature.html)
576576
// [支持的API](https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc)
577-
func (mp *MiniProgram) SafePostBuffer(ctx context.Context, path string, params internal.X) ([]byte, error) {
577+
func (mp *MiniProgram) SafePostBuffer(ctx context.Context, path string, params X) ([]byte, error) {
578578
token, err := mp.getToken()
579579
if err != nil {
580580
return nil, err
@@ -595,7 +595,7 @@ func (mp *MiniProgram) SafePostBuffer(ctx context.Context, path string, params i
595595
}
596596

597597
// Upload 上传媒体资源
598-
func (mp *MiniProgram) Upload(ctx context.Context, reqPath, fieldName, filePath string, formData internal.Form, query url.Values) (gjson.Result, error) {
598+
func (mp *MiniProgram) Upload(ctx context.Context, reqPath, fieldName, filePath string, formData Form, query url.Values) (gjson.Result, error) {
599599
token, err := mp.getToken()
600600
if err != nil {
601601
return internal.Fail(err)
@@ -635,7 +635,7 @@ func (mp *MiniProgram) Upload(ctx context.Context, reqPath, fieldName, filePath
635635
}
636636

637637
// UploadWithReader 上传媒体资源
638-
func (mp *MiniProgram) UploadWithReader(ctx context.Context, reqPath, fieldName, fileName string, reader io.Reader, formData internal.Form, query url.Values) (gjson.Result, error) {
638+
func (mp *MiniProgram) UploadWithReader(ctx context.Context, reqPath, fieldName, fileName string, reader io.Reader, formData Form, query url.Values) (gjson.Result, error) {
639639
token, err := mp.getToken()
640640
if err != nil {
641641
return internal.Fail(err)

‎wechat/official_account.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func (oa *OfficialAccount) url(path string, query url.Values) string {
6262
return builder.String()
6363
}
6464

65-
func (oa *OfficialAccount) do(ctx context.Context, method, path string, header http.Header, query url.Values, params internal.X) ([]byte, error) {
65+
func (oa *OfficialAccount) do(ctx context.Context, method, path string, header http.Header, query url.Values, params X) ([]byte, error) {
6666
reqURL := oa.url(path, query)
6767

6868
log := internal.NewReqLog(method, reqURL)
@@ -197,7 +197,7 @@ func (oa *OfficialAccount) AccessToken(ctx context.Context) (gjson.Result, error
197197
// [普通模式] access_token 有效期内重复调用该接口不会更新 access_token，绝大部分场景下使用该模式；
198198
// [强制刷新模式] 会导致上次获取的 access_token 失效，并返回新的 access_token
199199
func (oa *OfficialAccount) StableAccessToken(ctx context.Context, forceRefresh bool) (gjson.Result, error) {
200-
params := internal.X{
200+
params := X{
201201
"grant_type": "client_credential",
202202
"appid": oa.appid,
203203
"secret": oa.secret,
@@ -307,7 +307,7 @@ func (oa *OfficialAccount) GetJSON(ctx context.Context, path string, query url.V
307307
}
308308

309309
// PostJSON POST请求JSON数据
310-
func (oa *OfficialAccount) PostJSON(ctx context.Context, path string, params internal.X) (gjson.Result, error) {
310+
func (oa *OfficialAccount) PostJSON(ctx context.Context, path string, params X) (gjson.Result, error) {
311311
token, err := oa.getToken()
312312
if err != nil {
313313
return internal.Fail(err)
@@ -354,7 +354,7 @@ func (oa *OfficialAccount) GetBuffer(ctx context.Context, path string, query url
354354
}
355355

356356
// PostBuffer POST请求获取buffer (如：获取二维码)
357-
func (oa *OfficialAccount) PostBuffer(ctx context.Context, path string, params internal.X) ([]byte, error) {
357+
func (oa *OfficialAccount) PostBuffer(ctx context.Context, path string, params X) ([]byte, error) {
358358
token, err := oa.getToken()
359359
if err != nil {
360360
return nil, err
@@ -378,7 +378,7 @@ func (oa *OfficialAccount) PostBuffer(ctx context.Context, path string, params i
378378
}
379379

380380
// Upload 上传媒体资源
381-
func (oa *OfficialAccount) Upload(ctx context.Context, reqPath, fieldName, filePath string, formData internal.Form, query url.Values) (gjson.Result, error) {
381+
func (oa *OfficialAccount) Upload(ctx context.Context, reqPath, fieldName, filePath string, formData Form, query url.Values) (gjson.Result, error) {
382382
token, err := oa.getToken()
383383
if err != nil {
384384
return internal.Fail(err)
@@ -418,7 +418,7 @@ func (oa *OfficialAccount) Upload(ctx context.Context, reqPath, fieldName, fileP
418418
}
419419

420420
// UploadWithReader 上传媒体资源
421-
func (oa *OfficialAccount) UploadWithReader(ctx context.Context, reqPath, fieldName, fileName string, reader io.Reader, formData internal.Form, query url.Values) (gjson.Result, error) {
421+
func (oa *OfficialAccount) UploadWithReader(ctx context.Context, reqPath, fieldName, fileName string, reader io.Reader, formData Form, query url.Values) (gjson.Result, error) {
422422
token, err := oa.getToken()
423423
if err != nil {
424424
return internal.Fail(err)

‎wechat/pay_v3.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func (p *PayV3) reloadCerts() error {
157157
return nil
158158
}
159159

160-
func (p *PayV3) do(ctx context.Context, method, path string, query url.Values, params internal.X) (*APIResult, error) {
160+
func (p *PayV3) do(ctx context.Context, method, path string, query url.Values, params X) (*APIResult, error) {
161161
reqURL := p.url(path, query)
162162

163163
log := internal.NewReqLog(method, reqURL)
@@ -238,7 +238,7 @@ func (p *PayV3) GetJSON(ctx context.Context, path string, query url.Values) (*AP
238238
}
239239

240240
// PostJSON POST请求JSON数据
241-
func (p *PayV3) PostJSON(ctx context.Context, path string, params internal.X) (*APIResult, error) {
241+
func (p *PayV3) PostJSON(ctx context.Context, path string, params X) (*APIResult, error) {
242242
return p.do(ctx, http.MethodPost, path, nil, params)
243243
}
244244

‎wechat/util.go

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ import (
44
"github.com/tidwall/gjson"
55
)
66

7+
type X map[string]any
8+
9+
type Form map[string]string
10+
711
// APIResult API结果 (支付v3)
812
type APIResult struct {
913
Code int // HTTP状态码

0 commit comments

Comments
 (0)
Please sign in to comment.