mirror of
https://github.com/silenceper/wechat.git
synced 2026-11-16 05:12:03 +08:00
Compare commits
94
Commits
v2.1.6-rc.2
...
v2.1.14
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2bc22dc4ae | ||
|
|
0e34286d78 | ||
|
|
fb3009e337 | ||
|
|
d34af7aeeb | ||
|
|
bfbfc844ce | ||
|
|
269d93ea6f | ||
|
|
e4fc0bd615 | ||
|
|
20a8183e88 | ||
|
|
f0f35e2f77 | ||
|
|
eebfb93386 | ||
|
|
9b028e5368 | ||
|
|
2bfc250f21 | ||
|
|
f0866babb5 | ||
|
|
7d93d1b9c8 | ||
|
|
78c00a9124 | ||
|
|
54f08cbd73 | ||
|
|
c34ff2031b | ||
|
|
30c8e77246 | ||
|
|
6f6e95cfdb | ||
|
|
c806a0c172 | ||
|
|
c136b878ce | ||
|
|
d4a81916d5 | ||
|
|
ef1372b98a | ||
|
|
0d666b60ba | ||
|
|
e1122d42b0 | ||
|
|
be3f0d8bd5 | ||
|
|
66f9794d2f | ||
|
|
ee5f045b89 | ||
|
|
d35f0f0865 | ||
|
|
bbad169706 | ||
|
|
5927c26152 | ||
|
|
8ebff5c29c | ||
|
|
86ef690ecd | ||
|
|
ee85790123 | ||
|
|
8a810837a4 | ||
|
|
c51d41ee8a | ||
|
|
24f812d187 | ||
|
|
dd43b7baa3 | ||
|
|
2dfd2ff608 | ||
|
|
23bb10b0c9 | ||
|
|
b639d2235d | ||
|
|
26d2093bd7 | ||
|
|
cf42cd8d54 | ||
|
|
85ee45580b | ||
|
|
208d5c528a | ||
|
|
b5f9a8933e | ||
|
|
52fb5596d3 | ||
|
|
44150c557e | ||
|
|
635a0c640d | ||
|
|
010e49c35c | ||
|
|
9c87d1cb34 | ||
|
|
71c8ab58fb | ||
|
|
92bf6c7699 | ||
|
|
6b9d4f82da | ||
|
|
17521d047e | ||
|
|
d38e750876 | ||
|
|
3bd886d7f2 | ||
|
|
35af33f0bc | ||
|
|
4a8371e178 | ||
|
|
a571bf3546 | ||
|
|
3fbe8634d9 | ||
|
|
990ba6ede9 | ||
|
|
44b09c7c3b | ||
|
|
2e0708845b | ||
|
|
c1770130a0 | ||
|
|
c22a036b7f | ||
|
|
05ac7148d4 | ||
|
|
6b3532cc2d | ||
|
|
1138a7db0e | ||
|
|
1842f08f4c | ||
|
|
d28ca4f334 | ||
|
|
74795e86ee | ||
|
|
179704187b | ||
|
|
ceb006bf58 | ||
|
|
9f14122a87 | ||
|
|
7fcd7a34dd | ||
|
|
5b29289dbb | ||
|
|
74e3e9c04e | ||
|
|
97c9f7d908 | ||
|
|
97e1af5904 | ||
|
|
a5e674bf10 | ||
|
|
0ffe34187a | ||
|
|
04b62f6c3c | ||
|
|
4adc59b1b0 | ||
|
|
dad7932574 | ||
|
|
56a3734546 | ||
|
|
d4fd145bb5 | ||
|
|
038037b89d | ||
|
|
479ff1f242 | ||
|
|
3f1c5e7637 | ||
|
|
da5067bcb2 | ||
|
|
8f10936479 | ||
|
|
9bfebc8a27 | ||
|
|
4f6cbc3d59 |
No files matched your search
+2
-2
@@ -1,8 +1,8 @@
|
|||||||
# These are supported funding model platforms
|
# These are supported funding model platforms
|
||||||
|
|
||||||
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
|
github: # silenceper
|
||||||
patreon: # Replace with a single Patreon username
|
patreon: # Replace with a single Patreon username
|
||||||
open_collective: # Replace with a single Open Collective username
|
open_collective: gowechat
|
||||||
ko_fi: # Replace with a single Ko-fi username
|
ko_fi: # Replace with a single Ko-fi username
|
||||||
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||||
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
name: 报告Bug
|
name: 报告 Bug
|
||||||
about: 反馈BUG信息
|
about: 反馈 BUG 信息
|
||||||
title: "[BUG]"
|
title: "[BUG]"
|
||||||
labels: bug
|
labels: bug
|
||||||
assignees: ''
|
assignees: ''
|
||||||
@@ -18,4 +18,4 @@ assignees: ''
|
|||||||
|
|
||||||
|
|
||||||
**使用的版本**
|
**使用的版本**
|
||||||
- SDK版本: [比如 v0.0.0]
|
- SDK 版本:[比如 v0.0.0]
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
name: API需求
|
name: API 需求
|
||||||
about: 待实现的API接口,SDK的强大离不开社区的帮助,欢迎为项目贡献PR
|
about: 待实现的 API 接口,SDK 的强大离不开社区的帮助,欢迎为项目贡献 PR
|
||||||
title: "[Feature]"
|
title: "[Feature]"
|
||||||
labels: enhancement
|
labels: enhancement
|
||||||
assignees: ''
|
assignees: ''
|
||||||
@@ -8,8 +8,8 @@ assignees: ''
|
|||||||
---
|
---
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
!!!SDK的强大离不开社区的帮助,欢迎为本项目贡献PR!!!
|
!!!SDK 的强大离不开社区的帮助,欢迎为本项目贡献 PR!!!
|
||||||
-->
|
-->
|
||||||
**你想要实现的模块或API**
|
**你想要实现的模块或 API**
|
||||||
|
|
||||||
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
name: 使用咨询
|
name: 使用咨询
|
||||||
about: 关于SDK使用相关的咨询,在使用前请先阅读官方微信文档
|
about: 关于 SDK 使用相关的咨询,在使用前请先阅读官方微信文档
|
||||||
title: "[咨询]"
|
title: "[咨询]"
|
||||||
labels: question
|
labels: question
|
||||||
assignees: ''
|
assignees: ''
|
||||||
@@ -9,7 +9,7 @@ assignees: ''
|
|||||||
|
|
||||||
<!--
|
<!--
|
||||||
重要:
|
重要:
|
||||||
1、在使用本SDK前请先阅读对应的官方微信API文档:https://developers.weixin.qq.com/doc/offiaccount/Getting_Started/Overview.html
|
1、在使用本 SDK 前请先阅读对应的官方微信 API 文档:https://developers.weixin.qq.com/doc/offiaccount/Getting_Started/Overview.html
|
||||||
2、本SDK部分接口文档: https://silenceper.com/wechat/
|
2、本 SDK 部分接口文档:https://silenceper.com/wechat/
|
||||||
-->
|
-->
|
||||||
**请描述您的问题**
|
**请描述您的问题**
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
name: Claude Code
|
||||||
|
|
||||||
|
on:
|
||||||
|
issue_comment:
|
||||||
|
types: [created]
|
||||||
|
pull_request_review_comment:
|
||||||
|
types: [created]
|
||||||
|
issues:
|
||||||
|
types: [opened, assigned]
|
||||||
|
pull_request_review:
|
||||||
|
types: [submitted]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
claude:
|
||||||
|
if: |
|
||||||
|
(github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
|
||||||
|
(github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
|
||||||
|
(github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
|
||||||
|
(github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
pull-requests: read
|
||||||
|
issues: read
|
||||||
|
id-token: write
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 1
|
||||||
|
- name: Run Claude Code
|
||||||
|
id: claude
|
||||||
|
uses: anthropics/claude-code-action@beta
|
||||||
|
env:
|
||||||
|
ANTHROPIC_BASE_URL: "${{ secrets.ANTHROPIC_BASE_URL }}"
|
||||||
|
with:
|
||||||
|
model: "${{ secrets.ANTHROPIC_MODEL }}"
|
||||||
|
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
|
||||||
@@ -2,26 +2,26 @@ name: Go
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master,release-*,v2 ]
|
branches: [ master,release-*,v2,feature/**,fix/** ]
|
||||||
pull_request:
|
pull_request:
|
||||||
branches: [ master,release-*,v2 ]
|
branches: [ master,release-*,v2,feature/**,fix/** ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
golangci:
|
golangci:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
go-version: [ '1.16','1.17','1.18','1.19','1.20' ]
|
go-version: [ '1.16','1.17','1.18','1.19','1.20','1.21.4' ]
|
||||||
name: golangci-lint
|
name: golangci-lint
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Setup Golang ${{ matrix.go-version }}
|
- name: Setup Golang ${{ matrix.go-version }}
|
||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.go-version }}
|
go-version: ${{ matrix.go-version }}
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
- name: golangci-lint
|
- name: golangci-lint
|
||||||
uses: golangci/golangci-lint-action@v3
|
uses: golangci/golangci-lint-action@v4
|
||||||
with:
|
with:
|
||||||
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
|
||||||
version: v1.52.2
|
version: v1.52.2
|
||||||
@@ -42,12 +42,12 @@ jobs:
|
|||||||
# strategy set
|
# strategy set
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
go: [ '1.16','1.17','1.18','1.19','1.20' ]
|
go: [ '1.16','1.17','1.18','1.19','1.20','1.21','1.22' ]
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
- name: Set up Go 1.x
|
- name: Set up Go 1.x
|
||||||
uses: actions/setup-go@v4
|
uses: actions/setup-go@v5
|
||||||
with:
|
with:
|
||||||
go-version: ${{ matrix.go }}
|
go-version: ${{ matrix.go }}
|
||||||
id: go
|
id: go
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
name: goreleaser
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- '*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
goreleaser:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
-
|
|
||||||
name: Checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
-
|
|
||||||
name: Set up Go
|
|
||||||
uses: actions/setup-go@v4
|
|
||||||
with:
|
|
||||||
go-version: 1.16
|
|
||||||
-
|
|
||||||
name: Run GoReleaser
|
|
||||||
uses: goreleaser/goreleaser-action@v4
|
|
||||||
with:
|
|
||||||
version: latest
|
|
||||||
args: release --rm-dist
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
# This is an example goreleaser.yaml file with some sane defaults.
|
|
||||||
# Make sure to check the documentation at http://goreleaser.com
|
|
||||||
before:
|
|
||||||
hooks:
|
|
||||||
# You may remove this if you don't use go modules.
|
|
||||||
- go mod download
|
|
||||||
# you may remove this if you don't need go generate
|
|
||||||
- go generate ./...
|
|
||||||
builds:
|
|
||||||
- skip: true
|
|
||||||
|
|
||||||
archives:
|
|
||||||
- replacements:
|
|
||||||
darwin: Darwin
|
|
||||||
linux: Linux
|
|
||||||
windows: Windows
|
|
||||||
386: i386
|
|
||||||
amd64: x86_64
|
|
||||||
|
|
||||||
checksum:
|
|
||||||
name_template: 'checksums.txt'
|
|
||||||
snapshot:
|
|
||||||
name_template: "{{ .Tag }}-next"
|
|
||||||
changelog:
|
|
||||||
sort: asc
|
|
||||||
filters:
|
|
||||||
exclude:
|
|
||||||
- '^docs:'
|
|
||||||
- '^test:'
|
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
# WeChat SDK for Go
|
# WeChat SDK for Go
|
||||||
|
|
||||||

|

|
||||||
[](https://goreportcard.com/report/github.com/silenceper/wechat)
|
[](https://goreportcard.com/report/github.com/silenceper/wechat/v2)
|
||||||
[](https://pkg.go.dev/github.com/silenceper/wechat/v2?tab=doc)
|
[](https://pkg.go.dev/github.com/silenceper/wechat/v2?tab=doc)
|
||||||

|

|
||||||
|

|
||||||
|
|
||||||
|
|
||||||
使用Golang开发的微信SDK,简单、易用。
|
使用Golang开发的微信SDK,简单、易用。
|
||||||
> 注意:当前版本为v2版本,v1版本已废弃
|
|
||||||
|
|
||||||
## 文档 && 例子
|
## 文档 && 例子
|
||||||
|
|
||||||
@@ -75,7 +76,13 @@ server.Send()
|
|||||||
- 提交issue,描述需要贡献的内容
|
- 提交issue,描述需要贡献的内容
|
||||||
- 完成更改后,提交PR
|
- 完成更改后,提交PR
|
||||||
|
|
||||||
## 公众号
|
|
||||||
|
## 感谢以下贡献者
|
||||||
|
|
||||||
|
<a href="https://opencollective.com/gowechat"><img src="https://opencollective.com/gowechat/contributors.svg?width=890" /></a>
|
||||||
|
|
||||||
|
|
||||||
|
## 作者公众号
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|||||||
+100
-2
@@ -1,5 +1,103 @@
|
|||||||
# 智能对话
|
# 智能对话
|
||||||
|
|
||||||
[官方文档](https://developers.weixin.qq.com/doc/aispeech/platform/INTERFACEDOCUMENT.html)
|
[官方文档](https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/token.html)
|
||||||
|
|
||||||
## 快速入门
|
## 快速入门
|
||||||
|
|
||||||
|
```go
|
||||||
|
import (
|
||||||
|
"github.com/silenceper/wechat/v2"
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/dialog"
|
||||||
|
"github.com/silenceper/wechat/v2/cache"
|
||||||
|
)
|
||||||
|
|
||||||
|
wc := wechat.NewWechat()
|
||||||
|
memory := cache.NewMemory()
|
||||||
|
|
||||||
|
ai := wc.GetAISpeech(&config.Config{
|
||||||
|
AppID: "xxx",
|
||||||
|
Token: "xxx",
|
||||||
|
AESKey: "xxx",
|
||||||
|
Account: "admin",
|
||||||
|
Cache: memory,
|
||||||
|
})
|
||||||
|
|
||||||
|
dialogClient := ai.GetDialog()
|
||||||
|
|
||||||
|
accessToken, err := dialogClient.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
res, err := dialogClient.Query(&dialog.QueryRequest{
|
||||||
|
Query: "你好",
|
||||||
|
Env: "online",
|
||||||
|
UserID: "user-1",
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
## 简单问答导入与发布
|
||||||
|
|
||||||
|
```go
|
||||||
|
task, err := dialogClient.ImportJSON(&dialog.ImportJSONRequest{
|
||||||
|
Mode: 0,
|
||||||
|
Data: []dialog.BotIntent{{
|
||||||
|
Skill: "售前咨询",
|
||||||
|
Intent: "查询营业时间",
|
||||||
|
Disable: false,
|
||||||
|
Questions: []string{"你们几点开门", "营业时间是什么时候"},
|
||||||
|
Answers: []string{"我们的营业时间是周一至周五 9:00-18:00"},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
asyncResult, err := dialogClient.FetchAsync(&dialog.FetchAsyncRequest{
|
||||||
|
TaskID: task.TaskID,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
publish, err := dialogClient.Publish()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
progress, err := dialogClient.GetEffectiveProgress(&dialog.EffectiveProgressRequest{
|
||||||
|
Env: "online",
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
当前封装微信智能对话开放接口中“接入智能对话”的 6 个接口:
|
||||||
|
|
||||||
|
- `POST /v2/token`
|
||||||
|
- `POST /v2/bot/import/json`
|
||||||
|
- `POST /v2/async/fetch`
|
||||||
|
- `POST /v2/bot/publish`
|
||||||
|
- `POST /v2/bot/effective_progress`
|
||||||
|
- `POST /v2/bot/query`
|
||||||
|
|
||||||
|
## 真实接口验证
|
||||||
|
|
||||||
|
默认单元测试不会访问真实微信接口。如需验证 token 和 query 只读链路,可设置以下环境变量后运行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
AISPEECH_INTEGRATION=1
|
||||||
|
AISPEECH_APPID=xxx
|
||||||
|
AISPEECH_TOKEN=xxx
|
||||||
|
AISPEECH_AES_KEY=xxx
|
||||||
|
go test ./aispeech/dialog -run TestIntegrationAccessTokenAndQuery
|
||||||
|
```
|
||||||
|
|
||||||
|
如需验证导入、异步任务查询、发布、发布进度查询和命中回答的完整链路,可显式开启变更型测试。该测试会导入一个 `CodexSmokeTest` 临时问答并发布到线上机器人:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
AISPEECH_INTEGRATION_MUTATION=1
|
||||||
|
AISPEECH_APPID=xxx
|
||||||
|
AISPEECH_TOKEN=xxx
|
||||||
|
AISPEECH_AES_KEY=xxx
|
||||||
|
go test ./aispeech/dialog -run TestIntegrationFullDialogFlow -v
|
||||||
|
```
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
package aispeech
|
||||||
|
|
||||||
|
import (
|
||||||
|
stdcontext "context"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/context"
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/dialog"
|
||||||
|
"github.com/silenceper/wechat/v2/credential"
|
||||||
|
)
|
||||||
|
|
||||||
|
// AISpeech 微信智能对话相关 API.
|
||||||
|
type AISpeech struct {
|
||||||
|
ctx *context.Context
|
||||||
|
dialog *dialog.Dialog
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewAISpeech 实例化智能对话 API.
|
||||||
|
func NewAISpeech(cfg *config.Config) *AISpeech {
|
||||||
|
ctx := &context.Context{
|
||||||
|
Config: cfg,
|
||||||
|
AccessTokenContextHandle: dialog.NewAccessToken(cfg),
|
||||||
|
}
|
||||||
|
return &AISpeech{ctx: ctx}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetContext get Context.
|
||||||
|
func (a *AISpeech) GetContext() *context.Context {
|
||||||
|
return a.ctx
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetAccessTokenHandle 自定义 access_token 获取方式.
|
||||||
|
func (a *AISpeech) SetAccessTokenHandle(accessTokenHandle credential.AccessTokenHandle) {
|
||||||
|
a.ctx.AccessTokenContextHandle = credential.AccessTokenCompatibleHandle{
|
||||||
|
AccessTokenHandle: accessTokenHandle,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetAccessTokenContextHandle 自定义 access_token 获取方式.
|
||||||
|
func (a *AISpeech) SetAccessTokenContextHandle(accessTokenContextHandle credential.AccessTokenContextHandle) {
|
||||||
|
a.ctx.AccessTokenContextHandle = accessTokenContextHandle
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAccessToken 获取 access token.
|
||||||
|
func (a *AISpeech) GetAccessToken() (string, error) {
|
||||||
|
return a.ctx.GetAccessToken()
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAccessTokenContext 获取 access token.
|
||||||
|
func (a *AISpeech) GetAccessTokenContext(ctx stdcontext.Context) (string, error) {
|
||||||
|
return a.ctx.GetAccessTokenContext(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDialog 获取对话平台 API.
|
||||||
|
func (a *AISpeech) GetDialog() *dialog.Dialog {
|
||||||
|
if a.dialog == nil {
|
||||||
|
a.dialog = dialog.NewDialog(a.ctx)
|
||||||
|
}
|
||||||
|
return a.dialog
|
||||||
|
}
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
package aispeech
|
||||||
|
|
||||||
|
import (
|
||||||
|
stdcontext "context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
|
"github.com/silenceper/wechat/v2/cache"
|
||||||
|
)
|
||||||
|
|
||||||
|
type staticAccessToken struct {
|
||||||
|
token string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s staticAccessToken) GetAccessToken() (string, error) {
|
||||||
|
return s.token, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type staticAccessTokenContext struct {
|
||||||
|
token string
|
||||||
|
}
|
||||||
|
|
||||||
|
type contextTokenKey struct{}
|
||||||
|
|
||||||
|
func (s staticAccessTokenContext) GetAccessToken() (string, error) {
|
||||||
|
return s.GetAccessTokenContext(stdcontext.Background())
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s staticAccessTokenContext) GetAccessTokenContext(ctx stdcontext.Context) (string, error) {
|
||||||
|
if v := ctx.Value(contextTokenKey{}); v != nil {
|
||||||
|
return v.(string), nil
|
||||||
|
}
|
||||||
|
return s.token, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetAccessTokenHandle(t *testing.T) {
|
||||||
|
ai := NewAISpeech(&config.Config{Cache: cache.NewMemory()})
|
||||||
|
ai.SetAccessTokenHandle(staticAccessToken{token: "custom-token"})
|
||||||
|
|
||||||
|
token, err := ai.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetAccessToken error: %v", err)
|
||||||
|
}
|
||||||
|
if token != "custom-token" {
|
||||||
|
t.Fatalf("bad token: %s", token)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSetAccessTokenContextHandle(t *testing.T) {
|
||||||
|
ai := NewAISpeech(&config.Config{Cache: cache.NewMemory()})
|
||||||
|
ai.SetAccessTokenContextHandle(staticAccessTokenContext{token: "custom-token"})
|
||||||
|
|
||||||
|
ctx := stdcontext.WithValue(stdcontext.Background(), contextTokenKey{}, "context-token")
|
||||||
|
token, err := ai.GetAccessTokenContext(ctx)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetAccessTokenContext error: %v", err)
|
||||||
|
}
|
||||||
|
if token != "context-token" {
|
||||||
|
t.Fatalf("bad token: %s", token)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import "github.com/silenceper/wechat/v2/cache"
|
||||||
|
|
||||||
|
const defaultBaseURL = "https://openaiapi.weixin.qq.com"
|
||||||
|
|
||||||
|
// Config for 微信智能对话.
|
||||||
|
type Config struct {
|
||||||
|
AppID string `json:"app_id"`
|
||||||
|
Token string `json:"token"`
|
||||||
|
AESKey string `json:"aes_key"`
|
||||||
|
Account string `json:"account"`
|
||||||
|
BaseURL string `json:"base_url"`
|
||||||
|
Cache cache.Cache
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetBaseURL returns the API base URL.
|
||||||
|
func (cfg *Config) GetBaseURL() string {
|
||||||
|
if cfg.BaseURL == "" {
|
||||||
|
return defaultBaseURL
|
||||||
|
}
|
||||||
|
return cfg.BaseURL
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestGetBaseURL(t *testing.T) {
|
||||||
|
cfg := &Config{}
|
||||||
|
if cfg.GetBaseURL() != defaultBaseURL {
|
||||||
|
t.Fatalf("bad default base url: %s", cfg.GetBaseURL())
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.BaseURL = "http://example.com"
|
||||||
|
if cfg.GetBaseURL() != "http://example.com" {
|
||||||
|
t.Fatalf("bad custom base url: %s", cfg.GetBaseURL())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
package context
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
|
"github.com/silenceper/wechat/v2/credential"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Context struct
|
||||||
|
type Context struct {
|
||||||
|
*config.Config
|
||||||
|
credential.AccessTokenContextHandle
|
||||||
|
}
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
package dialog
|
||||||
|
|
||||||
|
import (
|
||||||
|
stdcontext "context"
|
||||||
|
"encoding/json"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/encryptor"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetAccessToken 获取 access token.
|
||||||
|
func (d *Dialog) GetAccessToken() (string, error) {
|
||||||
|
return d.Context.GetAccessToken()
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAccessTokenContext 获取 access token.
|
||||||
|
func (d *Dialog) GetAccessTokenContext(ctx stdcontext.Context) (string, error) {
|
||||||
|
return d.Context.GetAccessTokenContext(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ImportJSON 简单问答导入.
|
||||||
|
func (d *Dialog) ImportJSON(req *ImportJSONRequest) (*ImportJSONResponse, error) {
|
||||||
|
return d.ImportJSONContext(stdcontext.Background(), req)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ImportJSONContext 简单问答导入.
|
||||||
|
func (d *Dialog) ImportJSONContext(ctx stdcontext.Context, req *ImportJSONRequest) (*ImportJSONResponse, error) {
|
||||||
|
var res ImportJSONResponse
|
||||||
|
requestID, err := d.postJSON(ctx, importJSONPath, req, &res, "AISpeechImportJSON")
|
||||||
|
res.RequestID = requestID
|
||||||
|
return &res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Publish 发布机器人.
|
||||||
|
func (d *Dialog) Publish() (*PublishResponse, error) {
|
||||||
|
return d.PublishContext(stdcontext.Background())
|
||||||
|
}
|
||||||
|
|
||||||
|
// PublishContext 发布机器人.
|
||||||
|
func (d *Dialog) PublishContext(ctx stdcontext.Context) (*PublishResponse, error) {
|
||||||
|
var res PublishResponse
|
||||||
|
requestID, err := d.postEmpty(ctx, publishPath, &res, "AISpeechPublish")
|
||||||
|
res.RequestID = requestID
|
||||||
|
return &res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetEffectiveProgress 查询机器人发布进度.
|
||||||
|
func (d *Dialog) GetEffectiveProgress(req *EffectiveProgressRequest) (*EffectiveProgressResponse, error) {
|
||||||
|
return d.GetEffectiveProgressContext(stdcontext.Background(), req)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetEffectiveProgressContext 查询机器人发布进度.
|
||||||
|
func (d *Dialog) GetEffectiveProgressContext(ctx stdcontext.Context, req *EffectiveProgressRequest) (*EffectiveProgressResponse, error) {
|
||||||
|
var res EffectiveProgressResponse
|
||||||
|
requestID, err := d.postJSON(ctx, effectiveProgressPath, req, &res, "AISpeechGetEffectiveProgress")
|
||||||
|
res.RequestID = requestID
|
||||||
|
return &res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// FetchAsync 查询异步任务.
|
||||||
|
func (d *Dialog) FetchAsync(req *FetchAsyncRequest) (*FetchAsyncResponse, error) {
|
||||||
|
return d.FetchAsyncContext(stdcontext.Background(), req)
|
||||||
|
}
|
||||||
|
|
||||||
|
// FetchAsyncContext 查询异步任务.
|
||||||
|
func (d *Dialog) FetchAsyncContext(ctx stdcontext.Context, req *FetchAsyncRequest) (*FetchAsyncResponse, error) {
|
||||||
|
var res FetchAsyncResponse
|
||||||
|
requestID, err := d.postJSON(ctx, fetchAsyncPath, req, &res, "AISpeechFetchAsync")
|
||||||
|
res.RequestID = requestID
|
||||||
|
return &res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Query 调用智能对话.
|
||||||
|
func (d *Dialog) Query(req *QueryRequest) (*QueryResponse, error) {
|
||||||
|
return d.QueryContext(stdcontext.Background(), req)
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryContext 调用智能对话.
|
||||||
|
func (d *Dialog) QueryContext(ctx stdcontext.Context, req *QueryRequest) (*QueryResponse, error) {
|
||||||
|
body, err := json.Marshal(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
encryptedBody, err := encryptor.Encrypt(d.AESKey, body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
accessToken, err := d.GetAccessTokenContext(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if accessToken == "" {
|
||||||
|
return nil, errEmptyAccessToken
|
||||||
|
}
|
||||||
|
response, err := post(ctx, d.Config, queryPath, []byte(encryptedBody), "text/plain", accessToken, "")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
plainResponse := response
|
||||||
|
if !json.Valid(response) {
|
||||||
|
plainResponse, err = encryptor.Decrypt(d.AESKey, string(response))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var res QueryResponse
|
||||||
|
requestID, err := decodeResponse(plainResponse, &res, "AISpeechQuery")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
res.RequestID = requestID
|
||||||
|
if json.Valid([]byte(res.Answer)) {
|
||||||
|
res.RawAnswer = json.RawMessage(res.Answer)
|
||||||
|
}
|
||||||
|
return &res, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
package dialog
|
||||||
|
|
||||||
|
import (
|
||||||
|
stdcontext "context"
|
||||||
|
"crypto/rand"
|
||||||
|
"encoding/hex"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/context"
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/encryptor"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// tokenPath 获取 AccessToken.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/token.html
|
||||||
|
tokenPath = "/v2/token"
|
||||||
|
// importJSONPath 简单问答 JSON 导入.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/import.html
|
||||||
|
importJSONPath = "/v2/bot/import/json"
|
||||||
|
// fetchAsyncPath 异步任务查询.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/fetch.html
|
||||||
|
fetchAsyncPath = "/v2/async/fetch"
|
||||||
|
// publishPath 发布机器人.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/publish.html
|
||||||
|
publishPath = "/v2/bot/publish"
|
||||||
|
// effectiveProgressPath 查询机器人发布进度.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/progress.html
|
||||||
|
effectiveProgressPath = "/v2/bot/effective_progress"
|
||||||
|
// queryPath 调用智能对话.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/query.html
|
||||||
|
queryPath = "/v2/bot/query"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Dialog 智能对话平台.
|
||||||
|
type Dialog struct {
|
||||||
|
*context.Context
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewDialog init.
|
||||||
|
func NewDialog(ctx *context.Context) *Dialog {
|
||||||
|
return &Dialog{ctx}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Dialog) postJSON(ctx stdcontext.Context, path string, req interface{}, res interface{}, apiName string) (string, error) {
|
||||||
|
body, err := json.Marshal(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
accessToken, err := d.GetAccessTokenContext(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if accessToken == "" {
|
||||||
|
return "", errEmptyAccessToken
|
||||||
|
}
|
||||||
|
response, err := post(ctx, d.Config, path, body, "application/json", accessToken, "")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return decodeResponse(response, res, apiName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (d *Dialog) postEmpty(ctx stdcontext.Context, path string, res interface{}, apiName string) (string, error) {
|
||||||
|
accessToken, err := d.GetAccessTokenContext(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if accessToken == "" {
|
||||||
|
return "", errEmptyAccessToken
|
||||||
|
}
|
||||||
|
response, err := post(ctx, d.Config, path, nil, "application/json", accessToken, "")
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return decodeResponse(response, res, apiName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func post(ctx stdcontext.Context, cfg *config.Config, path string, body []byte, contentType, accessToken, appID string) ([]byte, error) {
|
||||||
|
timestamp := time.Now().Unix()
|
||||||
|
nonce, err := randomString(16)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
requestID, err := randomString(32)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
header := map[string]string{
|
||||||
|
"request_id": requestID,
|
||||||
|
"timestamp": fmt.Sprintf("%d", timestamp),
|
||||||
|
"nonce": nonce,
|
||||||
|
"sign": encryptor.Sign(cfg.Token, timestamp, nonce, body),
|
||||||
|
"Content-Type": contentType,
|
||||||
|
}
|
||||||
|
if accessToken != "" {
|
||||||
|
header["X-OPENAI-TOKEN"] = accessToken
|
||||||
|
} else {
|
||||||
|
header["X-APPID"] = appID
|
||||||
|
}
|
||||||
|
|
||||||
|
return util.HTTPPostContext(ctx, buildURL(cfg.GetBaseURL(), path), body, header)
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildURL(baseURL, path string) string {
|
||||||
|
return strings.TrimRight(baseURL, "/") + "/" + strings.TrimLeft(path, "/")
|
||||||
|
}
|
||||||
|
|
||||||
|
func randomString(length int) (string, error) {
|
||||||
|
buf := make([]byte, (length+1)/2)
|
||||||
|
if _, err := rand.Read(buf); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(buf)[:length], nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,422 @@
|
|||||||
|
package dialog
|
||||||
|
|
||||||
|
import (
|
||||||
|
stdcontext "context"
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
|
aispeechContext "github.com/silenceper/wechat/v2/aispeech/context"
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/encryptor"
|
||||||
|
"github.com/silenceper/wechat/v2/cache"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
testAccessToken = "access-token"
|
||||||
|
testAccount = "admin"
|
||||||
|
testAESKey = "q1Os1ZMe0nG28KUEx9lg3HjK7V5QyXvi212fzsgDqgz"
|
||||||
|
testAppID = "appid"
|
||||||
|
testImportRequest = "import-rid"
|
||||||
|
testImportTaskID = "task-import"
|
||||||
|
testPublishTaskID = "task-publish"
|
||||||
|
testQuery = "hello"
|
||||||
|
testQueryAnswer = "hello answer"
|
||||||
|
testQueryRequestID = "query-rid"
|
||||||
|
testToken = "token"
|
||||||
|
testTokenRequestID = "token-rid"
|
||||||
|
)
|
||||||
|
|
||||||
|
type emptyAccessTokenHandle struct{}
|
||||||
|
|
||||||
|
func (emptyAccessTokenHandle) GetAccessToken() (string, error) {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (emptyAccessTokenHandle) GetAccessTokenContext(ctx stdcontext.Context) (string, error) {
|
||||||
|
return "", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAccessTokenCache(t *testing.T) {
|
||||||
|
var tokenRequests int
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
tokenRequests++
|
||||||
|
body := readBody(t, r)
|
||||||
|
assertSign(t, r, testToken, body)
|
||||||
|
if r.Header.Get("X-APPID") != testAppID {
|
||||||
|
t.Fatalf("bad X-APPID: %s", r.Header.Get("X-APPID"))
|
||||||
|
}
|
||||||
|
_, _ = w.Write([]byte(accessTokenResponse("rid")))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
ak := NewAccessToken(&config.Config{
|
||||||
|
AppID: testAppID,
|
||||||
|
Token: testToken,
|
||||||
|
Account: testAccount,
|
||||||
|
BaseURL: srv.URL,
|
||||||
|
Cache: cache.NewMemory(),
|
||||||
|
})
|
||||||
|
|
||||||
|
token, err := ak.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetAccessToken error: %v", err)
|
||||||
|
}
|
||||||
|
if token != testAccessToken {
|
||||||
|
t.Fatalf("bad token: %s", token)
|
||||||
|
}
|
||||||
|
token, err = ak.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetAccessToken second error: %v", err)
|
||||||
|
}
|
||||||
|
if token != testAccessToken {
|
||||||
|
t.Fatalf("bad token second: %s", token)
|
||||||
|
}
|
||||||
|
if tokenRequests != 1 {
|
||||||
|
t.Fatalf("token requests = %d, want 1", tokenRequests)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAccessTokenCacheByAccount(t *testing.T) {
|
||||||
|
var tokenRequests int
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
tokenRequests++
|
||||||
|
body := readBody(t, r)
|
||||||
|
assertSign(t, r, testToken, body)
|
||||||
|
|
||||||
|
var req AccessTokenRequest
|
||||||
|
if err := json.Unmarshal(body, &req); err != nil {
|
||||||
|
t.Fatalf("bad token body: %v", err)
|
||||||
|
}
|
||||||
|
_, _ = w.Write([]byte(accountAccessTokenResponse(req.Account)))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
memory := cache.NewMemory()
|
||||||
|
cfgA := testDialogConfig(srv.URL)
|
||||||
|
cfgA.Account = "admin-a"
|
||||||
|
cfgA.Cache = memory
|
||||||
|
cfgB := testDialogConfig(srv.URL)
|
||||||
|
cfgB.Account = "admin-b"
|
||||||
|
cfgB.Cache = memory
|
||||||
|
|
||||||
|
tokenA, err := NewAccessToken(cfgA).GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetAccessToken A error: %v", err)
|
||||||
|
}
|
||||||
|
tokenB, err := NewAccessToken(cfgB).GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetAccessToken B error: %v", err)
|
||||||
|
}
|
||||||
|
if tokenA != "admin-a-token" || tokenB != "admin-b-token" {
|
||||||
|
t.Fatalf("bad tokens: %s %s", tokenA, tokenB)
|
||||||
|
}
|
||||||
|
if tokenRequests != 2 {
|
||||||
|
t.Fatalf("token requests = %d, want 2", tokenRequests)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestAccessTokenEmptyToken(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
_, _ = w.Write([]byte(`{"code":0,"msg":"success","request_id":"rid","data":{"access_token":""}}`))
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
ak := NewAccessToken(&config.Config{
|
||||||
|
AppID: testAppID,
|
||||||
|
Token: testToken,
|
||||||
|
BaseURL: srv.URL,
|
||||||
|
Cache: cache.NewMemory(),
|
||||||
|
})
|
||||||
|
|
||||||
|
if _, err := ak.GetAccessToken(); err == nil {
|
||||||
|
t.Fatal("GetAccessToken should return error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDialogAPIs(t *testing.T) {
|
||||||
|
srv := newDialogAPITestServer(t)
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
d := newTestDialog(srv.URL)
|
||||||
|
assertDialogImportJSON(t, d)
|
||||||
|
assertDialogPublish(t, d)
|
||||||
|
assertDialogProgress(t, d)
|
||||||
|
assertDialogFetchAsync(t, d)
|
||||||
|
assertDialogQuery(t, d)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDialogEmptyAccessToken(t *testing.T) {
|
||||||
|
d := NewDialog(&aispeechContext.Context{
|
||||||
|
Config: &config.Config{
|
||||||
|
AESKey: testAESKey,
|
||||||
|
},
|
||||||
|
AccessTokenContextHandle: emptyAccessTokenHandle{},
|
||||||
|
})
|
||||||
|
|
||||||
|
if _, err := d.ImportJSON(&ImportJSONRequest{}); err == nil {
|
||||||
|
t.Fatal("ImportJSON should return error")
|
||||||
|
}
|
||||||
|
if _, err := d.Publish(); err == nil {
|
||||||
|
t.Fatal("Publish should return error")
|
||||||
|
}
|
||||||
|
if _, err := d.Query(&QueryRequest{}); err == nil {
|
||||||
|
t.Fatal("Query should return error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDialogAPIError(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
switch r.URL.Path {
|
||||||
|
case tokenPath:
|
||||||
|
_, _ = w.Write([]byte(accessTokenResponse(testTokenRequestID)))
|
||||||
|
case importJSONPath:
|
||||||
|
_, _ = w.Write([]byte(`{"code":210202,"msg":"forbidden","request_id":"import-rid","data":{"reason":"forbidden"}}`))
|
||||||
|
default:
|
||||||
|
t.Fatalf("unexpected path: %s", r.URL.Path)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
d := newTestDialog(srv.URL)
|
||||||
|
|
||||||
|
_, err := d.ImportJSON(&ImportJSONRequest{})
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("ImportJSON should return error")
|
||||||
|
}
|
||||||
|
apiErr, ok := err.(*APIError)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("ImportJSON error should be *APIError but %T", err)
|
||||||
|
}
|
||||||
|
if apiErr.Code != 210202 || apiErr.Msg != "forbidden" || apiErr.RequestID != testImportRequest {
|
||||||
|
t.Fatalf("bad api error: %+v", apiErr)
|
||||||
|
}
|
||||||
|
if string(apiErr.Data) != `{"reason":"forbidden"}` {
|
||||||
|
t.Fatalf("bad api error data: %s", apiErr.Data)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestQueryPlainJSONError(t *testing.T) {
|
||||||
|
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
switch r.URL.Path {
|
||||||
|
case tokenPath:
|
||||||
|
_, _ = w.Write([]byte(accessTokenResponse(testTokenRequestID)))
|
||||||
|
case queryPath:
|
||||||
|
_, _ = w.Write([]byte(`{"code":110002,"msg":"bad param","request_id":"query-rid"}`))
|
||||||
|
default:
|
||||||
|
t.Fatalf("unexpected path: %s", r.URL.Path)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer srv.Close()
|
||||||
|
|
||||||
|
d := newTestDialog(srv.URL)
|
||||||
|
|
||||||
|
_, err := d.Query(&QueryRequest{Query: testQuery})
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("Query should return error")
|
||||||
|
}
|
||||||
|
apiErr, ok := err.(*APIError)
|
||||||
|
if !ok {
|
||||||
|
t.Fatalf("Query error should be *APIError but %T", err)
|
||||||
|
}
|
||||||
|
if apiErr.Code != 110002 || apiErr.RequestID != testQueryRequestID {
|
||||||
|
t.Fatalf("bad api error: %+v", apiErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func newDialogAPITestServer(t *testing.T) *httptest.Server {
|
||||||
|
t.Helper()
|
||||||
|
return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
body := readBody(t, r)
|
||||||
|
assertSign(t, r, testToken, body)
|
||||||
|
switch r.URL.Path {
|
||||||
|
case tokenPath:
|
||||||
|
handleDialogToken(t, w, r)
|
||||||
|
case importJSONPath:
|
||||||
|
handleDialogImport(t, w, r, body)
|
||||||
|
case publishPath:
|
||||||
|
handleDialogPublish(t, w, r, body)
|
||||||
|
case effectiveProgressPath:
|
||||||
|
assertToken(t, r)
|
||||||
|
_, _ = w.Write([]byte(`{"code":0,"msg":"success","request_id":"progress-rid","data":{"end_time":"","progress":100,"status":1}}`))
|
||||||
|
case fetchAsyncPath:
|
||||||
|
assertToken(t, r)
|
||||||
|
_, _ = w.Write([]byte(`{"code":0,"msg":"success","request_id":"fetch-rid","data":{"state":2,"msg":"","progress":100,"start":1,"end":2,"url":"","success_skill_info":[{"id":1,"name":"AAA","intents":[{"id":2,"name":"BBB"}]}]}}`))
|
||||||
|
case queryPath:
|
||||||
|
handleDialogQuery(t, w, r, body)
|
||||||
|
default:
|
||||||
|
t.Fatalf("unexpected path: %s", r.URL.Path)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleDialogToken(t *testing.T, w io.Writer, r *http.Request) {
|
||||||
|
t.Helper()
|
||||||
|
if r.Header.Get("X-APPID") != testAppID {
|
||||||
|
t.Fatalf("bad X-APPID: %s", r.Header.Get("X-APPID"))
|
||||||
|
}
|
||||||
|
_, _ = w.Write([]byte(accessTokenResponse(testTokenRequestID)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleDialogImport(t *testing.T, w io.Writer, r *http.Request, body []byte) {
|
||||||
|
t.Helper()
|
||||||
|
assertToken(t, r)
|
||||||
|
var req ImportJSONRequest
|
||||||
|
if err := json.Unmarshal(body, &req); err != nil {
|
||||||
|
t.Fatalf("bad import body: %v", err)
|
||||||
|
}
|
||||||
|
if len(req.Data) != 1 || req.Data[0].Skill != "pre-sale" {
|
||||||
|
t.Fatalf("bad import request: %+v", req)
|
||||||
|
}
|
||||||
|
_, _ = w.Write([]byte(`{"code":0,"msg":"success","request_id":"import-rid","data":{"task_id":"task-import"}}`))
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleDialogPublish(t *testing.T, w io.Writer, r *http.Request, body []byte) {
|
||||||
|
t.Helper()
|
||||||
|
assertToken(t, r)
|
||||||
|
if len(body) != 0 {
|
||||||
|
t.Fatalf("publish body should be empty: %s", body)
|
||||||
|
}
|
||||||
|
_, _ = w.Write([]byte(`{"code":0,"msg":"success","request_id":"publish-rid","data":{"task_id":"task-publish"}}`))
|
||||||
|
}
|
||||||
|
|
||||||
|
func handleDialogQuery(t *testing.T, w io.Writer, r *http.Request, body []byte) {
|
||||||
|
t.Helper()
|
||||||
|
assertToken(t, r)
|
||||||
|
if !strings.HasPrefix(r.Header.Get("Content-Type"), "text/plain") {
|
||||||
|
t.Fatalf("bad content type: %s", r.Header.Get("Content-Type"))
|
||||||
|
}
|
||||||
|
plain, err := encryptor.Decrypt(testAESKey, string(body))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("decrypt query body error: %v", err)
|
||||||
|
}
|
||||||
|
var req QueryRequest
|
||||||
|
if err = json.Unmarshal(plain, &req); err != nil {
|
||||||
|
t.Fatalf("bad query body: %v", err)
|
||||||
|
}
|
||||||
|
if req.Query != testQuery {
|
||||||
|
t.Fatalf("bad query: %+v", req)
|
||||||
|
}
|
||||||
|
_, _ = w.Write([]byte(encryptQueryResponse(t)))
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertDialogImportJSON(t *testing.T, d *Dialog) {
|
||||||
|
t.Helper()
|
||||||
|
res, err := d.ImportJSON(&ImportJSONRequest{
|
||||||
|
Mode: 0,
|
||||||
|
Data: []BotIntent{{
|
||||||
|
Skill: "pre-sale",
|
||||||
|
Intent: "business-hours",
|
||||||
|
Disable: false,
|
||||||
|
Questions: []string{"when are you open"},
|
||||||
|
Answers: []string{"9:00-18:00"},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
if err != nil || res.TaskID != testImportTaskID || res.RequestID != testImportRequest {
|
||||||
|
t.Fatalf("ImportJSON = %+v, %v", res, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertDialogPublish(t *testing.T, d *Dialog) {
|
||||||
|
t.Helper()
|
||||||
|
res, err := d.Publish()
|
||||||
|
if err != nil || res.TaskID != testPublishTaskID {
|
||||||
|
t.Fatalf("Publish = %+v, %v", res, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertDialogProgress(t *testing.T, d *Dialog) {
|
||||||
|
t.Helper()
|
||||||
|
res, err := d.GetEffectiveProgress(&EffectiveProgressRequest{Env: "online"})
|
||||||
|
if err != nil || res.Progress != 100 {
|
||||||
|
t.Fatalf("GetEffectiveProgress = %+v, %v", res, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertDialogFetchAsync(t *testing.T, d *Dialog) {
|
||||||
|
t.Helper()
|
||||||
|
res, err := d.FetchAsync(&FetchAsyncRequest{TaskID: testImportTaskID})
|
||||||
|
if err != nil || res.State != 2 || len(res.SuccessSkillInfo) != 1 {
|
||||||
|
t.Fatalf("FetchAsync = %+v, %v", res, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertDialogQuery(t *testing.T, d *Dialog) {
|
||||||
|
t.Helper()
|
||||||
|
res, err := d.Query(&QueryRequest{Query: testQuery, Env: "online"})
|
||||||
|
if err != nil || res.Answer != testQueryAnswer || res.RequestID != testQueryRequestID {
|
||||||
|
t.Fatalf("Query = %+v, %v", res, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func newTestDialog(baseURL string) *Dialog {
|
||||||
|
cfg := testDialogConfig(baseURL)
|
||||||
|
return NewDialog(&aispeechContext.Context{
|
||||||
|
Config: cfg,
|
||||||
|
AccessTokenContextHandle: NewAccessToken(cfg),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func testDialogConfig(baseURL string) *config.Config {
|
||||||
|
return &config.Config{
|
||||||
|
AppID: testAppID,
|
||||||
|
Token: testToken,
|
||||||
|
AESKey: testAESKey,
|
||||||
|
Account: testAccount,
|
||||||
|
BaseURL: baseURL,
|
||||||
|
Cache: cache.NewMemory(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func accountAccessTokenResponse(account string) string {
|
||||||
|
return `{"code":0,"msg":"success","request_id":"rid","data":{"access_token":"` + account + `-token"}}`
|
||||||
|
}
|
||||||
|
|
||||||
|
func accessTokenResponse(requestID string) string {
|
||||||
|
return `{"code":0,"msg":"success","request_id":"` + requestID + `","data":{"access_token":"` + testAccessToken + `"}}`
|
||||||
|
}
|
||||||
|
|
||||||
|
func encryptQueryResponse(t *testing.T) string {
|
||||||
|
t.Helper()
|
||||||
|
cipherText, err := encryptor.Encrypt(testAESKey, []byte(queryResponse()))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("encrypt response error: %v", err)
|
||||||
|
}
|
||||||
|
return cipherText
|
||||||
|
}
|
||||||
|
|
||||||
|
func queryResponse() string {
|
||||||
|
return `{"code":0,"msg":"success","request_id":"query-rid","data":{"answer":"hello answer","answer_type":"text","skill_name":"skill","intent_name":"intent","msg_id":"msg","status":"FAQ","slots":[{"name":"n","value":"v","norm":"v"}]}}`
|
||||||
|
}
|
||||||
|
|
||||||
|
func readBody(t *testing.T, r *http.Request) []byte {
|
||||||
|
t.Helper()
|
||||||
|
body, err := io.ReadAll(r.Body)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read body error: %v", err)
|
||||||
|
}
|
||||||
|
return body
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertToken(t *testing.T, r *http.Request) {
|
||||||
|
t.Helper()
|
||||||
|
if r.Header.Get("X-OPENAI-TOKEN") != testAccessToken {
|
||||||
|
t.Fatalf("bad X-OPENAI-TOKEN: %s", r.Header.Get("X-OPENAI-TOKEN"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func assertSign(t *testing.T, r *http.Request, token string, body []byte) {
|
||||||
|
t.Helper()
|
||||||
|
timestamp, err := strconv.ParseInt(r.Header.Get("timestamp"), 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("bad timestamp: %v", err)
|
||||||
|
}
|
||||||
|
want := encryptor.Sign(token, timestamp, r.Header.Get("nonce"), body)
|
||||||
|
if got := r.Header.Get("sign"); got != want {
|
||||||
|
t.Fatalf("bad sign: got %s want %s body %s", got, want, body)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,186 @@
|
|||||||
|
package dialog
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
|
aispeechContext "github.com/silenceper/wechat/v2/aispeech/context"
|
||||||
|
"github.com/silenceper/wechat/v2/cache"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestIntegrationAccessTokenAndQuery(t *testing.T) {
|
||||||
|
if os.Getenv("AISPEECH_INTEGRATION") != "1" {
|
||||||
|
t.Skip("set AISPEECH_INTEGRATION=1 to run real aispeech API test")
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg := &config.Config{
|
||||||
|
AppID: os.Getenv("AISPEECH_APPID"),
|
||||||
|
Token: os.Getenv("AISPEECH_TOKEN"),
|
||||||
|
AESKey: os.Getenv("AISPEECH_AES_KEY"),
|
||||||
|
Cache: cache.NewMemory(),
|
||||||
|
}
|
||||||
|
if cfg.AppID == "" || cfg.Token == "" || cfg.AESKey == "" {
|
||||||
|
t.Fatal("AISPEECH_APPID, AISPEECH_TOKEN and AISPEECH_AES_KEY are required")
|
||||||
|
}
|
||||||
|
|
||||||
|
d := NewDialog(&aispeechContext.Context{
|
||||||
|
Config: cfg,
|
||||||
|
AccessTokenContextHandle: NewAccessToken(cfg),
|
||||||
|
})
|
||||||
|
|
||||||
|
accessToken, err := d.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetAccessToken error: %v", err)
|
||||||
|
}
|
||||||
|
if accessToken == "" {
|
||||||
|
t.Fatal("access token is empty")
|
||||||
|
}
|
||||||
|
|
||||||
|
res, err := d.Query(&QueryRequest{
|
||||||
|
Query: "你好",
|
||||||
|
Env: "online",
|
||||||
|
UserID: "gowechat-integration-test",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Query error: %v", err)
|
||||||
|
}
|
||||||
|
if res.RequestID == "" {
|
||||||
|
t.Fatal("query request_id is empty")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestIntegrationFullDialogFlow(t *testing.T) {
|
||||||
|
if os.Getenv("AISPEECH_INTEGRATION_MUTATION") != "1" {
|
||||||
|
t.Skip("set AISPEECH_INTEGRATION_MUTATION=1 to run import/publish/query real aispeech API test")
|
||||||
|
}
|
||||||
|
|
||||||
|
d := newIntegrationDialog(t)
|
||||||
|
now := time.Now().Unix()
|
||||||
|
question := "codex-smoke-test-question-" + time.Unix(now, 0).Format("20060102150405")
|
||||||
|
answer := "codex-smoke-test-answer-" + time.Unix(now, 0).Format("20060102150405")
|
||||||
|
|
||||||
|
importRes, err := d.ImportJSON(&ImportJSONRequest{
|
||||||
|
Mode: 0,
|
||||||
|
Data: []BotIntent{{
|
||||||
|
Skill: "CodexSmokeTest",
|
||||||
|
Intent: question,
|
||||||
|
Disable: false,
|
||||||
|
Questions: []string{question},
|
||||||
|
Answers: []string{answer},
|
||||||
|
}},
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ImportJSON error: %v", err)
|
||||||
|
}
|
||||||
|
if importRes.TaskID == "" {
|
||||||
|
t.Fatal("ImportJSON task_id is empty")
|
||||||
|
}
|
||||||
|
t.Logf("ImportJSON request_id=%s task_id=%s", importRes.RequestID, importRes.TaskID)
|
||||||
|
|
||||||
|
importTask := waitAsyncTask(t, d, importRes.TaskID, 2*time.Minute)
|
||||||
|
if importTask.State != 2 {
|
||||||
|
t.Fatalf("import task failed: state=%d msg=%s progress=%d", importTask.State, importTask.Msg, importTask.Progress)
|
||||||
|
}
|
||||||
|
t.Logf("FetchAsync import request_id=%s state=%d progress=%d", importTask.RequestID, importTask.State, importTask.Progress)
|
||||||
|
|
||||||
|
publishRes, err := d.Publish()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Publish error: %v", err)
|
||||||
|
}
|
||||||
|
if publishRes.TaskID == "" {
|
||||||
|
t.Fatal("Publish task_id is empty")
|
||||||
|
}
|
||||||
|
t.Logf("Publish request_id=%s task_id=%s", publishRes.RequestID, publishRes.TaskID)
|
||||||
|
|
||||||
|
progress := waitEffectiveProgress(t, d, "online", 3*time.Minute)
|
||||||
|
if progress.Status != 1 {
|
||||||
|
t.Fatalf("publish progress failed: status=%d progress=%d", progress.Status, progress.Progress)
|
||||||
|
}
|
||||||
|
t.Logf("GetEffectiveProgress request_id=%s status=%d progress=%d", progress.RequestID, progress.Status, progress.Progress)
|
||||||
|
|
||||||
|
queryRes := waitQueryAnswer(t, d, question, answer, 2*time.Minute)
|
||||||
|
t.Logf("Query request_id=%s status=%s answer_type=%s answer=%s", queryRes.RequestID, queryRes.Status, queryRes.AnswerType, queryRes.Answer)
|
||||||
|
}
|
||||||
|
|
||||||
|
func newIntegrationDialog(t *testing.T) *Dialog {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
cfg := &config.Config{
|
||||||
|
AppID: os.Getenv("AISPEECH_APPID"),
|
||||||
|
Token: os.Getenv("AISPEECH_TOKEN"),
|
||||||
|
AESKey: os.Getenv("AISPEECH_AES_KEY"),
|
||||||
|
Account: os.Getenv("AISPEECH_ACCOUNT"),
|
||||||
|
Cache: cache.NewMemory(),
|
||||||
|
}
|
||||||
|
if cfg.AppID == "" || cfg.Token == "" || cfg.AESKey == "" {
|
||||||
|
t.Fatal("AISPEECH_APPID, AISPEECH_TOKEN and AISPEECH_AES_KEY are required")
|
||||||
|
}
|
||||||
|
|
||||||
|
return NewDialog(&aispeechContext.Context{
|
||||||
|
Config: cfg,
|
||||||
|
AccessTokenContextHandle: NewAccessToken(cfg),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func waitAsyncTask(t *testing.T, d *Dialog, taskID string, timeout time.Duration) *FetchAsyncResponse {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
deadline := time.Now().Add(timeout)
|
||||||
|
for {
|
||||||
|
res, err := d.FetchAsync(&FetchAsyncRequest{TaskID: taskID})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("FetchAsync error: %v", err)
|
||||||
|
}
|
||||||
|
if res.State == 2 || res.State == 3 {
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
if time.Now().After(deadline) {
|
||||||
|
t.Fatalf("FetchAsync timeout: state=%d progress=%d msg=%s", res.State, res.Progress, res.Msg)
|
||||||
|
}
|
||||||
|
time.Sleep(3 * time.Second)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func waitEffectiveProgress(t *testing.T, d *Dialog, env string, timeout time.Duration) *EffectiveProgressResponse {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
deadline := time.Now().Add(timeout)
|
||||||
|
for {
|
||||||
|
res, err := d.GetEffectiveProgress(&EffectiveProgressRequest{Env: env})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetEffectiveProgress error: %v", err)
|
||||||
|
}
|
||||||
|
if res.Status == 1 || res.Status == 2 {
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
if time.Now().After(deadline) {
|
||||||
|
t.Fatalf("GetEffectiveProgress timeout: status=%d progress=%d", res.Status, res.Progress)
|
||||||
|
}
|
||||||
|
time.Sleep(5 * time.Second)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func waitQueryAnswer(t *testing.T, d *Dialog, question, answer string, timeout time.Duration) *QueryResponse {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
deadline := time.Now().Add(timeout)
|
||||||
|
for {
|
||||||
|
res, err := d.Query(&QueryRequest{
|
||||||
|
Query: question,
|
||||||
|
Env: "online",
|
||||||
|
UserID: "gowechat-full-integration-test",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Query error: %v", err)
|
||||||
|
}
|
||||||
|
if res.Answer == answer {
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
if time.Now().After(deadline) {
|
||||||
|
t.Fatalf("Query timeout: status=%s answer=%s want=%s", res.Status, res.Answer, answer)
|
||||||
|
}
|
||||||
|
time.Sleep(5 * time.Second)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
package dialog
|
||||||
|
|
||||||
|
// AccessTokenRequest 获取 access token 请求.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/token.html
|
||||||
|
type AccessTokenRequest struct {
|
||||||
|
Account string `json:"account,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ImportJSONRequest 简单问答导入请求.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/import.html
|
||||||
|
type ImportJSONRequest struct {
|
||||||
|
Mode int `json:"mode"`
|
||||||
|
Data []BotIntent `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// BotIntent 简单问答意图.
|
||||||
|
type BotIntent struct {
|
||||||
|
Skill string `json:"skill"`
|
||||||
|
Intent string `json:"intent"`
|
||||||
|
Threshold string `json:"threshold,omitempty"`
|
||||||
|
Disable bool `json:"disable"`
|
||||||
|
Questions []string `json:"questions"`
|
||||||
|
Answers []string `json:"answers"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// EffectiveProgressRequest 发布进度查询请求.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/progress.html
|
||||||
|
type EffectiveProgressRequest struct {
|
||||||
|
Env string `json:"env"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// FetchAsyncRequest 异步任务查询请求.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/fetch.html
|
||||||
|
type FetchAsyncRequest struct {
|
||||||
|
TaskID string `json:"task_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryRequest 调用智能对话请求.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/query.html
|
||||||
|
type QueryRequest struct {
|
||||||
|
Query string `json:"query"`
|
||||||
|
Env string `json:"env,omitempty"`
|
||||||
|
FirstPrioritySkills []string `json:"first_priority_skills,omitempty"`
|
||||||
|
SecondPrioritySkills []string `json:"second_priority_skills,omitempty"`
|
||||||
|
UserName string `json:"user_name,omitempty"`
|
||||||
|
Avatar string `json:"avatar,omitempty"`
|
||||||
|
UserID string `json:"userid,omitempty"`
|
||||||
|
}
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
package dialog
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
type apiResponse struct {
|
||||||
|
RequestID string `json:"request_id"`
|
||||||
|
Code int64 `json:"code"`
|
||||||
|
Msg string `json:"msg"`
|
||||||
|
Data json.RawMessage `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// APIError 智能对话接口错误.
|
||||||
|
type APIError struct {
|
||||||
|
APIName string
|
||||||
|
Code int64
|
||||||
|
Msg string
|
||||||
|
RequestID string
|
||||||
|
Data json.RawMessage
|
||||||
|
}
|
||||||
|
|
||||||
|
func (e *APIError) Error() string {
|
||||||
|
return fmt.Sprintf("%s Error , code=%d , msg=%s , request_id=%s", e.APIName, e.Code, e.Msg, e.RequestID)
|
||||||
|
}
|
||||||
|
|
||||||
|
type accessTokenData struct {
|
||||||
|
AccessToken string `json:"access_token"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ImportJSONResponse 简单问答导入响应.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/import.html
|
||||||
|
type ImportJSONResponse struct {
|
||||||
|
RequestID string `json:"-"`
|
||||||
|
TaskID string `json:"task_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PublishResponse 发布响应.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/publish.html
|
||||||
|
type PublishResponse struct {
|
||||||
|
RequestID string `json:"-"`
|
||||||
|
TaskID string `json:"task_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// EffectiveProgressResponse 发布进度查询响应.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/progress.html
|
||||||
|
type EffectiveProgressResponse struct {
|
||||||
|
RequestID string `json:"-"`
|
||||||
|
EndTime string `json:"end_time"`
|
||||||
|
Progress int `json:"progress"`
|
||||||
|
Status int `json:"status"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// FetchAsyncResponse 异步任务查询响应.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/fetch.html
|
||||||
|
type FetchAsyncResponse struct {
|
||||||
|
RequestID string `json:"-"`
|
||||||
|
State int `json:"state"`
|
||||||
|
Msg string `json:"msg"`
|
||||||
|
Progress int `json:"progress"`
|
||||||
|
Start int64 `json:"start"`
|
||||||
|
End int64 `json:"end"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
TotalCount int `json:"total_count"`
|
||||||
|
SuccessCount int `json:"success_count"`
|
||||||
|
FailCount int `json:"fail_count"`
|
||||||
|
ReplaceCount int `json:"replace_count"`
|
||||||
|
SuccessUploadCount int `json:"success_upload_count"`
|
||||||
|
SuccessSkillInfo []SkillInfo `json:"success_skill_info"`
|
||||||
|
FailSkillInfo []SkillInfo `json:"fail_skill_info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SkillInfo 技能信息.
|
||||||
|
type SkillInfo struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Intents []IntentInfo `json:"intents"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntentInfo 意图信息.
|
||||||
|
type IntentInfo struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryResponse 调用智能对话响应.
|
||||||
|
// 官方文档: https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/bot/query.html
|
||||||
|
type QueryResponse struct {
|
||||||
|
RequestID string `json:"-"`
|
||||||
|
Answer string `json:"answer"`
|
||||||
|
RawAnswer json.RawMessage `json:"-"`
|
||||||
|
AnswerType string `json:"answer_type"`
|
||||||
|
SkillName string `json:"skill_name"`
|
||||||
|
IntentName string `json:"intent_name"`
|
||||||
|
MsgID string `json:"msg_id"`
|
||||||
|
Options []Option `json:"options"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Slots []SlotDetail `json:"slots"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Option 推荐问题.
|
||||||
|
type Option struct {
|
||||||
|
AnsNodeName string `json:"ans_node_name"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
Answer string `json:"answer"`
|
||||||
|
Confidence float64 `json:"confidence"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SlotDetail 槽位数据.
|
||||||
|
type SlotDetail struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Value string `json:"value"`
|
||||||
|
Norm string `json:"norm"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeResponse(response []byte, data interface{}, apiName string) (string, error) {
|
||||||
|
var res apiResponse
|
||||||
|
if err := json.Unmarshal(response, &res); err != nil {
|
||||||
|
return "", fmt.Errorf("json Unmarshal Error, err=%v", err)
|
||||||
|
}
|
||||||
|
if res.Code != 0 {
|
||||||
|
return "", &APIError{
|
||||||
|
APIName: apiName,
|
||||||
|
Code: res.Code,
|
||||||
|
Msg: res.Msg,
|
||||||
|
RequestID: res.RequestID,
|
||||||
|
Data: res.Data,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if data != nil && len(res.Data) > 0 && string(res.Data) != "null" {
|
||||||
|
if err := json.Unmarshal(res.Data, data); err != nil {
|
||||||
|
return "", fmt.Errorf("json Unmarshal Data Error, err=%v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return res.RequestID, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
package dialog
|
||||||
|
|
||||||
|
import (
|
||||||
|
stdcontext "context"
|
||||||
|
"encoding/json"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
|
"github.com/silenceper/wechat/v2/cache"
|
||||||
|
)
|
||||||
|
|
||||||
|
const accessTokenCacheKeyPrefix = "gowechat_aispeech_"
|
||||||
|
|
||||||
|
var errEmptyAccessToken = errors.New("aispeech access_token is empty")
|
||||||
|
|
||||||
|
// AccessToken 微信智能对话 access token.
|
||||||
|
type AccessToken struct {
|
||||||
|
cfg *config.Config
|
||||||
|
accessTokenLock *sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewAccessToken new AccessToken.
|
||||||
|
func NewAccessToken(cfg *config.Config) *AccessToken {
|
||||||
|
if cfg.Cache == nil {
|
||||||
|
panic("cache is needed")
|
||||||
|
}
|
||||||
|
return &AccessToken{
|
||||||
|
cfg: cfg,
|
||||||
|
accessTokenLock: new(sync.Mutex),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAccessToken 获取 access token.
|
||||||
|
func (ak *AccessToken) GetAccessToken() (string, error) {
|
||||||
|
return ak.GetAccessTokenContext(stdcontext.Background())
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAccessTokenContext 获取 access token.
|
||||||
|
func (ak *AccessToken) GetAccessTokenContext(ctx stdcontext.Context) (string, error) {
|
||||||
|
cacheKey := fmt.Sprintf("%s_access_token_%s_%s", accessTokenCacheKeyPrefix, ak.cfg.AppID, ak.cfg.Account)
|
||||||
|
if val := cache.GetContext(ctx, ak.cfg.Cache, cacheKey); val != nil {
|
||||||
|
if accessToken, ok := val.(string); ok && accessToken != "" {
|
||||||
|
return accessToken, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ak.accessTokenLock.Lock()
|
||||||
|
defer ak.accessTokenLock.Unlock()
|
||||||
|
|
||||||
|
if val := cache.GetContext(ctx, ak.cfg.Cache, cacheKey); val != nil {
|
||||||
|
if accessToken, ok := val.(string); ok && accessToken != "" {
|
||||||
|
return accessToken, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
accessToken, err := ak.getAccessTokenFromServer(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if err = cache.SetContext(ctx, ak.cfg.Cache, cacheKey, accessToken, 110*time.Minute); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return accessToken, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ak *AccessToken) getAccessTokenFromServer(ctx stdcontext.Context) (string, error) {
|
||||||
|
req := &AccessTokenRequest{Account: ak.cfg.Account}
|
||||||
|
body, err := json.Marshal(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := post(ctx, ak.cfg, tokenPath, body, "application/json", "", ak.cfg.AppID)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
var res accessTokenData
|
||||||
|
if _, err = decodeResponse(response, &res, "AISpeechGetAccessToken"); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
if res.AccessToken == "" {
|
||||||
|
return "", errEmptyAccessToken
|
||||||
|
}
|
||||||
|
return res.AccessToken, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,100 @@
|
|||||||
|
package encryptor
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"crypto/aes"
|
||||||
|
"crypto/cipher"
|
||||||
|
"encoding/base64"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
// ErrInvalidBlockSize block size 不合法.
|
||||||
|
ErrInvalidBlockSize = errors.New("invalid block size")
|
||||||
|
// ErrInvalidPKCS7Data PKCS7 数据不合法.
|
||||||
|
ErrInvalidPKCS7Data = errors.New("invalid PKCS7 data")
|
||||||
|
// ErrInvalidPKCS7Padding padding 不合法.
|
||||||
|
ErrInvalidPKCS7Padding = errors.New("invalid PKCS7 padding")
|
||||||
|
)
|
||||||
|
|
||||||
|
// Encrypt encrypts plaintext with AES-CBC and returns base64 ciphertext.
|
||||||
|
func Encrypt(aesKey string, plaintext []byte) (string, error) {
|
||||||
|
key, err := decodeAESKey(aesKey)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
block, err := aes.NewCipher(key)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
|
||||||
|
plaintext = pkcs7Pad(plaintext, block.BlockSize())
|
||||||
|
ciphertext := make([]byte, len(plaintext))
|
||||||
|
mode := cipher.NewCBCEncrypter(block, key[:aes.BlockSize])
|
||||||
|
mode.CryptBlocks(ciphertext, plaintext)
|
||||||
|
return base64.StdEncoding.EncodeToString(ciphertext), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decrypt decrypts base64 AES-CBC ciphertext.
|
||||||
|
func Decrypt(aesKey, ciphertext string) ([]byte, error) {
|
||||||
|
key, err := decodeAESKey(aesKey)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := base64.StdEncoding.DecodeString(ciphertext)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(data) == 0 || len(data)%aes.BlockSize != 0 {
|
||||||
|
return nil, ErrInvalidPKCS7Data
|
||||||
|
}
|
||||||
|
|
||||||
|
block, err := aes.NewCipher(key)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
plaintext := make([]byte, len(data))
|
||||||
|
mode := cipher.NewCBCDecrypter(block, key[:aes.BlockSize])
|
||||||
|
mode.CryptBlocks(plaintext, data)
|
||||||
|
return pkcs7Unpad(plaintext, block.BlockSize())
|
||||||
|
}
|
||||||
|
|
||||||
|
func decodeAESKey(encodingAESKey string) ([]byte, error) {
|
||||||
|
key, err := base64.StdEncoding.DecodeString(encodingAESKey + "=")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if len(key) != 32 {
|
||||||
|
return nil, fmt.Errorf("encodingAESKey invalid")
|
||||||
|
}
|
||||||
|
return key, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func pkcs7Pad(data []byte, blockSize int) []byte {
|
||||||
|
padding := blockSize - len(data)%blockSize
|
||||||
|
padText := bytes.Repeat([]byte{byte(padding)}, padding)
|
||||||
|
return append(data, padText...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func pkcs7Unpad(data []byte, blockSize int) ([]byte, error) {
|
||||||
|
if blockSize <= 0 {
|
||||||
|
return nil, ErrInvalidBlockSize
|
||||||
|
}
|
||||||
|
if len(data) == 0 || len(data)%blockSize != 0 {
|
||||||
|
return nil, ErrInvalidPKCS7Data
|
||||||
|
}
|
||||||
|
padding := int(data[len(data)-1])
|
||||||
|
if padding == 0 || padding > blockSize || padding > len(data) {
|
||||||
|
return nil, ErrInvalidPKCS7Padding
|
||||||
|
}
|
||||||
|
for i := len(data) - padding; i < len(data); i++ {
|
||||||
|
if int(data[i]) != padding {
|
||||||
|
return nil, ErrInvalidPKCS7Padding
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return data[:len(data)-padding], nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package encryptor
|
||||||
|
|
||||||
|
import "testing"
|
||||||
|
|
||||||
|
func TestSign(t *testing.T) {
|
||||||
|
sign := Sign("YV78Pyj1VvqdNGpMJ1pHic0bIBOWMv", 1711001766, "abc", nil)
|
||||||
|
if sign != "fff8dae1356e7867ea98743439f0e9f8" {
|
||||||
|
t.Fatalf("bad sign: %s", sign)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEncryptDecrypt(t *testing.T) {
|
||||||
|
aesKey := "q1Os1ZMe0nG28KUEx9lg3HjK7V5QyXvi212fzsgDqgz"
|
||||||
|
plainText := []byte(`{"query":"hello"}`)
|
||||||
|
|
||||||
|
cipherText, err := Encrypt(aesKey, plainText)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Encrypt error: %v", err)
|
||||||
|
}
|
||||||
|
got, err := Decrypt(aesKey, cipherText)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("Decrypt error: %v", err)
|
||||||
|
}
|
||||||
|
if string(got) != string(plainText) {
|
||||||
|
t.Fatalf("bad plaintext: %s", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDecryptInvalidKey(t *testing.T) {
|
||||||
|
if _, err := Encrypt("bad-key", []byte("hello")); err == nil {
|
||||||
|
t.Fatal("Encrypt should return error")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
package encryptor
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/md5"
|
||||||
|
"encoding/hex"
|
||||||
|
"strconv"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Sign calculates the aispeech request signature.
|
||||||
|
func Sign(token string, timestamp int64, nonce string, body []byte) string {
|
||||||
|
bodyMD5 := md5.Sum(body)
|
||||||
|
bodySign := hex.EncodeToString(bodyMD5[:])
|
||||||
|
|
||||||
|
h := md5.New()
|
||||||
|
h.Write([]byte(token))
|
||||||
|
h.Write([]byte(strconv.FormatInt(timestamp, 10)))
|
||||||
|
h.Write([]byte(nonce))
|
||||||
|
h.Write([]byte(bodySign))
|
||||||
|
return hex.EncodeToString(h.Sum(nil))
|
||||||
|
}
|
||||||
Vendored
+43
-27
@@ -5,53 +5,64 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Memory struct contains *memcache.Client
|
// Memory is an concurrent-safe in-process cache backed by a plain map.
|
||||||
type Memory struct {
|
type Memory struct {
|
||||||
sync.Mutex
|
mu sync.RWMutex
|
||||||
|
|
||||||
data map[string]*data
|
data map[string]*data
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// data holds a single cached value together with its expiry time.
|
||||||
type data struct {
|
type data struct {
|
||||||
Data interface{}
|
Data interface{}
|
||||||
Expired time.Time
|
Expired time.Time
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewMemory create new memcache
|
// NewMemory returns a ready-to-use in-memory cache.
|
||||||
func NewMemory() *Memory {
|
func NewMemory() *Memory {
|
||||||
return &Memory{
|
return &Memory{
|
||||||
data: map[string]*data{},
|
data: map[string]*data{},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get return cached value
|
// Get returns the cached value for key.
|
||||||
|
// Returns nil if the key does not exist or has expired.
|
||||||
func (mem *Memory) Get(key string) interface{} {
|
func (mem *Memory) Get(key string) interface{} {
|
||||||
if ret, ok := mem.data[key]; ok {
|
mem.mu.RLock()
|
||||||
if ret.Expired.Before(time.Now()) {
|
ret, ok := mem.data[key]
|
||||||
mem.deleteKey(key)
|
expired := ok && ret.Expired.Before(time.Now())
|
||||||
return nil
|
mem.mu.RUnlock()
|
||||||
}
|
|
||||||
return ret.Data
|
if !ok {
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
return nil
|
if expired {
|
||||||
|
mem.deleteExpiredKey(key)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return ret.Data
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsExist check value exists in memcache.
|
// IsExist check value exists in memcache.
|
||||||
func (mem *Memory) IsExist(key string) bool {
|
func (mem *Memory) IsExist(key string) bool {
|
||||||
if ret, ok := mem.data[key]; ok {
|
mem.mu.RLock()
|
||||||
if ret.Expired.Before(time.Now()) {
|
ret, ok := mem.data[key]
|
||||||
mem.deleteKey(key)
|
expired := ok && ret.Expired.Before(time.Now())
|
||||||
return false
|
mem.mu.RUnlock()
|
||||||
}
|
|
||||||
return true
|
if !ok {
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
return false
|
if expired {
|
||||||
|
mem.deleteExpiredKey(key)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set cached value with key and expire time.
|
// Set cached value with key and expire time.
|
||||||
func (mem *Memory) Set(key string, val interface{}, timeout time.Duration) (err error) {
|
func (mem *Memory) Set(key string, val interface{}, timeout time.Duration) (err error) {
|
||||||
mem.Lock()
|
mem.mu.Lock()
|
||||||
defer mem.Unlock()
|
defer mem.mu.Unlock()
|
||||||
|
|
||||||
mem.data[key] = &data{
|
mem.data[key] = &data{
|
||||||
Data: val,
|
Data: val,
|
||||||
@@ -62,13 +73,18 @@ func (mem *Memory) Set(key string, val interface{}, timeout time.Duration) (err
|
|||||||
|
|
||||||
// Delete delete value in memcache.
|
// Delete delete value in memcache.
|
||||||
func (mem *Memory) Delete(key string) error {
|
func (mem *Memory) Delete(key string) error {
|
||||||
mem.deleteKey(key)
|
mem.mu.Lock()
|
||||||
|
defer mem.mu.Unlock()
|
||||||
|
delete(mem.data, key)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// deleteKey
|
// deleteExpiredKey deletes a key only if it has expired.
|
||||||
func (mem *Memory) deleteKey(key string) {
|
// Caller must NOT hold any lock.
|
||||||
mem.Lock()
|
func (mem *Memory) deleteExpiredKey(key string) {
|
||||||
defer mem.Unlock()
|
mem.mu.Lock()
|
||||||
delete(mem.data, key)
|
defer mem.mu.Unlock()
|
||||||
|
if d, ok := mem.data[key]; ok && d.Expired.Before(time.Now()) {
|
||||||
|
delete(mem.data, key)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Vendored
+116
@@ -0,0 +1,116 @@
|
|||||||
|
// 运行测试:go test -race -v ./cache/ -run "TestMemory" -count=1
|
||||||
|
package cache
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
"testing"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMemoryGet(t *testing.T) {
|
||||||
|
mem := NewMemory()
|
||||||
|
|
||||||
|
err := mem.Set("username", "silenceper", 10*time.Second)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
val := mem.Get("username")
|
||||||
|
assert.Equal(t, "silenceper", val)
|
||||||
|
|
||||||
|
val = mem.Get("unknown-key")
|
||||||
|
assert.Nil(t, val)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMemoryIsExist(t *testing.T) {
|
||||||
|
mem := NewMemory()
|
||||||
|
|
||||||
|
err := mem.Set("username", "silenceper", 10*time.Second)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
assert.True(t, mem.IsExist("username"))
|
||||||
|
assert.False(t, mem.IsExist("unknown-key"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMemoryDelete(t *testing.T) {
|
||||||
|
mem := NewMemory()
|
||||||
|
|
||||||
|
err := mem.Set("username", "silenceper", 10*time.Second)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
err = mem.Delete("username")
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
// delete 不存在的 key 不应报错
|
||||||
|
err = mem.Delete("unknown-key")
|
||||||
|
assert.NoError(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMemoryExpire(t *testing.T) {
|
||||||
|
mem := NewMemory()
|
||||||
|
|
||||||
|
err := mem.Set("username", "silenceper", 10*time.Millisecond)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
|
||||||
|
assert.True(t, mem.IsExist("username"))
|
||||||
|
|
||||||
|
time.Sleep(20 * time.Millisecond)
|
||||||
|
|
||||||
|
assert.False(t, mem.IsExist("username"))
|
||||||
|
assert.Nil(t, mem.Get("username"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestMemoryConcurrentOps 验证 Get/IsExist/Set/Delete 并发执行不产生数据竞争
|
||||||
|
func TestMemoryConcurrentOps(t *testing.T) {
|
||||||
|
mem := NewMemory()
|
||||||
|
_ = mem.Set("key", "value", time.Minute)
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for i := 0; i < 100; i++ {
|
||||||
|
wg.Add(4)
|
||||||
|
// 并发读
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
_ = mem.Get("key")
|
||||||
|
}()
|
||||||
|
// 并发 IsExist
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
_ = mem.IsExist("key")
|
||||||
|
}()
|
||||||
|
// 并发写
|
||||||
|
go func(i int) {
|
||||||
|
defer wg.Done()
|
||||||
|
_ = mem.Set("key", i, time.Minute)
|
||||||
|
}(i)
|
||||||
|
// 并发删除
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
_ = mem.Delete("key")
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestMemoryConcurrentExpireAndRead 验证过期惰性删除在并发场景下不会死锁
|
||||||
|
func TestMemoryConcurrentExpireAndRead(t *testing.T) {
|
||||||
|
mem := NewMemory()
|
||||||
|
|
||||||
|
var wg sync.WaitGroup
|
||||||
|
for i := 0; i < 50; i++ {
|
||||||
|
wg.Add(2)
|
||||||
|
go func(i int) {
|
||||||
|
defer wg.Done()
|
||||||
|
key := "expire-key"
|
||||||
|
_ = mem.Set(key, i, 5*time.Millisecond)
|
||||||
|
}(i)
|
||||||
|
go func() {
|
||||||
|
defer wg.Done()
|
||||||
|
time.Sleep(3 * time.Millisecond)
|
||||||
|
// 此时 key 可能已过期,触发 deleteKey,验证不死锁
|
||||||
|
_ = mem.Get("expire-key")
|
||||||
|
_ = mem.IsExist("expire-key")
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
wg.Wait()
|
||||||
|
}
|
||||||
Vendored
+65
-10
@@ -2,6 +2,8 @@ package cache
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/tls"
|
||||||
|
"net"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/go-redis/redis/v8"
|
"github.com/go-redis/redis/v8"
|
||||||
@@ -15,23 +17,76 @@ type Redis struct {
|
|||||||
|
|
||||||
// RedisOpts redis 连接属性
|
// RedisOpts redis 连接属性
|
||||||
type RedisOpts struct {
|
type RedisOpts struct {
|
||||||
Host string `yml:"host" json:"host"`
|
Host string `json:"host" yaml:"host"`
|
||||||
Password string `yml:"password" json:"password"`
|
Username string `json:"username" yaml:"username"`
|
||||||
Database int `yml:"database" json:"database"`
|
Password string `json:"password" yaml:"password"`
|
||||||
MaxIdle int `yml:"max_idle" json:"max_idle"`
|
Database int `json:"database" yaml:"database"`
|
||||||
MaxActive int `yml:"max_active" json:"max_active"`
|
MinIdleConns int `json:"min_idle_conns" yaml:"min_idle_conns"` // 最小空闲连接数
|
||||||
IdleTimeout int `yml:"idle_timeout" json:"idle_timeout"` // second
|
PoolSize int `json:"pool_size" yaml:"pool_size"` // 连接池大小,0 表示使用默认值(即 CPU 核心数 * 10)
|
||||||
|
MaxRetries int `json:"max_retries" yaml:"max_retries"` // 最大重试次数,-1 表示不重试,0 表示使用默认值(即 3 次)
|
||||||
|
DialTimeout int `json:"dial_timeout" yaml:"dial_timeout"` // 连接超时时间(秒),0 表示使用默认值(即 5 秒)
|
||||||
|
ReadTimeout int `json:"read_timeout" yaml:"read_timeout"` // 读取超时时间(秒),-1 表示不超时,0 表示使用默认值(即 3 秒)
|
||||||
|
WriteTimeout int `json:"write_timeout" yaml:"write_timeout"` // 写入超时时间(秒),-1 表示不超时,0 表示使用默认值(即 ReadTimeout)
|
||||||
|
PoolTimeout int `json:"pool_timeout" yaml:"pool_timeout"` // 连接池获取连接超时时间(秒),0 表示使用默认值(即 ReadTimeout + 1 秒)
|
||||||
|
IdleTimeout int `json:"idle_timeout" yaml:"idle_timeout"` // 空闲连接超时时间(秒),-1 表示禁用空闲连接超时检查,0 表示使用默认值(即 5 分钟)
|
||||||
|
UseTLS bool `json:"use_tls" yaml:"use_tls"` // 是否使用 TLS
|
||||||
|
|
||||||
|
// Deprecated: 应使用 MinIdleConns 代替
|
||||||
|
MaxIdle int `json:"max_idle" yaml:"max_idle"`
|
||||||
|
// Deprecated: 应使用 PoolSize 代替
|
||||||
|
MaxActive int `json:"max_active" yaml:"max_active"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewRedis 实例化
|
// NewRedis 实例化
|
||||||
func NewRedis(ctx context.Context, opts *RedisOpts) *Redis {
|
func NewRedis(ctx context.Context, opts *RedisOpts) *Redis {
|
||||||
conn := redis.NewUniversalClient(&redis.UniversalOptions{
|
uniOpt := &redis.UniversalOptions{
|
||||||
Addrs: []string{opts.Host},
|
Addrs: []string{opts.Host},
|
||||||
DB: opts.Database,
|
DB: opts.Database,
|
||||||
|
Username: opts.Username,
|
||||||
Password: opts.Password,
|
Password: opts.Password,
|
||||||
IdleTimeout: time.Second * time.Duration(opts.IdleTimeout),
|
MinIdleConns: opts.MinIdleConns,
|
||||||
MinIdleConns: opts.MaxIdle,
|
PoolSize: opts.PoolSize,
|
||||||
})
|
MaxRetries: opts.MaxRetries,
|
||||||
|
}
|
||||||
|
|
||||||
|
// 兼容旧的 MaxIdle 参数,仅在未显式设置 MinIdleConns 时生效
|
||||||
|
if opts.MaxIdle > 0 && opts.MinIdleConns == 0 {
|
||||||
|
uniOpt.MinIdleConns = opts.MaxIdle
|
||||||
|
}
|
||||||
|
|
||||||
|
// 兼容旧的 MaxActive 参数,仅在未显式设置 PoolSize 时生效
|
||||||
|
if opts.MaxActive > 0 && opts.PoolSize == 0 {
|
||||||
|
uniOpt.PoolSize = opts.MaxActive
|
||||||
|
}
|
||||||
|
|
||||||
|
applyTimeout := func(seconds int, target *time.Duration) {
|
||||||
|
if seconds > 0 {
|
||||||
|
*target = time.Duration(seconds) * time.Second
|
||||||
|
} else if seconds == -1 {
|
||||||
|
// 当 seconds 为 -1 时,表示禁用超时:按 go-redis 约定,将超时时间设置为负值(如 -1ns)代表「无超时」
|
||||||
|
*target = -1
|
||||||
|
}
|
||||||
|
// 当 seconds 为 0 时,使用 go-redis 的默认超时配置:
|
||||||
|
// 不修改 target,保持其零值(0),由 go-redis 解释为“使用默认值”
|
||||||
|
}
|
||||||
|
|
||||||
|
applyTimeout(opts.DialTimeout, &uniOpt.DialTimeout)
|
||||||
|
applyTimeout(opts.ReadTimeout, &uniOpt.ReadTimeout)
|
||||||
|
applyTimeout(opts.WriteTimeout, &uniOpt.WriteTimeout)
|
||||||
|
applyTimeout(opts.PoolTimeout, &uniOpt.PoolTimeout)
|
||||||
|
applyTimeout(opts.IdleTimeout, &uniOpt.IdleTimeout)
|
||||||
|
|
||||||
|
if opts.UseTLS {
|
||||||
|
h, _, err := net.SplitHostPort(opts.Host)
|
||||||
|
if err != nil {
|
||||||
|
h = opts.Host
|
||||||
|
}
|
||||||
|
uniOpt.TLSConfig = &tls.Config{
|
||||||
|
ServerName: h,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
conn := redis.NewUniversalClient(uniOpt)
|
||||||
return &Redis{ctx: ctx, conn: conn}
|
return &Redis{ctx: ctx, conn: conn}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Vendored
+267
-1
@@ -6,6 +6,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/alicebob/miniredis/v2"
|
"github.com/alicebob/miniredis/v2"
|
||||||
|
"github.com/go-redis/redis/v8"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestRedis(t *testing.T) {
|
func TestRedis(t *testing.T) {
|
||||||
@@ -18,7 +19,16 @@ func TestRedis(t *testing.T) {
|
|||||||
timeoutDuration = time.Second
|
timeoutDuration = time.Second
|
||||||
ctx = context.Background()
|
ctx = context.Background()
|
||||||
opts = &RedisOpts{
|
opts = &RedisOpts{
|
||||||
Host: server.Addr(),
|
Host: server.Addr(),
|
||||||
|
Password: "",
|
||||||
|
Database: 0,
|
||||||
|
PoolSize: 10,
|
||||||
|
MinIdleConns: 5,
|
||||||
|
DialTimeout: 5,
|
||||||
|
ReadTimeout: 5,
|
||||||
|
WriteTimeout: 5,
|
||||||
|
PoolTimeout: 5,
|
||||||
|
IdleTimeout: 300,
|
||||||
}
|
}
|
||||||
redis = NewRedis(ctx, opts)
|
redis = NewRedis(ctx, opts)
|
||||||
val = "silenceper"
|
val = "silenceper"
|
||||||
@@ -44,3 +54,259 @@ func TestRedis(t *testing.T) {
|
|||||||
t.Errorf("delete Error , err=%v", err)
|
t.Errorf("delete Error , err=%v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// setupRedisServer 创建并返回一个 miniredis 服务器实例
|
||||||
|
func setupRedisServer(t *testing.T) *miniredis.Miniredis {
|
||||||
|
server, err := miniredis.Run()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal("miniredis.Run Error", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(server.Close)
|
||||||
|
return server
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRedisMaxIdleMapping 测试只设置MaxIdle应该映射到MinIdleConns
|
||||||
|
func TestRedisMaxIdleMapping(t *testing.T) {
|
||||||
|
server := setupRedisServer(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
opts := &RedisOpts{
|
||||||
|
Host: server.Addr(),
|
||||||
|
Database: 0,
|
||||||
|
MaxIdle: 10,
|
||||||
|
}
|
||||||
|
r := NewRedis(ctx, opts)
|
||||||
|
|
||||||
|
// 获取底层的 UniversalClient 并断言为 *redis.Client
|
||||||
|
client, ok := r.conn.(*redis.Client)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("无法转换为 *redis.Client")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 注意:MinIdleConns 表示期望的最小空闲连接数,但实际空闲连接数可能不同
|
||||||
|
// 我们需要通过 Options() 来验证配置是否正确应用
|
||||||
|
clientOpts := client.Options()
|
||||||
|
if clientOpts.MinIdleConns != 10 {
|
||||||
|
t.Errorf("期望 MinIdleConns = 10, 实际 = %d", clientOpts.MinIdleConns)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRedisMaxActiveMapping 测试只设置MaxActive应该映射到PoolSize
|
||||||
|
func TestRedisMaxActiveMapping(t *testing.T) {
|
||||||
|
server := setupRedisServer(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
opts := &RedisOpts{
|
||||||
|
Host: server.Addr(),
|
||||||
|
Database: 0,
|
||||||
|
MaxActive: 20,
|
||||||
|
}
|
||||||
|
r := NewRedis(ctx, opts)
|
||||||
|
|
||||||
|
client, ok := r.conn.(*redis.Client)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("无法转换为 *redis.Client")
|
||||||
|
}
|
||||||
|
|
||||||
|
clientOpts := client.Options()
|
||||||
|
if clientOpts.PoolSize != 20 {
|
||||||
|
t.Errorf("期望 PoolSize = 20, 实际 = %d", clientOpts.PoolSize)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRedisNewFieldsPriority 测试新字段应该优先于旧字段
|
||||||
|
func TestRedisNewFieldsPriority(t *testing.T) {
|
||||||
|
server := setupRedisServer(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
opts := &RedisOpts{
|
||||||
|
Host: server.Addr(),
|
||||||
|
Database: 0,
|
||||||
|
MaxIdle: 5,
|
||||||
|
MinIdleConns: 15,
|
||||||
|
MaxActive: 10,
|
||||||
|
PoolSize: 30,
|
||||||
|
}
|
||||||
|
r := NewRedis(ctx, opts)
|
||||||
|
|
||||||
|
client, ok := r.conn.(*redis.Client)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("无法转换为 *redis.Client")
|
||||||
|
}
|
||||||
|
|
||||||
|
clientOpts := client.Options()
|
||||||
|
if clientOpts.MinIdleConns != 15 {
|
||||||
|
t.Errorf("期望 MinIdleConns = 15 (新字段优先), 实际 = %d", clientOpts.MinIdleConns)
|
||||||
|
}
|
||||||
|
if clientOpts.PoolSize != 30 {
|
||||||
|
t.Errorf("期望 PoolSize = 30 (新字段优先), 实际 = %d", clientOpts.PoolSize)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRedisPositiveTimeouts 测试正值超时应该正确应用
|
||||||
|
func TestRedisPositiveTimeouts(t *testing.T) {
|
||||||
|
server := setupRedisServer(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
opts := &RedisOpts{
|
||||||
|
Host: server.Addr(),
|
||||||
|
Database: 0,
|
||||||
|
DialTimeout: 10,
|
||||||
|
ReadTimeout: 20,
|
||||||
|
WriteTimeout: 30,
|
||||||
|
PoolTimeout: 40,
|
||||||
|
IdleTimeout: 50,
|
||||||
|
}
|
||||||
|
r := NewRedis(ctx, opts)
|
||||||
|
|
||||||
|
client, ok := r.conn.(*redis.Client)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("无法转换为 *redis.Client")
|
||||||
|
}
|
||||||
|
|
||||||
|
clientOpts := client.Options()
|
||||||
|
if clientOpts.DialTimeout != 10*time.Second {
|
||||||
|
t.Errorf("期望 DialTimeout = 10s, 实际 = %v", clientOpts.DialTimeout)
|
||||||
|
}
|
||||||
|
if clientOpts.ReadTimeout != 20*time.Second {
|
||||||
|
t.Errorf("期望 ReadTimeout = 20s, 实际 = %v", clientOpts.ReadTimeout)
|
||||||
|
}
|
||||||
|
if clientOpts.WriteTimeout != 30*time.Second {
|
||||||
|
t.Errorf("期望 WriteTimeout = 30s, 实际 = %v", clientOpts.WriteTimeout)
|
||||||
|
}
|
||||||
|
if clientOpts.PoolTimeout != 40*time.Second {
|
||||||
|
t.Errorf("期望 PoolTimeout = 40s, 实际 = %v", clientOpts.PoolTimeout)
|
||||||
|
}
|
||||||
|
if clientOpts.IdleTimeout != 50*time.Second {
|
||||||
|
t.Errorf("期望 IdleTimeout = 50s, 实际 = %v", clientOpts.IdleTimeout)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRedisNegativeTimeouts 测试-1值应该禁用超时
|
||||||
|
func TestRedisNegativeTimeouts(t *testing.T) {
|
||||||
|
server := setupRedisServer(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
opts := &RedisOpts{
|
||||||
|
Host: server.Addr(),
|
||||||
|
Database: 0,
|
||||||
|
DialTimeout: -1,
|
||||||
|
ReadTimeout: -1,
|
||||||
|
WriteTimeout: -1,
|
||||||
|
PoolTimeout: -1,
|
||||||
|
IdleTimeout: -1,
|
||||||
|
}
|
||||||
|
r := NewRedis(ctx, opts)
|
||||||
|
|
||||||
|
client, ok := r.conn.(*redis.Client)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("无法转换为 *redis.Client")
|
||||||
|
}
|
||||||
|
|
||||||
|
clientOpts := client.Options()
|
||||||
|
// -1 应该被设置为负值表示禁用超时
|
||||||
|
// DialTimeout, PoolTimeout, IdleTimeout 会被设置为 -1ns
|
||||||
|
if clientOpts.DialTimeout != -1 {
|
||||||
|
t.Errorf("期望 DialTimeout = -1ns (禁用), 实际 = %v", clientOpts.DialTimeout)
|
||||||
|
}
|
||||||
|
// ReadTimeout 和 WriteTimeout 在 go-redis 中有特殊处理
|
||||||
|
// 当设置为负值时,会被规范化为 0,这也表示无超时
|
||||||
|
t.Logf("ReadTimeout = %v (设置为-1后的值)", clientOpts.ReadTimeout)
|
||||||
|
t.Logf("WriteTimeout = %v (设置为-1后的值)", clientOpts.WriteTimeout)
|
||||||
|
|
||||||
|
if clientOpts.PoolTimeout != -1 {
|
||||||
|
t.Errorf("期望 PoolTimeout = -1ns (禁用), 实际 = %v", clientOpts.PoolTimeout)
|
||||||
|
}
|
||||||
|
if clientOpts.IdleTimeout != -1 {
|
||||||
|
t.Errorf("期望 IdleTimeout = -1ns (禁用), 实际 = %v", clientOpts.IdleTimeout)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRedisZeroTimeouts 测试0值应该使用go-redis默认值
|
||||||
|
func TestRedisZeroTimeouts(t *testing.T) {
|
||||||
|
server := setupRedisServer(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
opts := &RedisOpts{
|
||||||
|
Host: server.Addr(),
|
||||||
|
Database: 0,
|
||||||
|
DialTimeout: 0,
|
||||||
|
ReadTimeout: 0,
|
||||||
|
WriteTimeout: 0,
|
||||||
|
PoolTimeout: 0,
|
||||||
|
IdleTimeout: 0,
|
||||||
|
}
|
||||||
|
r := NewRedis(ctx, opts)
|
||||||
|
|
||||||
|
client, ok := r.conn.(*redis.Client)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("无法转换为 *redis.Client")
|
||||||
|
}
|
||||||
|
|
||||||
|
clientOpts := client.Options()
|
||||||
|
// 0值应该保持为0,由 go-redis 使用默认值
|
||||||
|
// go-redis 的默认值:
|
||||||
|
// DialTimeout: 5s
|
||||||
|
// ReadTimeout: 3s
|
||||||
|
// WriteTimeout: ReadTimeout
|
||||||
|
// PoolTimeout: ReadTimeout + 1s
|
||||||
|
// IdleTimeout: 5min
|
||||||
|
|
||||||
|
if clientOpts.DialTimeout == 0 {
|
||||||
|
t.Error("期望 DialTimeout 使用 go-redis 默认值 (5s), 实际为 0")
|
||||||
|
}
|
||||||
|
if clientOpts.ReadTimeout == 0 {
|
||||||
|
t.Error("期望 ReadTimeout 使用 go-redis 默认值 (3s), 实际为 0")
|
||||||
|
}
|
||||||
|
if clientOpts.WriteTimeout == 0 {
|
||||||
|
t.Error("期望 WriteTimeout 使用 go-redis 默认值 (ReadTimeout), 实际为 0")
|
||||||
|
}
|
||||||
|
if clientOpts.PoolTimeout == 0 {
|
||||||
|
t.Error("期望 PoolTimeout 使用 go-redis 默认值 (ReadTimeout + 1s), 实际为 0")
|
||||||
|
}
|
||||||
|
if clientOpts.IdleTimeout == 0 {
|
||||||
|
t.Error("期望 IdleTimeout 使用 go-redis 默认值 (5min), 实际为 0")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestRedisMixedTimeouts 测试混合超时配置
|
||||||
|
func TestRedisMixedTimeouts(t *testing.T) {
|
||||||
|
server := setupRedisServer(t)
|
||||||
|
ctx := context.Background()
|
||||||
|
|
||||||
|
opts := &RedisOpts{
|
||||||
|
Host: server.Addr(),
|
||||||
|
Database: 0,
|
||||||
|
DialTimeout: 5, // 正值
|
||||||
|
ReadTimeout: -1, // 禁用
|
||||||
|
WriteTimeout: 0, // 使用默认值
|
||||||
|
PoolTimeout: 10, // 正值
|
||||||
|
IdleTimeout: -1, // 禁用
|
||||||
|
}
|
||||||
|
r := NewRedis(ctx, opts)
|
||||||
|
|
||||||
|
client, ok := r.conn.(*redis.Client)
|
||||||
|
if !ok {
|
||||||
|
t.Fatal("无法转换为 *redis.Client")
|
||||||
|
}
|
||||||
|
|
||||||
|
clientOpts := client.Options()
|
||||||
|
if clientOpts.DialTimeout != 5*time.Second {
|
||||||
|
t.Errorf("期望 DialTimeout = 5s, 实际 = %v", clientOpts.DialTimeout)
|
||||||
|
}
|
||||||
|
// ReadTimeout 设置为 -1,会被 go-redis 处理为 0(无超时)
|
||||||
|
t.Logf("ReadTimeout = %v (设置为-1后的值)", clientOpts.ReadTimeout)
|
||||||
|
|
||||||
|
// WriteTimeout 设置为 0,应该使用 go-redis 的默认值
|
||||||
|
// 默认值通常是 ReadTimeout 的值
|
||||||
|
t.Logf("WriteTimeout = %v (设置为0后使用的默认值)", clientOpts.WriteTimeout)
|
||||||
|
|
||||||
|
if clientOpts.PoolTimeout != 10*time.Second {
|
||||||
|
t.Errorf("期望 PoolTimeout = 10s, 实际 = %v", clientOpts.PoolTimeout)
|
||||||
|
}
|
||||||
|
|
||||||
|
// IdleTimeout 设置为 -1,应该被设置为 -1ns(禁用空闲超时)
|
||||||
|
if clientOpts.IdleTimeout != -1 {
|
||||||
|
t.Errorf("期望 IdleTimeout = -1ns (禁用), 实际 = %v", clientOpts.IdleTimeout)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -7,6 +7,16 @@ type AccessTokenHandle interface {
|
|||||||
GetAccessToken() (accessToken string, err error)
|
GetAccessToken() (accessToken string, err error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AccessTokenCompatibleHandle 同时实现 AccessTokenHandle 和 AccessTokenContextHandle
|
||||||
|
type AccessTokenCompatibleHandle struct {
|
||||||
|
AccessTokenHandle
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetAccessTokenContext 获取access_token,先从cache中获取,没有则从服务端获取
|
||||||
|
func (c AccessTokenCompatibleHandle) GetAccessTokenContext(_ context.Context) (accessToken string, err error) {
|
||||||
|
return c.GetAccessToken()
|
||||||
|
}
|
||||||
|
|
||||||
// AccessTokenContextHandle AccessToken 接口
|
// AccessTokenContextHandle AccessToken 接口
|
||||||
type AccessTokenContextHandle interface {
|
type AccessTokenContextHandle interface {
|
||||||
AccessTokenHandle
|
AccessTokenHandle
|
||||||
|
|||||||
@@ -66,9 +66,11 @@ func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
|
|||||||
func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
|
func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
|
||||||
// 先从cache中取
|
// 先从cache中取
|
||||||
accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.appID)
|
accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.appID)
|
||||||
val := ak.cache.Get(accessTokenCacheKey)
|
|
||||||
if accessToken = val.(string); accessToken != "" {
|
if val := ak.cache.Get(accessTokenCacheKey); val != nil {
|
||||||
return
|
if accessToken = val.(string); accessToken != "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 加上lock,是为了防止在并发获取token时,cache刚好失效,导致从微信服务器上获取到不同token
|
// 加上lock,是为了防止在并发获取token时,cache刚好失效,导致从微信服务器上获取到不同token
|
||||||
@@ -76,9 +78,10 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
|
|||||||
defer ak.accessTokenLock.Unlock()
|
defer ak.accessTokenLock.Unlock()
|
||||||
|
|
||||||
// 双检,防止重复从微信服务器获取
|
// 双检,防止重复从微信服务器获取
|
||||||
val = ak.cache.Get(accessTokenCacheKey)
|
if val := ak.cache.Get(accessTokenCacheKey); val != nil {
|
||||||
if accessToken = val.(string); accessToken != "" {
|
if accessToken = val.(string); accessToken != "" {
|
||||||
return
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// cache失效,从微信服务器获取
|
// cache失效,从微信服务器获取
|
||||||
@@ -87,9 +90,9 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(resAccessToken.ExpiresIn-1500)*time.Second); err != nil {
|
expires := resAccessToken.ExpiresIn - 1500
|
||||||
return
|
err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
|
||||||
}
|
|
||||||
accessToken = resAccessToken.AccessToken
|
accessToken = resAccessToken.AccessToken
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -98,10 +101,11 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
|
|||||||
// 不强制更新access_token,可用于不同环境不同服务而不需要分布式锁以及公用缓存,避免access_token争抢
|
// 不强制更新access_token,可用于不同环境不同服务而不需要分布式锁以及公用缓存,避免access_token争抢
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getStableAccessToken.html
|
// https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getStableAccessToken.html
|
||||||
type StableAccessToken struct {
|
type StableAccessToken struct {
|
||||||
appID string
|
appID string
|
||||||
appSecret string
|
appSecret string
|
||||||
cacheKeyPrefix string
|
cacheKeyPrefix string
|
||||||
cache cache.Cache
|
cache cache.Cache
|
||||||
|
accessTokenLock *sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewStableAccessToken new StableAccessToken
|
// NewStableAccessToken new StableAccessToken
|
||||||
@@ -110,10 +114,11 @@ func NewStableAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.C
|
|||||||
panic("cache is need")
|
panic("cache is need")
|
||||||
}
|
}
|
||||||
return &StableAccessToken{
|
return &StableAccessToken{
|
||||||
appID: appID,
|
appID: appID,
|
||||||
appSecret: appSecret,
|
appSecret: appSecret,
|
||||||
cache: cache,
|
cache: cache,
|
||||||
cacheKeyPrefix: cacheKeyPrefix,
|
cacheKeyPrefix: cacheKeyPrefix,
|
||||||
|
accessTokenLock: new(sync.Mutex),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,7 +132,20 @@ func (ak *StableAccessToken) GetAccessTokenContext(ctx context.Context) (accessT
|
|||||||
// 先从cache中取
|
// 先从cache中取
|
||||||
accessTokenCacheKey := fmt.Sprintf("%s_stable_access_token_%s", ak.cacheKeyPrefix, ak.appID)
|
accessTokenCacheKey := fmt.Sprintf("%s_stable_access_token_%s", ak.cacheKeyPrefix, ak.appID)
|
||||||
if val := ak.cache.Get(accessTokenCacheKey); val != nil {
|
if val := ak.cache.Get(accessTokenCacheKey); val != nil {
|
||||||
return val.(string), nil
|
if accessToken = val.(string); accessToken != "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 加上lock,是为了防止在并发获取token时,cache刚好失效,导致从微信服务器上获取到不同token
|
||||||
|
ak.accessTokenLock.Lock()
|
||||||
|
defer ak.accessTokenLock.Unlock()
|
||||||
|
|
||||||
|
// 双检,防止重复从微信服务器获取
|
||||||
|
if val := ak.cache.Get(accessTokenCacheKey); val != nil {
|
||||||
|
if accessToken = val.(string); accessToken != "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// cache失效,从微信服务器获取
|
// cache失效,从微信服务器获取
|
||||||
@@ -138,7 +156,7 @@ func (ak *StableAccessToken) GetAccessTokenContext(ctx context.Context) (accessT
|
|||||||
}
|
}
|
||||||
|
|
||||||
expires := resAccessToken.ExpiresIn - 300
|
expires := resAccessToken.ExpiresIn - 300
|
||||||
_ = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
|
err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
|
||||||
|
|
||||||
accessToken = resAccessToken.AccessToken
|
accessToken = resAccessToken.AccessToken
|
||||||
return
|
return
|
||||||
@@ -171,19 +189,27 @@ func (ak *StableAccessToken) GetAccessTokenDirectly(ctx context.Context, forceRe
|
|||||||
type WorkAccessToken struct {
|
type WorkAccessToken struct {
|
||||||
CorpID string
|
CorpID string
|
||||||
CorpSecret string
|
CorpSecret string
|
||||||
|
AgentID string // 可选,用于区分不同应用
|
||||||
cacheKeyPrefix string
|
cacheKeyPrefix string
|
||||||
cache cache.Cache
|
cache cache.Cache
|
||||||
accessTokenLock *sync.Mutex
|
accessTokenLock *sync.Mutex
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewWorkAccessToken new WorkAccessToken
|
// NewWorkAccessToken new WorkAccessToken (保持向后兼容)
|
||||||
func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
|
func NewWorkAccessToken(corpID, corpSecret, agentID, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
|
||||||
|
// 调用新方法,保持兼容性
|
||||||
|
return NewWorkAccessTokenWithAgentID(corpID, corpSecret, agentID, cacheKeyPrefix, cache)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewWorkAccessTokenWithAgentID new WorkAccessToken with agentID
|
||||||
|
func NewWorkAccessTokenWithAgentID(corpID, corpSecret, agentID, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
|
||||||
if cache == nil {
|
if cache == nil {
|
||||||
panic("cache the not exist")
|
panic("cache is needed")
|
||||||
}
|
}
|
||||||
return &WorkAccessToken{
|
return &WorkAccessToken{
|
||||||
CorpID: corpID,
|
CorpID: corpID,
|
||||||
CorpSecret: corpSecret,
|
CorpSecret: corpSecret,
|
||||||
|
AgentID: agentID,
|
||||||
cache: cache,
|
cache: cache,
|
||||||
cacheKeyPrefix: cacheKeyPrefix,
|
cacheKeyPrefix: cacheKeyPrefix,
|
||||||
accessTokenLock: new(sync.Mutex),
|
accessTokenLock: new(sync.Mutex),
|
||||||
@@ -200,7 +226,18 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
|
|||||||
// 加上lock,是为了防止在并发获取token时,cache刚好失效,导致从微信服务器上获取到不同token
|
// 加上lock,是为了防止在并发获取token时,cache刚好失效,导致从微信服务器上获取到不同token
|
||||||
ak.accessTokenLock.Lock()
|
ak.accessTokenLock.Lock()
|
||||||
defer ak.accessTokenLock.Unlock()
|
defer ak.accessTokenLock.Unlock()
|
||||||
accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
|
|
||||||
|
// 构建缓存key
|
||||||
|
var accessTokenCacheKey string
|
||||||
|
|
||||||
|
if ak.AgentID != "" {
|
||||||
|
// 如果设置了AgentID,使用新的key格式
|
||||||
|
accessTokenCacheKey = fmt.Sprintf("%s_access_token_%s_%s", ak.cacheKeyPrefix, ak.CorpID, ak.AgentID)
|
||||||
|
} else {
|
||||||
|
// 兼容历史版本的key格式
|
||||||
|
accessTokenCacheKey = fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
|
||||||
|
}
|
||||||
|
|
||||||
val := ak.cache.Get(accessTokenCacheKey)
|
val := ak.cache.Get(accessTokenCacheKey)
|
||||||
if val != nil {
|
if val != nil {
|
||||||
accessToken = val.(string)
|
accessToken = val.(string)
|
||||||
@@ -219,6 +256,7 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
accessToken = resAccessToken.AccessToken
|
accessToken = resAccessToken.AccessToken
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package credential
|
package credential
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
context2 "context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -42,10 +43,22 @@ type ResTicket struct {
|
|||||||
|
|
||||||
// GetTicket 获取jsapi_ticket
|
// GetTicket 获取jsapi_ticket
|
||||||
func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err error) {
|
func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err error) {
|
||||||
|
return js.GetTicketContext(context2.Background(), accessToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTicketFromServer 从服务器中获取ticket
|
||||||
|
func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
|
||||||
|
return GetTicketFromServerContext(context2.Background(), accessToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTicketContext 获取jsapi_ticket
|
||||||
|
func (js *DefaultJsTicket) GetTicketContext(ctx context2.Context, accessToken string) (ticketStr string, err error) {
|
||||||
// 先从cache中取
|
// 先从cache中取
|
||||||
jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", js.cacheKeyPrefix, js.appID)
|
jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", js.cacheKeyPrefix, js.appID)
|
||||||
if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
|
if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
|
||||||
return val.(string), nil
|
if ticketStr = val.(string); ticketStr != "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
js.jsAPITicketLock.Lock()
|
js.jsAPITicketLock.Lock()
|
||||||
@@ -53,11 +66,13 @@ func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err
|
|||||||
|
|
||||||
// 双检,防止重复从微信服务器获取
|
// 双检,防止重复从微信服务器获取
|
||||||
if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
|
if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
|
||||||
return val.(string), nil
|
if ticketStr = val.(string); ticketStr != "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var ticket ResTicket
|
var ticket ResTicket
|
||||||
ticket, err = GetTicketFromServer(accessToken)
|
ticket, err = GetTicketFromServerContext(ctx, accessToken)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -67,11 +82,11 @@ func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetTicketFromServer 从服务器中获取ticket
|
// GetTicketFromServerContext 从服务器中获取ticket
|
||||||
func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
|
func GetTicketFromServerContext(ctx context2.Context, accessToken string) (ticket ResTicket, err error) {
|
||||||
var response []byte
|
var response []byte
|
||||||
url := fmt.Sprintf(getTicketURL, accessToken)
|
url := fmt.Sprintf(getTicketURL, accessToken)
|
||||||
response, err = util.HTTPGet(url)
|
response, err = util.HTTPGetContext(ctx, url)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package credential
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"gopkg.in/h2non/gock.v1"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestGetTicketFromServerContext 测试 GetTicketFromServerContext 函数
|
||||||
|
func TestGetTicketFromServerContext(t *testing.T) {
|
||||||
|
defer gock.Off()
|
||||||
|
gock.New(fmt.Sprintf(getTicketURL, "arg-ak")).Reply(200).JSON(&ResTicket{Ticket: "mock-ticket", ExpiresIn: 10})
|
||||||
|
|
||||||
|
ticket, err := GetTicketFromServerContext(context.Background(), "arg-ak")
|
||||||
|
assert.Nil(t, err)
|
||||||
|
assert.Equal(t, int64(0), ticket.ErrCode)
|
||||||
|
assert.Equal(t, "mock-ticket", ticket.Ticket, "they should be equal")
|
||||||
|
assert.Equal(t, int64(10), ticket.ExpiresIn, "they should be equal")
|
||||||
|
}
|
||||||
@@ -1,7 +1,15 @@
|
|||||||
package credential
|
package credential
|
||||||
|
|
||||||
|
import context2 "context"
|
||||||
|
|
||||||
// JsTicketHandle js ticket获取
|
// JsTicketHandle js ticket获取
|
||||||
type JsTicketHandle interface {
|
type JsTicketHandle interface {
|
||||||
// GetTicket 获取ticket
|
// GetTicket 获取ticket
|
||||||
GetTicket(accessToken string) (ticket string, err error)
|
GetTicket(accessToken string) (ticket string, err error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// JsTicketContextHandle js ticket获取
|
||||||
|
type JsTicketContextHandle interface {
|
||||||
|
JsTicketHandle
|
||||||
|
GetTicketContext(ctx context2.Context, accessToken string) (ticket string, err error)
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
package credential
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/cache"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TicketType ticket类型
|
||||||
|
type TicketType int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// TicketTypeCorpJs 企业jsapi ticket
|
||||||
|
TicketTypeCorpJs TicketType = iota
|
||||||
|
// TicketTypeAgentJs 应用jsapi ticket
|
||||||
|
TicketTypeAgentJs
|
||||||
|
)
|
||||||
|
|
||||||
|
// 企业微信相关的 ticket URL
|
||||||
|
const (
|
||||||
|
// 企业微信 jsapi ticket
|
||||||
|
getWorkJsTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=%s"
|
||||||
|
// 企业微信应用 jsapi ticket
|
||||||
|
getWorkAgentJsTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/ticket/get?access_token=%s&type=agent_config"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WorkJsTicket 企业微信js ticket获取
|
||||||
|
type WorkJsTicket struct {
|
||||||
|
corpID string
|
||||||
|
agentID string
|
||||||
|
cacheKeyPrefix string
|
||||||
|
cache cache.Cache
|
||||||
|
jsAPITicketLock *sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewWorkJsTicket new WorkJsTicket
|
||||||
|
func NewWorkJsTicket(corpID, agentID, cacheKeyPrefix string, cache cache.Cache) *WorkJsTicket {
|
||||||
|
return &WorkJsTicket{
|
||||||
|
corpID: corpID,
|
||||||
|
agentID: agentID,
|
||||||
|
cache: cache,
|
||||||
|
cacheKeyPrefix: cacheKeyPrefix,
|
||||||
|
jsAPITicketLock: new(sync.Mutex),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTicket 根据类型获取相应的jsapi_ticket
|
||||||
|
func (js *WorkJsTicket) GetTicket(accessToken string, ticketType TicketType) (ticketStr string, err error) {
|
||||||
|
var cacheKey string
|
||||||
|
switch ticketType {
|
||||||
|
case TicketTypeCorpJs:
|
||||||
|
cacheKey = fmt.Sprintf("%s_corp_jsapi_ticket_%s", js.cacheKeyPrefix, js.corpID)
|
||||||
|
case TicketTypeAgentJs:
|
||||||
|
if js.agentID == "" {
|
||||||
|
err = fmt.Errorf("agentID is empty")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
cacheKey = fmt.Sprintf("%s_agent_jsapi_ticket_%s_%s", js.cacheKeyPrefix, js.corpID, js.agentID)
|
||||||
|
default:
|
||||||
|
err = fmt.Errorf("unsupported ticket type: %v", ticketType)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if val := js.cache.Get(cacheKey); val != nil {
|
||||||
|
return val.(string), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
js.jsAPITicketLock.Lock()
|
||||||
|
defer js.jsAPITicketLock.Unlock()
|
||||||
|
|
||||||
|
// 双检,防止重复从微信服务器获取
|
||||||
|
if val := js.cache.Get(cacheKey); val != nil {
|
||||||
|
return val.(string), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var ticket ResTicket
|
||||||
|
ticket, err = js.getTicketFromServer(accessToken, ticketType)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
expires := ticket.ExpiresIn - 1500
|
||||||
|
err = js.cache.Set(cacheKey, ticket.Ticket, time.Duration(expires)*time.Second)
|
||||||
|
ticketStr = ticket.Ticket
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// getTicketFromServer 从服务器中获取ticket
|
||||||
|
func (js *WorkJsTicket) getTicketFromServer(accessToken string, ticketType TicketType) (ticket ResTicket, err error) {
|
||||||
|
var url string
|
||||||
|
switch ticketType {
|
||||||
|
case TicketTypeCorpJs:
|
||||||
|
url = fmt.Sprintf(getWorkJsTicketURL, accessToken)
|
||||||
|
case TicketTypeAgentJs:
|
||||||
|
url = fmt.Sprintf(getWorkAgentJsTicketURL, accessToken)
|
||||||
|
default:
|
||||||
|
err = fmt.Errorf("unsupported ticket type: %v", ticketType)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
response, err = util.HTTPGet(url)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = json.Unmarshal(response, &ticket)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ticket.ErrCode != 0 {
|
||||||
|
err = fmt.Errorf("getTicket Error : errcode=%d , errmsg=%s", ticket.ErrCode, ticket.ErrMsg)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
+10
-1
@@ -1,3 +1,12 @@
|
|||||||
# 智能对话
|
# 智能对话
|
||||||
|
|
||||||
TODO
|
## 接入智能对话
|
||||||
|
|
||||||
|
- 获取 Accesstoken:`POST /v2/token`
|
||||||
|
- 简单问答导入:`POST /v2/bot/import/json`
|
||||||
|
- 异步任务查询:`POST /v2/async/fetch`
|
||||||
|
- 发布机器人:`POST /v2/bot/publish`
|
||||||
|
- 查询机器人发布进度:`POST /v2/bot/effective_progress`
|
||||||
|
- 调用智能对话:`POST /v2/bot/query`
|
||||||
|
|
||||||
|
官方文档:https://developers.weixin.qq.com/doc/aispeech/confapi/dialog/token.html
|
||||||
@@ -90,10 +90,12 @@ host: https://qyapi.weixin.qq.com/
|
|||||||
| 名称 | 请求方式 | URL | 是否已实现 | 使用方法 | 贡献者 |
|
| 名称 | 请求方式 | URL | 是否已实现 | 使用方法 | 贡献者 |
|
||||||
|:---------:|------|:----------------------------------------| ---------- | ------------------------------- |----------|
|
|:---------:|------|:----------------------------------------| ---------- | ------------------------------- |----------|
|
||||||
| 获取子部门ID列表 | GET | /cgi-bin/department/simplelist | YES | (r *Client) DepartmentSimpleList| MARKWANG |
|
| 获取子部门ID列表 | GET | /cgi-bin/department/simplelist | YES | (r *Client) DepartmentSimpleList| MARKWANG |
|
||||||
|
| 获取部门列表 | GET | /cgi-bin/department/list | YES | (r *Client) DepartmentList| just5325, ourines |
|
||||||
| 获取部门成员 | GET | /cgi-bin/user/simplelist | YES | (r *Client) UserSimpleList | MARKWANG |
|
| 获取部门成员 | GET | /cgi-bin/user/simplelist | YES | (r *Client) UserSimpleList | MARKWANG |
|
||||||
| 获取成员ID列表 | Post | /cgi-bin/user/list_id | YES | (r *Client) UserListId | MARKWANG |
|
| 获取成员ID列表 | Post | /cgi-bin/user/list_id | YES | (r *Client) UserListId | MARKWANG |
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## 素材管理
|
## 素材管理
|
||||||
[官方文档](https://developer.work.weixin.qq.com/document/path/91054)
|
[官方文档](https://developer.work.weixin.qq.com/document/path/91054)
|
||||||
|
|
||||||
@@ -116,5 +118,14 @@ host: https://qyapi.weixin.qq.com/
|
|||||||
| ---------------- | -------- | --------------------- | ---------- | -------------------------- | -------- |
|
| ---------------- | -------- | --------------------- | ---------- | -------------------------- | -------- |
|
||||||
| 群机器人发送消息 | POST | /cgi-bin/webhook/send | YES | (r *Client) RobotBroadcast | chcthink |
|
| 群机器人发送消息 | POST | /cgi-bin/webhook/send | YES | (r *Client) RobotBroadcast | chcthink |
|
||||||
|
|
||||||
|
## 打卡
|
||||||
|
|
||||||
|
[官方文档](https://developer.work.weixin.qq.com/document/path/96497)
|
||||||
|
|
||||||
|
| 名称 | 请求方式 | URL | 是否已实现 | 使用方法 | 贡献者 |
|
||||||
|
|----------| -------- | --------------------- | ---------- | -------------------------- |---------|
|
||||||
|
| 获取打卡日报数据 | POST | /cgi-bin/checkin/getcheckin_daydata | YES | (r *Client) GetDayData | Thinker |
|
||||||
|
| 获取打卡月报数据 | POST | /cgi-bin/checkin/getcheckin_monthdata | YES | (r *Client) GetMonthData | Thinker |
|
||||||
|
|
||||||
## 应用管理
|
## 应用管理
|
||||||
TODO
|
TODO
|
||||||
+10
-10
@@ -2,12 +2,12 @@ package openapi
|
|||||||
|
|
||||||
import "github.com/silenceper/wechat/v2/util"
|
import "github.com/silenceper/wechat/v2/util"
|
||||||
|
|
||||||
// GetAPIQuotaParams 查询API调用额度参数
|
// GetAPIQuotaParams 查询 API 调用额度参数
|
||||||
type GetAPIQuotaParams struct {
|
type GetAPIQuotaParams struct {
|
||||||
CgiPath string `json:"cgi_path"` // api的请求地址,例如"/cgi-bin/message/custom/send";不要前缀“https://api.weixin.qq.com” ,也不要漏了"/",否则都会76003的报错
|
CgiPath string `json:"cgi_path"` // api 的请求地址,例如"/cgi-bin/message/custom/send";不要前缀“https://api.weixin.qq.com” ,也不要漏了"/",否则都会 76003 的报错
|
||||||
}
|
}
|
||||||
|
|
||||||
// APIQuota API调用额度
|
// APIQuota API 调用额度
|
||||||
type APIQuota struct {
|
type APIQuota struct {
|
||||||
util.CommonError
|
util.CommonError
|
||||||
Quota struct {
|
Quota struct {
|
||||||
@@ -17,20 +17,20 @@ type APIQuota struct {
|
|||||||
} `json:"quota"` // 详情
|
} `json:"quota"` // 详情
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRidInfoParams 查询rid信息参数
|
// GetRidInfoParams 查询 rid 信息参数
|
||||||
type GetRidInfoParams struct {
|
type GetRidInfoParams struct {
|
||||||
Rid string `json:"rid"` // 调用接口报错返回的rid
|
Rid string `json:"rid"` // 调用接口报错返回的 rid
|
||||||
}
|
}
|
||||||
|
|
||||||
// RidInfo rid信息
|
// RidInfo rid 信息
|
||||||
type RidInfo struct {
|
type RidInfo struct {
|
||||||
util.CommonError
|
util.CommonError
|
||||||
Request struct {
|
Request struct {
|
||||||
InvokeTime int64 `json:"invoke_time"` // 发起请求的时间戳
|
InvokeTime int64 `json:"invoke_time"` // 发起请求的时间戳
|
||||||
CostInMs int64 `json:"cost_in_ms"` // 请求毫秒级耗时
|
CostInMs int64 `json:"cost_in_ms"` // 请求毫秒级耗时
|
||||||
RequestURL string `json:"request_url"` // 请求的URL参数
|
RequestURL string `json:"request_url"` // 请求的 URL 参数
|
||||||
RequestBody string `json:"request_body"` // post请求的请求参数
|
RequestBody string `json:"request_body"` // post 请求的请求参数
|
||||||
ResponseBody string `json:"response_body"` // 接口请求返回参数
|
ResponseBody string `json:"response_body"` // 接口请求返回参数
|
||||||
ClientIP string `json:"client_ip"` // 接口请求的客户端ip
|
ClientIP string `json:"client_ip"` // 接口请求的客户端 ip
|
||||||
} `json:"request"` // 该rid对应的请求详情
|
} `json:"request"` // 该 rid 对应的请求详情
|
||||||
}
|
}
|
||||||
@@ -30,6 +30,8 @@ const (
|
|||||||
getAnalysisVisitDistributionURL = "https://api.weixin.qq.com/datacube/getweanalysisappidvisitdistribution?access_token=%s"
|
getAnalysisVisitDistributionURL = "https://api.weixin.qq.com/datacube/getweanalysisappidvisitdistribution?access_token=%s"
|
||||||
// 访问页面
|
// 访问页面
|
||||||
getAnalysisVisitPageURL = "https://api.weixin.qq.com/datacube/getweanalysisappidvisitpage?access_token=%s"
|
getAnalysisVisitPageURL = "https://api.weixin.qq.com/datacube/getweanalysisappidvisitpage?access_token=%s"
|
||||||
|
// 获取小程序性能数据
|
||||||
|
getPerformanceDataURL = "https://api.weixin.qq.com/wxa/business/performance/boot?access_token=%s"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Analysis analyis 数据分析
|
// Analysis analyis 数据分析
|
||||||
@@ -315,3 +317,67 @@ func (analysis *Analysis) GetAnalysisVisitPage(beginDate, endDate string) (resul
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetPerformanceDataRequest 获取小程序性能数据请求
|
||||||
|
type GetPerformanceDataRequest struct {
|
||||||
|
Module string `json:"module"`
|
||||||
|
Time PerformanceDataTime `json:"time"`
|
||||||
|
Params []PerformanceDataParams `json:"params"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PerformanceDataTime 获取小程序性能数据开始和结束日期
|
||||||
|
type PerformanceDataTime struct {
|
||||||
|
BeginTimestamp int64 `json:"begin_timestamp"`
|
||||||
|
EndTimestamp int64 `json:"end_timestamp"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PerformanceDataParams 获取小程序性能数据查询条件
|
||||||
|
type PerformanceDataParams struct {
|
||||||
|
Field string `json:"field"`
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPerformanceDataResponse 获取小程序性能数据响应
|
||||||
|
type GetPerformanceDataResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Body PerformanceDataBody `json:"body"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PerformanceDataBody 性能数据
|
||||||
|
type PerformanceDataBody struct {
|
||||||
|
Tables []PerformanceDataTable `json:"tables"`
|
||||||
|
Count int64 `json:"count"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PerformanceDataTable 数据数组
|
||||||
|
type PerformanceDataTable struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Lines []PerformanceDataTableLine `json:"lines"`
|
||||||
|
Zh string `json:"zh"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PerformanceDataTableLine 按时间排列的性能数据
|
||||||
|
type PerformanceDataTableLine struct {
|
||||||
|
Fields []PerformanceDataTableLineField `json:"fields"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PerformanceDataTableLineField 单天的性能数据
|
||||||
|
type PerformanceDataTableLineField struct {
|
||||||
|
RefDate string `json:"refdate"`
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPerformanceData 获取小程序性能数据
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/data-analysis/others/getPerformanceData.html
|
||||||
|
func (analysis *Analysis) GetPerformanceData(req *GetPerformanceDataRequest) (res GetPerformanceDataResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = analysis.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getPerformanceDataURL, accessToken), req); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetPerformanceData")
|
||||||
|
return
|
||||||
|
}
|
||||||
+167
-10
@@ -10,11 +10,22 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
// code2SessionURL 小程序登录
|
||||||
code2SessionURL = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code"
|
code2SessionURL = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code"
|
||||||
|
// checkEncryptedDataURL 检查加密信息
|
||||||
checkEncryptedDataURL = "https://api.weixin.qq.com/wxa/business/checkencryptedmsg?access_token=%s"
|
checkEncryptedDataURL = "https://api.weixin.qq.com/wxa/business/checkencryptedmsg?access_token=%s"
|
||||||
|
// getPhoneNumber 获取手机号
|
||||||
getPhoneNumber = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"
|
getPhoneNumber = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"
|
||||||
|
// checkSessionURL 检验登录态
|
||||||
|
checkSessionURL = "https://api.weixin.qq.com/wxa/checksession?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
|
||||||
|
// resetUserSessionKeyURL 重置登录态
|
||||||
|
resetUserSessionKeyURL = "https://api.weixin.qq.com/wxa/resetusersessionkey?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
|
||||||
|
// getPluginOpenPIDURL 获取插件用户openPID
|
||||||
|
getPluginOpenPIDURL = "https://api.weixin.qq.com/wxa/getpluginopenpid?access_token=%s"
|
||||||
|
// getPaidUnionIDURL 支付后获取 UnionID
|
||||||
|
getPaidUnionIDURL = "https://api.weixin.qq.com/wxa/getpaidunionid"
|
||||||
|
// getUserEncryptKeyURL 获取用户encryptKey
|
||||||
|
getUserEncryptKeyURL = "https://api.weixin.qq.com/wxa/business/getuserencryptkey?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Auth 登录/用户信息
|
// Auth 登录/用户信息
|
||||||
@@ -65,9 +76,45 @@ func (auth *Auth) Code2SessionContext(ctx context2.Context, jsCode string) (resu
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type (
|
||||||
|
// GetPaidUnionIDRequest 支付后获取UnionID请求
|
||||||
|
GetPaidUnionIDRequest struct {
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
TransactionID string `json:"transaction_id,omitempty"`
|
||||||
|
MchID string `json:"mch_id,omitempty"`
|
||||||
|
OutTradeNo string `json:"out_trade_no,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPaidUnionIDResponse 支付后获取UnionID响应
|
||||||
|
GetPaidUnionIDResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
UnionID string `json:"unionid"`
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
// GetPaidUnionID 用户支付完成后,获取该用户的 UnionId,无需用户授权
|
// GetPaidUnionID 用户支付完成后,获取该用户的 UnionId,无需用户授权
|
||||||
func (auth *Auth) GetPaidUnionID() {
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/basic-info/getPaidUnionid.html
|
||||||
// TODO
|
func (auth *Auth) GetPaidUnionID(req *GetPaidUnionIDRequest) (string, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = auth.GetAccessToken(); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
var url string
|
||||||
|
if req.TransactionID != "" {
|
||||||
|
url = fmt.Sprintf("%s?access_token=%s&openid=%s&transaction_id=%s", getPaidUnionIDURL, accessToken, req.OpenID, req.TransactionID)
|
||||||
|
} else {
|
||||||
|
url = fmt.Sprintf("%s?access_token=%s&openid=%s&mch_id=%s&out_trade_no=%s", getPaidUnionIDURL, accessToken, req.OpenID, req.MchID, req.OutTradeNo)
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(url); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
result := &GetPaidUnionIDResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetPaidUnionID")
|
||||||
|
return result.UnionID, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// CheckEncryptedData .检查加密信息是否由微信生成(当前只支持手机号加密数据),只能检测最近3天生成的加密数据
|
// CheckEncryptedData .检查加密信息是否由微信生成(当前只支持手机号加密数据),只能检测最近3天生成的加密数据
|
||||||
@@ -81,7 +128,7 @@ func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHa
|
|||||||
var (
|
var (
|
||||||
at string
|
at string
|
||||||
)
|
)
|
||||||
if at, err = auth.GetAccessToken(); err != nil {
|
if at, err = auth.GetAccessTokenContext(ctx); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,7 +167,7 @@ func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*Get
|
|||||||
at string
|
at string
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
if at, err = auth.GetAccessToken(); err != nil {
|
if at, err = auth.GetAccessTokenContext(ctx); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
body := map[string]interface{}{
|
body := map[string]interface{}{
|
||||||
@@ -138,13 +185,123 @@ func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*Get
|
|||||||
}
|
}
|
||||||
|
|
||||||
var result GetPhoneNumberResponse
|
var result GetPhoneNumberResponse
|
||||||
if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil {
|
err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber")
|
||||||
return nil, err
|
return &result, err
|
||||||
}
|
|
||||||
return &result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetPhoneNumber 小程序通过code获取用户手机号
|
// GetPhoneNumber 小程序通过code获取用户手机号
|
||||||
func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
|
func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
|
||||||
return auth.GetPhoneNumberContext(context2.Background(), code)
|
return auth.GetPhoneNumberContext(context2.Background(), code)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CheckSession 检验登录态
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/checkSessionKey.html
|
||||||
|
func (auth *Auth) CheckSession(signature, openID string) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = auth.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(checkSessionURL, accessToken, signature, openID)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "CheckSession")
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResetUserSessionKeyResponse 重置登录态响应
|
||||||
|
type ResetUserSessionKeyResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
SessionKey string `json:"session_key"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResetUserSessionKey 重置登录态
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/ResetUserSessionKey.html
|
||||||
|
func (auth *Auth) ResetUserSessionKey(signature, openID string) (*ResetUserSessionKeyResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = auth.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(resetUserSessionKeyURL, accessToken, signature, openID)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &ResetUserSessionKeyResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "ResetUserSessionKey")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
type (
|
||||||
|
// GetPluginOpenPIDRequest 获取插件用户openPID请求
|
||||||
|
GetPluginOpenPIDRequest struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPluginOpenPIDResponse 获取插件用户openPID响应
|
||||||
|
GetPluginOpenPIDResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
OpenPID string `json:"openpid"`
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetPluginOpenPID 获取插件用户openPID
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/basic-info/getPluginOpenPId.html
|
||||||
|
func (auth *Auth) GetPluginOpenPID(code string) (string, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = auth.GetAccessToken(); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
req := &GetPluginOpenPIDRequest{
|
||||||
|
Code: code,
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getPluginOpenPIDURL, accessToken), req); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
result := &GetPluginOpenPIDResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetPluginOpenPID")
|
||||||
|
return result.OpenPID, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserEncryptKeyResponse 获取用户encryptKey响应
|
||||||
|
type GetUserEncryptKeyResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
KeyInfoList []KeyInfo `json:"key_info_list"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeyInfo 用户最近三次的加密key
|
||||||
|
type KeyInfo struct {
|
||||||
|
EncryptKey string `json:"encrypt_key"`
|
||||||
|
Version int64 `json:"version"`
|
||||||
|
ExpireIn int64 `json:"expire_in"`
|
||||||
|
Iv string `json:"iv"`
|
||||||
|
CreateTime int64 `json:"create_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserEncryptKey 获取用户encryptKey
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/internet/getUserEncryptKey.html
|
||||||
|
func (auth *Auth) GetUserEncryptKey(signature, openID string) (*GetUserEncryptKeyResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = auth.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(getUserEncryptKeyURL, accessToken, signature, openID)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetUserEncryptKeyResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetUserEncryptKey")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package business
|
package business
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/util"
|
"github.com/silenceper/wechat/v2/util"
|
||||||
@@ -28,13 +29,18 @@ type PhoneInfo struct {
|
|||||||
|
|
||||||
// GetPhoneNumber code换取用户手机号。 每个code只能使用一次,code的有效期为5min
|
// GetPhoneNumber code换取用户手机号。 每个code只能使用一次,code的有效期为5min
|
||||||
func (business *Business) GetPhoneNumber(in *GetPhoneNumberRequest) (info PhoneInfo, err error) {
|
func (business *Business) GetPhoneNumber(in *GetPhoneNumberRequest) (info PhoneInfo, err error) {
|
||||||
accessToken, err := business.GetAccessToken()
|
return business.GetPhoneNumberWithContext(context.Background(), in)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPhoneNumberWithContext 利用context将code换取用户手机号。 每个code只能使用一次,code的有效期为5min
|
||||||
|
func (business *Business) GetPhoneNumberWithContext(ctx context.Context, in *GetPhoneNumberRequest) (info PhoneInfo, err error) {
|
||||||
|
accessToken, err := business.GetAccessTokenContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
uri := fmt.Sprintf(getPhoneNumberURL, accessToken)
|
uri := fmt.Sprintf(getPhoneNumberURL, accessToken)
|
||||||
response, err := util.PostJSON(uri, in)
|
response, err := util.PostJSONContext(ctx, uri, in)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -45,10 +51,5 @@ func (business *Business) GetPhoneNumber(in *GetPhoneNumberRequest) (info PhoneI
|
|||||||
PhoneInfo PhoneInfo `json:"phone_info"`
|
PhoneInfo PhoneInfo `json:"phone_info"`
|
||||||
}
|
}
|
||||||
err = util.DecodeWithError(response, &resp, "business.GetPhoneNumber")
|
err = util.DecodeWithError(response, &resp, "business.GetPhoneNumber")
|
||||||
if nil != err {
|
return resp.PhoneInfo, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
info = resp.PhoneInfo
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
@@ -14,4 +14,5 @@ type Config struct {
|
|||||||
Token string `json:"token"` // token
|
Token string `json:"token"` // token
|
||||||
EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
|
EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
|
||||||
Cache cache.Cache
|
Cache cache.Cache
|
||||||
|
UseStableAK bool // use the stable access_token
|
||||||
}
|
}
|
||||||
@@ -8,5 +8,5 @@ import (
|
|||||||
// Context struct
|
// Context struct
|
||||||
type Context struct {
|
type Context struct {
|
||||||
*config.Config
|
*config.Config
|
||||||
credential.AccessTokenHandle
|
credential.AccessTokenContextHandle
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,295 @@
|
|||||||
|
package express
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// 传运单接口,商户使用此接口向微信提供某交易单号对应的运单号。微信后台会跟踪运单的状态变化
|
||||||
|
openMsgTraceWaybillURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/trace_waybill?access_token=%s"
|
||||||
|
|
||||||
|
// 查询运单接口,商户在调用完trace_waybill接口后,可以使用本接口查询到对应运单的详情信息
|
||||||
|
openMsgQueryTraceURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/query_trace?access_token=%s"
|
||||||
|
|
||||||
|
// 更新物流信息,更新物品信息
|
||||||
|
openMsgUpdateWaybillGoodsURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/update_waybill_goods?access_token=%s"
|
||||||
|
|
||||||
|
// 传运单接口,商户使用此接口向微信提供某交易单号对应的运单号。微信后台会跟踪运单的状态变化,在关键物流节点给下单用户推送消息通知
|
||||||
|
openMsgFollowWaybillURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/follow_waybill?access_token=%s"
|
||||||
|
|
||||||
|
// 查运单接口,商户在调用完follow_waybill接口后,可以使用本接口查询到对应运单的详情信息
|
||||||
|
openMsgQueryFollowTraceURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/query_follow_trace?access_token=%s"
|
||||||
|
|
||||||
|
// 更新物品信息接口
|
||||||
|
openMsgUpdateFollowWaybillGoodsURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/update_follow_waybill_goods?access_token=%s"
|
||||||
|
|
||||||
|
// 获取运力id列表
|
||||||
|
openMsgGetDeliveryListURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/get_delivery_list?access_token=%s"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TraceWaybill 传运单
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_search.html#_2-%E6%8E%A5%E5%8F%A3%E5%88%97%E8%A1%A8
|
||||||
|
func (express *Express) TraceWaybill(ctx context.Context, in *TraceWaybillRequest) (res TraceWaybillResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(openMsgTraceWaybillURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, in)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &res, "TraceWaybill")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryTrace 查询运单详情信息
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_search.html#_2-%E6%8E%A5%E5%8F%A3%E5%88%97%E8%A1%A8
|
||||||
|
func (express *Express) QueryTrace(ctx context.Context, in *QueryTraceRequest) (res QueryTraceResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(openMsgQueryTraceURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, in)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &res, "QueryTrace")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateWaybillGoods 更新物品信息
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_search.html#_2-%E6%8E%A5%E5%8F%A3%E5%88%97%E8%A1%A8
|
||||||
|
func (express *Express) UpdateWaybillGoods(ctx context.Context, in *UpdateWaybillGoodsRequest) (err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(openMsgUpdateWaybillGoodsURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, in)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithCommonError(response, "UpdateWaybillGoods")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// FollowWaybill 传运单
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_open_msg.html#_4-1%E3%80%81%E4%BC%A0%E8%BF%90%E5%8D%95%E6%8E%A5%E5%8F%A3-follow-waybill
|
||||||
|
func (express *Express) FollowWaybill(ctx context.Context, in *FollowWaybillRequest) (res FollowWaybillResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(openMsgFollowWaybillURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, in)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &res, "FollowWaybill")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryFollowTrace 查询运单详情信息
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_open_msg.html#_4-2%E3%80%81%E6%9F%A5%E8%BF%90%E5%8D%95%E6%8E%A5%E5%8F%A3-query-follow-trace
|
||||||
|
func (express *Express) QueryFollowTrace(ctx context.Context, in *QueryFollowTraceRequest) (res QueryFollowTraceResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(openMsgQueryFollowTraceURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, in)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &res, "QueryFollowTrace")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateFollowWaybillGoods 更新物品信息
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_open_msg.html#_4-3%E3%80%81%E6%9B%B4%E6%96%B0%E7%89%A9%E5%93%81%E4%BF%A1%E6%81%AF%E6%8E%A5%E5%8F%A3-update-follow-waybill-goods
|
||||||
|
func (express *Express) UpdateFollowWaybillGoods(ctx context.Context, in *UpdateFollowWaybillGoodsRequest) (err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(openMsgUpdateFollowWaybillGoodsURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, in)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithCommonError(response, "UpdateFollowWaybillGoods")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDeliveryList 获取运力id列表
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_open_msg.html#_4-4%E8%8E%B7%E5%8F%96%E8%BF%90%E5%8A%9Bid%E5%88%97%E8%A1%A8get-delivery-list
|
||||||
|
func (express *Express) GetDeliveryList(ctx context.Context) (res GetDeliveryListResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(openMsgGetDeliveryListURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, map[string]interface{}{})
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &res, "GetDeliveryList")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// TraceWaybillRequest 传运单接口请求参数
|
||||||
|
type TraceWaybillRequest struct {
|
||||||
|
GoodsInfo FollowWaybillGoodsInfo `json:"goods_info"` // 必选,商品信息
|
||||||
|
Openid string `json:"openid"` // 必选,用户openid
|
||||||
|
SenderPhone string `json:"sender_phone"` // 寄件人手机号
|
||||||
|
ReceiverPhone string `json:"receiver_phone"` // 必选,收件人手机号,部分运力需要用户手机号作为查单依据
|
||||||
|
DeliveryID string `json:"delivery_id"` // 运力id(运单号所属运力公司id)
|
||||||
|
WaybillID string `json:"waybill_id"` // 必选,运单号
|
||||||
|
TransID string `json:"trans_id"` // 必选,交易单号(微信支付生成的交易单号,一般以420开头)
|
||||||
|
OrderDetailPath string `json:"order_detail_path"` // 订单详情页地址
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// TraceWaybillResponse 传运单接口返回参数
|
||||||
|
type TraceWaybillResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WaybillToken string `json:"waybill_token"` // 查询id
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryTraceRequest 查询运单详情接口请求参数
|
||||||
|
type QueryTraceRequest struct {
|
||||||
|
WaybillToken string `json:"waybill_token"` // 必选,查询id
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryTraceResponse 查询运单详情接口返回参数
|
||||||
|
type QueryTraceResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WaybillInfo FlowWaybillInfo `json:"waybill_info"` // 运单信息
|
||||||
|
ShopInfo FollowWaybillShopInfo `json:"shop_info"` // 商品信息
|
||||||
|
DeliveryInfo FlowWaybillDeliveryInfo `json:"delivery_info"` // 运力信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateWaybillGoodsRequest 更新物品信息接口请求参数
|
||||||
|
type UpdateWaybillGoodsRequest struct {
|
||||||
|
WaybillToken string `json:"waybill_token"` // 必选,查询id
|
||||||
|
GoodsInfo FollowWaybillGoodsInfo `json:"goods_info"` // 必选,商品信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// FollowWaybillRequest 传运单接口请求参数
|
||||||
|
type FollowWaybillRequest struct {
|
||||||
|
GoodsInfo FollowWaybillGoodsInfo `json:"goods_info"` // 必选,商品信息
|
||||||
|
Openid string `json:"openid"` // 必选,用户openid
|
||||||
|
SenderPhone string `json:"sender_phone"` // 寄件人手机号
|
||||||
|
ReceiverPhone string `json:"receiver_phone"` // 必选,收件人手机号,部分运力需要用户手机号作为查单依据
|
||||||
|
DeliveryID string `json:"delivery_id"` // 运力id(运单号所属运力公司id)
|
||||||
|
WaybillID string `json:"waybill_id"` // 必选,运单号
|
||||||
|
TransID string `json:"trans_id"` // 必选,交易单号(微信支付生成的交易单号,一般以420开头)
|
||||||
|
OrderDetailPath string `json:"order_detail_path"` // 订单详情页地址
|
||||||
|
}
|
||||||
|
|
||||||
|
// FollowWaybillGoodsInfo 商品信息
|
||||||
|
type FollowWaybillGoodsInfo struct {
|
||||||
|
DetailList []FollowWaybillGoodsInfoItem `json:"detail_list"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// FollowWaybillShopInfo 商品信息
|
||||||
|
type FollowWaybillShopInfo struct {
|
||||||
|
GoodsInfo FollowWaybillGoodsInfo `json:"goods_info"` // 商品信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// FollowWaybillGoodsInfoItem 商品信息详情
|
||||||
|
type FollowWaybillGoodsInfoItem struct {
|
||||||
|
GoodsName string `json:"goods_name"` // 必选,商品名称(最大长度为utf-8编码下的60个字符)
|
||||||
|
GoodsImgURL string `json:"goods_img_url"` // 必选,商品图片url
|
||||||
|
GoodsDesc string `json:"goods_desc,omitempty"` // 商品详情描述,不传默认取“商品名称”值,最多40汉字
|
||||||
|
}
|
||||||
|
|
||||||
|
// FollowWaybillResponse 传运单接口返回参数
|
||||||
|
type FollowWaybillResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WaybillToken string `json:"waybill_token"` // 查询id
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryFollowTraceRequest 查询运单详情信息请求参数
|
||||||
|
type QueryFollowTraceRequest struct {
|
||||||
|
WaybillToken string `json:"waybill_token"` // 必选,查询id
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryFollowTraceResponse 查询运单详情信息返回参数
|
||||||
|
type QueryFollowTraceResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WaybillInfo FlowWaybillInfo `json:"waybill_info"` // 运单信息
|
||||||
|
ShopInfo FollowWaybillShopInfo `json:"shop_info"` // 商品信息
|
||||||
|
DeliveryInfo FlowWaybillDeliveryInfo `json:"delivery_info"` // 运力信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlowWaybillInfo 运单信息
|
||||||
|
type FlowWaybillInfo struct {
|
||||||
|
WaybillID string `json:"waybill_id"` // 运单号
|
||||||
|
Status WaybillStatus `json:"status"` // 运单状态
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateFollowWaybillGoodsRequest 修改运单商品信息请求参数
|
||||||
|
type UpdateFollowWaybillGoodsRequest struct {
|
||||||
|
WaybillToken string `json:"waybill_token"` // 必选,查询id
|
||||||
|
GoodsInfo FollowWaybillGoodsInfo `json:"goods_info"` // 必选,商品信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDeliveryListResponse 获取运力id列表返回参数
|
||||||
|
type GetDeliveryListResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
DeliveryList []FlowWaybillDeliveryInfo `json:"delivery_list"` // 运力公司列表
|
||||||
|
Count int `json:"count"` // 运力公司个数
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlowWaybillDeliveryInfo 运力公司信息
|
||||||
|
type FlowWaybillDeliveryInfo struct {
|
||||||
|
DeliveryID string `json:"delivery_id"` // 运力公司id
|
||||||
|
DeliveryName string `json:"delivery_name"` // 运力公司名称
|
||||||
|
}
|
||||||
|
|
||||||
|
// WaybillStatus 运单状态
|
||||||
|
type WaybillStatus int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// WaybillStatusNotExist 运单不存在或者未揽收
|
||||||
|
WaybillStatusNotExist WaybillStatus = iota
|
||||||
|
// WaybillStatusPicked 已揽件
|
||||||
|
WaybillStatusPicked
|
||||||
|
// WaybillStatusTransporting 运输中
|
||||||
|
WaybillStatusTransporting
|
||||||
|
// WaybillStatusDispatching 派件中
|
||||||
|
WaybillStatusDispatching
|
||||||
|
// WaybillStatusSigned 已签收
|
||||||
|
WaybillStatusSigned
|
||||||
|
// WaybillStatusException 异常
|
||||||
|
WaybillStatusException
|
||||||
|
// WaybillStatusSignedByOthers 代签收
|
||||||
|
WaybillStatusSignedByOthers
|
||||||
|
)
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package express
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Express 微信物流服务
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/introduction.html
|
||||||
|
type Express struct {
|
||||||
|
*context.Context
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewExpress init
|
||||||
|
func NewExpress(ctx *context.Context) *Express {
|
||||||
|
return &Express{ctx}
|
||||||
|
}
|
||||||
@@ -0,0 +1,618 @@
|
|||||||
|
package express
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
// 同城配送 API URL
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/intracity_service.html
|
||||||
|
const (
|
||||||
|
// 开通门店权限
|
||||||
|
intracityApplyURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/apply?access_token=%s"
|
||||||
|
// 创建门店
|
||||||
|
intracityCreateStoreURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/createstore?access_token=%s"
|
||||||
|
// 查询门店
|
||||||
|
intracityQueryStoreURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/querystore?access_token=%s"
|
||||||
|
// 更新门店
|
||||||
|
intracityUpdateStoreURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/updatestore?access_token=%s"
|
||||||
|
// 门店运费充值
|
||||||
|
intracityStoreChargeURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/storecharge?access_token=%s"
|
||||||
|
// 门店运费退款
|
||||||
|
intracityStoreRefundURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/storerefund?access_token=%s"
|
||||||
|
// 门店运费流水查询
|
||||||
|
intracityQueryFlowURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/queryflow?access_token=%s"
|
||||||
|
// 门店余额查询
|
||||||
|
intracityBalanceQueryURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/balancequery?access_token=%s"
|
||||||
|
// 预下配送单(查询运费)
|
||||||
|
intracityPreAddOrderURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/preaddorder?access_token=%s"
|
||||||
|
// 创建配送单
|
||||||
|
intracityAddOrderURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/addorder?access_token=%s"
|
||||||
|
// 查询配送单
|
||||||
|
intracityQueryOrderURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/queryorder?access_token=%s"
|
||||||
|
// 取消配送单
|
||||||
|
intracityCancelOrderURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/cancelorder?access_token=%s"
|
||||||
|
// 模拟配送回调(仅用于测试)
|
||||||
|
intracityMockNotifyURL = "https://api.weixin.qq.com/cgi-bin/express/intracity/mocknotify?access_token=%s"
|
||||||
|
)
|
||||||
|
|
||||||
|
// PayMode 充值/扣费主体
|
||||||
|
type PayMode string
|
||||||
|
|
||||||
|
const (
|
||||||
|
// PayModeStore 门店
|
||||||
|
PayModeStore PayMode = "PAY_MODE_STORE"
|
||||||
|
// PayModeApp 小程序
|
||||||
|
PayModeApp PayMode = "PAY_MODE_APP"
|
||||||
|
// PayModeComponent 服务商
|
||||||
|
PayModeComponent PayMode = "PAY_MODE_COMPONENT"
|
||||||
|
)
|
||||||
|
|
||||||
|
// OrderPattern 运力偏好
|
||||||
|
type OrderPattern uint32
|
||||||
|
|
||||||
|
const (
|
||||||
|
// OrderPatternPriceFirst 价格优先
|
||||||
|
OrderPatternPriceFirst OrderPattern = 1
|
||||||
|
// OrderPatternTransFirst 运力优先
|
||||||
|
OrderPatternTransFirst OrderPattern = 2
|
||||||
|
)
|
||||||
|
|
||||||
|
// FlowType 流水类型
|
||||||
|
type FlowType uint32
|
||||||
|
|
||||||
|
const (
|
||||||
|
// FlowTypeCharge 充值流水
|
||||||
|
FlowTypeCharge FlowType = 1
|
||||||
|
// FlowTypeConsume 消费流水
|
||||||
|
FlowTypeConsume FlowType = 2
|
||||||
|
// FlowTypeRefund 退款流水
|
||||||
|
FlowTypeRefund FlowType = 3
|
||||||
|
)
|
||||||
|
|
||||||
|
// IntracityDeliveryStatus 配送单状态
|
||||||
|
type IntracityDeliveryStatus int32
|
||||||
|
|
||||||
|
const (
|
||||||
|
// IntracityDeliveryStatusReady 配送单待接单
|
||||||
|
IntracityDeliveryStatusReady IntracityDeliveryStatus = 100
|
||||||
|
// IntracityDeliveryStatusPickedUp 配送单待取货
|
||||||
|
IntracityDeliveryStatusPickedUp IntracityDeliveryStatus = 101
|
||||||
|
// IntracityDeliveryStatusOngoing 配送单配送中
|
||||||
|
IntracityDeliveryStatusOngoing IntracityDeliveryStatus = 102
|
||||||
|
// IntracityDeliveryStatusFinished 配送单已送达
|
||||||
|
IntracityDeliveryStatusFinished IntracityDeliveryStatus = 200
|
||||||
|
// IntracityDeliveryStatusCancelled 配送单已取消
|
||||||
|
IntracityDeliveryStatusCancelled IntracityDeliveryStatus = 300
|
||||||
|
// IntracityDeliveryStatusAbnormal 配送单异常
|
||||||
|
IntracityDeliveryStatusAbnormal IntracityDeliveryStatus = 400
|
||||||
|
)
|
||||||
|
|
||||||
|
// IntracityAddressInfo 门店地址信息
|
||||||
|
type IntracityAddressInfo struct {
|
||||||
|
Province string `json:"province"` // 省/自治区/直辖市
|
||||||
|
City string `json:"city"` // 地级市
|
||||||
|
Area string `json:"area"` // 县/县级市/区
|
||||||
|
Street string `json:"street"` // 街道
|
||||||
|
House string `json:"house"` // 具体门牌号或详细地址
|
||||||
|
Lat float64 `json:"lat"` // 门店所在地纬度
|
||||||
|
Lng float64 `json:"lng"` // 门店所在地经度
|
||||||
|
Phone string `json:"phone"` // 门店联系电话
|
||||||
|
Name string `json:"name,omitempty"` // 联系人姓名(收货地址时使用)
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityStoreInfo 门店信息
|
||||||
|
type IntracityStoreInfo struct {
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
OutStoreID string `json:"out_store_id"` // 自定义门店编号
|
||||||
|
CityID string `json:"city_id"` // 门店所在城市ID
|
||||||
|
StoreName string `json:"store_name"` // 门店名称
|
||||||
|
OrderPattern OrderPattern `json:"order_pattern"` // 运力偏好
|
||||||
|
ServiceTransPrefer string `json:"service_trans_prefer"` // 优先使用的运力ID
|
||||||
|
AddressInfo IntracityAddressInfo `json:"address_info"` // 门店地址信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============ 门店管理接口 ============
|
||||||
|
|
||||||
|
// IntracityApply 开通门店权限
|
||||||
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/intracity_service.html
|
||||||
|
func (express *Express) IntracityApply(ctx context.Context) error {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityApplyURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, map[string]interface{}{})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return util.DecodeWithCommonError(response, "IntracityApply")
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateStoreRequest 创建门店请求参数
|
||||||
|
type CreateStoreRequest struct {
|
||||||
|
OutStoreID string `json:"out_store_id"` // 自定义门店编号
|
||||||
|
StoreName string `json:"store_name"` // 门店名称
|
||||||
|
OrderPattern OrderPattern `json:"order_pattern,omitempty"` // 运力偏好:1-价格优先,2-运力优先
|
||||||
|
ServiceTransPrefer string `json:"service_trans_prefer,omitempty"` // 优先使用的运力ID,order_pattern=2时必填
|
||||||
|
AddressInfo IntracityAddressInfo `json:"address_info"` // 门店地址信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateStoreResponse 创建门店返回参数
|
||||||
|
type CreateStoreResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
AppID string `json:"appid"` // 小程序appid
|
||||||
|
OutStoreID string `json:"out_store_id"` // 自定义门店ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityCreateStore 创建门店
|
||||||
|
func (express *Express) IntracityCreateStore(ctx context.Context, req *CreateStoreRequest) (res CreateStoreResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityCreateStoreURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityCreateStore")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryStoreRequest 查询门店请求参数
|
||||||
|
type QueryStoreRequest struct {
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号
|
||||||
|
OutStoreID string `json:"out_store_id,omitempty"` // 自定义门店编号
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryStoreResponse 查询门店返回参数
|
||||||
|
type QueryStoreResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Total uint32 `json:"total"` // 符合条件的门店总数
|
||||||
|
AppID string `json:"appid"` // 小程序appid
|
||||||
|
StoreList []IntracityStoreInfo `json:"store_list"` // 门店信息列表
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityQueryStore 查询门店
|
||||||
|
func (express *Express) IntracityQueryStore(ctx context.Context, req *QueryStoreRequest) (res QueryStoreResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityQueryStoreURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityQueryStore")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateStoreKeyInfo 更新门店的key信息
|
||||||
|
type UpdateStoreKeyInfo struct {
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号
|
||||||
|
OutStoreID string `json:"out_store_id,omitempty"` // 自定义门店编号,二选一
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateStoreContent 更新门店的内容
|
||||||
|
type UpdateStoreContent struct {
|
||||||
|
StoreName string `json:"store_name,omitempty"` // 门店名称
|
||||||
|
OrderPattern OrderPattern `json:"order_pattern,omitempty"` // 运力偏好
|
||||||
|
ServiceTransPrefer string `json:"service_trans_prefer,omitempty"` // 优先使用的运力ID
|
||||||
|
AddressInfo *IntracityAddressInfo `json:"address_info,omitempty"` // 门店地址信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateStoreRequest 更新门店请求参数
|
||||||
|
type UpdateStoreRequest struct {
|
||||||
|
Keys UpdateStoreKeyInfo `json:"keys"` // 门店编号
|
||||||
|
Content UpdateStoreContent `json:"content"` // 更新内容
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityUpdateStore 更新门店
|
||||||
|
func (express *Express) IntracityUpdateStore(ctx context.Context, req *UpdateStoreRequest) error {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityUpdateStoreURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return util.DecodeWithCommonError(response, "IntracityUpdateStore")
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============ 充值退款接口 ============
|
||||||
|
|
||||||
|
// StoreChargeRequest 门店运费充值请求参数
|
||||||
|
type StoreChargeRequest struct {
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号,pay_mode=PAY_MODE_STORE时必传
|
||||||
|
ServiceTransID string `json:"service_trans_id"` // 运力ID
|
||||||
|
Amount uint32 `json:"amount"` // 充值金额,单位:分,50元起充
|
||||||
|
PayMode PayMode `json:"pay_mode,omitempty"` // 充值主体
|
||||||
|
}
|
||||||
|
|
||||||
|
// StoreChargeResponse 门店运费充值返回参数
|
||||||
|
type StoreChargeResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
PayURL string `json:"payurl"` // 充值页面地址
|
||||||
|
AppID string `json:"appid"` // 小程序appid
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityStoreCharge 门店运费充值
|
||||||
|
func (express *Express) IntracityStoreCharge(ctx context.Context, req *StoreChargeRequest) (res StoreChargeResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityStoreChargeURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityStoreCharge")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// StoreRefundRequest 门店运费退款请求参数
|
||||||
|
type StoreRefundRequest struct {
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号
|
||||||
|
PayMode PayMode `json:"pay_mode,omitempty"` // 充值/扣费主体
|
||||||
|
ServiceTransID string `json:"service_trans_id"` // 运力ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// StoreRefundResponse 门店运费退款返回参数
|
||||||
|
type StoreRefundResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
AppID string `json:"appid"` // 小程序appid
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
RefundAmount uint32 `json:"refund_amount"` // 退款金额,单位:分
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityStoreRefund 门店运费退款
|
||||||
|
func (express *Express) IntracityStoreRefund(ctx context.Context, req *StoreRefundRequest) (res StoreRefundResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityStoreRefundURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityStoreRefund")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryFlowRequest 门店运费流水查询请求参数
|
||||||
|
type QueryFlowRequest struct {
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
FlowType FlowType `json:"flow_type"` // 流水类型:1-充值,2-消费,3-退款
|
||||||
|
ServiceTransID string `json:"service_trans_id,omitempty"` // 运力ID
|
||||||
|
BeginTime uint32 `json:"begin_time,omitempty"` // 开始时间戳
|
||||||
|
EndTime uint32 `json:"end_time,omitempty"` // 结束时间戳
|
||||||
|
PayMode PayMode `json:"pay_mode"` // 扣费主体
|
||||||
|
}
|
||||||
|
|
||||||
|
// FlowRecordInfo 流水记录信息
|
||||||
|
type FlowRecordInfo struct {
|
||||||
|
FlowType FlowType `json:"flow_type"` // 流水类型
|
||||||
|
AppID string `json:"appid"` // appid
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店ID
|
||||||
|
PayOrderID uint64 `json:"pay_order_id,omitempty"` // 充值订单号
|
||||||
|
WxOrderID string `json:"wx_order_id,omitempty"` // 订单ID(消费流水)
|
||||||
|
ServiceTransID string `json:"service_trans_id"` // 运力ID
|
||||||
|
OpenID string `json:"openid,omitempty"` // 用户openid(消费流水)
|
||||||
|
DeliveryStatus int32 `json:"delivery_status,omitempty"` // 运单状态(消费流水)
|
||||||
|
PayAmount int32 `json:"pay_amount"` // 支付金额,单位:分
|
||||||
|
PayTime uint32 `json:"pay_time,omitempty"` // 支付时间
|
||||||
|
PayStatus string `json:"pay_status,omitempty"` // 支付状态
|
||||||
|
RefundStatus string `json:"refund_status,omitempty"` // 退款状态
|
||||||
|
RefundAmount int32 `json:"refund_amount,omitempty"` // 退款金额
|
||||||
|
RefundTime uint32 `json:"refund_time,omitempty"` // 退款时间
|
||||||
|
DeductAmount int32 `json:"deduct_amount,omitempty"` // 扣除违约金
|
||||||
|
CreateTime uint32 `json:"create_time"` // 创建时间
|
||||||
|
ConsumeDeadline uint32 `json:"consume_deadline,omitempty"` // 有效截止日期
|
||||||
|
BillID string `json:"bill_id,omitempty"` // 运单ID
|
||||||
|
DeliveryFinishedTime uint32 `json:"delivery_finished_time,omitempty"` // 运单完成配送的时间
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryFlowResponse 门店运费流水查询返回参数
|
||||||
|
type QueryFlowResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Total uint32 `json:"total"` // 总数
|
||||||
|
FlowList []FlowRecordInfo `json:"flow_list"` // 流水数组
|
||||||
|
TotalPayAmt int `json:"total_pay_amt"` // 总支付金额
|
||||||
|
TotalRefundAmt int `json:"total_refund_amt"` // 总退款金额
|
||||||
|
TotalDeductAmt int `json:"total_deduct_amt"` // 总违约金(消费流水返回)
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityQueryFlow 门店运费流水查询
|
||||||
|
func (express *Express) IntracityQueryFlow(ctx context.Context, req *QueryFlowRequest) (res QueryFlowResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityQueryFlowURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityQueryFlow")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// BalanceQueryRequest 门店余额查询请求参数
|
||||||
|
type BalanceQueryRequest struct {
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号
|
||||||
|
ServiceTransID string `json:"service_trans_id,omitempty"` // 运力ID
|
||||||
|
PayMode PayMode `json:"pay_mode,omitempty"` // 充值/扣费主体
|
||||||
|
}
|
||||||
|
|
||||||
|
// BalanceInfo 余额信息
|
||||||
|
type BalanceInfo struct {
|
||||||
|
ServiceTransID string `json:"service_trans_id"` // 运力ID
|
||||||
|
Balance int32 `json:"balance"` // 余额,单位:分
|
||||||
|
}
|
||||||
|
|
||||||
|
// BalanceQueryResponse 门店余额查询返回参数
|
||||||
|
type BalanceQueryResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
AppID string `json:"appid"` // 小程序appid
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
BalanceList []BalanceInfo `json:"balance_list"` // 余额列表
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityBalanceQuery 门店余额查询
|
||||||
|
func (express *Express) IntracityBalanceQuery(ctx context.Context, req *BalanceQueryRequest) (res BalanceQueryResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityBalanceQueryURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityBalanceQuery")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// ============ 配送订单接口 ============
|
||||||
|
|
||||||
|
// CargoInfo 货物信息
|
||||||
|
type CargoInfo struct {
|
||||||
|
Name string `json:"name"` // 货物名称
|
||||||
|
Num uint32 `json:"num,omitempty"` // 货物数量
|
||||||
|
Price uint32 `json:"price,omitempty"` // 货物价格,单位:分
|
||||||
|
Weight uint32 `json:"weight,omitempty"` // 货物重量,单位:克
|
||||||
|
}
|
||||||
|
|
||||||
|
// PreAddOrderRequest 预下配送单请求参数
|
||||||
|
type PreAddOrderRequest struct {
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号,二选一
|
||||||
|
OutStoreID string `json:"out_store_id,omitempty"` // 自定义门店编号,二选一
|
||||||
|
UserOpenID string `json:"user_openid"` // 用户openid
|
||||||
|
UserPhone string `json:"user_phone,omitempty"` // 用户联系电话
|
||||||
|
UserName string `json:"user_name,omitempty"` // 用户姓名
|
||||||
|
UserLat float64 `json:"user_lat"` // 用户地址纬度
|
||||||
|
UserLng float64 `json:"user_lng"` // 用户地址经度
|
||||||
|
UserAddress string `json:"user_address"` // 用户详细地址
|
||||||
|
ServiceTransID string `json:"service_trans_id,omitempty"` // 运力ID,不传则查询所有运力
|
||||||
|
PayMode PayMode `json:"pay_mode,omitempty"` // 充值/扣费主体
|
||||||
|
CargoInfo *CargoInfo `json:"cargo_info,omitempty"` // 货物信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// TransInfo 运力信息
|
||||||
|
type TransInfo struct {
|
||||||
|
ServiceTransID string `json:"service_trans_id"` // 运力ID
|
||||||
|
ServiceName string `json:"service_name"` // 运力名称
|
||||||
|
Price uint32 `json:"price"` // 配送费用,单位:分
|
||||||
|
Distance uint32 `json:"distance"` // 配送距离,单位:米
|
||||||
|
Errcode int `json:"errcode"` // 错误码,0表示成功
|
||||||
|
Errmsg string `json:"errmsg"` // 错误信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// PreAddOrderResponse 预下配送单返回参数
|
||||||
|
type PreAddOrderResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
AppID string `json:"appid"` // 小程序appid
|
||||||
|
TransList []TransInfo `json:"trans_list"` // 运力列表
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityPreAddOrder 预下配送单(查询运费)
|
||||||
|
func (express *Express) IntracityPreAddOrder(ctx context.Context, req *PreAddOrderRequest) (res PreAddOrderResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityPreAddOrderURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityPreAddOrder")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddOrderRequest 创建配送单请求参数
|
||||||
|
type AddOrderRequest struct {
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号,二选一
|
||||||
|
OutStoreID string `json:"out_store_id,omitempty"` // 自定义门店编号,二选一
|
||||||
|
OutOrderID string `json:"out_order_id"` // 自定义订单号,需唯一
|
||||||
|
ServiceTransID string `json:"service_trans_id,omitempty"` // 运力ID
|
||||||
|
UserOpenID string `json:"user_openid"` // 用户openid
|
||||||
|
UserPhone string `json:"user_phone"` // 用户联系电话
|
||||||
|
UserName string `json:"user_name"` // 用户姓名
|
||||||
|
UserLat float64 `json:"user_lat"` // 用户地址纬度
|
||||||
|
UserLng float64 `json:"user_lng"` // 用户地址经度
|
||||||
|
UserAddress string `json:"user_address"` // 用户详细地址
|
||||||
|
PayMode PayMode `json:"pay_mode,omitempty"` // 充值/扣费主体
|
||||||
|
CargoInfo *CargoInfo `json:"cargo_info,omitempty"` // 货物信息
|
||||||
|
OrderDetailPath string `json:"order_detail_path,omitempty"` // 订单详情页路径
|
||||||
|
CallbackURL string `json:"callback_url,omitempty"` // 配送状态回调URL
|
||||||
|
UseInsurance uint32 `json:"use_insurance,omitempty"` // 是否使用保价:0-不使用,1-使用
|
||||||
|
InsuranceValue uint32 `json:"insurance_value,omitempty"` // 保价金额,单位:分
|
||||||
|
ExpectTime uint32 `json:"expect_time,omitempty"` // 期望送达时间戳
|
||||||
|
Remark string `json:"remark,omitempty"` // 备注
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddOrderResponse 创建配送单返回参数
|
||||||
|
type AddOrderResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WxOrderID string `json:"wx_order_id"` // 微信订单号
|
||||||
|
AppID string `json:"appid"` // 小程序appid
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
OutOrderID string `json:"out_order_id"` // 自定义订单号
|
||||||
|
ServiceTransID string `json:"service_trans_id"` // 运力ID
|
||||||
|
BillID string `json:"bill_id"` // 运力订单号
|
||||||
|
Price uint32 `json:"price"` // 配送费用,单位:分
|
||||||
|
Distance uint32 `json:"distance"` // 配送距离,单位:米
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityAddOrder 创建配送单
|
||||||
|
func (express *Express) IntracityAddOrder(ctx context.Context, req *AddOrderRequest) (res AddOrderResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityAddOrderURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityAddOrder")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryOrderRequest 查询配送单请求参数
|
||||||
|
type QueryOrderRequest struct {
|
||||||
|
WxOrderID string `json:"wx_order_id,omitempty"` // 微信订单号,二选一
|
||||||
|
OutOrderID string `json:"out_order_id,omitempty"` // 自定义订单号,二选一
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号
|
||||||
|
OutStoreID string `json:"out_store_id,omitempty"` // 自定义门店编号
|
||||||
|
}
|
||||||
|
|
||||||
|
// RiderInfo 骑手信息
|
||||||
|
type RiderInfo struct {
|
||||||
|
Name string `json:"name"` // 骑手姓名
|
||||||
|
Phone string `json:"phone"` // 骑手电话
|
||||||
|
RiderCode string `json:"rider_code"` // 骑手编号
|
||||||
|
RiderImgURL string `json:"rider_img_url"` // 骑手头像URL
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryOrderResponse 查询配送单返回参数
|
||||||
|
type QueryOrderResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WxOrderID string `json:"wx_order_id"` // 微信订单号
|
||||||
|
AppID string `json:"appid"` // 小程序appid
|
||||||
|
WxStoreID string `json:"wx_store_id"` // 微信门店编号
|
||||||
|
OutOrderID string `json:"out_order_id"` // 自定义订单号
|
||||||
|
ServiceTransID string `json:"service_trans_id"` // 运力ID
|
||||||
|
BillID string `json:"bill_id"` // 运力订单号
|
||||||
|
DeliveryStatus IntracityDeliveryStatus `json:"delivery_status"` // 配送状态
|
||||||
|
Price uint32 `json:"price"` // 配送费用,单位:分
|
||||||
|
Distance uint32 `json:"distance"` // 配送距离,单位:米
|
||||||
|
CreateTime uint32 `json:"create_time"` // 订单创建时间
|
||||||
|
RiderInfo *RiderInfo `json:"rider_info"` // 骑手信息
|
||||||
|
FinishTime uint32 `json:"finish_time"` // 订单完成时间
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityQueryOrder 查询配送单
|
||||||
|
func (express *Express) IntracityQueryOrder(ctx context.Context, req *QueryOrderRequest) (res QueryOrderResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityQueryOrderURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityQueryOrder")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// CancelOrderRequest 取消配送单请求参数
|
||||||
|
type CancelOrderRequest struct {
|
||||||
|
WxOrderID string `json:"wx_order_id,omitempty"` // 微信订单号,二选一
|
||||||
|
OutOrderID string `json:"out_order_id,omitempty"` // 自定义订单号,二选一
|
||||||
|
WxStoreID string `json:"wx_store_id,omitempty"` // 微信门店编号
|
||||||
|
OutStoreID string `json:"out_store_id,omitempty"` // 自定义门店编号
|
||||||
|
CancelReason string `json:"cancel_reason,omitempty"` // 取消原因
|
||||||
|
}
|
||||||
|
|
||||||
|
// CancelOrderResponse 取消配送单返回参数
|
||||||
|
type CancelOrderResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
WxOrderID string `json:"wx_order_id"` // 微信订单号
|
||||||
|
RefundAmount int32 `json:"refund_amount"` // 退款金额,单位:分
|
||||||
|
DeductAmount int32 `json:"deduct_amount"` // 扣除违约金,单位:分
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityCancelOrder 取消配送单
|
||||||
|
func (express *Express) IntracityCancelOrder(ctx context.Context, req *CancelOrderRequest) (res CancelOrderResponse, err error) {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityCancelOrderURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &res, "IntracityCancelOrder")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// MockNotifyRequest 模拟配送回调请求参数(仅用于测试)
|
||||||
|
type MockNotifyRequest struct {
|
||||||
|
WxOrderID string `json:"wx_order_id"` // 微信订单号
|
||||||
|
DeliveryStatus IntracityDeliveryStatus `json:"delivery_status"` // 配送状态
|
||||||
|
}
|
||||||
|
|
||||||
|
// IntracityMockNotify 模拟配送回调(仅用于测试)
|
||||||
|
func (express *Express) IntracityMockNotify(ctx context.Context, req *MockNotifyRequest) error {
|
||||||
|
accessToken, err := express.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(intracityMockNotifyURL, accessToken)
|
||||||
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return util.DecodeWithCommonError(response, "IntracityMockNotify")
|
||||||
|
}
|
||||||
@@ -22,9 +22,9 @@ const (
|
|||||||
MsgTypeMiniProgramPage = "miniprogrampage"
|
MsgTypeMiniProgramPage = "miniprogrampage"
|
||||||
// MsgTypeEvent 事件
|
// MsgTypeEvent 事件
|
||||||
MsgTypeEvent MsgType = "event"
|
MsgTypeEvent MsgType = "event"
|
||||||
// DataTypeXML XML格式数据
|
// DataTypeXML XML 格式数据
|
||||||
DataTypeXML = "xml"
|
DataTypeXML = "xml"
|
||||||
// DataTypeJSON JSON格式数据
|
// DataTypeJSON JSON 格式数据
|
||||||
DataTypeJSON = "json"
|
DataTypeJSON = "json"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ type MediaText struct {
|
|||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// MediaResource 消息使用的临时素材id
|
// MediaResource 消息使用的临时素材 id
|
||||||
type MediaResource struct {
|
type MediaResource struct {
|
||||||
MediaID string `json:"media_id"`
|
MediaID string `json:"media_id"`
|
||||||
}
|
}
|
||||||
@@ -51,7 +51,7 @@ type MediaLink struct {
|
|||||||
|
|
||||||
// CustomerMessage 客服消息
|
// CustomerMessage 客服消息
|
||||||
type CustomerMessage struct {
|
type CustomerMessage struct {
|
||||||
ToUser string `json:"touser"` // 接受者OpenID
|
ToUser string `json:"touser"` // 接受者 OpenID
|
||||||
Msgtype MsgType `json:"msgtype"` // 客服消息类型
|
Msgtype MsgType `json:"msgtype"` // 客服消息类型
|
||||||
Text *MediaText `json:"text,omitempty"` // 可选
|
Text *MediaText `json:"text,omitempty"` // 可选
|
||||||
Image *MediaResource `json:"image,omitempty"` // 可选
|
Image *MediaResource `json:"image,omitempty"` // 可选
|
||||||
|
|||||||
+317
-30
@@ -9,6 +9,8 @@ import (
|
|||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/tidwall/gjson"
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/context"
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/security"
|
"github.com/silenceper/wechat/v2/miniprogram/security"
|
||||||
"github.com/silenceper/wechat/v2/util"
|
"github.com/silenceper/wechat/v2/util"
|
||||||
@@ -18,11 +20,11 @@ import (
|
|||||||
type ConfirmReceiveMethod int8
|
type ConfirmReceiveMethod int8
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// EventTypeTradeManageRemindAccessAPI 提醒接入发货信息管理服务API
|
// EventTypeTradeManageRemindAccessAPI 提醒接入发货信息管理服务 API
|
||||||
// 小程序完成账期授权时/小程序产生第一笔交易时/已产生交易但从未发货的小程序,每天一次
|
// 小程序完成账期授权时/小程序产生第一笔交易时/已产生交易但从未发货的小程序,每天一次
|
||||||
EventTypeTradeManageRemindAccessAPI EventType = "trade_manage_remind_access_api"
|
EventTypeTradeManageRemindAccessAPI EventType = "trade_manage_remind_access_api"
|
||||||
// EventTypeTradeManageRemindShipping 提醒需要上传发货信息
|
// EventTypeTradeManageRemindShipping 提醒需要上传发货信息
|
||||||
// 曾经发过货的小程序,订单超过48小时未发货时
|
// 曾经发过货的小程序,订单超过 48 小时未发货时
|
||||||
EventTypeTradeManageRemindShipping EventType = "trade_manage_remind_shipping"
|
EventTypeTradeManageRemindShipping EventType = "trade_manage_remind_shipping"
|
||||||
// EventTypeTradeManageOrderSettlement 订单将要结算或已经结算
|
// EventTypeTradeManageOrderSettlement 订单将要结算或已经结算
|
||||||
// 订单完成发货时/订单结算时
|
// 订单完成发货时/订单结算时
|
||||||
@@ -39,14 +41,33 @@ const (
|
|||||||
EventTypeXpayGoodsDeliverNotify EventType = "xpay_goods_deliver_notify"
|
EventTypeXpayGoodsDeliverNotify EventType = "xpay_goods_deliver_notify"
|
||||||
// EventTypeXpayCoinPayNotify 代币支付推送事件
|
// EventTypeXpayCoinPayNotify 代币支付推送事件
|
||||||
EventTypeXpayCoinPayNotify EventType = "xpay_coin_pay_notify"
|
EventTypeXpayCoinPayNotify EventType = "xpay_coin_pay_notify"
|
||||||
|
// EventTypeXpayRefundNotify 退款推送事件
|
||||||
|
EventTypeXpayRefundNotify EventType = "xpay_refund_notify"
|
||||||
|
// EventTypeXpaySubscribeIosRefundQueryNotify iOS Apple 支付退款问询事件
|
||||||
|
EventTypeXpaySubscribeIosRefundQueryNotify EventType = "xpay_subscribe_ios_refund_query_notify"
|
||||||
|
// EventTypeXpayComplaintNotify 用户投诉推送事件
|
||||||
|
EventTypeXpayComplaintNotify EventType = "xpay_complaint_notify"
|
||||||
|
// EventSubscribePopup 用户操作订阅通知弹窗事件推送,用户在图文等场景内订阅通知的操作
|
||||||
|
EventSubscribePopup EventType = "subscribe_msg_popup_event"
|
||||||
|
// EventSubscribeMsgChange 用户管理订阅通知,用户在服务通知管理页面做通知管理时的操作
|
||||||
|
EventSubscribeMsgChange EventType = "subscribe_msg_change_event"
|
||||||
|
// EventSubscribeMsgSent 发送订阅通知,调用 bizsend 接口发送通知
|
||||||
|
EventSubscribeMsgSent EventType = "subscribe_msg_sent_event"
|
||||||
// ConfirmReceiveMethodAuto 自动确认收货
|
// ConfirmReceiveMethodAuto 自动确认收货
|
||||||
ConfirmReceiveMethodAuto ConfirmReceiveMethod = 1
|
ConfirmReceiveMethodAuto ConfirmReceiveMethod = 1
|
||||||
// ConfirmReceiveMethodManual 手动确认收货
|
// ConfirmReceiveMethodManual 手动确认收货
|
||||||
ConfirmReceiveMethodManual ConfirmReceiveMethod = 2
|
ConfirmReceiveMethodManual ConfirmReceiveMethod = 2
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// InfoTypeAcceptSubscribeMessage 接受订阅通知
|
||||||
|
InfoTypeAcceptSubscribeMessage InfoType = "accept"
|
||||||
|
// InfoTypeRejectSubscribeMessage 拒绝订阅通知
|
||||||
|
InfoTypeRejectSubscribeMessage InfoType = "reject"
|
||||||
|
)
|
||||||
|
|
||||||
// PushReceiver 接收消息推送
|
// PushReceiver 接收消息推送
|
||||||
// 暂仅支付Aes加密方式
|
// 暂仅支付 Aes 加密方式
|
||||||
type PushReceiver struct {
|
type PushReceiver struct {
|
||||||
*context.Context
|
*context.Context
|
||||||
}
|
}
|
||||||
@@ -58,16 +79,16 @@ func NewPushReceiver(ctx *context.Context) *PushReceiver {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMsg 获取接收到的消息(如果是加密的返回解密数据)
|
// GetMsg 获取接收到的消息 (如果是加密的返回解密数据)
|
||||||
func (receiver *PushReceiver) GetMsg(r *http.Request) (string, []byte, error) {
|
func (receiver *PushReceiver) GetMsg(r *http.Request) (string, []byte, error) {
|
||||||
// 判断请求格式
|
// 判断请求格式
|
||||||
var dataType string
|
var dataType string
|
||||||
contentType := r.Header.Get("Content-Type")
|
contentType := r.Header.Get("Content-Type")
|
||||||
if strings.HasPrefix(contentType, "text/xml") {
|
if strings.HasPrefix(contentType, "text/xml") {
|
||||||
// xml格式
|
// xml 格式
|
||||||
dataType = DataTypeXML
|
dataType = DataTypeXML
|
||||||
} else {
|
} else {
|
||||||
// json格式
|
// json 格式
|
||||||
dataType = DataTypeJSON
|
dataType = DataTypeJSON
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,7 +129,7 @@ func (receiver *PushReceiver) GetMsg(r *http.Request) (string, []byte, error) {
|
|||||||
return dataType, byteData, err
|
return dataType, byteData, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMsgData 获取接收到的消息(解密数据)
|
// GetMsgData 获取接收到的消息 (解密数据)
|
||||||
func (receiver *PushReceiver) GetMsgData(r *http.Request) (MsgType, EventType, PushData, error) {
|
func (receiver *PushReceiver) GetMsgData(r *http.Request) (MsgType, EventType, PushData, error) {
|
||||||
dataType, decryptMsg, err := receiver.GetMsg(r)
|
dataType, decryptMsg, err := receiver.GetMsg(r)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -144,7 +165,7 @@ func (receiver *PushReceiver) GetMsgData(r *http.Request) (MsgType, EventType, P
|
|||||||
func (receiver *PushReceiver) getEvent(dataType string, eventType EventType, decryptMsg []byte) (PushData, error) {
|
func (receiver *PushReceiver) getEvent(dataType string, eventType EventType, decryptMsg []byte) (PushData, error) {
|
||||||
switch eventType {
|
switch eventType {
|
||||||
case EventTypeTradeManageRemindAccessAPI:
|
case EventTypeTradeManageRemindAccessAPI:
|
||||||
// 提醒接入发货信息管理服务API
|
// 提醒接入发货信息管理服务 API
|
||||||
var pushData PushDataRemindAccessAPI
|
var pushData PushDataRemindAccessAPI
|
||||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||||
return &pushData, err
|
return &pushData, err
|
||||||
@@ -188,25 +209,118 @@ func (receiver *PushReceiver) getEvent(dataType string, eventType EventType, dec
|
|||||||
var pushData PushDataXpayCoinPayNotify
|
var pushData PushDataXpayCoinPayNotify
|
||||||
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||||
return &pushData, err
|
return &pushData, err
|
||||||
|
case EventTypeXpayRefundNotify:
|
||||||
|
// 退款推送事件
|
||||||
|
return receiver.unmarshalPushData(dataType, decryptMsg, &PushDataXpayRefundNotify{})
|
||||||
|
case EventTypeXpaySubscribeIosRefundQueryNotify: // iOS Apple 支付退款问询事件
|
||||||
|
return receiver.unmarshalPushData(dataType, decryptMsg, &PushDataXpaySubscribeIosRefundQueryNotify{})
|
||||||
|
case EventTypeXpayComplaintNotify:
|
||||||
|
// 用户投诉推送事件
|
||||||
|
return receiver.unmarshalPushData(dataType, decryptMsg, &PushDataXpayComplaintNotify{})
|
||||||
|
case EventSubscribePopup:
|
||||||
|
// 用户操作订阅通知弹窗事件推送
|
||||||
|
return receiver.unmarshalSubscribePopup(dataType, decryptMsg)
|
||||||
|
case EventSubscribeMsgChange:
|
||||||
|
// 用户管理订阅通知事件推送
|
||||||
|
return receiver.unmarshalSubscribeMsgChange(dataType, decryptMsg)
|
||||||
|
case EventSubscribeMsgSent:
|
||||||
|
// 用户发送订阅通知事件推送
|
||||||
|
return receiver.unmarshalSubscribeMsgSent(dataType, decryptMsg)
|
||||||
}
|
}
|
||||||
// 暂不支持其他事件类型,直接返回解密后的数据,由调用方处理
|
// 暂不支持其他事件类型,直接返回解密后的数据,由调用方处理
|
||||||
return decryptMsg, nil
|
return decryptMsg, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// unmarshal 解析推送的数据
|
// unmarshal 解析推送的数据
|
||||||
func (receiver *PushReceiver) unmarshal(dateType string, decryptMsg []byte, pushData interface{}) error {
|
func (receiver *PushReceiver) unmarshal(dataType string, decryptMsg []byte, pushData interface{}) error {
|
||||||
if dateType == DataTypeXML {
|
if dataType == DataTypeXML {
|
||||||
return xml.Unmarshal(decryptMsg, pushData)
|
return xml.Unmarshal(decryptMsg, pushData)
|
||||||
}
|
}
|
||||||
return json.Unmarshal(decryptMsg, pushData)
|
return json.Unmarshal(decryptMsg, pushData)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// unmarshalPushData unmarshal push data helper
|
||||||
|
func (receiver *PushReceiver) unmarshalPushData(dataType string, decryptMsg []byte, pushData interface{}) (PushData, error) {
|
||||||
|
err := receiver.unmarshal(dataType, decryptMsg, pushData)
|
||||||
|
return pushData, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// unmarshalSubscribePopup
|
||||||
|
func (receiver *PushReceiver) unmarshalSubscribePopup(dataType string, decryptMsg []byte) (PushData, error) {
|
||||||
|
var pushData PushDataSubscribePopup
|
||||||
|
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||||
|
if err == nil {
|
||||||
|
listData := gjson.Get(string(decryptMsg), "List")
|
||||||
|
if listData.IsObject() {
|
||||||
|
listItem := SubscribeMsgPopupEventList{}
|
||||||
|
if parseErr := json.Unmarshal([]byte(listData.Raw), &listItem); parseErr != nil {
|
||||||
|
return &pushData, parseErr
|
||||||
|
}
|
||||||
|
pushData.SetSubscribeMsgPopupEvents([]SubscribeMsgPopupEventList{listItem})
|
||||||
|
} else if listData.IsArray() {
|
||||||
|
listItems := make([]SubscribeMsgPopupEventList, 0)
|
||||||
|
if parseErr := json.Unmarshal([]byte(listData.Raw), &listItems); parseErr != nil {
|
||||||
|
return &pushData, parseErr
|
||||||
|
}
|
||||||
|
pushData.SetSubscribeMsgPopupEvents(listItems)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return &pushData, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// unmarshalSubscribeMsgChange 解析用户管理订阅通知事件推送
|
||||||
|
func (receiver *PushReceiver) unmarshalSubscribeMsgChange(dataType string, decryptMsg []byte) (PushData, error) {
|
||||||
|
var pushData PushDataSubscribeMsgChange
|
||||||
|
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||||
|
if err == nil {
|
||||||
|
listData := gjson.Get(string(decryptMsg), "List")
|
||||||
|
if listData.IsObject() {
|
||||||
|
listItem := SubscribeMsgChangeList{}
|
||||||
|
if parseErr := json.Unmarshal([]byte(listData.Raw), &listItem); parseErr != nil {
|
||||||
|
return &pushData, parseErr
|
||||||
|
}
|
||||||
|
pushData.SetSubscribeMsgChangeEvents([]SubscribeMsgChangeList{listItem})
|
||||||
|
} else if listData.IsArray() {
|
||||||
|
listItems := make([]SubscribeMsgChangeList, 0)
|
||||||
|
if parseErr := json.Unmarshal([]byte(listData.Raw), &listItems); parseErr != nil {
|
||||||
|
return &pushData, parseErr
|
||||||
|
}
|
||||||
|
pushData.SetSubscribeMsgChangeEvents(listItems)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &pushData, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// unmarshalSubscribeMsgSent 解析用户发送订阅通知事件推送
|
||||||
|
func (receiver *PushReceiver) unmarshalSubscribeMsgSent(dataType string, decryptMsg []byte) (PushData, error) {
|
||||||
|
var pushData PushDataSubscribeMsgSent
|
||||||
|
err := receiver.unmarshal(dataType, decryptMsg, &pushData)
|
||||||
|
if err == nil {
|
||||||
|
listData := gjson.Get(string(decryptMsg), "List")
|
||||||
|
if listData.IsObject() {
|
||||||
|
listItem := SubscribeMsgSentList{}
|
||||||
|
if parseErr := json.Unmarshal([]byte(listData.Raw), &listItem); parseErr != nil {
|
||||||
|
return &pushData, parseErr
|
||||||
|
}
|
||||||
|
pushData.SetSubscribeMsgSentEvents([]SubscribeMsgSentList{listItem})
|
||||||
|
} else if listData.IsArray() {
|
||||||
|
listItems := make([]SubscribeMsgSentList, 0)
|
||||||
|
if parseErr := json.Unmarshal([]byte(listData.Raw), &listItems); parseErr != nil {
|
||||||
|
return &pushData, parseErr
|
||||||
|
}
|
||||||
|
pushData.SetSubscribeMsgSentEvents(listItems)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return &pushData, err
|
||||||
|
}
|
||||||
|
|
||||||
// DataReceived 接收到的数据
|
// DataReceived 接收到的数据
|
||||||
type DataReceived struct {
|
type DataReceived struct {
|
||||||
Encrypt string `json:"Encrypt" xml:"Encrypt"` // 加密的消息体
|
Encrypt string `json:"Encrypt" xml:"Encrypt"` // 加密的消息体
|
||||||
}
|
}
|
||||||
|
|
||||||
// PushData 推送的数据(已转对应的结构体)
|
// PushData 推送的数据 (已转对应的结构体)
|
||||||
type PushData interface{}
|
type PushData interface{}
|
||||||
|
|
||||||
// CommonPushData 推送数据通用部分
|
// CommonPushData 推送数据通用部分
|
||||||
@@ -216,7 +330,7 @@ type CommonPushData struct {
|
|||||||
Event EventType `json:"Event" xml:"Event"` // 事件类型
|
Event EventType `json:"Event" xml:"Event"` // 事件类型
|
||||||
ToUserName string `json:"ToUserName" xml:"ToUserName"` // 小程序的原始 ID
|
ToUserName string `json:"ToUserName" xml:"ToUserName"` // 小程序的原始 ID
|
||||||
FromUserName string `json:"FromUserName" xml:"FromUserName"` // 发送方账号(一个 OpenID,此时发送方是系统账号)
|
FromUserName string `json:"FromUserName" xml:"FromUserName"` // 发送方账号(一个 OpenID,此时发送方是系统账号)
|
||||||
CreateTime int64 `json:"CreateTime" xml:"CreateTime"` // 消息创建时间 (整型),时间戳
|
CreateTime int64 `json:"CreateTime" xml:"CreateTime"` // 消息创建时间(整型),时间戳
|
||||||
}
|
}
|
||||||
|
|
||||||
// MediaCheckAsyncData 媒体内容安全异步审查结果通知
|
// MediaCheckAsyncData 媒体内容安全异步审查结果通知
|
||||||
@@ -272,7 +386,7 @@ type PushDataRemindShipping struct {
|
|||||||
Msg string `json:"msg" xml:"msg"` // 消息文本内容
|
Msg string `json:"msg" xml:"msg"` // 消息文本内容
|
||||||
}
|
}
|
||||||
|
|
||||||
// PushDataRemindAccessAPI 提醒接入发货信息管理服务API信息
|
// PushDataRemindAccessAPI 提醒接入发货信息管理服务 API 信息
|
||||||
type PushDataRemindAccessAPI struct {
|
type PushDataRemindAccessAPI struct {
|
||||||
CommonPushData
|
CommonPushData
|
||||||
Msg string `json:"msg" xml:"msg"` // 消息文本内容
|
Msg string `json:"msg" xml:"msg"` // 消息文本内容
|
||||||
@@ -281,9 +395,9 @@ type PushDataRemindAccessAPI struct {
|
|||||||
// PushDataAddExpressPath 运单轨迹更新信息
|
// PushDataAddExpressPath 运单轨迹更新信息
|
||||||
type PushDataAddExpressPath struct {
|
type PushDataAddExpressPath struct {
|
||||||
CommonPushData
|
CommonPushData
|
||||||
DeliveryID string `json:"DeliveryID" xml:"DeliveryID"` // 快递公司ID
|
DeliveryID string `json:"DeliveryID" xml:"DeliveryID"` // 快递公司 ID
|
||||||
WayBillID string `json:"WaybillId" xml:"WaybillId"` // 运单ID
|
WayBillID string `json:"WaybillId" xml:"WaybillId"` // 运单 ID
|
||||||
OrderID string `json:"OrderId" xml:"OrderId"` // 订单ID
|
OrderID string `json:"OrderId" xml:"OrderId"` // 订单 ID
|
||||||
Version int `json:"Version" xml:"Version"` // 轨迹版本号(整型)
|
Version int `json:"Version" xml:"Version"` // 轨迹版本号(整型)
|
||||||
Count int `json:"Count" xml:"Count"` // 轨迹节点数(整型)
|
Count int `json:"Count" xml:"Count"` // 轨迹节点数(整型)
|
||||||
Actions []*PushDataAddExpressPathAction `json:"Actions" xml:"Actions"` // 轨迹节点列表
|
Actions []*PushDataAddExpressPathAction `json:"Actions" xml:"Actions"` // 轨迹节点列表
|
||||||
@@ -304,10 +418,10 @@ type PushDataSecVodUpload struct {
|
|||||||
|
|
||||||
// SecVodUploadEvent 短剧媒资上传完成事件
|
// SecVodUploadEvent 短剧媒资上传完成事件
|
||||||
type SecVodUploadEvent struct {
|
type SecVodUploadEvent struct {
|
||||||
MediaID string `json:"media_id" xml:"media_id"` // 媒资id
|
MediaID int64 `json:"media_id" xml:"media_id"` // 媒资 id
|
||||||
SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值。
|
SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值。
|
||||||
Errcode int `json:"errcode" xml:"errcode"` // 错误码,上传失败时该值非
|
ErrCode int `json:"errcode" xml:"errcode"` // 错误码,上传失败时该值非
|
||||||
Errmsg string `json:"errmsg" xml:"errmsg"` // 错误提示
|
ErrMsg string `json:"errmsg" xml:"errmsg"` // 错误提示
|
||||||
}
|
}
|
||||||
|
|
||||||
// PushDataSecVodAudit 短剧媒资审核状态
|
// PushDataSecVodAudit 短剧媒资审核状态
|
||||||
@@ -318,14 +432,14 @@ type PushDataSecVodAudit struct {
|
|||||||
|
|
||||||
// SecVodAuditEvent 短剧媒资审核状态事件
|
// SecVodAuditEvent 短剧媒资审核状态事件
|
||||||
type SecVodAuditEvent struct {
|
type SecVodAuditEvent struct {
|
||||||
DramaID string `json:"drama_id" xml:"drama_id"` // 剧目id
|
DramaID int64 `json:"drama_id" xml:"drama_id"` // 剧目 id
|
||||||
SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值
|
SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值
|
||||||
AuditDetail DramaAuditDetail `json:"audit_detail" xml:"audit_detail"` // 剧目审核结果,单独每一集的审核结果可以根据drama_id查询剧集详情得到
|
AuditDetail DramaAuditDetail `json:"audit_detail" xml:"audit_detail"` // 剧目审核结果,单独每一集的审核结果可以根据 drama_id 查询剧集详情得到
|
||||||
}
|
}
|
||||||
|
|
||||||
// DramaAuditDetail 剧目审核结果
|
// DramaAuditDetail 剧目审核结果
|
||||||
type DramaAuditDetail struct {
|
type DramaAuditDetail struct {
|
||||||
Status int `json:"status" xml:"status"` // 审核状态,0为无效值;1为审核中;2为最终失败;3为审核通过;4为驳回重填
|
Status int `json:"status" xml:"status"` // 审核状态,0 为无效值;1 为审核中;2 为最终失败;3 为审核通过;4 为驳回重填
|
||||||
CreateTime int64 `json:"create_time" xml:"create_time"` // 提审时间戳
|
CreateTime int64 `json:"create_time" xml:"create_time"` // 提审时间戳
|
||||||
AuditTime int64 `json:"audit_time" xml:"audit_time"` // 审核时间戳
|
AuditTime int64 `json:"audit_time" xml:"audit_time"` // 审核时间戳
|
||||||
}
|
}
|
||||||
@@ -333,25 +447,26 @@ type DramaAuditDetail struct {
|
|||||||
// PushDataXpayGoodsDeliverNotify 道具发货推送
|
// PushDataXpayGoodsDeliverNotify 道具发货推送
|
||||||
type PushDataXpayGoodsDeliverNotify struct {
|
type PushDataXpayGoodsDeliverNotify struct {
|
||||||
CommonPushData
|
CommonPushData
|
||||||
OpenID string `json:"OpenId" xml:"OpenId"` // 用户openid
|
OpenID string `json:"OpenId" xml:"OpenId"` // 用户 openid
|
||||||
OutTradeNo string `json:"OutTradeNo" xml:"OutTradeNo"` // 业务订单号
|
OutTradeNo string `json:"OutTradeNo" xml:"OutTradeNo"` // 业务订单号
|
||||||
Env int `json:"Env" xml:"Env"` //,环境配置 0:现网环境(也叫正式环境)1:沙箱环境
|
Env int `json:"Env" xml:"Env"` // ,环境配置 0:现网环境(也叫正式环境)1:沙箱环境
|
||||||
WeChatPayInfo WeChatPayInfo `json:"WeChatPayInfo" xml:"WeChatPayInfo"` // 微信支付信息 非微信支付渠道可能没有
|
WeChatPayInfo WeChatPayInfo `json:"WeChatPayInfo" xml:"WeChatPayInfo"` // 微信支付信息 非微信支付渠道可能没有
|
||||||
GoodsInfo GoodsInfo `json:"GoodsInfo" xml:"GoodsInfo"` // 道具参数信息
|
GoodsInfo GoodsInfo `json:"GoodsInfo" xml:"GoodsInfo"` // 道具参数信息
|
||||||
|
TeamInfo XpayTeamInfo `json:"TeamInfo" xml:"TeamInfo"` // 拼团信息
|
||||||
}
|
}
|
||||||
|
|
||||||
// WeChatPayInfo 微信支付信息
|
// WeChatPayInfo 微信支付信息
|
||||||
type WeChatPayInfo struct {
|
type WeChatPayInfo struct {
|
||||||
MchOrderNo string `json:"MchOrderNo" xml:"MchOrderNo"` // 微信支付商户单号
|
MchOrderNo string `json:"MchOrderNo" xml:"MchOrderNo"` // 微信支付商户单号
|
||||||
TransactionID string `json:"TransactionId" xml:"TransactionId"` // 交易单号(微信支付订单号)
|
TransactionID string `json:"TransactionId" xml:"TransactionId"` // 交易单号(微信支付订单号)
|
||||||
PaidTime int64 `json:"PaidTime" xml:"PaidTime"` // 用户支付时间,Linux秒级时间戳
|
PaidTime int64 `json:"PaidTime" xml:"PaidTime"` // 用户支付时间,Linux 秒级时间戳
|
||||||
}
|
}
|
||||||
|
|
||||||
// GoodsInfo 道具参数信息
|
// GoodsInfo 道具参数信息
|
||||||
type GoodsInfo struct {
|
type GoodsInfo struct {
|
||||||
ProductID string `json:"ProductId" xml:"ProductId"` // 道具ID
|
ProductID string `json:"ProductId" xml:"ProductId"` // 道具 ID
|
||||||
Quantity int `json:"Quantity" xml:"Quantity"` // 数量
|
Quantity int `json:"Quantity" xml:"Quantity"` // 数量
|
||||||
OrigPrice int64 `json:"OrigPrice" xml:"OrigPrice"` // 物品原始价格 (单位:分)
|
OrigPrice int64 `json:"OrigPrice" xml:"OrigPrice"` // 物品原始价格(单位:分)
|
||||||
ActualPrice int64 `json:"ActualPrice" xml:"ActualPrice"` // 物品实际支付价格(单位:分)
|
ActualPrice int64 `json:"ActualPrice" xml:"ActualPrice"` // 物品实际支付价格(单位:分)
|
||||||
Attach string `json:"Attach" xml:"Attach"` // 透传信息
|
Attach string `json:"Attach" xml:"Attach"` // 透传信息
|
||||||
}
|
}
|
||||||
@@ -359,9 +474,9 @@ type GoodsInfo struct {
|
|||||||
// PushDataXpayCoinPayNotify 代币支付推送
|
// PushDataXpayCoinPayNotify 代币支付推送
|
||||||
type PushDataXpayCoinPayNotify struct {
|
type PushDataXpayCoinPayNotify struct {
|
||||||
CommonPushData
|
CommonPushData
|
||||||
OpenID string `json:"OpenId" xml:"OpenId"` // 用户openid
|
OpenID string `json:"OpenId" xml:"OpenId"` // 用户 openid
|
||||||
OutTradeNo string `json:"OutTradeNo" xml:"OutTradeNo"` // 业务订单号
|
OutTradeNo string `json:"OutTradeNo" xml:"OutTradeNo"` // 业务订单号
|
||||||
Env int `json:"Env" xml:"Env"` //,环境配置 0:现网环境(也叫正式环境)1:沙箱环境
|
Env int `json:"Env" xml:"Env"` // ,环境配置 0:现网环境(也叫正式环境)1:沙箱环境
|
||||||
WeChatPayInfo WeChatPayInfo `json:"WeChatPayInfo" xml:"WeChatPayInfo"` // 微信支付信息 非微信支付渠道可能没有
|
WeChatPayInfo WeChatPayInfo `json:"WeChatPayInfo" xml:"WeChatPayInfo"` // 微信支付信息 非微信支付渠道可能没有
|
||||||
CoinInfo CoinInfo `json:"CoinInfo" xml:"CoinInfo"` // 代币参数信息
|
CoinInfo CoinInfo `json:"CoinInfo" xml:"CoinInfo"` // 代币参数信息
|
||||||
}
|
}
|
||||||
@@ -369,7 +484,179 @@ type PushDataXpayCoinPayNotify struct {
|
|||||||
// CoinInfo 代币参数信息
|
// CoinInfo 代币参数信息
|
||||||
type CoinInfo struct {
|
type CoinInfo struct {
|
||||||
Quantity int `json:"Quantity" xml:"Quantity"` // 数量
|
Quantity int `json:"Quantity" xml:"Quantity"` // 数量
|
||||||
OrigPrice int64 `json:"OrigPrice" xml:"OrigPrice"` // 物品原始价格 (单位:分)
|
OrigPrice int64 `json:"OrigPrice" xml:"OrigPrice"` // 物品原始价格(单位:分)
|
||||||
ActualPrice int64 `json:"ActualPrice" xml:"ActualPrice"` // 物品实际支付价格(单位:分)
|
ActualPrice int64 `json:"ActualPrice" xml:"ActualPrice"` // 物品实际支付价格(单位:分)
|
||||||
Attach string `json:"Attach" xml:"Attach"` // 透传信息
|
Attach string `json:"Attach" xml:"Attach"` // 透传信息
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PushDataSubscribePopup 用户操作订阅通知弹窗事件推送
|
||||||
|
type PushDataSubscribePopup struct {
|
||||||
|
CommonPushData
|
||||||
|
subscribeMsgPopupEventList []SubscribeMsgPopupEventList `json:"-"`
|
||||||
|
SubscribeMsgPopupEvent SubscribeMsgPopupEvent `xml:"SubscribeMsgPopupEvent"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubscribeMsgPopupEvent 用户操作订阅通知弹窗消息回调
|
||||||
|
type SubscribeMsgPopupEvent struct {
|
||||||
|
List []SubscribeMsgPopupEventList `xml:"List"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubscribeMsgPopupEventList 订阅消息事件列表
|
||||||
|
type SubscribeMsgPopupEventList struct {
|
||||||
|
TemplateID string `xml:"TemplateId" json:"TemplateId"`
|
||||||
|
SubscribeStatusString string `xml:"SubscribeStatusString" json:"SubscribeStatusString"`
|
||||||
|
PopupScene string `xml:"PopupScene" json:"PopupScene"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSubscribeMsgPopupEvents 设置订阅消息事件
|
||||||
|
func (s *PushDataSubscribePopup) SetSubscribeMsgPopupEvents(list []SubscribeMsgPopupEventList) {
|
||||||
|
s.subscribeMsgPopupEventList = list
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSubscribeMsgPopupEvents 获取订阅消息事件数据
|
||||||
|
func (s *PushDataSubscribePopup) GetSubscribeMsgPopupEvents() []SubscribeMsgPopupEventList {
|
||||||
|
if s.subscribeMsgPopupEventList != nil {
|
||||||
|
return s.subscribeMsgPopupEventList
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.SubscribeMsgPopupEvent.List == nil || len(s.SubscribeMsgPopupEvent.List) < 1 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return s.SubscribeMsgPopupEvent.List
|
||||||
|
}
|
||||||
|
|
||||||
|
// PushDataSubscribeMsgChange 用户管理订阅通知事件推送
|
||||||
|
type PushDataSubscribeMsgChange struct {
|
||||||
|
CommonPushData
|
||||||
|
SubscribeMsgChangeEvent SubscribeMsgChangeEvent `xml:"SubscribeMsgChangeEvent"`
|
||||||
|
subscribeMsgChangeList []SubscribeMsgChangeList `json:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubscribeMsgChangeEvent 用户管理订阅通知回调
|
||||||
|
type SubscribeMsgChangeEvent struct {
|
||||||
|
List []SubscribeMsgChangeList `xml:"List" json:"List"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubscribeMsgChangeList 订阅消息事件列表
|
||||||
|
type SubscribeMsgChangeList struct {
|
||||||
|
TemplateID string `xml:"TemplateId" json:"TemplateId"`
|
||||||
|
SubscribeStatusString string `xml:"SubscribeStatusString" json:"SubscribeStatusString"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSubscribeMsgChangeEvents 设置订阅消息事件
|
||||||
|
func (s *PushDataSubscribeMsgChange) SetSubscribeMsgChangeEvents(list []SubscribeMsgChangeList) {
|
||||||
|
s.subscribeMsgChangeList = list
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSubscribeMsgChangeEvents 获取订阅消息事件数据
|
||||||
|
func (s *PushDataSubscribeMsgChange) GetSubscribeMsgChangeEvents() []SubscribeMsgChangeList {
|
||||||
|
if s.subscribeMsgChangeList != nil {
|
||||||
|
return s.subscribeMsgChangeList
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.SubscribeMsgChangeEvent.List == nil || len(s.SubscribeMsgChangeEvent.List) < 1 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.SubscribeMsgChangeEvent.List
|
||||||
|
}
|
||||||
|
|
||||||
|
// PushDataSubscribeMsgSent 用户发送订阅通知事件推送
|
||||||
|
type PushDataSubscribeMsgSent struct {
|
||||||
|
CommonPushData
|
||||||
|
SubscribeMsgSentEvent SubscribeMsgSentEvent `xml:"SubscribeMsgSentEvent"`
|
||||||
|
subscribeMsgSentEventList []SubscribeMsgSentList `json:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubscribeMsgSentEvent 用户发送订阅通知回调
|
||||||
|
type SubscribeMsgSentEvent struct {
|
||||||
|
List []SubscribeMsgSentList `xml:"List" json:"List"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SubscribeMsgSentList 订阅消息事件列表
|
||||||
|
type SubscribeMsgSentList struct {
|
||||||
|
TemplateID string `xml:"TemplateId" json:"TemplateId"`
|
||||||
|
MsgID string `xml:"MsgID" json:"MsgID"`
|
||||||
|
ErrorCode string `xml:"ErrorCode" json:"ErrorCode"`
|
||||||
|
ErrorStatus string `xml:"ErrorStatus" json:"ErrorStatus"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSubscribeMsgSentEvents 设置订阅消息事件
|
||||||
|
func (s *PushDataSubscribeMsgSent) SetSubscribeMsgSentEvents(list []SubscribeMsgSentList) {
|
||||||
|
s.subscribeMsgSentEventList = list
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSubscribeMsgSentEvents 获取订阅消息事件数据
|
||||||
|
func (s *PushDataSubscribeMsgSent) GetSubscribeMsgSentEvents() []SubscribeMsgSentList {
|
||||||
|
if s.subscribeMsgSentEventList != nil {
|
||||||
|
return s.subscribeMsgSentEventList
|
||||||
|
}
|
||||||
|
|
||||||
|
if s.SubscribeMsgSentEvent.List == nil || len(s.SubscribeMsgSentEvent.List) < 1 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return s.SubscribeMsgSentEvent.List
|
||||||
|
}
|
||||||
|
|
||||||
|
// XpayTeamInfo team purchase info
|
||||||
|
type XpayTeamInfo struct {
|
||||||
|
ActivityID string `json:"ActivityId" xml:"ActivityId"` // 活动 id
|
||||||
|
TeamID string `json:"TeamId" xml:"TeamId"` // 团 id
|
||||||
|
TeamType int `json:"TeamType" xml:"TeamType"` // 团类型 1-支付全部,拼成退款
|
||||||
|
TeamAction int `json:"TeamAction" xml:"TeamAction"` // 0-创团 1-参团
|
||||||
|
}
|
||||||
|
|
||||||
|
// PushDataXpayRefundNotify 退款推送
|
||||||
|
type PushDataXpayRefundNotify struct {
|
||||||
|
CommonPushData
|
||||||
|
OpenID string `json:"OpenId" xml:"OpenId"` // 用户 openid
|
||||||
|
WxRefundID string `json:"WxRefundId" xml:"WxRefundId"` // 微信退款单号
|
||||||
|
MchRefundID string `json:"MchRefundId" xml:"MchRefundId"` // 商户退款单号
|
||||||
|
WxOrderID string `json:"WxOrderId" xml:"WxOrderId"` // 退款单对应支付单的微信单号
|
||||||
|
MchOrderID string `json:"MchOrderId" xml:"MchOrderId"` // 退款单对应支付单的商户单号
|
||||||
|
RefundFee int `json:"RefundFee" xml:"RefundFee"` // 退款金额,单位分
|
||||||
|
RetCode int `json:"RetCode" xml:"RetCode"` // 退款结果,0 为成功
|
||||||
|
RetMsg string `json:"RetMsg" xml:"RetMsg"` // 退款结果详情
|
||||||
|
RefundStartTimestamp int64 `json:"RefundStartTimestamp" xml:"RefundStartTimestamp"` // 开始退款时间,秒级时间戳
|
||||||
|
RefundSuccTimestamp int64 `json:"RefundSuccTimestamp" xml:"RefundSuccTimestamp"` // 结束退款时间,秒级时间戳
|
||||||
|
WxpayRefundTransactionID string `json:"WxpayRefundTransactionId" xml:"WxpayRefundTransactionId"` // 退款单的微信支付单号
|
||||||
|
RetryTimes int `json:"RetryTimes" xml:"RetryTimes"` // 重试次数,从 0 开始
|
||||||
|
TeamInfo XpayTeamInfo `json:"TeamInfo" xml:"TeamInfo"` // 拼团信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// PushDataXpaySubscribeIosRefundQueryNotify iOS Apple 支付退款问询事件
|
||||||
|
// 文档:https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/virtual-payment/ios.html
|
||||||
|
type PushDataXpaySubscribeIosRefundQueryNotify struct {
|
||||||
|
CommonPushData
|
||||||
|
RefundTime string `json:"refund_time" xml:"refund_time"` // 问询时间,Unix 时间戳
|
||||||
|
OrderTime string `json:"order_time" xml:"order_time"` // 该笔退款的订单时间,Unix 时间戳
|
||||||
|
ChannelBill string `json:"channel_bill" xml:"channel_bill"` // Apple 支付票据号
|
||||||
|
BundleID string `json:"bundleid" xml:"bundleid"` // 应用的 Apple bundleid
|
||||||
|
ProductID string `json:"product_id" xml:"product_id"` // 道具 id
|
||||||
|
PCount string `json:"p_count" xml:"p_count"` // 道具/代币数量
|
||||||
|
RefundRequestReason string `json:"refund_request_reason" xml:"refund_request_reason"` // 用户请求退款的原因
|
||||||
|
ProvideStatus string `json:"provide_status" xml:"provide_status"` // 发货状态,0:未发货 1:已发货 2:发货中
|
||||||
|
PayOrderID string `json:"pay_order_id" xml:"pay_order_id"` // 退款对应支付订单号
|
||||||
|
}
|
||||||
|
|
||||||
|
// IosRefundQueryResponse iOS Apple 支付退款问询应答
|
||||||
|
type IosRefundQueryResponse struct {
|
||||||
|
ResultCode int32 `json:"result_code" xml:"result_code"` // 结果码,0-放过,建议退款;1-拦截,拒绝退款
|
||||||
|
ResultInfo string `json:"result_info" xml:"result_info"` // 结果描述
|
||||||
|
Evidence string `json:"evidence" xml:"evidence"` // 决策凭据,必填,用于退款审计
|
||||||
|
}
|
||||||
|
|
||||||
|
// PushDataXpayComplaintNotify 用户投诉推送
|
||||||
|
type PushDataXpayComplaintNotify struct {
|
||||||
|
CommonPushData
|
||||||
|
OpenID string `json:"OpenId" xml:"OpenId"` // 用户 openid
|
||||||
|
WxOrderID string `json:"WxOrderId" xml:"WxOrderId"` // 微信单号
|
||||||
|
MchOrderID string `json:"MchOrderId" xml:"MchOrderId"` // 商户单号
|
||||||
|
TransactionID string `json:"TransactionId" xml:"TransactionId"` // 微信支付交易单号
|
||||||
|
ComplaintID string `json:"ComplaintId" xml:"ComplaintId"` // 投诉单号
|
||||||
|
ComplaintDetail string `json:"ComplaintDetail" xml:"ComplaintDetail"` // 投诉详情
|
||||||
|
ComplaintTime int64 `json:"ComplaintTime" xml:"ComplaintTime"` // 投诉时间,秒级时间戳
|
||||||
|
RetryTimes int `json:"RetryTimes" xml:"RetryTimes"` // 重试次数,从 0 开始
|
||||||
|
RequestID string `json:"RequestId" xml:"RequestId"` // 请求编号
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package message
|
||||||
|
|
||||||
|
import "errors"
|
||||||
|
|
||||||
|
// ErrInvalidReply 无效的回复
|
||||||
|
var ErrInvalidReply = errors.New("无效的回复信息")
|
||||||
|
|
||||||
|
// ErrUnsupportedReply 不支持的回复类型
|
||||||
|
var ErrUnsupportedReply = errors.New("不支持的回复消息")
|
||||||
|
|
||||||
|
// Reply 消息回复
|
||||||
|
type Reply struct {
|
||||||
|
MsgType MsgType
|
||||||
|
MsgData interface{}
|
||||||
|
}
|
||||||
@@ -0,0 +1,147 @@
|
|||||||
|
package message
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// createActivityIDURL 创建activity_id
|
||||||
|
createActivityIDURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?access_token=%s&unionid=%s&openid=%s"
|
||||||
|
// SendUpdatableMsgURL 修改动态消息
|
||||||
|
setUpdatableMsgURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/send?access_token=%s"
|
||||||
|
// setChatToolMsgURL 修改小程序聊天工具的动态卡片消息
|
||||||
|
setChatToolMsgURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/chattoolmsg/send?access_token=%s"
|
||||||
|
)
|
||||||
|
|
||||||
|
// UpdatableTargetState 动态消息状态
|
||||||
|
type UpdatableTargetState int
|
||||||
|
|
||||||
|
const (
|
||||||
|
// TargetStateNotStarted 未开始
|
||||||
|
TargetStateNotStarted UpdatableTargetState = 0
|
||||||
|
// TargetStateStarted 已开始
|
||||||
|
TargetStateStarted UpdatableTargetState = 1
|
||||||
|
// TargetStateFinished 已结束
|
||||||
|
TargetStateFinished UpdatableTargetState = 2
|
||||||
|
)
|
||||||
|
|
||||||
|
// UpdatableMessage 动态消息
|
||||||
|
type UpdatableMessage struct {
|
||||||
|
*context.Context
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewUpdatableMessage 实例化
|
||||||
|
func NewUpdatableMessage(ctx *context.Context) *UpdatableMessage {
|
||||||
|
return &UpdatableMessage{
|
||||||
|
Context: ctx,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateActivityIDRequest 创建activity_id请求
|
||||||
|
type CreateActivityIDRequest struct {
|
||||||
|
UnionID string
|
||||||
|
OpenID string
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateActivityID 创建activity_id
|
||||||
|
func (updatableMessage *UpdatableMessage) CreateActivityID() (CreateActivityIDResponse, error) {
|
||||||
|
return updatableMessage.CreateActivityIDWithReq(&CreateActivityIDRequest{})
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateActivityIDWithReq 创建activity_id
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/updatable-message/createActivityId.html
|
||||||
|
func (updatableMessage *UpdatableMessage) CreateActivityIDWithReq(req *CreateActivityIDRequest) (res CreateActivityIDResponse, err error) {
|
||||||
|
accessToken, err := updatableMessage.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf(createActivityIDURL, accessToken, req.UnionID, req.OpenID)
|
||||||
|
response, err := util.HTTPGet(url)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "CreateActivityID")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetUpdatableMsg 修改动态消息
|
||||||
|
func (updatableMessage *UpdatableMessage) SetUpdatableMsg(activityID string, targetState UpdatableTargetState, template UpdatableMsgTemplate) (err error) {
|
||||||
|
accessToken, err := updatableMessage.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(setUpdatableMsgURL, accessToken)
|
||||||
|
data := SendUpdatableMsgReq{
|
||||||
|
ActivityID: activityID,
|
||||||
|
TargetState: targetState,
|
||||||
|
TemplateInfo: template,
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := util.PostJSON(uri, data)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "SendUpdatableMsg")
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateActivityIDResponse 创建activity_id 返回
|
||||||
|
type CreateActivityIDResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
|
||||||
|
ActivityID string `json:"activity_id"`
|
||||||
|
ExpirationTime int64 `json:"expiration_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdatableMsgTemplate 动态消息模板
|
||||||
|
type UpdatableMsgTemplate struct {
|
||||||
|
ParameterList []UpdatableMsgParameter `json:"parameter_list"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdatableMsgParameter 动态消息参数
|
||||||
|
type UpdatableMsgParameter struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SendUpdatableMsgReq 修改动态消息参数
|
||||||
|
type SendUpdatableMsgReq struct {
|
||||||
|
ActivityID string `json:"activity_id"`
|
||||||
|
TemplateInfo UpdatableMsgTemplate `json:"template_info"`
|
||||||
|
TargetState UpdatableTargetState `json:"target_state"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetChatToolMsgRequest 修改小程序聊天工具的动态卡片消息请求
|
||||||
|
type SetChatToolMsgRequest struct {
|
||||||
|
VersionType int64 `json:"version_type"`
|
||||||
|
TargetState UpdatableTargetState `json:"target_state"`
|
||||||
|
ActivityID string `json:"activity_id"`
|
||||||
|
TemplateID string `json:"template_id"`
|
||||||
|
ParticipatorInfoList []ParticipatorInfo `json:"participator_info_list,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ParticipatorInfo 更新后的聊天室成员状态
|
||||||
|
type ParticipatorInfo struct {
|
||||||
|
State int `json:"state"`
|
||||||
|
GroupOpenID string `json:"group_openid"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetChatToolMsg 修改小程序聊天工具的动态卡片消息
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/updatable-message/setChatToolMsg.html
|
||||||
|
func (updatableMessage *UpdatableMessage) SetChatToolMsg(req *SetChatToolMsgRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = updatableMessage.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(setChatToolMsgURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "SetChatToolMsg")
|
||||||
|
}
|
||||||
@@ -180,7 +180,7 @@ type MediaInfo struct {
|
|||||||
CreateTime int64 `json:"create_time"` // 上传时间,时间戳。
|
CreateTime int64 `json:"create_time"` // 上传时间,时间戳。
|
||||||
ExpireTime int64 `json:"expire_time"` // 过期时间,时间戳。
|
ExpireTime int64 `json:"expire_time"` // 过期时间,时间戳。
|
||||||
DramaID int64 `json:"drama_id"` // 所属剧目 id。
|
DramaID int64 `json:"drama_id"` // 所属剧目 id。
|
||||||
FileSize string `json:"file_size"` // 媒资文件大小,单位:字节。
|
FileSize int64 `json:"file_size"` // 媒资文件大小,单位:字节。
|
||||||
Duration int64 `json:"duration"` // 播放时长,单位:秒。
|
Duration int64 `json:"duration"` // 播放时长,单位:秒。
|
||||||
Name string `json:"name"` // 媒资文件名。
|
Name string `json:"name"` // 媒资文件名。
|
||||||
Description string `json:"description"` // 描述。
|
Description string `json:"description"` // 描述。
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// SingleFileUpload 单文件上传
|
// SingleFileUpload 单文件上传
|
||||||
func (s *MiniDrama) SingleFileUpload(ctx context.Context, in *SingleFileUploadRequest) (out *SingleFileUploadResponse, err error) {
|
func (s *MiniDrama) SingleFileUpload(ctx context.Context, in *SingleFileUploadRequest) (out SingleFileUploadResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, singleFileUpload); err != nil {
|
if address, err = s.requestAddress(ctx, singleFileUpload); err != nil {
|
||||||
return
|
return
|
||||||
@@ -76,12 +76,12 @@ func (s *MiniDrama) SingleFileUpload(ctx context.Context, in *SingleFileUploadRe
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "SingleFileUpload")
|
err = util.DecodeWithError(response, &out, "SingleFileUpload")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// PullUpload 拉取上传
|
// PullUpload 拉取上传
|
||||||
func (s *MiniDrama) PullUpload(ctx context.Context, in *PullUploadRequest) (out *PullUploadResponse, err error) {
|
func (s *MiniDrama) PullUpload(ctx context.Context, in *PullUploadRequest) (out PullUploadResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, pullUpload); err != nil {
|
if address, err = s.requestAddress(ctx, pullUpload); err != nil {
|
||||||
return
|
return
|
||||||
@@ -92,12 +92,12 @@ func (s *MiniDrama) PullUpload(ctx context.Context, in *PullUploadRequest) (out
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "PullUpload")
|
err = util.DecodeWithError(response, &out, "PullUpload")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetTask 查询任务状态
|
// GetTask 查询任务状态
|
||||||
func (s *MiniDrama) GetTask(ctx context.Context, in *GetTaskRequest) (out *GetTaskResponse, err error) {
|
func (s *MiniDrama) GetTask(ctx context.Context, in *GetTaskRequest) (out GetTaskResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, getTask); err != nil {
|
if address, err = s.requestAddress(ctx, getTask); err != nil {
|
||||||
return
|
return
|
||||||
@@ -109,12 +109,12 @@ func (s *MiniDrama) GetTask(ctx context.Context, in *GetTaskRequest) (out *GetTa
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "GetTask")
|
err = util.DecodeWithError(response, &out, "GetTask")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// ApplyUpload 申请分片上传
|
// ApplyUpload 申请分片上传
|
||||||
func (s *MiniDrama) ApplyUpload(ctx context.Context, in *ApplyUploadRequest) (out *ApplyUploadResponse, err error) {
|
func (s *MiniDrama) ApplyUpload(ctx context.Context, in *ApplyUploadRequest) (out ApplyUploadResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, applyUpload); err != nil {
|
if address, err = s.requestAddress(ctx, applyUpload); err != nil {
|
||||||
return
|
return
|
||||||
@@ -126,13 +126,13 @@ func (s *MiniDrama) ApplyUpload(ctx context.Context, in *ApplyUploadRequest) (ou
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "ApplyUpload")
|
err = util.DecodeWithError(response, &out, "ApplyUpload")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// UploadPart 上传分片
|
// UploadPart 上传分片
|
||||||
// Content-Type 需要指定为 multipart/form-data; boundary=<delimiter>,<箭头括号>表示必须替换为有效值的变量。
|
// Content-Type 需要指定为 multipart/form-data; boundary=<delimiter>,<箭头括号>表示必须替换为有效值的变量。
|
||||||
func (s *MiniDrama) UploadPart(ctx context.Context, in *UploadPartRequest) (out *UploadPartResponse, err error) {
|
func (s *MiniDrama) UploadPart(ctx context.Context, in *UploadPartRequest) (out UploadPartResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, uploadPart); err != nil {
|
if address, err = s.requestAddress(ctx, uploadPart); err != nil {
|
||||||
return
|
return
|
||||||
@@ -165,12 +165,12 @@ func (s *MiniDrama) UploadPart(ctx context.Context, in *UploadPartRequest) (out
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "UploadPart")
|
err = util.DecodeWithError(response, &out, "UploadPart")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// CommitUpload 确认上传
|
// CommitUpload 确认上传
|
||||||
func (s *MiniDrama) CommitUpload(ctx context.Context, in *CommitUploadRequest) (out *CommitUploadResponse, err error) {
|
func (s *MiniDrama) CommitUpload(ctx context.Context, in *CommitUploadRequest) (out CommitUploadResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, commitUpload); err != nil {
|
if address, err = s.requestAddress(ctx, commitUpload); err != nil {
|
||||||
return
|
return
|
||||||
@@ -182,12 +182,12 @@ func (s *MiniDrama) CommitUpload(ctx context.Context, in *CommitUploadRequest) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "CommitUpload")
|
err = util.DecodeWithError(response, &out, "CommitUpload")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListMedia 获取媒体列表
|
// ListMedia 获取媒体列表
|
||||||
func (s *MiniDrama) ListMedia(ctx context.Context, in *ListMediaRequest) (out *ListMediaResponse, err error) {
|
func (s *MiniDrama) ListMedia(ctx context.Context, in *ListMediaRequest) (out ListMediaResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, listMedia); err != nil {
|
if address, err = s.requestAddress(ctx, listMedia); err != nil {
|
||||||
return
|
return
|
||||||
@@ -199,12 +199,12 @@ func (s *MiniDrama) ListMedia(ctx context.Context, in *ListMediaRequest) (out *L
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "ListMedia")
|
err = util.DecodeWithError(response, &out, "ListMedia")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMedia 获取媒资详细信息
|
// GetMedia 获取媒资详细信息
|
||||||
func (s *MiniDrama) GetMedia(ctx context.Context, in *GetMediaRequest) (out *GetMediaResponse, err error) {
|
func (s *MiniDrama) GetMedia(ctx context.Context, in *GetMediaRequest) (out GetMediaResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, getMedia); err != nil {
|
if address, err = s.requestAddress(ctx, getMedia); err != nil {
|
||||||
return
|
return
|
||||||
@@ -216,12 +216,12 @@ func (s *MiniDrama) GetMedia(ctx context.Context, in *GetMediaRequest) (out *Get
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "GetMedia")
|
err = util.DecodeWithError(response, &out, "GetMedia")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMediaLink 获取媒资播放链接
|
// GetMediaLink 获取媒资播放链接
|
||||||
func (s *MiniDrama) GetMediaLink(ctx context.Context, in *GetMediaLinkRequest) (out *GetMediaLinkResponse, err error) {
|
func (s *MiniDrama) GetMediaLink(ctx context.Context, in *GetMediaLinkRequest) (out GetMediaLinkResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, getMediaLink); err != nil {
|
if address, err = s.requestAddress(ctx, getMediaLink); err != nil {
|
||||||
return
|
return
|
||||||
@@ -233,12 +233,12 @@ func (s *MiniDrama) GetMediaLink(ctx context.Context, in *GetMediaLinkRequest) (
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "GetMediaLink")
|
err = util.DecodeWithError(response, &out, "GetMediaLink")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteMedia 删除媒体
|
// DeleteMedia 删除媒体
|
||||||
func (s *MiniDrama) DeleteMedia(ctx context.Context, in *DeleteMediaRequest) (out *DeleteMediaResponse, err error) {
|
func (s *MiniDrama) DeleteMedia(ctx context.Context, in *DeleteMediaRequest) (out DeleteMediaResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, deleteMedia); err != nil {
|
if address, err = s.requestAddress(ctx, deleteMedia); err != nil {
|
||||||
return
|
return
|
||||||
@@ -250,12 +250,12 @@ func (s *MiniDrama) DeleteMedia(ctx context.Context, in *DeleteMediaRequest) (ou
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "DeleteMedia")
|
err = util.DecodeWithError(response, &out, "DeleteMedia")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// AuditDrama 审核剧本
|
// AuditDrama 审核剧本
|
||||||
func (s *MiniDrama) AuditDrama(ctx context.Context, in *AuditDramaRequest) (out *AuditDramaResponse, err error) {
|
func (s *MiniDrama) AuditDrama(ctx context.Context, in *AuditDramaRequest) (out AuditDramaResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, auditDrama); err != nil {
|
if address, err = s.requestAddress(ctx, auditDrama); err != nil {
|
||||||
return
|
return
|
||||||
@@ -267,12 +267,12 @@ func (s *MiniDrama) AuditDrama(ctx context.Context, in *AuditDramaRequest) (out
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "AuditDrama")
|
err = util.DecodeWithError(response, &out, "AuditDrama")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListDramas 获取剧目列表
|
// ListDramas 获取剧目列表
|
||||||
func (s *MiniDrama) ListDramas(ctx context.Context, in *ListDramasRequest) (out *ListDramasResponse, err error) {
|
func (s *MiniDrama) ListDramas(ctx context.Context, in *ListDramasRequest) (out ListDramasResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, listDramas); err != nil {
|
if address, err = s.requestAddress(ctx, listDramas); err != nil {
|
||||||
return
|
return
|
||||||
@@ -284,12 +284,12 @@ func (s *MiniDrama) ListDramas(ctx context.Context, in *ListDramasRequest) (out
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "ListDramas")
|
err = util.DecodeWithError(response, &out, "ListDramas")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetDrama 获取剧目信息
|
// GetDrama 获取剧目信息
|
||||||
func (s *MiniDrama) GetDrama(ctx context.Context, in *GetDramaRequest) (out *GetDramaResponse, err error) {
|
func (s *MiniDrama) GetDrama(ctx context.Context, in *GetDramaRequest) (out GetDramaResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, getDrama); err != nil {
|
if address, err = s.requestAddress(ctx, getDrama); err != nil {
|
||||||
return
|
return
|
||||||
@@ -300,12 +300,12 @@ func (s *MiniDrama) GetDrama(ctx context.Context, in *GetDramaRequest) (out *Get
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "GetDrama")
|
err = util.DecodeWithError(response, &out, "GetDrama")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetCdnUsageData 查询 CDN 用量数据
|
// GetCdnUsageData 查询 CDN 用量数据
|
||||||
func (s *MiniDrama) GetCdnUsageData(ctx context.Context, in *GetCdnUsageDataRequest) (out *GetCdnUsageDataResponse, err error) {
|
func (s *MiniDrama) GetCdnUsageData(ctx context.Context, in *GetCdnUsageDataRequest) (out GetCdnUsageDataResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, getCdnUsageData); err != nil {
|
if address, err = s.requestAddress(ctx, getCdnUsageData); err != nil {
|
||||||
return
|
return
|
||||||
@@ -316,12 +316,12 @@ func (s *MiniDrama) GetCdnUsageData(ctx context.Context, in *GetCdnUsageDataRequ
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "GetCdnUsageData")
|
err = util.DecodeWithError(response, &out, "GetCdnUsageData")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetCdnLogs 查询 CDN 日志
|
// GetCdnLogs 查询 CDN 日志
|
||||||
func (s *MiniDrama) GetCdnLogs(ctx context.Context, in *GetCdnLogsRequest) (out *GetCdnLogsResponse, err error) {
|
func (s *MiniDrama) GetCdnLogs(ctx context.Context, in *GetCdnLogsRequest) (out GetCdnLogsResponse, err error) {
|
||||||
var address string
|
var address string
|
||||||
if address, err = s.requestAddress(ctx, getCdnLogs); err != nil {
|
if address, err = s.requestAddress(ctx, getCdnLogs); err != nil {
|
||||||
return
|
return
|
||||||
@@ -332,7 +332,7 @@ func (s *MiniDrama) GetCdnLogs(ctx context.Context, in *GetCdnLogsRequest) (out
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "GetCdnLogs")
|
err = util.DecodeWithError(response, &out, "GetCdnLogs")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,11 +10,15 @@ import (
|
|||||||
"github.com/silenceper/wechat/v2/miniprogram/content"
|
"github.com/silenceper/wechat/v2/miniprogram/content"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/context"
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/encryptor"
|
"github.com/silenceper/wechat/v2/miniprogram/encryptor"
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/express"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/message"
|
"github.com/silenceper/wechat/v2/miniprogram/message"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/minidrama"
|
"github.com/silenceper/wechat/v2/miniprogram/minidrama"
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/ocr"
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/operation"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/order"
|
"github.com/silenceper/wechat/v2/miniprogram/order"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/privacy"
|
"github.com/silenceper/wechat/v2/miniprogram/privacy"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/qrcode"
|
"github.com/silenceper/wechat/v2/miniprogram/qrcode"
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/redpacketcover"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/riskcontrol"
|
"github.com/silenceper/wechat/v2/miniprogram/riskcontrol"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/security"
|
"github.com/silenceper/wechat/v2/miniprogram/security"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/shortlink"
|
"github.com/silenceper/wechat/v2/miniprogram/shortlink"
|
||||||
@@ -33,17 +37,30 @@ type MiniProgram struct {
|
|||||||
|
|
||||||
// NewMiniProgram 实例化小程序 API
|
// NewMiniProgram 实例化小程序 API
|
||||||
func NewMiniProgram(cfg *config.Config) *MiniProgram {
|
func NewMiniProgram(cfg *config.Config) *MiniProgram {
|
||||||
defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyMiniProgramPrefix, cfg.Cache)
|
var defaultAkHandle credential.AccessTokenContextHandle
|
||||||
|
const cacheKeyPrefix = credential.CacheKeyMiniProgramPrefix
|
||||||
|
if cfg.UseStableAK {
|
||||||
|
defaultAkHandle = credential.NewStableAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
|
||||||
|
} else {
|
||||||
|
defaultAkHandle = credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
|
||||||
|
}
|
||||||
ctx := &context.Context{
|
ctx := &context.Context{
|
||||||
Config: cfg,
|
Config: cfg,
|
||||||
AccessTokenHandle: defaultAkHandle,
|
AccessTokenContextHandle: defaultAkHandle,
|
||||||
}
|
}
|
||||||
return &MiniProgram{ctx}
|
return &MiniProgram{ctx}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetAccessTokenHandle 自定义 access_token 获取方式
|
// SetAccessTokenHandle 自定义 access_token 获取方式
|
||||||
func (miniProgram *MiniProgram) SetAccessTokenHandle(accessTokenHandle credential.AccessTokenHandle) {
|
func (miniProgram *MiniProgram) SetAccessTokenHandle(accessTokenHandle credential.AccessTokenHandle) {
|
||||||
miniProgram.ctx.AccessTokenHandle = accessTokenHandle
|
miniProgram.ctx.AccessTokenContextHandle = credential.AccessTokenCompatibleHandle{
|
||||||
|
AccessTokenHandle: accessTokenHandle,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetAccessTokenContextHandle 自定义 access_token 获取方式
|
||||||
|
func (miniProgram *MiniProgram) SetAccessTokenContextHandle(accessTokenContextHandle credential.AccessTokenContextHandle) {
|
||||||
|
miniProgram.ctx.AccessTokenContextHandle = accessTokenContextHandle
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetContext get Context
|
// GetContext get Context
|
||||||
@@ -155,3 +172,33 @@ func (miniProgram *MiniProgram) GetShipping() *order.Shipping {
|
|||||||
func (miniProgram *MiniProgram) GetMiniDrama() *minidrama.MiniDrama {
|
func (miniProgram *MiniProgram) GetMiniDrama() *minidrama.MiniDrama {
|
||||||
return minidrama.NewMiniDrama(miniProgram.ctx)
|
return minidrama.NewMiniDrama(miniProgram.ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetRedPacketCover 小程序微信红包封面 API
|
||||||
|
func (miniProgram *MiniProgram) GetRedPacketCover() *redpacketcover.RedPacketCover {
|
||||||
|
return redpacketcover.NewRedPacketCover(miniProgram.ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUpdatableMessage 小程序动态消息
|
||||||
|
func (miniProgram *MiniProgram) GetUpdatableMessage() *message.UpdatableMessage {
|
||||||
|
return message.NewUpdatableMessage(miniProgram.ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetOperation 小程序运维中心
|
||||||
|
func (miniProgram *MiniProgram) GetOperation() *operation.Operation {
|
||||||
|
return operation.NewOperation(miniProgram.ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetExpress 微信物流服务
|
||||||
|
func (miniProgram *MiniProgram) GetExpress() *express.Express {
|
||||||
|
return express.NewExpress(miniProgram.ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetOCR OCR接口
|
||||||
|
func (miniProgram *MiniProgram) GetOCR() *ocr.OCR {
|
||||||
|
return ocr.NewOCR(miniProgram.ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetIntracity 同城配送接口
|
||||||
|
func (miniProgram *MiniProgram) GetIntracity() *express.Express {
|
||||||
|
return express.NewExpress(miniProgram.ctx)
|
||||||
|
}
|
||||||
@@ -0,0 +1,248 @@
|
|||||||
|
package ocr
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/url"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
ocrIDCardURL = "https://api.weixin.qq.com/cv/ocr/idcard"
|
||||||
|
ocrBankCardURL = "https://api.weixin.qq.com/cv/ocr/bankcard"
|
||||||
|
ocrDrivingURL = "https://api.weixin.qq.com/cv/ocr/driving"
|
||||||
|
ocrDrivingLicenseURL = "https://api.weixin.qq.com/cv/ocr/drivinglicense"
|
||||||
|
ocrBizLicenseURL = "https://api.weixin.qq.com/cv/ocr/bizlicense"
|
||||||
|
ocrCommonURL = "https://api.weixin.qq.com/cv/ocr/comm"
|
||||||
|
)
|
||||||
|
|
||||||
|
// OCR struct
|
||||||
|
type OCR struct {
|
||||||
|
*context.Context
|
||||||
|
}
|
||||||
|
|
||||||
|
// coordinate 坐标
|
||||||
|
type coordinate struct {
|
||||||
|
X int64 `json:"x,omitempty"`
|
||||||
|
Y int64 `json:"y,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// position 位置
|
||||||
|
type position struct {
|
||||||
|
LeftTop coordinate `json:"left_top"`
|
||||||
|
RightTop coordinate `json:"right_top"`
|
||||||
|
RightBottom coordinate `json:"right_bottom"`
|
||||||
|
LeftBottom coordinate `json:"left_bottom"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// imageSize 图片尺寸
|
||||||
|
type imageSize struct {
|
||||||
|
Width int64 `json:"w,omitempty"`
|
||||||
|
Height int64 `json:"h,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResDriving 行驶证返回结果
|
||||||
|
type ResDriving struct {
|
||||||
|
util.CommonError
|
||||||
|
|
||||||
|
PlateNumber string `json:"plate_num,omitempty"`
|
||||||
|
VehicleType string `json:"vehicle_type,omitempty"`
|
||||||
|
Owner string `json:"owner,omitempty"`
|
||||||
|
Address string `json:"addr,omitempty"`
|
||||||
|
UseCharacter string `json:"use_character,omitempty"`
|
||||||
|
Model string `json:"model,omitempty"`
|
||||||
|
Vin string `json:"vin,omitempty"`
|
||||||
|
EngineNumber string `json:"engine_num,omitempty"`
|
||||||
|
RegisterDate string `json:"register_date,omitempty"`
|
||||||
|
IssueDate string `json:"issue_date,omitempty"`
|
||||||
|
PlateNumberB string `json:"plate_num_b,omitempty"`
|
||||||
|
Record string `json:"record,omitempty"`
|
||||||
|
PassengersNumber string `json:"passengers_num,omitempty"`
|
||||||
|
TotalQuality string `json:"total_quality,omitempty"`
|
||||||
|
PrepareQuality string `json:"prepare_quality,omitempty"`
|
||||||
|
OverallSize string `json:"overall_size,omitempty"`
|
||||||
|
CardPositionFront map[string]position `json:"card_position_front,omitempty"`
|
||||||
|
CardPositionBack map[string]position `json:"card_position_back,omitempty"`
|
||||||
|
ImageSize imageSize `json:"img_size,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResIDCard 身份证返回结果
|
||||||
|
type ResIDCard struct {
|
||||||
|
util.CommonError
|
||||||
|
|
||||||
|
Type string `json:"type,omitempty"`
|
||||||
|
Name string `json:"name,omitempty"`
|
||||||
|
ID string `json:"id,omitempty"`
|
||||||
|
Address string `json:"addr,omitempty"`
|
||||||
|
Gender string `json:"gender,omitempty"`
|
||||||
|
Nationality string `json:"nationality,omitempty"`
|
||||||
|
ValidDate string `json:"valid_date,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResBankCard 银行卡返回结果
|
||||||
|
type ResBankCard struct {
|
||||||
|
util.CommonError
|
||||||
|
|
||||||
|
Number string `json:"number,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResDrivingLicense 驾驶证返回结果
|
||||||
|
type ResDrivingLicense struct {
|
||||||
|
util.CommonError
|
||||||
|
|
||||||
|
IDNumber string `json:"id_num,omitempty"`
|
||||||
|
Name string `json:"name,omitempty"`
|
||||||
|
Sex string `json:"sex,omitempty"`
|
||||||
|
Nationality string `json:"nationality,omitempty"`
|
||||||
|
Address string `json:"address,omitempty"`
|
||||||
|
Birthday string `json:"birth_date,omitempty"`
|
||||||
|
IssueDate string `json:"issue_date,omitempty"`
|
||||||
|
CarClass string `json:"car_class,omitempty"`
|
||||||
|
ValidFrom string `json:"valid_from,omitempty"`
|
||||||
|
ValidTo string `json:"valid_to,omitempty"`
|
||||||
|
OfficialSeal string `json:"official_seal,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResBizLicense 营业执照返回结果
|
||||||
|
type ResBizLicense struct {
|
||||||
|
util.CommonError
|
||||||
|
|
||||||
|
RegisterNumber string `json:"reg_num,omitempty"`
|
||||||
|
Serial string `json:"serial,omitempty"`
|
||||||
|
LegalRepresentative string `json:"legal_representative,omitempty"`
|
||||||
|
EnterpriseName string `json:"enterprise_name,omitempty"`
|
||||||
|
TypeOfOrganization string `json:"type_of_organization,omitempty"`
|
||||||
|
Address string `json:"address,omitempty"`
|
||||||
|
TypeOfEnterprise string `json:"type_of_enterprise,omitempty"`
|
||||||
|
BusinessScope string `json:"business_scope,omitempty"`
|
||||||
|
RegisteredCapital string `json:"registered_capital,omitempty"`
|
||||||
|
PaidInCapital string `json:"paid_in_capital,omitempty"`
|
||||||
|
ValidPeriod string `json:"valid_period,omitempty"`
|
||||||
|
RegisterDate string `json:"registered_date,omitempty"`
|
||||||
|
CertPosition map[string]position `json:"cert_position,omitempty"`
|
||||||
|
ImageSize imageSize `json:"img_size,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResCommon 公共印刷品返回结果
|
||||||
|
type ResCommon struct {
|
||||||
|
util.CommonError
|
||||||
|
|
||||||
|
Items []commonItem `json:"items,omitempty"`
|
||||||
|
ImageSize imageSize `json:"img_size,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// commonItem 公共元素
|
||||||
|
type commonItem struct {
|
||||||
|
Position position `json:"pos"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewOCR 实例
|
||||||
|
func NewOCR(c *context.Context) *OCR {
|
||||||
|
ocr := new(OCR)
|
||||||
|
ocr.Context = c
|
||||||
|
return ocr
|
||||||
|
}
|
||||||
|
|
||||||
|
// IDCard 身份证OCR识别接口
|
||||||
|
func (ocr *OCR) IDCard(path string) (resIDCard ResIDCard, err error) {
|
||||||
|
accessToken, err := ocr.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := util.HTTPPost(fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrIDCardURL, url.QueryEscape(path), accessToken), "")
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &resIDCard, "OCRIDCard")
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// BankCard 银行卡OCR识别接口
|
||||||
|
func (ocr *OCR) BankCard(path string) (resBankCard ResBankCard, err error) {
|
||||||
|
accessToken, err := ocr.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := util.HTTPPost(fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrBankCardURL, url.QueryEscape(path), accessToken), "")
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &resBankCard, "OCRBankCard")
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Driving 行驶证OCR识别接口
|
||||||
|
func (ocr *OCR) Driving(path string) (resDriving ResDriving, err error) {
|
||||||
|
accessToken, err := ocr.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := util.HTTPPost(fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrDrivingURL, url.QueryEscape(path), accessToken), "")
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &resDriving, "OCRDriving")
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// DrivingLicense 驾驶证OCR识别接口
|
||||||
|
func (ocr *OCR) DrivingLicense(path string) (resDrivingLicense ResDrivingLicense, err error) {
|
||||||
|
accessToken, err := ocr.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := util.HTTPPost(fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrDrivingLicenseURL, url.QueryEscape(path), accessToken), "")
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &resDrivingLicense, "OCRDrivingLicense")
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// BizLicense 营业执照OCR识别接口
|
||||||
|
func (ocr *OCR) BizLicense(path string) (resBizLicense ResBizLicense, err error) {
|
||||||
|
accessToken, err := ocr.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := util.HTTPPost(fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrBizLicenseURL, url.QueryEscape(path), accessToken), "")
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &resBizLicense, "OCRBizLicense")
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Common 通用印刷体OCR识别接口
|
||||||
|
func (ocr *OCR) Common(path string) (resCommon ResCommon, err error) {
|
||||||
|
accessToken, err := ocr.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
response, err := util.HTTPPost(fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrCommonURL, url.QueryEscape(path), accessToken), "")
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
err = util.DecodeWithError(response, &resCommon, "OCRCommon")
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
@@ -0,0 +1,456 @@
|
|||||||
|
package operation
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// getDomainInfoURL 查询域名配置
|
||||||
|
getDomainInfoURL = "https://api.weixin.qq.com/wxa/getwxadevinfo?access_token=%s"
|
||||||
|
// getPerformanceURL 获取性能数据
|
||||||
|
getPerformanceURL = "https://api.weixin.qq.com/wxaapi/log/get_performance?access_token=%s"
|
||||||
|
// getSceneListURL 获取访问来源
|
||||||
|
getSceneListURL = "https://api.weixin.qq.com/wxaapi/log/get_scene?access_token=%s"
|
||||||
|
// getVersionListURL 获取客户端版本
|
||||||
|
getVersionListURL = "https://api.weixin.qq.com/wxaapi/log/get_client_version?access_token=%s"
|
||||||
|
// realTimeLogSearchURL 查询实时日志
|
||||||
|
realTimeLogSearchURL = "https://api.weixin.qq.com/wxaapi/userlog/userlog_search?%s"
|
||||||
|
// getFeedbackListURL 获取用户反馈列表
|
||||||
|
getFeedbackListURL = "https://api.weixin.qq.com/wxaapi/feedback/list?%s"
|
||||||
|
// getJsErrDetailURL 查询js错误详情
|
||||||
|
getJsErrDetailURL = "https://api.weixin.qq.com/wxaapi/log/jserr_detail?access_token=%s"
|
||||||
|
// getJsErrListURL 查询错误列表
|
||||||
|
getJsErrListURL = "https://api.weixin.qq.com/wxaapi/log/jserr_list?access_token=%s"
|
||||||
|
// getGrayReleasePlanURL 获取分阶段发布详情
|
||||||
|
getGrayReleasePlanURL = "https://api.weixin.qq.com/wxa/getgrayreleaseplan?access_token=%s"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Operation 运维中心
|
||||||
|
type Operation struct {
|
||||||
|
*context.Context
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewOperation 实例化
|
||||||
|
func NewOperation(ctx *context.Context) *Operation {
|
||||||
|
return &Operation{ctx}
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDomainInfoRequest 查询域名配置请求
|
||||||
|
type GetDomainInfoRequest struct {
|
||||||
|
Action string `json:"action"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDomainInfoResponse 查询域名配置响应
|
||||||
|
type GetDomainInfoResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
RequestDomain []string `json:"requestdomain"`
|
||||||
|
WsRequestDomain []string `json:"wsrequestdomain"`
|
||||||
|
UploadDomain []string `json:"uploaddomain"`
|
||||||
|
DownloadDomain []string `json:"downloaddomain"`
|
||||||
|
UDPDomain []string `json:"udpdomain"`
|
||||||
|
BizDomain []string `json:"bizdomain"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDomainInfo 查询域名配置
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getDomainInfo.html
|
||||||
|
func (o *Operation) GetDomainInfo(req *GetDomainInfoRequest) (res GetDomainInfoResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getDomainInfoURL, accessToken), req); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetDomainInfo")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPerformanceRequest 获取性能数据请求
|
||||||
|
type GetPerformanceRequest struct {
|
||||||
|
CostTimeType int64 `json:"cost_time_type"`
|
||||||
|
DefaultStartTime int64 `json:"default_start_time"`
|
||||||
|
DefaultEndTime int64 `json:"default_end_time"`
|
||||||
|
Device string `json:"device"`
|
||||||
|
IsDownloadCode string `json:"is_download_code"`
|
||||||
|
Scene string `json:"scene"`
|
||||||
|
NetworkType string `json:"networktype"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPerformanceResponse 获取性能数据响应
|
||||||
|
type GetPerformanceResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
DefaultTimeData string `json:"default_time_data"`
|
||||||
|
CompareTimeData string `json:"compare_time_data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PerformanceDefaultTimeData 查询数据
|
||||||
|
type PerformanceDefaultTimeData struct {
|
||||||
|
List []DefaultTimeDataItem `json:"list"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DefaultTimeDataItem 查询数据
|
||||||
|
type DefaultTimeDataItem struct {
|
||||||
|
RefData string `json:"ref_data"`
|
||||||
|
CostTimeType int64 `json:"cost_time_type"`
|
||||||
|
CostTime int64 `json:"cost_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPerformance 获取性能数据
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getPerformance.html
|
||||||
|
func (o *Operation) GetPerformance(req *GetPerformanceRequest) (res GetPerformanceResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getPerformanceURL, accessToken), req); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetPerformance")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSceneListResponse 获取访问来源响应
|
||||||
|
type GetSceneListResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Scene []Scene `json:"scene"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Scene 访问来源
|
||||||
|
type Scene struct {
|
||||||
|
Name string `json:"name"`
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSceneList 获取访问来源
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getSceneList.html
|
||||||
|
func (o *Operation) GetSceneList() (res GetSceneListResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(getSceneListURL, accessToken)); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetSceneList")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetVersionListResponse 获取客户端版本响应
|
||||||
|
type GetVersionListResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
CvList []ClientVersion `json:"cvlist"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClientVersion 客户端版本
|
||||||
|
type ClientVersion struct {
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
ClientVersionList []string `json:"client_version_list"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetVersionList 获取客户端版本
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getVersionList.html
|
||||||
|
func (o *Operation) GetVersionList() (res GetVersionListResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(getVersionListURL, accessToken)); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetVersionList")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// RealTimeLogSearchRequest 查询实时日志请求
|
||||||
|
type RealTimeLogSearchRequest struct {
|
||||||
|
Date string
|
||||||
|
BeginTime int64
|
||||||
|
EndTime int64
|
||||||
|
Start int64
|
||||||
|
Limit int64
|
||||||
|
Level int64
|
||||||
|
TraceID string
|
||||||
|
URL string
|
||||||
|
ID string
|
||||||
|
FilterMsg string
|
||||||
|
}
|
||||||
|
|
||||||
|
// RealTimeLogSearchResponse 查询实时日志响应
|
||||||
|
type RealTimeLogSearchResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Data RealTimeLogSearchData `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RealTimeLogSearchData 日志数据和日志条数总量
|
||||||
|
type RealTimeLogSearchData struct {
|
||||||
|
List []RealTimeLogSearchDataList `json:"list"`
|
||||||
|
Total int64 `json:"total"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RealTimeLogSearchDataList 日志数据列表
|
||||||
|
type RealTimeLogSearchDataList struct {
|
||||||
|
Level int64 `json:"level"`
|
||||||
|
LibraryVersion string `json:"libraryVersion"`
|
||||||
|
ClientVersion string `json:"clientVersion"`
|
||||||
|
ID string `json:"id"`
|
||||||
|
Timestamp int64 `json:"timestamp"`
|
||||||
|
Platform int64 `json:"platform"`
|
||||||
|
URL string `json:"url"`
|
||||||
|
TraceID string `json:"traceid"`
|
||||||
|
FilterMsg string `json:"filterMsg"`
|
||||||
|
Msg []RealTimeLogSearchDataListMsg `json:"msg"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RealTimeLogSearchDataListMsg 日志内容数组
|
||||||
|
type RealTimeLogSearchDataListMsg struct {
|
||||||
|
Time int64 `json:"time"`
|
||||||
|
Level int64 `json:"level"`
|
||||||
|
Msg []string `json:"msg"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// RealTimeLogSearch 查询实时日志
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/realtimelogSearch.html
|
||||||
|
func (o *Operation) RealTimeLogSearch(req *RealTimeLogSearchRequest) (res RealTimeLogSearchResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
params := map[string]interface{}{
|
||||||
|
"access_token": accessToken,
|
||||||
|
"date": req.Date,
|
||||||
|
"begintime": req.BeginTime,
|
||||||
|
"endtime": req.EndTime,
|
||||||
|
}
|
||||||
|
if req.Start > 0 {
|
||||||
|
params["start"] = req.Start
|
||||||
|
}
|
||||||
|
if req.Limit > 0 {
|
||||||
|
params["limit"] = req.Limit
|
||||||
|
}
|
||||||
|
if req.TraceID != "" {
|
||||||
|
params["traceId"] = req.TraceID
|
||||||
|
}
|
||||||
|
if req.URL != "" {
|
||||||
|
params["url"] = req.URL
|
||||||
|
}
|
||||||
|
if req.ID != "" {
|
||||||
|
params["id"] = req.ID
|
||||||
|
}
|
||||||
|
if req.FilterMsg != "" {
|
||||||
|
params["filterMsg"] = req.FilterMsg
|
||||||
|
}
|
||||||
|
if req.Level > 0 {
|
||||||
|
params["level"] = req.Level
|
||||||
|
}
|
||||||
|
query := util.Query(params)
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(realTimeLogSearchURL, query)); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "RealTimeLogSearch")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetFeedbackListRequest 获取用户反馈列表请求
|
||||||
|
type GetFeedbackListRequest struct {
|
||||||
|
Page int64
|
||||||
|
Num int64
|
||||||
|
Type int64
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetFeedbackListResponse 获取用户反馈列表响应
|
||||||
|
type GetFeedbackListResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
TotalNum int64 `json:"total_num"`
|
||||||
|
List []Feedback `json:"list"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Feedback 反馈列表
|
||||||
|
type Feedback struct {
|
||||||
|
RecordID int64 `json:"record_id"`
|
||||||
|
CreateTime int64 `json:"create_time"`
|
||||||
|
Content string `json:"content"`
|
||||||
|
Phone string `json:"phone"`
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
Nickname string `json:"nickname"`
|
||||||
|
HeadURL string `json:"head_url"`
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
MediaIDS []string `json:"mediaIds"`
|
||||||
|
SystemInfo string `json:"systemInfo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetFeedbackList 获取用户反馈列表
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getFeedback.html
|
||||||
|
func (o *Operation) GetFeedbackList(req *GetFeedbackListRequest) (res GetFeedbackListResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
params := map[string]interface{}{
|
||||||
|
"access_token": accessToken,
|
||||||
|
"page": req.Page,
|
||||||
|
"num": req.Num,
|
||||||
|
}
|
||||||
|
if req.Type > 0 {
|
||||||
|
params["type"] = req.Type
|
||||||
|
}
|
||||||
|
query := util.Query(params)
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(getFeedbackListURL, query)); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetFeedbackList")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetJsErrDetailRequest 查询js错误详情请求
|
||||||
|
type GetJsErrDetailRequest struct {
|
||||||
|
StartTime string `json:"startTime"`
|
||||||
|
EndTime string `json:"endTime"`
|
||||||
|
ErrorMsgMd5 string `json:"errorMsgMd5"`
|
||||||
|
ErrorStackMd5 string `json:"errorStackMd5"`
|
||||||
|
AppVersion string `json:"appVersion"`
|
||||||
|
SdkVersion string `json:"sdkVersion"`
|
||||||
|
OsName string `json:"osName"`
|
||||||
|
ClientVersion string `json:"clientVersion"`
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
Offset int64 `json:"offset"`
|
||||||
|
Limit int64 `json:"limit"`
|
||||||
|
Desc string `json:"desc"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetJsErrDetailResponse 查询js错误详情响应
|
||||||
|
type GetJsErrDetailResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
TotalCount int64 `json:"totalCount"`
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
Data []JsErrDetailData `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// JsErrDetailData 错误列表
|
||||||
|
type JsErrDetailData struct {
|
||||||
|
Count string `json:"Count"`
|
||||||
|
SdkVersion string `json:"sdkVersion"`
|
||||||
|
ClientVersion string `json:"ClientVersion"`
|
||||||
|
ErrorStackMd5 string `json:"errorStackMd5"`
|
||||||
|
TimeStamp string `json:"TimeStamp"`
|
||||||
|
AppVersion string `json:"appVersion"`
|
||||||
|
ErrorMsgMd5 string `json:"errorMsgMd5"`
|
||||||
|
ErrorMsg string `json:"errorMsg"`
|
||||||
|
ErrorStack string `json:"errorStack"`
|
||||||
|
Ds string `json:"Ds"`
|
||||||
|
OsName string `json:"OsName"`
|
||||||
|
OpenID string `json:"openId"`
|
||||||
|
PluginVersion string `json:"pluginversion"`
|
||||||
|
AppID string `json:"appId"`
|
||||||
|
DeviceModel string `json:"DeviceModel"`
|
||||||
|
Source string `json:"source"`
|
||||||
|
Route string `json:"route"`
|
||||||
|
Uin string `json:"Uin"`
|
||||||
|
Nickname string `json:"nickname"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetJsErrDetail 查询js错误详情
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getJsErrDetail.html
|
||||||
|
func (o *Operation) GetJsErrDetail(req *GetJsErrDetailRequest) (res GetJsErrDetailResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getJsErrDetailURL, accessToken), req); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetJsErrDetail")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetJsErrListRequest 查询错误列表请求
|
||||||
|
type GetJsErrListRequest struct {
|
||||||
|
AppVersion string `json:"appVersion"`
|
||||||
|
ErrType string `json:"errType"`
|
||||||
|
StartTime string `json:"startTime"`
|
||||||
|
EndTime string `json:"endTime"`
|
||||||
|
Keyword string `json:"keyword"`
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
OrderBy string `json:"orderby"`
|
||||||
|
Desc string `json:"desc"`
|
||||||
|
Offset int64 `json:"offset"`
|
||||||
|
Limit int64 `json:"limit"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetJsErrListResponse 查询错误列表响应
|
||||||
|
type GetJsErrListResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
TotalCount int64 `json:"totalCount"`
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
Data []JsErrListData `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// JsErrListData 错误列表
|
||||||
|
type JsErrListData struct {
|
||||||
|
ErrorMsgMd5 string `json:"errorMsgMd5"`
|
||||||
|
ErrorMsg string `json:"errorMsg"`
|
||||||
|
Uv int64 `json:"uv"`
|
||||||
|
Pv int64 `json:"pv"`
|
||||||
|
ErrorStackMd5 string `json:"errorStackMd5"`
|
||||||
|
ErrorStack string `json:"errorStack"`
|
||||||
|
PvPercent string `json:"pvPercent"`
|
||||||
|
UvPercent string `json:"uvPercent"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetJsErrList 查询错误列表
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getJsErrList.html
|
||||||
|
func (o *Operation) GetJsErrList(req *GetJsErrListRequest) (res GetJsErrListResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getJsErrListURL, accessToken), req); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetJsErrList")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetGrayReleasePlanResponse 获取分阶段发布详情响应
|
||||||
|
type GetGrayReleasePlanResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
GrayReleasePlan GrayReleasePlanDetail `json:"gray_release_plan"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GrayReleasePlanDetail 分阶段发布计划详情
|
||||||
|
type GrayReleasePlanDetail struct {
|
||||||
|
Status int64 `json:"status"`
|
||||||
|
CreateTimestamp int64 `json:"create_timestamp"`
|
||||||
|
GrayPercentage int64 `json:"gray_percentage"`
|
||||||
|
SupportExperiencerFirst bool `json:"support_experiencer_first"`
|
||||||
|
SupportDebugerFirst bool `json:"support_debuger_first"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetGrayReleasePlan 获取分阶段发布详情
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getGrayReleasePlan.html
|
||||||
|
func (o *Operation) GetGrayReleasePlan() (res GetGrayReleasePlanResponse, err error) {
|
||||||
|
var accessToken string
|
||||||
|
if accessToken, err = o.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(getGrayReleasePlanURL, accessToken)); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = util.DecodeWithError(response, &res, "GetGrayReleasePlan")
|
||||||
|
return
|
||||||
|
}
|
||||||
@@ -103,11 +103,8 @@ func (s *Privacy) GetPrivacySetting(privacyVer int) (GetPrivacySettingResponse,
|
|||||||
}
|
}
|
||||||
// 返回错误信息
|
// 返回错误信息
|
||||||
var result GetPrivacySettingResponse
|
var result GetPrivacySettingResponse
|
||||||
if err = util.DecodeWithError(response, &result, "getprivacysetting"); err != nil {
|
err = util.DecodeWithError(response, &result, "getprivacysetting")
|
||||||
return GetPrivacySettingResponse{}, err
|
return result, err
|
||||||
}
|
|
||||||
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetPrivacySetting 更新小程序权限配置
|
// SetPrivacySetting 更新小程序权限配置
|
||||||
@@ -130,11 +127,7 @@ func (s *Privacy) SetPrivacySetting(privacyVer int, ownerSetting OwnerSetting, s
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 返回错误信息
|
// 返回错误信息
|
||||||
if err = util.DecodeWithCommonError(response, "setprivacysetting"); err != nil {
|
return util.DecodeWithCommonError(response, "setprivacysetting")
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UploadPrivacyExtFileResponse 上传权限定义模板响应参数
|
// UploadPrivacyExtFileResponse 上传权限定义模板响应参数
|
||||||
@@ -159,9 +152,6 @@ func (s *Privacy) UploadPrivacyExtFile(fileData []byte) (UploadPrivacyExtFileRes
|
|||||||
|
|
||||||
// 返回错误信息
|
// 返回错误信息
|
||||||
var result UploadPrivacyExtFileResponse
|
var result UploadPrivacyExtFileResponse
|
||||||
if err = util.DecodeWithError(response, &result, "setprivacysetting"); err != nil {
|
err = util.DecodeWithError(response, &result, "setprivacysetting")
|
||||||
return UploadPrivacyExtFileResponse{}, err
|
|
||||||
}
|
|
||||||
|
|
||||||
return result, err
|
return result, err
|
||||||
}
|
}
|
||||||
@@ -54,6 +54,8 @@ type QRCoder struct {
|
|||||||
IsHyaline bool `json:"is_hyaline,omitempty"`
|
IsHyaline bool `json:"is_hyaline,omitempty"`
|
||||||
// envVersion 要打开的小程序版本。正式版为 "release",体验版为 "trial",开发版为 "develop"
|
// envVersion 要打开的小程序版本。正式版为 "release",体验版为 "trial",开发版为 "develop"
|
||||||
EnvVersion string `json:"env_version,omitempty"`
|
EnvVersion string `json:"env_version,omitempty"`
|
||||||
|
// ShowSplashAd 控制通过该小程序码进入小程序是否展示封面广告1、默认为true,展示封面广告2、传入为false时,不展示封面广告
|
||||||
|
ShowSplashAd *bool `json:"show_splash_ad,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// fetchCode 请求并返回二维码二进制数据
|
// fetchCode 请求并返回二维码二进制数据
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
package redpacketcover
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
getRedPacketCoverURL = "https://api.weixin.qq.com/redpacketcover/wxapp/cover_url/get_by_token?access_token=%s"
|
||||||
|
)
|
||||||
|
|
||||||
|
// RedPacketCover struct
|
||||||
|
type RedPacketCover struct {
|
||||||
|
*context.Context
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewRedPacketCover 实例
|
||||||
|
func NewRedPacketCover(context *context.Context) *RedPacketCover {
|
||||||
|
redPacketCover := new(RedPacketCover)
|
||||||
|
redPacketCover.Context = context
|
||||||
|
return redPacketCover
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRedPacketCoverRequest 获取微信红包封面参数
|
||||||
|
type GetRedPacketCoverRequest struct {
|
||||||
|
// openid 可领取用户的openid
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
// ctoken 在红包封面平台获取发放ctoken(需要指定可以发放的appid)
|
||||||
|
CToken string `json:"ctoken"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRedPacketCoverResp 获取微信红包封面
|
||||||
|
type GetRedPacketCoverResp struct {
|
||||||
|
util.CommonError
|
||||||
|
Data struct {
|
||||||
|
URL string `json:"url"`
|
||||||
|
} `json:"data"` // 唯一请求标识
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetRedPacketCoverURL 获得指定用户可以领取的红包封面链接。获取参数ctoken参考微信红包封面开放平台
|
||||||
|
// 文档地址: https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/red-packet-cover/getRedPacketCoverUrl.html
|
||||||
|
func (cover *RedPacketCover) GetRedPacketCoverURL(coderParams GetRedPacketCoverRequest) (res GetRedPacketCoverResp, err error) {
|
||||||
|
accessToken, err := cover.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(getRedPacketCoverURL, accessToken)
|
||||||
|
response, err := util.PostJSON(uri, coderParams)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &res, "GetRedPacketCoverURL")
|
||||||
|
return
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package security
|
package security
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
context2 "context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
@@ -51,12 +52,7 @@ func (security *Security) MediaCheckAsyncV1(in *MediaCheckAsyncV1Request) (trace
|
|||||||
TraceID string `json:"trace_id"`
|
TraceID string `json:"trace_id"`
|
||||||
}
|
}
|
||||||
err = util.DecodeWithError(response, &res, "MediaCheckAsyncV1")
|
err = util.DecodeWithError(response, &res, "MediaCheckAsyncV1")
|
||||||
if err != nil {
|
return res.TraceID, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
traceID = res.TraceID
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// MediaCheckAsyncRequest 图片/音频异步校验请求参数
|
// MediaCheckAsyncRequest 图片/音频异步校验请求参数
|
||||||
@@ -69,7 +65,12 @@ type MediaCheckAsyncRequest struct {
|
|||||||
|
|
||||||
// MediaCheckAsync 异步校验图片/音频是否含有违法违规内容
|
// MediaCheckAsync 异步校验图片/音频是否含有违法违规内容
|
||||||
func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID string, err error) {
|
func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID string, err error) {
|
||||||
accessToken, err := security.GetAccessToken()
|
return security.MediaCheckAsyncContext(context2.Background(), in)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MediaCheckAsyncContext 异步校验图片/音频是否含有违法违规内容
|
||||||
|
func (security *Security) MediaCheckAsyncContext(ctx context2.Context, in *MediaCheckAsyncRequest) (traceID string, err error) {
|
||||||
|
accessToken, err := security.GetAccessTokenContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -82,7 +83,7 @@ func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID s
|
|||||||
req.Version = 2
|
req.Version = 2
|
||||||
|
|
||||||
uri := fmt.Sprintf(mediaCheckAsyncURL, accessToken)
|
uri := fmt.Sprintf(mediaCheckAsyncURL, accessToken)
|
||||||
response, err := util.PostJSON(uri, req)
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -93,12 +94,7 @@ func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID s
|
|||||||
TraceID string `json:"trace_id"`
|
TraceID string `json:"trace_id"`
|
||||||
}
|
}
|
||||||
err = util.DecodeWithError(response, &res, "MediaCheckAsync")
|
err = util.DecodeWithError(response, &res, "MediaCheckAsync")
|
||||||
if err != nil {
|
return res.TraceID, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
traceID = res.TraceID
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ImageCheckV1 校验一张图片是否含有违法违规内容(同步)
|
// ImageCheckV1 校验一张图片是否含有违法违规内容(同步)
|
||||||
@@ -232,7 +228,12 @@ func (security *Security) MsgCheckV1(content string) (res MsgCheckResponse, err
|
|||||||
|
|
||||||
// MsgCheck 检查一段文本是否含有违法违规内容
|
// MsgCheck 检查一段文本是否含有违法违规内容
|
||||||
func (security *Security) MsgCheck(in *MsgCheckRequest) (res MsgCheckResponse, err error) {
|
func (security *Security) MsgCheck(in *MsgCheckRequest) (res MsgCheckResponse, err error) {
|
||||||
accessToken, err := security.GetAccessToken()
|
return security.MsgCheckContext(context2.Background(), in)
|
||||||
|
}
|
||||||
|
|
||||||
|
// MsgCheckContext 检查一段文本是否含有违法违规内容
|
||||||
|
func (security *Security) MsgCheckContext(ctx context2.Context, in *MsgCheckRequest) (res MsgCheckResponse, err error) {
|
||||||
|
accessToken, err := security.GetAccessTokenContext(ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -245,7 +246,7 @@ func (security *Security) MsgCheck(in *MsgCheckRequest) (res MsgCheckResponse, e
|
|||||||
req.Version = 2
|
req.Version = 2
|
||||||
|
|
||||||
uri := fmt.Sprintf(msgCheckURL, accessToken)
|
uri := fmt.Sprintf(msgCheckURL, accessToken)
|
||||||
response, err := util.PostJSON(uri, req)
|
response, err := util.PostJSONContext(ctx, uri, req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,11 +60,7 @@ func (shortLink *ShortLink) generate(shortLinkParams ShortLinker) (string, error
|
|||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
var res resShortLinker
|
var res resShortLinker
|
||||||
err = util.DecodeWithError(response, &res, "GenerateShortLink")
|
err = util.DecodeWithError(response, &res, "GenerateShortLink")
|
||||||
if err != nil {
|
return res.Link, err
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
|
|
||||||
return res.Link, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GenerateShortLinkPermanent 生成永久 shortLink
|
// GenerateShortLinkPermanent 生成永久 shortLink
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package subscribe
|
package subscribe
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/miniprogram/context"
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
@@ -11,22 +12,30 @@ const (
|
|||||||
// 发送订阅消息
|
// 发送订阅消息
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.send.html
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.send.html
|
||||||
subscribeSendURL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send"
|
subscribeSendURL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send"
|
||||||
|
|
||||||
// 获取当前帐号下的个人模板列表
|
// 获取当前帐号下的个人模板列表
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
|
||||||
getTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate"
|
getTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate"
|
||||||
|
|
||||||
// 添加订阅模板
|
// 添加订阅模板
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.addTemplate.html
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.addTemplate.html
|
||||||
addTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate"
|
addTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate"
|
||||||
|
|
||||||
// 删除私有模板
|
// 删除私有模板
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.deleteTemplate.html
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.deleteTemplate.html
|
||||||
delTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate"
|
delTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate"
|
||||||
|
|
||||||
// 统一服务消息
|
// 统一服务消息
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/uniform-message/uniformMessage.send.html
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/uniform-message/uniformMessage.send.html
|
||||||
uniformMessageSend = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send"
|
uniformMessageSend = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send"
|
||||||
|
// getCategoryURL 获取类目
|
||||||
|
getCategoryURL = "https://api.weixin.qq.com/wxaapi/newtmpl/getcategory?access_token=%s"
|
||||||
|
// getPubTemplateKeyWordsByIDURL 获取关键词列表
|
||||||
|
getPubTemplateKeyWordsByIDURL = "https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatekeywords?access_token=%s&tid=%s"
|
||||||
|
// getPubTemplateTitleListURL 获取所属类目下的公共模板
|
||||||
|
getPubTemplateTitleListURL = "https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatetitles?access_token=%s&ids=%s&start=%d&limit=%d"
|
||||||
|
// setUserNotifyURL 激活与更新服务卡片
|
||||||
|
setUserNotifyURL = "https://api.weixin.qq.com/wxa/set_user_notify?access_token=%s"
|
||||||
|
// setUserNotifyExtURL 更新服务卡片扩展信息
|
||||||
|
setUserNotifyExtURL = "https://api.weixin.qq.com/wxa/set_user_notifyext?access_token=%s"
|
||||||
|
// getUserNotifyURL 查询服务卡片状态
|
||||||
|
getUserNotifyURL = "https://api.weixin.qq.com/wxa/get_user_notify?access_token=%s"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Subscribe 订阅消息
|
// Subscribe 订阅消息
|
||||||
@@ -57,11 +66,18 @@ type DataItem struct {
|
|||||||
|
|
||||||
// TemplateItem template item
|
// TemplateItem template item
|
||||||
type TemplateItem struct {
|
type TemplateItem struct {
|
||||||
PriTmplID string `json:"priTmplId"`
|
PriTmplID string `json:"priTmplId"`
|
||||||
Title string `json:"title"`
|
Title string `json:"title"`
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
Example string `json:"example"`
|
Example string `json:"example"`
|
||||||
Type int64 `json:"type"`
|
Type int64 `json:"type"`
|
||||||
|
KeywordEnumValueList []KeywordEnumValue `json:"keywordEnumValueList"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// KeywordEnumValue 枚举参数值范围
|
||||||
|
type KeywordEnumValue struct {
|
||||||
|
EnumValueList []string `json:"enumValueList"`
|
||||||
|
KeywordCode string `json:"keywordCode"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// TemplateList template list
|
// TemplateList template list
|
||||||
@@ -70,6 +86,13 @@ type TemplateList struct {
|
|||||||
Data []TemplateItem `json:"data"`
|
Data []TemplateItem `json:"data"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// resTemplateSend 发送获取 msg id
|
||||||
|
type resTemplateSend struct {
|
||||||
|
util.CommonError
|
||||||
|
|
||||||
|
MsgID int64 `json:"msgid"`
|
||||||
|
}
|
||||||
|
|
||||||
// Send 发送订阅消息
|
// Send 发送订阅消息
|
||||||
func (s *Subscribe) Send(msg *Message) (err error) {
|
func (s *Subscribe) Send(msg *Message) (err error) {
|
||||||
var accessToken string
|
var accessToken string
|
||||||
@@ -85,6 +108,33 @@ func (s *Subscribe) Send(msg *Message) (err error) {
|
|||||||
return util.DecodeWithCommonError(response, "Send")
|
return util.DecodeWithCommonError(response, "Send")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SendGetMsgID 发送订阅消息返回 msgid
|
||||||
|
func (s *Subscribe) SendGetMsgID(msg *Message) (msgID int64, err error) {
|
||||||
|
var accessToken string
|
||||||
|
accessToken, err = s.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
uri := fmt.Sprintf("%s?access_token=%s", subscribeSendURL, accessToken)
|
||||||
|
response, err := util.PostJSON(uri, msg)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var result resTemplateSend
|
||||||
|
if err = json.Unmarshal(response, &result); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if result.ErrCode != 0 {
|
||||||
|
err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
msgID = result.MsgID
|
||||||
|
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// ListTemplates 获取当前帐号下的个人模板列表
|
// ListTemplates 获取当前帐号下的个人模板列表
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
|
||||||
func (s *Subscribe) ListTemplates() (*TemplateList, error) {
|
func (s *Subscribe) ListTemplates() (*TemplateList, error) {
|
||||||
@@ -168,11 +218,7 @@ func (s *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (templa
|
|||||||
}
|
}
|
||||||
var result resSubscribeAdd
|
var result resSubscribeAdd
|
||||||
err = util.DecodeWithError(response, &result, "AddSubscribe")
|
err = util.DecodeWithError(response, &result, "AddSubscribe")
|
||||||
if err != nil {
|
return result.TemplateID, err
|
||||||
return
|
|
||||||
}
|
|
||||||
templateID = result.TemplateID
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete 删除私有模板
|
// Delete 删除私有模板
|
||||||
@@ -193,3 +239,200 @@ func (s *Subscribe) Delete(templateID string) (err error) {
|
|||||||
}
|
}
|
||||||
return util.DecodeWithCommonError(response, "DeleteSubscribe")
|
return util.DecodeWithCommonError(response, "DeleteSubscribe")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetCategoryResponse 获取类目响应
|
||||||
|
type GetCategoryResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Data []Category `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Category 类目
|
||||||
|
type Category struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetCategory 获取类目
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/getCategory.html
|
||||||
|
func (s *Subscribe) GetCategory() ([]Category, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = s.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(getCategoryURL, accessToken)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetCategoryResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetCategory")
|
||||||
|
return result.Data, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPubTemplateKeywordsByIDResponse 获取关键词列表响应
|
||||||
|
type GetPubTemplateKeywordsByIDResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Count int64 `json:"count"`
|
||||||
|
Data []PubTemplateKeywords `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PubTemplateKeywords 关键词
|
||||||
|
type PubTemplateKeywords struct {
|
||||||
|
KID int64 `json:"kid"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Example string `json:"example"`
|
||||||
|
Rule string `json:"rule"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPubTemplateKeywordsByID 获取关键词列表
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/getPubTemplateKeyWordsById.html
|
||||||
|
func (s *Subscribe) GetPubTemplateKeywordsByID(tid string) (*GetPubTemplateKeywordsByIDResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = s.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(getPubTemplateKeyWordsByIDURL, accessToken, tid)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetPubTemplateKeywordsByIDResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetPubTemplateKeywordsByID")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPubTemplateTitleListRequest 获取所属类目下的公共模板请求
|
||||||
|
type GetPubTemplateTitleListRequest struct {
|
||||||
|
Start int64
|
||||||
|
Limit int64
|
||||||
|
IDs string
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPubTemplateTitleListResponse 获取所属类目下的公共模板响应
|
||||||
|
type GetPubTemplateTitleListResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Count int64 `json:"count"`
|
||||||
|
Data []PubTemplateTitle `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PubTemplateTitle 模板标题
|
||||||
|
type PubTemplateTitle struct {
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
TID string `json:"tid"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
CategoryID string `json:"categoryId"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetPubTemplateTitleList 获取所属类目下的公共模板
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/getPubTemplateTitleList.html
|
||||||
|
func (s *Subscribe) GetPubTemplateTitleList(req *GetPubTemplateTitleListRequest) (*GetPubTemplateTitleListResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = s.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(getPubTemplateTitleListURL, accessToken, req.IDs, req.Start, req.Limit)); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetPubTemplateTitleListResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetPubTemplateTitleList")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetUserNotifyRequest 激活与更新服务卡片请求
|
||||||
|
type SetUserNotifyRequest struct {
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
NotifyType int64 `json:"notify_type"`
|
||||||
|
NotifyCode string `json:"notify_code"`
|
||||||
|
ContentJSON string `json:"content_json"`
|
||||||
|
CheckJSON string `json:"check_json,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetUserNotify 激活与更新服务卡片
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/setUserNotify.html
|
||||||
|
func (s *Subscribe) SetUserNotify(req *SetUserNotifyRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = s.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(setUserNotifyURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "SetUserNotify")
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetUserNotifyExtRequest 更新服务卡片扩展信息请求
|
||||||
|
type SetUserNotifyExtRequest struct {
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
NotifyType int64 `json:"notify_type"`
|
||||||
|
NotifyCode string `json:"notify_code"`
|
||||||
|
ExtJSON string `json:"ext_json"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetUserNotifyExt 更新服务卡片扩展信息
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/setUserNotifyExt.html
|
||||||
|
func (s *Subscribe) SetUserNotifyExt(req *SetUserNotifyExtRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = s.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(setUserNotifyExtURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "SetUserNotifyExt")
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserNotifyRequest 查询服务卡片状态请求
|
||||||
|
type GetUserNotifyRequest struct {
|
||||||
|
OpenID string `json:"openid"`
|
||||||
|
NotifyType int64 `json:"notify_type"`
|
||||||
|
NotifyCode string `json:"notify_code"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserNotifyResponse 查询服务卡片状态响应
|
||||||
|
type GetUserNotifyResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
NotifyInfo NotifyInfo `json:"notify_info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// NotifyInfo 卡片状态
|
||||||
|
type NotifyInfo struct {
|
||||||
|
NotifyType int64 `json:"notify_type"`
|
||||||
|
ContentJSON string `json:"content_json"`
|
||||||
|
CodeState int64 `json:"code_state"`
|
||||||
|
CodeExpireTime int64 `json:"code_expire_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserNotify 查询服务卡片状态
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/getUserNotify.html
|
||||||
|
func (s *Subscribe) GetUserNotify(req *GetUserNotifyRequest) (*GetUserNotifyResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = s.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getUserNotifyURL, accessToken), req); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetUserNotifyResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetUserNotify")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
@@ -6,7 +6,13 @@ import (
|
|||||||
"github.com/silenceper/wechat/v2/util"
|
"github.com/silenceper/wechat/v2/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
const queryURL = "https://api.weixin.qq.com/wxa/query_urllink"
|
const queryURL = "https://api.weixin.qq.com/wxa/query_urllink?access_token=%s"
|
||||||
|
|
||||||
|
// ULQueryRequest 查询加密URLLink请求
|
||||||
|
type ULQueryRequest struct {
|
||||||
|
URLLink string `json:"url_link"`
|
||||||
|
QueryType int `json:"query_type"`
|
||||||
|
}
|
||||||
|
|
||||||
// ULQueryResult 返回的结果
|
// ULQueryResult 返回的结果
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-link/urllink.query.html 返回值
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-link/urllink.query.html 返回值
|
||||||
@@ -28,25 +34,35 @@ type ULQueryResult struct {
|
|||||||
ResourceAppid string `json:"resource_appid"`
|
ResourceAppid string `json:"resource_appid"`
|
||||||
} `json:"cloud_base"`
|
} `json:"cloud_base"`
|
||||||
} `json:"url_link_info"`
|
} `json:"url_link_info"`
|
||||||
VisitOpenid string `json:"visit_openid"`
|
VisitOpenid string `json:"visit_openid"`
|
||||||
|
QuotaInfo QuotaInfo `json:"quota_info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// QuotaInfo quota 配置
|
||||||
|
type QuotaInfo struct {
|
||||||
|
RemainVisitQuota int64 `json:"remain_visit_quota"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Query 查询小程序 url_link 配置。
|
// Query 查询小程序 url_link 配置。
|
||||||
func (u *URLLink) Query(urlLink string) (*ULQueryResult, error) {
|
func (u *URLLink) Query(urlLink string) (*ULQueryResult, error) {
|
||||||
accessToken, err := u.GetAccessToken()
|
return u.QueryWithType(&ULQueryRequest{URLLink: urlLink})
|
||||||
if err != nil {
|
}
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
uri := fmt.Sprintf("%s?access_token=%s", queryURL, accessToken)
|
// QueryWithType 查询加密URLLink
|
||||||
response, err := util.PostJSON(uri, map[string]string{"url_link": urlLink})
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/qrcode-link/url-link/queryUrlLink.html
|
||||||
if err != nil {
|
func (u *URLLink) QueryWithType(req *ULQueryRequest) (*ULQueryResult, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = u.GetAccessToken(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
var resp ULQueryResult
|
var response []byte
|
||||||
err = util.DecodeWithError(response, &resp, "URLLink.Query")
|
if response, err = util.PostJSON(fmt.Sprintf(queryURL, accessToken), req); err != nil {
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return &resp, nil
|
result := &ULQueryResult{}
|
||||||
|
err = util.DecodeWithError(response, result, "URLLink.Query")
|
||||||
|
return result, err
|
||||||
}
|
}
|
||||||
@@ -65,8 +65,5 @@ func (u *URLLink) Generate(params *ULParams) (string, error) {
|
|||||||
}
|
}
|
||||||
var resp ULResult
|
var resp ULResult
|
||||||
err = util.DecodeWithError(response, &resp, "URLLink.Generate")
|
err = util.DecodeWithError(response, &resp, "URLLink.Generate")
|
||||||
if err != nil {
|
return resp.URLLink, err
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return resp.URLLink, nil
|
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,8 @@ const (
|
|||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
|
||||||
type QueryScheme struct {
|
type QueryScheme struct {
|
||||||
// 小程序 scheme 码
|
// 小程序 scheme 码
|
||||||
Scheme string `json:"scheme"`
|
Scheme string `json:"scheme"`
|
||||||
|
QueryType int `json:"query_type"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// SchemeInfo scheme 配置
|
// SchemeInfo scheme 配置
|
||||||
@@ -33,38 +34,47 @@ type SchemeInfo struct {
|
|||||||
EnvVersion EnvVersion `json:"env_version"`
|
EnvVersion EnvVersion `json:"env_version"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// resQueryScheme 返回结构体
|
// QuotaInfo quota 配置
|
||||||
|
type QuotaInfo struct {
|
||||||
|
RemainVisitQuota int64 `json:"remain_visit_quota"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResQueryScheme 返回结构体
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
|
||||||
type resQueryScheme struct {
|
type ResQueryScheme struct {
|
||||||
// 通用错误
|
// 通用错误
|
||||||
*util.CommonError
|
util.CommonError
|
||||||
// scheme 配置
|
// scheme 配置
|
||||||
SchemeInfo SchemeInfo `json:"scheme_info"`
|
SchemeInfo SchemeInfo `json:"scheme_info"`
|
||||||
// 访问该链接的openid,没有用户访问过则为空字符串
|
// 访问该链接的openid,没有用户访问过则为空字符串
|
||||||
VisitOpenid string `json:"visit_openid"`
|
VisitOpenid string `json:"visit_openid"`
|
||||||
|
QuotaInfo QuotaInfo `json:"quota_info"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// QueryScheme 查询小程序 scheme 码
|
// QueryScheme 查询小程序 scheme 码
|
||||||
func (u *URLScheme) QueryScheme(querySchemeParams QueryScheme) (schemeInfo SchemeInfo, visitOpenid string, err error) {
|
func (u *URLScheme) QueryScheme(querySchemeParams QueryScheme) (schemeInfo SchemeInfo, visitOpenid string, err error) {
|
||||||
var accessToken string
|
res, err := u.QuerySchemeWithRes(querySchemeParams)
|
||||||
accessToken, err = u.GetAccessToken()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
return res.SchemeInfo, res.VisitOpenid, err
|
||||||
|
}
|
||||||
|
|
||||||
urlStr := fmt.Sprintf(querySchemeURL, accessToken)
|
// QuerySchemeWithRes 查询scheme码
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/qrcode-link/url-scheme/queryScheme.html
|
||||||
|
func (u *URLScheme) QuerySchemeWithRes(req QueryScheme) (*ResQueryScheme, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = u.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
var response []byte
|
var response []byte
|
||||||
response, err = util.PostJSON(urlStr, querySchemeParams)
|
if response, err = util.PostJSON(fmt.Sprintf(querySchemeURL, accessToken), req); err != nil {
|
||||||
if err != nil {
|
return nil, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
|
||||||
var res resQueryScheme
|
|
||||||
err = util.DecodeWithError(response, &res, "QueryScheme")
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
result := &ResQueryScheme{}
|
||||||
return res.SchemeInfo, res.VisitOpenid, nil
|
err = util.DecodeWithError(response, result, "QueryScheme")
|
||||||
|
return result, err
|
||||||
}
|
}
|
||||||
@@ -17,7 +17,12 @@ func NewURLScheme(ctx *context.Context) *URLScheme {
|
|||||||
return &URLScheme{Context: ctx}
|
return &URLScheme{Context: ctx}
|
||||||
}
|
}
|
||||||
|
|
||||||
const generateURL = "https://api.weixin.qq.com/wxa/generatescheme"
|
const (
|
||||||
|
// generateURL 获取加密scheme码
|
||||||
|
generateURL = "https://api.weixin.qq.com/wxa/generatescheme"
|
||||||
|
// generateNFCURL 获取 NFC 的小程序 scheme
|
||||||
|
generateNFCURL = "https://api.weixin.qq.com/wxa/generatenfcscheme?access_token=%s"
|
||||||
|
)
|
||||||
|
|
||||||
// TExpireType 失效类型 (指定时间戳/指定间隔)
|
// TExpireType 失效类型 (指定时间戳/指定间隔)
|
||||||
type TExpireType int
|
type TExpireType int
|
||||||
@@ -50,10 +55,13 @@ type JumpWxa struct {
|
|||||||
// USParams 请求参数
|
// USParams 请求参数
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.generate.html#请求参数
|
// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.generate.html#请求参数
|
||||||
type USParams struct {
|
type USParams struct {
|
||||||
JumpWxa *JumpWxa `json:"jump_wxa"`
|
JumpWxa *JumpWxa `json:"jump_wxa,omitempty"`
|
||||||
ExpireType TExpireType `json:"expire_type"`
|
ExpireType TExpireType `json:"expire_type,omitempty"`
|
||||||
ExpireTime int64 `json:"expire_time"`
|
ExpireTime int64 `json:"expire_time,omitempty"`
|
||||||
ExpireInterval int `json:"expire_interval"`
|
ExpireInterval int `json:"expire_interval,omitempty"`
|
||||||
|
IsExpire bool `json:"is_expire,omitempty"`
|
||||||
|
ModelID string `json:"model_id,omitempty"`
|
||||||
|
Sn string `json:"sn,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// USResult 返回的结果
|
// USResult 返回的结果
|
||||||
@@ -78,8 +86,24 @@ func (u *URLScheme) Generate(params *USParams) (string, error) {
|
|||||||
}
|
}
|
||||||
var resp USResult
|
var resp USResult
|
||||||
err = util.DecodeWithError(response, &resp, "URLScheme.Generate")
|
err = util.DecodeWithError(response, &resp, "URLScheme.Generate")
|
||||||
if err != nil {
|
return resp.OpenLink, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GenerateNFC 获取 NFC 的小程序 scheme
|
||||||
|
// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/qrcode-link/url-scheme/generateNFCScheme.html
|
||||||
|
func (u *URLScheme) GenerateNFC(params *USParams) (string, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = u.GetAccessToken(); err != nil {
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
return resp.OpenLink, nil
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(generateNFCURL, accessToken), params); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
result := &USResult{}
|
||||||
|
err = util.DecodeWithError(response, result, "URLScheme.GenerateNFC")
|
||||||
|
return result.OpenLink, err
|
||||||
}
|
}
|
||||||
@@ -51,6 +51,30 @@ const (
|
|||||||
SessionKeyExpiredError ErrCode = 268490009
|
SessionKeyExpiredError ErrCode = 268490009
|
||||||
// BillGeneratingError 错误码 268490011、账单数据生成中,请稍后调用本接口获取
|
// BillGeneratingError 错误码 268490011、账单数据生成中,请稍后调用本接口获取
|
||||||
BillGeneratingError ErrCode = 268490011
|
BillGeneratingError ErrCode = 268490011
|
||||||
|
// BatchTaskRunningError 错误码 268490012、批量任务运行中,请等待完成后才能再次运行
|
||||||
|
BatchTaskRunningError ErrCode = 268490012
|
||||||
|
// RefundVerifiedOrderError 错误码 268490013、禁止对核销状态的单进行退款
|
||||||
|
RefundVerifiedOrderError ErrCode = 268490013
|
||||||
|
// RefundInProgressError 错误码 268490014、退款操作进行中,稍后可以使用相同参数重试
|
||||||
|
RefundInProgressError ErrCode = 268490014
|
||||||
|
// FrequencyLimitError 错误码 268490015、频率限制
|
||||||
|
FrequencyLimitError ErrCode = 268490015
|
||||||
|
// RefundLeftFeeMismatchError 错误码 268490016、退款的 left_fee 字段与实际不符
|
||||||
|
RefundLeftFeeMismatchError ErrCode = 268490016
|
||||||
|
// AdFundIndustryMismatchError 错误码 268490018、广告金充值帐户行业 id 不匹配
|
||||||
|
AdFundIndustryMismatchError ErrCode = 268490018
|
||||||
|
// AdFundAccountBoundError 错误码 268490019、广告金充值帐户 id 已绑定其他 appid
|
||||||
|
AdFundAccountBoundError ErrCode = 268490019
|
||||||
|
// AdFundAccountNameError 错误码 268490020、广告金充值帐户主体名称错误
|
||||||
|
AdFundAccountNameError ErrCode = 268490020
|
||||||
|
// AccountNotVerifiedError 错误码 268490021、账户未完成进件
|
||||||
|
AccountNotVerifiedError ErrCode = 268490021
|
||||||
|
// AdFundAccountInvalidError 错误码 268490022、广告金充值账户无效
|
||||||
|
AdFundAccountInvalidError ErrCode = 268490022
|
||||||
|
// AdFundInsufficientError 错误码 268490023、广告金余额不足
|
||||||
|
AdFundInsufficientError ErrCode = 268490023
|
||||||
|
// AdFundAmountMustPositiveError 错误码 268490024、广告金充值金额必须大于 0
|
||||||
|
AdFundAmountMustPositiveError ErrCode = 268490024
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@@ -117,6 +141,57 @@ const (
|
|||||||
|
|
||||||
// queryPublishGoods 查询批量发布道具任务状态
|
// queryPublishGoods 查询批量发布道具任务状态
|
||||||
queryPublishGoods = "/xpay/query_publish_goods"
|
queryPublishGoods = "/xpay/query_publish_goods"
|
||||||
|
|
||||||
|
// startDownloadOrder 发起下载小程序订单明细任务
|
||||||
|
startDownloadOrder = "/xpay/start_download_order"
|
||||||
|
|
||||||
|
// queryDownloadOrder 查询下载订单任务结果
|
||||||
|
queryDownloadOrder = "/xpay/query_download_order"
|
||||||
|
|
||||||
|
// queryBizBalance 查询商家账户可提现余额
|
||||||
|
queryBizBalance = "/xpay/query_biz_balance"
|
||||||
|
|
||||||
|
// queryTransferAccount 查询广告金充值账户
|
||||||
|
queryTransferAccount = "/xpay/query_transfer_account"
|
||||||
|
|
||||||
|
// queryAdverFunds 查询广告金发放记录
|
||||||
|
queryAdverFunds = "/xpay/query_adver_funds"
|
||||||
|
|
||||||
|
// createFundsBill 充值广告金
|
||||||
|
createFundsBill = "/xpay/create_funds_bill"
|
||||||
|
|
||||||
|
// bindTransferAccount 绑定广告金充值账户
|
||||||
|
bindTransferAccount = "/xpay/bind_transfer_accout"
|
||||||
|
|
||||||
|
// queryFundsBill 查询广告金充值记录
|
||||||
|
queryFundsBill = "/xpay/query_funds_bill"
|
||||||
|
|
||||||
|
// queryRecoverBill 查询广告金回收记录
|
||||||
|
queryRecoverBill = "/xpay/query_recover_bill"
|
||||||
|
|
||||||
|
// downloadAdverFundsOrder 下载广告金对应的商户订单信息
|
||||||
|
downloadAdverFundsOrder = "/xpay/download_adverfunds_order"
|
||||||
|
|
||||||
|
// getComplaintList 获取投诉列表
|
||||||
|
getComplaintList = "/xpay/get_complaint_list"
|
||||||
|
|
||||||
|
// getComplaintDetail 获取投诉详情
|
||||||
|
getComplaintDetail = "/xpay/get_complaint_detail"
|
||||||
|
|
||||||
|
// getNegotiationHistory 获取协商历史
|
||||||
|
getNegotiationHistory = "/xpay/get_negotiation_history"
|
||||||
|
|
||||||
|
// responseComplaint 回复用户
|
||||||
|
responseComplaint = "/xpay/response_complaint"
|
||||||
|
|
||||||
|
// completeComplaint 完成投诉处理
|
||||||
|
completeComplaint = "/xpay/complete_complaint"
|
||||||
|
|
||||||
|
// uploadVPFile 上传媒体文件
|
||||||
|
uploadVPFile = "/xpay/upload_vp_file"
|
||||||
|
|
||||||
|
// getUploadFileSign 获取微信支付反馈投诉图片的签名头部
|
||||||
|
getUploadFileSign = "/xpay/get_upload_file_sign"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// VirtualPayment mini program virtual payment
|
// VirtualPayment mini program virtual payment
|
||||||
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/virtual-payment.html#_2-3-%E6%9C%8D%E5%8A%A1%E5%99%A8API
|
// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/virtual-payment.html
|
||||||
type VirtualPayment struct {
|
type VirtualPayment struct {
|
||||||
ctx *context.Context
|
ctx *context.Context
|
||||||
sessionKey string
|
sessionKey string
|
||||||
@@ -368,12 +368,14 @@ type AsyncXPayGoodsDeliverNotifyRequest struct {
|
|||||||
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
WechatPayInfo *WeChatPayInfo `json:"WechatPayInfo"` // 微信支付订单信息
|
WechatPayInfo *WeChatPayInfo `json:"WechatPayInfo"` // 微信支付订单信息
|
||||||
GoodsInfo *GoodsInfo `json:"GoodsInfo"` // 道具信息
|
GoodsInfo *GoodsInfo `json:"GoodsInfo"` // 道具信息
|
||||||
|
TeamInfo *TeamInfo `json:"TeamInfo"` // 拼团信息
|
||||||
}
|
}
|
||||||
|
|
||||||
// WeChatPayInfo 微信支付信息 非微信支付渠道可能没有
|
// WeChatPayInfo 微信支付信息 非微信支付渠道可能没有
|
||||||
type WeChatPayInfo struct {
|
type WeChatPayInfo struct {
|
||||||
MchOrderNo string `json:"MchOrderNo"` // 商户订单号
|
MchOrderNo string `json:"MchOrderNo"` // 商户订单号
|
||||||
TransactionID string `json:"TransactionId"` // 微信支付订单号
|
TransactionID string `json:"TransactionId"` // 微信支付订单号
|
||||||
|
PaidTime int64 `json:"PaidTime"` // 用户支付时间,Linux 秒级时间戳
|
||||||
}
|
}
|
||||||
|
|
||||||
// GoodsInfo 道具参数信息
|
// GoodsInfo 道具参数信息
|
||||||
@@ -385,6 +387,14 @@ type GoodsInfo struct {
|
|||||||
Attach string `json:"Attach"` // 透传信息
|
Attach string `json:"Attach"` // 透传信息
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TeamInfo 拼团信息
|
||||||
|
type TeamInfo struct {
|
||||||
|
ActivityID string `json:"ActivityId"` // 活动 id
|
||||||
|
TeamID string `json:"TeamId"` // 团 id
|
||||||
|
TeamType int `json:"TeamType"` // 团类型 1-支付全部,拼成退款
|
||||||
|
TeamAction int `json:"TeamAction"` // 0-创团 1-参团
|
||||||
|
}
|
||||||
|
|
||||||
// AsyncXPayGoodsDeliverNotifyResponse 异步通知发货响应参数
|
// AsyncXPayGoodsDeliverNotifyResponse 异步通知发货响应参数
|
||||||
type AsyncXPayGoodsDeliverNotifyResponse struct {
|
type AsyncXPayGoodsDeliverNotifyResponse struct {
|
||||||
util.CommonError
|
util.CommonError
|
||||||
@@ -417,6 +427,438 @@ type AsyncXPayCoinPayNotifyResponse struct {
|
|||||||
util.CommonError
|
util.CommonError
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AsyncXPayRefundNotifyRequest 异步通知退款推送,请求参数
|
||||||
|
type AsyncXPayRefundNotifyRequest struct {
|
||||||
|
ToUserName string `json:"ToUserName"` // 小程序的原始 ID
|
||||||
|
FromUserName string `json:"FromUserName"` // 发送方帐号(一个 OpenID)
|
||||||
|
CreateTime int `json:"CreateTime"` // 消息发送时间(整型)
|
||||||
|
MsgType string `json:"MsgType"` // 消息类型,此时固定为:event
|
||||||
|
Event string `json:"Event"` // 事件类型,此时固定为:xpay_refund_notify
|
||||||
|
Openid string `json:"openid"` // 用户 openid
|
||||||
|
WxRefundID string `json:"WxRefundId"` // 微信退款单号
|
||||||
|
MchRefundID string `json:"MchRefundId"` // 商户退款单号
|
||||||
|
WxOrderID string `json:"WxOrderId"` // 退款单对应支付单的微信单号
|
||||||
|
MchOrderID string `json:"MchOrderId"` // 退款单对应支付单的商户单号
|
||||||
|
RefundFee int `json:"RefundFee"` // 退款金额,单位分
|
||||||
|
RetCode int `json:"RetCode"` // 退款结果,0 为成功,非0 为失败
|
||||||
|
RetMsg string `json:"RetMsg"` // 退款结果详情
|
||||||
|
RefundStartTimestamp int64 `json:"RefundStartTimestamp"` // 开始退款时间,秒级时间戳
|
||||||
|
RefundSuccTimestamp int64 `json:"RefundSuccTimestamp"` // 结束退款时间,秒级时间戳
|
||||||
|
WxpayRefundTransactionID string `json:"WxpayRefundTransactionId"` // 退款单的微信支付单号
|
||||||
|
RetryTimes int `json:"RetryTimes"` // 重试次数,从 0 开始
|
||||||
|
TeamInfo *TeamInfo `json:"TeamInfo"` // 拼团信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// AsyncXPayRefundNotifyResponse 异步通知退款推送响应参数
|
||||||
|
type AsyncXPayRefundNotifyResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// AsyncXPaySubscribeIosRefundQueryNotifyRequest iOS Apple 支付退款问询消息
|
||||||
|
// 文档:https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/virtual-payment/ios.html
|
||||||
|
type AsyncXPaySubscribeIosRefundQueryNotifyRequest struct {
|
||||||
|
ToUserName string `json:"ToUserName"` // 小程序的原始 ID
|
||||||
|
FromUserName string `json:"FromUserName"` // 发送方帐号
|
||||||
|
CreateTime int `json:"CreateTime"` // 消息发送时间
|
||||||
|
MsgType string `json:"MsgType"` // 消息类型,此时固定为 event
|
||||||
|
Event string `json:"Event"` // 事件类型,此时固定为 xpay_subscribe_ios_refund_query_notify
|
||||||
|
|
||||||
|
RefundTime string `json:"refund_time"` // 问询时间,Unix 时间戳
|
||||||
|
OrderTime string `json:"order_time"` // 该笔退款的订单时间,Unix 时间戳
|
||||||
|
ChannelBill string `json:"channel_bill"` // Apple 支付票据号
|
||||||
|
BundleID string `json:"bundleid"` // 应用的 Apple bundleid
|
||||||
|
ProductID string `json:"product_id"` // 道具 id
|
||||||
|
PCount string `json:"p_count"` // 道具/代币数量
|
||||||
|
RefundRequestReason string `json:"refund_request_reason"` // 用户请求退款的原因
|
||||||
|
ProvideStatus string `json:"provide_status"` // 发货状态,0:未发货 1:已发货 2:发货中
|
||||||
|
PayOrderID string `json:"pay_order_id"` // 退款对应支付订单号
|
||||||
|
}
|
||||||
|
|
||||||
|
// AsyncXPaySubscribeIosRefundQueryNotifyResponse iOS Apple 支付退款问询应答
|
||||||
|
type AsyncXPaySubscribeIosRefundQueryNotifyResponse struct {
|
||||||
|
ResultCode int32 `json:"result_code"` // 结果码,0-放过,建议退款;1-拦截,拒绝退款
|
||||||
|
ResultInfo string `json:"result_info"` // 结果描述
|
||||||
|
Evidence string `json:"evidence"` // 决策凭据,必填,用于退款审计
|
||||||
|
}
|
||||||
|
|
||||||
|
// AsyncXPayComplaintNotifyRequest 异步通知用户投诉推送,请求参数
|
||||||
|
type AsyncXPayComplaintNotifyRequest struct {
|
||||||
|
ToUserName string `json:"ToUserName"` // 小程序的原始 ID
|
||||||
|
FromUserName string `json:"FromUserName"` // 发送方帐号(一个 OpenID)
|
||||||
|
CreateTime int `json:"CreateTime"` // 消息发送时间(整型)
|
||||||
|
MsgType string `json:"MsgType"` // 消息类型,此时固定为:event
|
||||||
|
Event string `json:"Event"` // 事件类型,此时固定为:xpay_complaint_notify
|
||||||
|
Openid string `json:"openid"` // 用户 openid
|
||||||
|
WxOrderID string `json:"WxOrderId"` // 微信单号
|
||||||
|
MchOrderID string `json:"MchOrderId"` // 商户单号
|
||||||
|
TransactionID string `json:"TransactionId"` // 微信支付交易单号
|
||||||
|
ComplaintID string `json:"ComplaintId"` // 投诉单号
|
||||||
|
ComplaintDetail string `json:"ComplaintDetail"` // 投诉详情
|
||||||
|
ComplaintTime int64 `json:"ComplaintTime"` // 投诉时间,秒级时间戳
|
||||||
|
RetryTimes int `json:"RetryTimes"` // 重试次数,从 0 开始
|
||||||
|
RequestID string `json:"RequestId"` // 请求编号
|
||||||
|
}
|
||||||
|
|
||||||
|
// AsyncXPayComplaintNotifyResponse 异步通知用户投诉推送响应参数
|
||||||
|
type AsyncXPayComplaintNotifyResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== 下载订单 ====================
|
||||||
|
|
||||||
|
// StartDownloadOrderRequest 发起下载小程序订单明细任务,请求参数
|
||||||
|
type StartDownloadOrderRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
BeginDs string `json:"begin_ds"` // 账单开始日期,格式为 yyyymmdd
|
||||||
|
EndDs string `json:"end_ds"` // 账单结束日期,格式为 yyyymmdd
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartDownloadOrderResponse 发起下载小程序订单明细任务 响应参数
|
||||||
|
type StartDownloadOrderResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryDownloadOrderRequest 查询下载订单任务结果,请求参数
|
||||||
|
type QueryDownloadOrderRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
BeginDs string `json:"begin_ds"` // 账单开始日期,格式为 yyyymmdd
|
||||||
|
EndDs string `json:"end_ds"` // 账单结束日期,格式为 yyyymmdd
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryDownloadOrderResponse 查询下载订单任务结果 响应参数
|
||||||
|
type QueryDownloadOrderResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
URL string `json:"url"` // 订单下载地址
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== 资金管理 ====================
|
||||||
|
|
||||||
|
// QueryBizBalanceRequest 查询商家账户可提现余额,请求参数
|
||||||
|
type QueryBizBalanceRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境(仅作为签名校验,查询结果都是正式环境的)
|
||||||
|
}
|
||||||
|
|
||||||
|
// BizBalanceAvailable 可提现余额
|
||||||
|
type BizBalanceAvailable struct {
|
||||||
|
Amount string `json:"amount"` // 可提现余额,单位元
|
||||||
|
CurrencyCode string `json:"currency_code"` // 币种(一般为 CNY)
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryBizBalanceResponse 查询商家账户可提现余额 响应参数
|
||||||
|
type QueryBizBalanceResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
BalanceAvailable *BizBalanceAvailable `json:"balance_available"` // 可提现余额
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== 广告金 ====================
|
||||||
|
|
||||||
|
// TransferAccount 广告金充值账户信息
|
||||||
|
type TransferAccount struct {
|
||||||
|
TransferAccountName string `json:"transfer_account_name"` // 账户名称
|
||||||
|
TransferAccountUID int64 `json:"transfer_account_uid"` // 账户 UID
|
||||||
|
TransferAccountAgencyID int64 `json:"transfer_account_agency_id"` // 代理商 ID
|
||||||
|
TransferAccountAgencyName string `json:"transfer_account_agency_name"` // 代理商名称
|
||||||
|
State int `json:"state"` // 审核状态 0-待审核 1-已通过 2-已驳回
|
||||||
|
BindResult int `json:"bind_result"` // 绑定结果 1-绑定成功 2-绑定失败
|
||||||
|
ErrorMsg string `json:"error_msg"` // 错误信息
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryTransferAccountRequest 查询广告金充值账户,请求参数
|
||||||
|
type QueryTransferAccountRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryTransferAccountResponse 查询广告金充值账户 响应参数
|
||||||
|
type QueryTransferAccountResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
AcctList []*TransferAccount `json:"acct_list"` // 充值账户列表
|
||||||
|
}
|
||||||
|
|
||||||
|
// AdverFundsFilter 广告金发放记录查询过滤条件
|
||||||
|
type AdverFundsFilter struct {
|
||||||
|
SettleBegin int64 `json:"settle_begin,omitempty"` // 结算周期开始时间,unix 秒级时间戳
|
||||||
|
SettleEnd int64 `json:"settle_end,omitempty"` // 结算周期结束时间,unix 秒级时间戳
|
||||||
|
FundType int `json:"fund_type,omitempty"` // 资金类型 0-普通赠送 1-广告激励 2-定向激励
|
||||||
|
}
|
||||||
|
|
||||||
|
// AdverFundsRecord 广告金发放记录
|
||||||
|
type AdverFundsRecord struct {
|
||||||
|
SettleBegin int64 `json:"settle_begin"` // 结算周期开始时间,unix 秒级时间戳
|
||||||
|
SettleEnd int64 `json:"settle_end"` // 结算周期结束时间,unix 秒级时间戳
|
||||||
|
TotalAmount int64 `json:"total_amount"` // 发放总金额,单位分
|
||||||
|
RemainAmount int64 `json:"remain_amount"` // 剩余可用金额,单位分
|
||||||
|
ExpireTime int64 `json:"expire_time"` // 过期时间,unix 秒级时间戳
|
||||||
|
FundType int `json:"fund_type"` // 资金类型 0-普通赠送 1-广告激励 2-定向激励
|
||||||
|
FundID string `json:"fund_id"` // 广告金发放 ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryAdverFundsRequest 查询广告金发放记录,请求参数
|
||||||
|
type QueryAdverFundsRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
Page int `json:"page,omitempty"` // 页码,>= 1
|
||||||
|
PageSize int `json:"page_size,omitempty"` // 每页记录数
|
||||||
|
Filter *AdverFundsFilter `json:"filter,omitempty"` // 查询过滤条件
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryAdverFundsResponse 查询广告金发放记录 响应参数
|
||||||
|
type QueryAdverFundsResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
AdverFundsList []*AdverFundsRecord `json:"adver_funds_list"` // 发放记录列表
|
||||||
|
TotalPage int `json:"total_page"` // 总页数
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateFundsBillRequest 充值广告金,请求参数
|
||||||
|
type CreateFundsBillRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
TransferAmount int64 `json:"transfer_amount"` // 充值金额,单位分
|
||||||
|
TransferAccountUID int64 `json:"transfer_account_uid"` // 充值账户 UID
|
||||||
|
TransferAccountName string `json:"transfer_account_name"` // 充值账户名称
|
||||||
|
TransferAccountAgencyID int64 `json:"transfer_account_agency_id"` // 代理商 ID
|
||||||
|
RequestID string `json:"request_id"` // 幂等请求 ID,最长 1024 字符
|
||||||
|
SettleBegin int64 `json:"settle_begin"` // 结算周期开始时间,unix 秒级时间戳
|
||||||
|
SettleEnd int64 `json:"settle_end"` // 结算周期结束时间,unix 秒级时间戳
|
||||||
|
AuthorizeAdvertise int `json:"authorize_advertise"` // 是否授权广告数据 0-否 1-是
|
||||||
|
FundType int `json:"fund_type"` // 资金类型 0-普通赠送 1-广告激励 2-定向激励
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateFundsBillResponse 充值广告金 响应参数
|
||||||
|
type CreateFundsBillResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
BillID string `json:"bill_id"` // 充值订单号
|
||||||
|
}
|
||||||
|
|
||||||
|
// BindTransferAccountRequest 绑定广告金充值账户,请求参数
|
||||||
|
type BindTransferAccountRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
TransferAccountUID int64 `json:"transfer_account_uid,omitempty"` // 充值账户 UID
|
||||||
|
TransferAccountOrgName string `json:"transfer_account_org_name,omitempty"` // 充值账户主体名称
|
||||||
|
}
|
||||||
|
|
||||||
|
// BindTransferAccountResponse 绑定广告金充值账户 响应参数
|
||||||
|
type BindTransferAccountResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// FundsBillFilter 广告金充值记录查询过滤条件
|
||||||
|
type FundsBillFilter struct {
|
||||||
|
OperTimeBegin int64 `json:"oper_time_begin"` // 充值开始时间,unix 秒级时间戳
|
||||||
|
OperTimeEnd int64 `json:"oper_time_end"` // 充值结束时间,unix 秒级时间戳
|
||||||
|
BillID string `json:"bill_id,omitempty"` // 充值订单号
|
||||||
|
RequestID string `json:"request_id,omitempty"` // 幂等请求 ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// FundsBillRecord 广告金充值记录
|
||||||
|
type FundsBillRecord struct {
|
||||||
|
BillID string `json:"bill_id"` // 充值订单号
|
||||||
|
OperTime int64 `json:"oper_time"` // 充值时间,unix 秒级时间戳
|
||||||
|
SettleBegin int64 `json:"settle_begin"` // 对应广告金结算开始时间,unix 秒级时间戳
|
||||||
|
SettleEnd int64 `json:"settle_end"` // 对应广告金结算结束时间,unix 秒级时间戳
|
||||||
|
FundID string `json:"fund_id"` // 对应广告金发放 ID
|
||||||
|
TransferAccountName string `json:"transfer_account_name"` // 充值账户名称
|
||||||
|
TransferAccountUID int64 `json:"transfer_account_uid"` // 充值账户 UID
|
||||||
|
TransferAmount int64 `json:"transfer_amount"` // 充值金额,单位分
|
||||||
|
Status int `json:"status"` // 状态 0-充值中 1-成功 2-失败
|
||||||
|
RequestID string `json:"request_id"` // 幂等请求 ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryFundsBillRequest 查询广告金充值记录,请求参数
|
||||||
|
type QueryFundsBillRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
Page int `json:"page"` // 页码,>= 1
|
||||||
|
PageSize int `json:"page_size"` // 每页记录数
|
||||||
|
Filter FundsBillFilter `json:"filter"` // 查询过滤条件
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryFundsBillResponse 查询广告金充值记录 响应参数
|
||||||
|
type QueryFundsBillResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
BillList []*FundsBillRecord `json:"bill_list"` // 充值记录列表
|
||||||
|
TotalPage int `json:"total_page"` // 总页数
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecoverBillFilter 广告金回收记录查询过滤条件
|
||||||
|
type RecoverBillFilter struct {
|
||||||
|
RecoverTimeBegin int64 `json:"recover_time_begin"` // 回收开始时间,unix 秒级时间戳
|
||||||
|
RecoverTimeEnd int64 `json:"recover_time_end"` // 回收结束时间,unix 秒级时间戳
|
||||||
|
BillID string `json:"bill_id,omitempty"` // 回收订单号
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecoverBillRecord 广告金回收记录
|
||||||
|
type RecoverBillRecord struct {
|
||||||
|
BillID string `json:"bill_id"` // 回收订单号
|
||||||
|
RecoverTime int64 `json:"recover_time"` // 回收时间,unix 秒级时间戳
|
||||||
|
SettleBegin int64 `json:"settle_begin"` // 结算周期开始时间,unix 秒级时间戳
|
||||||
|
SettleEnd int64 `json:"settle_end"` // 结算周期结束时间,unix 秒级时间戳
|
||||||
|
FundID string `json:"fund_id"` // 对应广告金发放 ID
|
||||||
|
RecoverAccountName string `json:"recover_account_name"` // 回收账户
|
||||||
|
RecoverAmount int64 `json:"recover_amount"` // 回收金额,单位分
|
||||||
|
RefundOrderList []string `json:"refund_order_list"` // 对应的退款订单号列表
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryRecoverBillRequest 查询广告金回收记录,请求参数
|
||||||
|
type QueryRecoverBillRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
Page int `json:"page"` // 页码,>= 1
|
||||||
|
PageSize int `json:"page_size"` // 每页记录数
|
||||||
|
Filter RecoverBillFilter `json:"filter"` // 查询过滤条件
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryRecoverBillResponse 查询广告金回收记录 响应参数
|
||||||
|
type QueryRecoverBillResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
BillList []*RecoverBillRecord `json:"bill_list"` // 回收记录列表
|
||||||
|
TotalPage int `json:"total_page"` // 总页数
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadAdverFundsOrderRequest 下载广告金对应的商户订单信息,请求参数
|
||||||
|
type DownloadAdverFundsOrderRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
FundID string `json:"fund_id"` // 广告金发放 ID
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadAdverFundsOrderResponse 下载广告金对应的商户订单信息 响应参数
|
||||||
|
type DownloadAdverFundsOrderResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
URL string `json:"url"` // 订单下载地址
|
||||||
|
}
|
||||||
|
|
||||||
|
// ==================== 投诉处理 ====================
|
||||||
|
|
||||||
|
// ComplaintOrderInfo 投诉关联订单信息
|
||||||
|
type ComplaintOrderInfo struct {
|
||||||
|
TransactionID string `json:"transaction_id"` // 微信支付交易单号
|
||||||
|
MchOrderNo string `json:"mch_order_no"` // 商户订单号
|
||||||
|
RefundID string `json:"refund_id"` // 退款订单号
|
||||||
|
}
|
||||||
|
|
||||||
|
// ComplaintMedia 投诉媒体信息
|
||||||
|
type ComplaintMedia struct {
|
||||||
|
MediaType int `json:"media_type"` // 媒体类型
|
||||||
|
MediaURL string `json:"media_url"` // 媒体 URL
|
||||||
|
MediaTags []string `json:"media_tags"` // 媒体标签
|
||||||
|
}
|
||||||
|
|
||||||
|
// ComplaintItem 投诉详情
|
||||||
|
type ComplaintItem struct {
|
||||||
|
ComplaintID string `json:"complaint_id"` // 投诉单号
|
||||||
|
ComplaintTime string `json:"complaint_time"` // 投诉时间
|
||||||
|
ComplaintDetail string `json:"complaint_detail"` // 投诉内容
|
||||||
|
ComplaintState string `json:"complaint_state"` // 投诉状态 PENDING/PROCESSING/PROCESSED
|
||||||
|
PayerPhone string `json:"payer_phone"` // 投诉人联系方式
|
||||||
|
PayerOpenID string `json:"payer_openid"` // 投诉人 OpenID
|
||||||
|
ComplaintOrderInfo []*ComplaintOrderInfo `json:"complaint_order_info"` // 关联订单信息
|
||||||
|
ComplaintFullRefunded bool `json:"complaint_full_refunded"` // 是否全部退款
|
||||||
|
IncomingUserResponse bool `json:"incoming_user_response"` // 是否有待处理的用户消息
|
||||||
|
UserComplaintTimes int `json:"user_complaint_times"` // 用户投诉次数
|
||||||
|
ComplaintMediaList []*ComplaintMedia `json:"complaint_media_list"` // 用户上传的证据
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetComplaintListRequest 获取投诉列表,请求参数
|
||||||
|
type GetComplaintListRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
BeginDate string `json:"begin_date"` // 查询开始日期,格式 yyyy-mm-dd
|
||||||
|
EndDate string `json:"end_date"` // 查询结束日期,格式 yyyy-mm-dd
|
||||||
|
Offset int `json:"offset"` // 偏移量,从 0 开始
|
||||||
|
Limit int `json:"limit"` // 最大返回记录数
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetComplaintListResponse 获取投诉列表 响应参数
|
||||||
|
type GetComplaintListResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Total int `json:"total"` // 总数
|
||||||
|
Complaints []*ComplaintItem `json:"complaints"` // 投诉列表
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetComplaintDetailRequest 获取投诉详情,请求参数
|
||||||
|
type GetComplaintDetailRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
ComplaintID string `json:"complaint_id"` // 投诉单号
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetComplaintDetailResponse 获取投诉详情 响应参数
|
||||||
|
type GetComplaintDetailResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Complaint *ComplaintItem `json:"complaint"` // 投诉详情
|
||||||
|
}
|
||||||
|
|
||||||
|
// NegotiationHistory 协商历史记录
|
||||||
|
type NegotiationHistory struct {
|
||||||
|
LogID string `json:"log_id"` // 操作流水号
|
||||||
|
Operator string `json:"operator"` // 操作人
|
||||||
|
OperateTime string `json:"operate_time"` // 操作时间
|
||||||
|
OperateType string `json:"operate_type"` // 操作类型
|
||||||
|
OperateDetails string `json:"operate_details"` // 操作详情
|
||||||
|
ComplaintMediaList []*ComplaintMedia `json:"complaint_media_list"` // 上传的证据
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetNegotiationHistoryRequest 获取协商历史,请求参数
|
||||||
|
type GetNegotiationHistoryRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
ComplaintID string `json:"complaint_id"` // 投诉单号
|
||||||
|
Offset int `json:"offset"` // 偏移量,从 0 开始
|
||||||
|
Limit int `json:"limit"` // 最大返回记录数
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetNegotiationHistoryResponse 获取协商历史 响应参数
|
||||||
|
type GetNegotiationHistoryResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Total int `json:"total"` // 总数
|
||||||
|
History []*NegotiationHistory `json:"history"` // 协商历史列表
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResponseComplaintRequest 回复用户投诉,请求参数
|
||||||
|
type ResponseComplaintRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
ComplaintID string `json:"complaint_id"` // 投诉单号
|
||||||
|
ResponseContent string `json:"response_content"` // 回复内容
|
||||||
|
ResponseImages []string `json:"response_images"` // 图片文件 ID 列表(来自 upload_vp_file)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResponseComplaintResponse 回复用户投诉 响应参数
|
||||||
|
type ResponseComplaintResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompleteComplaintRequest 完成投诉处理,请求参数
|
||||||
|
type CompleteComplaintRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
ComplaintID string `json:"complaint_id"` // 投诉单号
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompleteComplaintResponse 完成投诉处理 响应参数
|
||||||
|
type CompleteComplaintResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// UploadVPFileRequest 上传媒体文件,请求参数
|
||||||
|
type UploadVPFileRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
Base64Img string `json:"base64_img,omitempty"` // Base64 编码的图片,最大 1MB
|
||||||
|
ImgURL string `json:"img_url,omitempty"` // 图片 URL(可直接下载,不支持 302 跳转),最大 2MB,优先使用此字段
|
||||||
|
FileName string `json:"file_name"` // 图片名称
|
||||||
|
}
|
||||||
|
|
||||||
|
// UploadVPFileResponse 上传媒体文件 响应参数
|
||||||
|
type UploadVPFileResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
FileID string `json:"file_id"` // 返回的文件 ID(用于 response_complaint)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUploadFileSignRequest 获取微信支付反馈投诉图片的签名头部,请求参数
|
||||||
|
type GetUploadFileSignRequest struct {
|
||||||
|
Env Env `json:"env"` // 环境 0-正式环境 1-沙箱环境
|
||||||
|
WxpayURL string `json:"wxpay_url"` // 微信支付图片 URL,格式 "https://api.mch.weixin.qq.com/v3/merchant-service/images/{xxxxxx}"
|
||||||
|
ConvertCOS bool `json:"convert_cos"` // 是否转换为 COS,获取临时下载链接(有效期 30 分钟)
|
||||||
|
ComplaintID string `json:"complaint_id"` // 对应的投诉单号
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUploadFileSignResponse 获取微信支付反馈投诉图片的签名头部 响应参数
|
||||||
|
type GetUploadFileSignResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Sign string `json:"sign"` // Authorization 头部值
|
||||||
|
CosURL string `json:"cos_url"` // 当 convert_cos=true 时返回的 COS URL,有效期 30 分钟
|
||||||
|
}
|
||||||
|
|
||||||
// URLParams url parameter
|
// URLParams url parameter
|
||||||
type URLParams struct {
|
type URLParams struct {
|
||||||
Path string `json:"path"`
|
Path string `json:"path"`
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ func (s *VirtualPayment) SetSessionKey(sessionKey string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// QueryUserBalance 查询虚拟支付余额
|
// QueryUserBalance 查询虚拟支付余额
|
||||||
func (s *VirtualPayment) QueryUserBalance(ctx context.Context, in *QueryUserBalanceRequest) (out *QueryUserBalanceResponse, err error) {
|
func (s *VirtualPayment) QueryUserBalance(ctx context.Context, in *QueryUserBalanceRequest) (out QueryUserBalanceResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -55,17 +55,17 @@ func (s *VirtualPayment) QueryUserBalance(ctx context.Context, in *QueryUserBala
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "QueryUserBalance")
|
err = util.DecodeWithError(response, &out, "QueryUserBalance")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// CurrencyPay currency pay 扣减代币(一般用于代币支付)
|
// CurrencyPay currency pay 扣减代币(一般用于代币支付)
|
||||||
func (s *VirtualPayment) CurrencyPay(ctx context.Context, in *CurrencyPayRequest) (out *CurrencyPayResponse, err error) {
|
func (s *VirtualPayment) CurrencyPay(ctx context.Context, in *CurrencyPayRequest) (out CurrencyPayResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -83,17 +83,17 @@ func (s *VirtualPayment) CurrencyPay(ctx context.Context, in *CurrencyPayRequest
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "CurrencyPay")
|
err = util.DecodeWithError(response, &out, "CurrencyPay")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// QueryOrder 查询创建的订单(现金单,非代币单)
|
// QueryOrder 查询创建的订单(现金单,非代币单)
|
||||||
func (s *VirtualPayment) QueryOrder(ctx context.Context, in *QueryOrderRequest) (out *QueryOrderResponse, err error) {
|
func (s *VirtualPayment) QueryOrder(ctx context.Context, in *QueryOrderRequest) (out QueryOrderResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -111,17 +111,17 @@ func (s *VirtualPayment) QueryOrder(ctx context.Context, in *QueryOrderRequest)
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "QueryOrder")
|
err = util.DecodeWithError(response, &out, "QueryOrder")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// CancelCurrencyPay 取消订单 代币支付退款 (currency_pay 接口的逆操作)
|
// CancelCurrencyPay 取消订单 代币支付退款 (currency_pay 接口的逆操作)
|
||||||
func (s *VirtualPayment) CancelCurrencyPay(ctx context.Context, in *CancelCurrencyPayRequest) (out *CancelCurrencyPayResponse, err error) {
|
func (s *VirtualPayment) CancelCurrencyPay(ctx context.Context, in *CancelCurrencyPayRequest) (out CancelCurrencyPayResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -139,18 +139,18 @@ func (s *VirtualPayment) CancelCurrencyPay(ctx context.Context, in *CancelCurren
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "CancelCurrencyPay")
|
err = util.DecodeWithError(response, &out, "CancelCurrencyPay")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// NotifyProvideGoods 通知发货
|
// NotifyProvideGoods 通知发货
|
||||||
// 通知已经发货完成(只能通知现金单),正常通过 xpay_goods_deliver_notify 消息推送返回成功就不需要调用这个 api 接口。这个接口用于异常情况推送不成功时手动将单改成已发货状态
|
// 通知已经发货完成(只能通知现金单),正常通过 xpay_goods_deliver_notify 消息推送返回成功就不需要调用这个 api 接口。这个接口用于异常情况推送不成功时手动将单改成已发货状态
|
||||||
func (s *VirtualPayment) NotifyProvideGoods(ctx context.Context, in *NotifyProvideGoodsRequest) (out *NotifyProvideGoodsResponse, err error) {
|
func (s *VirtualPayment) NotifyProvideGoods(ctx context.Context, in *NotifyProvideGoodsRequest) (out NotifyProvideGoodsResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -169,17 +169,17 @@ func (s *VirtualPayment) NotifyProvideGoods(ctx context.Context, in *NotifyProvi
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "NotifyProvideGoods")
|
err = util.DecodeWithError(response, &out, "NotifyProvideGoods")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// PresentCurrency 代币赠送接口,由于目前不支付按单号查赠送单的功能,所以当需要赠送的时候可以一直重试到返回 0 或者返回 268490004(重复操作)为止
|
// PresentCurrency 代币赠送接口,由于目前不支付按单号查赠送单的功能,所以当需要赠送的时候可以一直重试到返回 0 或者返回 268490004(重复操作)为止
|
||||||
func (s *VirtualPayment) PresentCurrency(ctx context.Context, in *PresentCurrencyRequest) (out *PresentCurrencyResponse, err error) {
|
func (s *VirtualPayment) PresentCurrency(ctx context.Context, in *PresentCurrencyRequest) (out PresentCurrencyResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -198,17 +198,17 @@ func (s *VirtualPayment) PresentCurrency(ctx context.Context, in *PresentCurrenc
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "PresentCurrency")
|
err = util.DecodeWithError(response, &out, "PresentCurrency")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// DownloadBill 下载订单交易账单
|
// DownloadBill 下载订单交易账单
|
||||||
func (s *VirtualPayment) DownloadBill(ctx context.Context, in *DownloadBillRequest) (out *DownloadBillResponse, err error) {
|
func (s *VirtualPayment) DownloadBill(ctx context.Context, in *DownloadBillRequest) (out DownloadBillResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -227,17 +227,17 @@ func (s *VirtualPayment) DownloadBill(ctx context.Context, in *DownloadBillReque
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "DownloadBill")
|
err = util.DecodeWithError(response, &out, "DownloadBill")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// RefundOrder 退款 对使用 jsapi 接口下的单进行退款
|
// RefundOrder 退款 对使用 jsapi 接口下的单进行退款
|
||||||
func (s *VirtualPayment) RefundOrder(ctx context.Context, in *RefundOrderRequest) (out *RefundOrderResponse, err error) {
|
func (s *VirtualPayment) RefundOrder(ctx context.Context, in *RefundOrderRequest) (out RefundOrderResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -256,17 +256,17 @@ func (s *VirtualPayment) RefundOrder(ctx context.Context, in *RefundOrderRequest
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "RefundOrder")
|
err = util.DecodeWithError(response, &out, "RefundOrder")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// CreateWithdrawOrder 创建提现单
|
// CreateWithdrawOrder 创建提现单
|
||||||
func (s *VirtualPayment) CreateWithdrawOrder(ctx context.Context, in *CreateWithdrawOrderRequest) (out *CreateWithdrawOrderResponse, err error) {
|
func (s *VirtualPayment) CreateWithdrawOrder(ctx context.Context, in *CreateWithdrawOrderRequest) (out CreateWithdrawOrderResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -285,17 +285,17 @@ func (s *VirtualPayment) CreateWithdrawOrder(ctx context.Context, in *CreateWith
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "CreateWithdrawOrder")
|
err = util.DecodeWithError(response, &out, "CreateWithdrawOrder")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// QueryWithdrawOrder 查询提现单
|
// QueryWithdrawOrder 查询提现单
|
||||||
func (s *VirtualPayment) QueryWithdrawOrder(ctx context.Context, in *QueryWithdrawOrderRequest) (out *QueryWithdrawOrderResponse, err error) {
|
func (s *VirtualPayment) QueryWithdrawOrder(ctx context.Context, in *QueryWithdrawOrderRequest) (out QueryWithdrawOrderResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -314,17 +314,17 @@ func (s *VirtualPayment) QueryWithdrawOrder(ctx context.Context, in *QueryWithdr
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "QueryWithdrawOrder")
|
err = util.DecodeWithError(response, &out, "QueryWithdrawOrder")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// StartUploadGoods 开始上传商品
|
// StartUploadGoods 开始上传商品
|
||||||
func (s *VirtualPayment) StartUploadGoods(ctx context.Context, in *StartUploadGoodsRequest) (out *StartUploadGoodsResponse, err error) {
|
func (s *VirtualPayment) StartUploadGoods(ctx context.Context, in *StartUploadGoodsRequest) (out StartUploadGoodsResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -343,17 +343,17 @@ func (s *VirtualPayment) StartUploadGoods(ctx context.Context, in *StartUploadGo
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "StartUploadGoods")
|
err = util.DecodeWithError(response, &out, "StartUploadGoods")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// QueryUploadGoods 查询上传商品
|
// QueryUploadGoods 查询上传商品
|
||||||
func (s *VirtualPayment) QueryUploadGoods(ctx context.Context, in *QueryUploadGoodsRequest) (out *QueryUploadGoodsResponse, err error) {
|
func (s *VirtualPayment) QueryUploadGoods(ctx context.Context, in *QueryUploadGoodsRequest) (out QueryUploadGoodsResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -372,17 +372,17 @@ func (s *VirtualPayment) QueryUploadGoods(ctx context.Context, in *QueryUploadGo
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "QueryUploadGoods")
|
err = util.DecodeWithError(response, &out, "QueryUploadGoods")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// StartPublishGoods 开始发布商品
|
// StartPublishGoods 开始发布商品
|
||||||
func (s *VirtualPayment) StartPublishGoods(ctx context.Context, in *StartPublishGoodsRequest) (out *StartPublishGoodsResponse, err error) {
|
func (s *VirtualPayment) StartPublishGoods(ctx context.Context, in *StartPublishGoodsRequest) (out StartPublishGoodsResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -401,17 +401,17 @@ func (s *VirtualPayment) StartPublishGoods(ctx context.Context, in *StartPublish
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "StartPublishGoods")
|
err = util.DecodeWithError(response, &out, "StartPublishGoods")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// QueryPublishGoods 查询发布商品
|
// QueryPublishGoods 查询发布商品
|
||||||
func (s *VirtualPayment) QueryPublishGoods(ctx context.Context, in *QueryPublishGoodsRequest) (out *QueryPublishGoodsResponse, err error) {
|
func (s *VirtualPayment) QueryPublishGoods(ctx context.Context, in *QueryPublishGoodsRequest) (out QueryPublishGoodsResponse, err error) {
|
||||||
var jsonByte []byte
|
var jsonByte []byte
|
||||||
if jsonByte, err = json.Marshal(in); err != nil {
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
return
|
return
|
||||||
@@ -430,12 +430,505 @@ func (s *VirtualPayment) QueryPublishGoods(ctx context.Context, in *QueryPublish
|
|||||||
}
|
}
|
||||||
|
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSONContext(ctx, address, in); err != nil {
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "QueryPublishGoods")
|
err = util.DecodeWithError(response, &out, "QueryPublishGoods")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartDownloadOrder 发起下载小程序订单明细任务
|
||||||
|
func (s *VirtualPayment) StartDownloadOrder(ctx context.Context, in *StartDownloadOrderRequest) (out StartDownloadOrderResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: startDownloadOrder,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "StartDownloadOrder")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryDownloadOrder 查询下载订单任务结果
|
||||||
|
func (s *VirtualPayment) QueryDownloadOrder(ctx context.Context, in *QueryDownloadOrderRequest) (out QueryDownloadOrderResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: queryDownloadOrder,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "QueryDownloadOrder")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryBizBalance 查询商家账户可提现余额
|
||||||
|
func (s *VirtualPayment) QueryBizBalance(ctx context.Context, in *QueryBizBalanceRequest) (out QueryBizBalanceResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: queryBizBalance,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "QueryBizBalance")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryTransferAccount 查询广告金充值账户
|
||||||
|
func (s *VirtualPayment) QueryTransferAccount(ctx context.Context, in *QueryTransferAccountRequest) (out QueryTransferAccountResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: queryTransferAccount,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "QueryTransferAccount")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryAdverFunds 查询广告金发放记录
|
||||||
|
func (s *VirtualPayment) QueryAdverFunds(ctx context.Context, in *QueryAdverFundsRequest) (out QueryAdverFundsResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: queryAdverFunds,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "QueryAdverFunds")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateFundsBill 充值广告金
|
||||||
|
func (s *VirtualPayment) CreateFundsBill(ctx context.Context, in *CreateFundsBillRequest) (out CreateFundsBillResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: createFundsBill,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "CreateFundsBill")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// BindTransferAccount 绑定广告金充值账户
|
||||||
|
func (s *VirtualPayment) BindTransferAccount(ctx context.Context, in *BindTransferAccountRequest) (out BindTransferAccountResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: bindTransferAccount,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "BindTransferAccount")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryFundsBill 查询广告金充值记录
|
||||||
|
func (s *VirtualPayment) QueryFundsBill(ctx context.Context, in *QueryFundsBillRequest) (out QueryFundsBillResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: queryFundsBill,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "QueryFundsBill")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// QueryRecoverBill 查询广告金回收记录
|
||||||
|
func (s *VirtualPayment) QueryRecoverBill(ctx context.Context, in *QueryRecoverBillRequest) (out QueryRecoverBillResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: queryRecoverBill,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "QueryRecoverBill")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// DownloadAdverFundsOrder 下载广告金对应的商户订单信息
|
||||||
|
func (s *VirtualPayment) DownloadAdverFundsOrder(ctx context.Context, in *DownloadAdverFundsOrderRequest) (out DownloadAdverFundsOrderResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: downloadAdverFundsOrder,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "DownloadAdverFundsOrder")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetComplaintList 获取投诉列表
|
||||||
|
func (s *VirtualPayment) GetComplaintList(ctx context.Context, in *GetComplaintListRequest) (out GetComplaintListResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: getComplaintList,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "GetComplaintList")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetComplaintDetail 获取投诉详情
|
||||||
|
func (s *VirtualPayment) GetComplaintDetail(ctx context.Context, in *GetComplaintDetailRequest) (out GetComplaintDetailResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: getComplaintDetail,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "GetComplaintDetail")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetNegotiationHistory 获取协商历史
|
||||||
|
func (s *VirtualPayment) GetNegotiationHistory(ctx context.Context, in *GetNegotiationHistoryRequest) (out GetNegotiationHistoryResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: getNegotiationHistory,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "GetNegotiationHistory")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResponseComplaint 回复用户
|
||||||
|
func (s *VirtualPayment) ResponseComplaint(ctx context.Context, in *ResponseComplaintRequest) (out ResponseComplaintResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: responseComplaint,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "ResponseComplaint")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompleteComplaint 完成投诉处理
|
||||||
|
func (s *VirtualPayment) CompleteComplaint(ctx context.Context, in *CompleteComplaintRequest) (out CompleteComplaintResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: completeComplaint,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "CompleteComplaint")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// UploadVPFile 上传媒体文件
|
||||||
|
func (s *VirtualPayment) UploadVPFile(ctx context.Context, in *UploadVPFileRequest) (out UploadVPFileResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: uploadVPFile,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "UploadVPFile")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUploadFileSign 获取微信支付反馈投诉图片的签名头部
|
||||||
|
func (s *VirtualPayment) GetUploadFileSign(ctx context.Context, in *GetUploadFileSignRequest) (out GetUploadFileSignResponse, err error) {
|
||||||
|
var jsonByte []byte
|
||||||
|
if jsonByte, err = json.Marshal(in); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
params = URLParams{
|
||||||
|
Path: getUploadFileSign,
|
||||||
|
Content: string(jsonByte),
|
||||||
|
Signature: EmptyString,
|
||||||
|
}
|
||||||
|
address string
|
||||||
|
)
|
||||||
|
if address, err = s.requestAddress(params); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
if response, err = postJSONBytesContext(ctx, address, jsonByte); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 使用通用方法返回错误
|
||||||
|
err = util.DecodeWithError(response, &out, "GetUploadFileSign")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -446,6 +939,13 @@ func (s *VirtualPayment) hmacSha256(key, data string) string {
|
|||||||
return hex.EncodeToString(h.Sum(nil))
|
return hex.EncodeToString(h.Sum(nil))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// postJSONBytesContext POST JSON bytes with context
|
||||||
|
func postJSONBytesContext(ctx context.Context, address string, jsonByte []byte) ([]byte, error) {
|
||||||
|
return util.HTTPPostContext(ctx, address, jsonByte, map[string]string{
|
||||||
|
"Content-Type": "application/json;charset=utf-8",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// PaySign pay sign
|
// PaySign pay sign
|
||||||
func (s *VirtualPayment) PaySign(url, data string) (string, error) {
|
func (s *VirtualPayment) PaySign(url, data string) (string, error) {
|
||||||
if strings.TrimSpace(s.ctx.Config.AppKey) == "" {
|
if strings.TrimSpace(s.ctx.Config.AppKey) == "" {
|
||||||
@@ -476,23 +976,17 @@ func (s *VirtualPayment) PaySignature(url, data string) (paySign, signature stri
|
|||||||
// requestURL .组合 URL
|
// requestURL .组合 URL
|
||||||
func (s *VirtualPayment) requestAddress(params URLParams) (url string, err error) {
|
func (s *VirtualPayment) requestAddress(params URLParams) (url string, err error) {
|
||||||
switch params.Path {
|
switch params.Path {
|
||||||
case queryUserBalance:
|
case queryUserBalance, currencyPay, cancelCurrencyPay:
|
||||||
case currencyPay:
|
|
||||||
case cancelCurrencyPay:
|
|
||||||
if params.PaySign, params.Signature, err = s.PaySignature(params.Path, params.Content); err != nil {
|
if params.PaySign, params.Signature, err = s.PaySignature(params.Path, params.Content); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
case queryOrder:
|
case queryOrder, notifyProvideGoods, presentCurrency, downloadBill, refundOrder,
|
||||||
case notifyProvideGoods:
|
createWithdrawOrder, queryWithdrawOrder, startUploadGoods, queryUploadGoods,
|
||||||
case presentCurrency:
|
startPublishGoods, queryPublishGoods, startDownloadOrder, queryDownloadOrder,
|
||||||
case downloadBill:
|
queryBizBalance, queryTransferAccount, queryAdverFunds, createFundsBill,
|
||||||
case refundOrder:
|
bindTransferAccount, queryFundsBill, queryRecoverBill, downloadAdverFundsOrder,
|
||||||
case createWithdrawOrder:
|
getComplaintList, getComplaintDetail, getNegotiationHistory, responseComplaint,
|
||||||
case queryWithdrawOrder:
|
completeComplaint, uploadVPFile, getUploadFileSign:
|
||||||
case startUploadGoods:
|
|
||||||
case queryUploadGoods:
|
|
||||||
case startPublishGoods:
|
|
||||||
case queryPublishGoods:
|
|
||||||
if params.PaySign, err = s.PaySign(params.Path, params.Content); err != nil {
|
if params.PaySign, err = s.PaySign(params.Path, params.Content); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,9 +44,6 @@ func (basic *Basic) Long2ShortURL(longURL string) (shortURL string, err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err = util.DecodeWithError(responseBytes, resp, long2shortAction); err != nil {
|
err = util.DecodeWithError(responseBytes, resp, long2shortAction)
|
||||||
return
|
return resp.ShortURL, err
|
||||||
}
|
|
||||||
shortURL = resp.ShortURL
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
@@ -79,6 +79,10 @@ type sendRequest struct {
|
|||||||
Mpnews map[string]interface{} `json:"mpnews,omitempty"`
|
Mpnews map[string]interface{} `json:"mpnews,omitempty"`
|
||||||
// 发送语音
|
// 发送语音
|
||||||
Voice map[string]interface{} `json:"voice,omitempty"`
|
Voice map[string]interface{} `json:"voice,omitempty"`
|
||||||
|
// 发送视频
|
||||||
|
Mpvideo map[string]interface{} `json:"mpvideo,omitempty"`
|
||||||
|
// 发送图片-预览使用
|
||||||
|
Image map[string]interface{} `json:"image,omitempty"`
|
||||||
// 发送图片
|
// 发送图片
|
||||||
Images *Image `json:"images,omitempty"`
|
Images *Image `json:"images,omitempty"`
|
||||||
// 发送卡券
|
// 发送卡券
|
||||||
@@ -183,7 +187,13 @@ func (broadcast *Broadcast) SendImage(user *User, images *Image) (*Result, error
|
|||||||
ToUser: nil,
|
ToUser: nil,
|
||||||
MsgType: MsgTypeImage,
|
MsgType: MsgTypeImage,
|
||||||
}
|
}
|
||||||
req.Images = images
|
if broadcast.preview {
|
||||||
|
req.Image = map[string]interface{}{
|
||||||
|
"media_id": images.MediaIDs[0],
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
req.Images = images
|
||||||
|
}
|
||||||
req, sendURL := broadcast.chooseTagOrOpenID(user, req)
|
req, sendURL := broadcast.chooseTagOrOpenID(user, req)
|
||||||
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
|
url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
|
||||||
data, err := util.PostJSON(url, req)
|
data, err := util.PostJSON(url, req)
|
||||||
@@ -205,7 +215,7 @@ func (broadcast *Broadcast) SendVideo(user *User, mediaID string, title, descrip
|
|||||||
ToUser: nil,
|
ToUser: nil,
|
||||||
MsgType: MsgTypeVideo,
|
MsgType: MsgTypeVideo,
|
||||||
}
|
}
|
||||||
req.Voice = map[string]interface{}{
|
req.Mpvideo = map[string]interface{}{
|
||||||
"media_id": mediaID,
|
"media_id": mediaID,
|
||||||
"title": title,
|
"title": title,
|
||||||
"description": description,
|
"description": description,
|
||||||
|
|||||||
@@ -11,4 +11,5 @@ type Config struct {
|
|||||||
Token string `json:"token"` // token
|
Token string `json:"token"` // token
|
||||||
EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
|
EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
|
||||||
Cache cache.Cache
|
Cache cache.Cache
|
||||||
|
UseStableAK bool // use the stable access_token
|
||||||
}
|
}
|
||||||
@@ -72,11 +72,7 @@ func (csm *Manager) List() (customerServiceList []*KeFuInfo, err error) {
|
|||||||
}
|
}
|
||||||
var res resKeFuList
|
var res resKeFuList
|
||||||
err = util.DecodeWithError(response, &res, "ListCustomerService")
|
err = util.DecodeWithError(response, &res, "ListCustomerService")
|
||||||
if err != nil {
|
return res.KfList, err
|
||||||
return
|
|
||||||
}
|
|
||||||
customerServiceList = res.KfList
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// KeFuOnlineInfo 客服在线信息
|
// KeFuOnlineInfo 客服在线信息
|
||||||
@@ -107,11 +103,7 @@ func (csm *Manager) OnlineList() (customerServiceOnlineList []*KeFuOnlineInfo, e
|
|||||||
}
|
}
|
||||||
var res resKeFuOnlineList
|
var res resKeFuOnlineList
|
||||||
err = util.DecodeWithError(response, &res, "ListOnlineCustomerService")
|
err = util.DecodeWithError(response, &res, "ListOnlineCustomerService")
|
||||||
if err != nil {
|
return res.KfOnlineList, err
|
||||||
return
|
|
||||||
}
|
|
||||||
customerServiceOnlineList = res.KfOnlineList
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add 添加客服账号
|
// Add 添加客服账号
|
||||||
|
|||||||
@@ -183,9 +183,6 @@ func (cube *DataCube) fetchData(params ParamsPublisher) (response []byte, err er
|
|||||||
uri := fmt.Sprintf("%s?%s", publisherURL, v.Encode())
|
uri := fmt.Sprintf("%s?%s", publisherURL, v.Encode())
|
||||||
|
|
||||||
response, err = util.HTTPGet(uri)
|
response, err = util.HTTPGet(uri)
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -64,11 +64,7 @@ func (draft *Draft) AddDraft(articles []*Article) (mediaID string, err error) {
|
|||||||
MediaID string `json:"media_id"`
|
MediaID string `json:"media_id"`
|
||||||
}
|
}
|
||||||
err = util.DecodeWithError(response, &res, "AddDraft")
|
err = util.DecodeWithError(response, &res, "AddDraft")
|
||||||
if err != nil {
|
return res.MediaID, err
|
||||||
return
|
|
||||||
}
|
|
||||||
mediaID = res.MediaID
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetDraft 获取草稿
|
// GetDraft 获取草稿
|
||||||
@@ -94,12 +90,7 @@ func (draft *Draft) GetDraft(mediaID string) (articles []*Article, err error) {
|
|||||||
NewsItem []*Article `json:"news_item"`
|
NewsItem []*Article `json:"news_item"`
|
||||||
}
|
}
|
||||||
err = util.DecodeWithError(response, &res, "GetDraft")
|
err = util.DecodeWithError(response, &res, "GetDraft")
|
||||||
if err != nil {
|
return res.NewsItem, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
articles = res.NewsItem
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DeleteDraft 删除草稿
|
// DeleteDraft 删除草稿
|
||||||
@@ -172,12 +163,7 @@ func (draft *Draft) CountDraft() (total uint, err error) {
|
|||||||
Total uint `json:"total_count"`
|
Total uint `json:"total_count"`
|
||||||
}
|
}
|
||||||
err = util.DecodeWithError(response, &res, "CountDraft")
|
err = util.DecodeWithError(response, &res, "CountDraft")
|
||||||
if nil != err {
|
return res.Total, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
total = res.Total
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ArticleList 草稿列表
|
// ArticleList 草稿列表
|
||||||
|
|||||||
@@ -73,12 +73,7 @@ func (freePublish *FreePublish) Publish(mediaID string) (publishID int64, err er
|
|||||||
PublishID int64 `json:"publish_id"`
|
PublishID int64 `json:"publish_id"`
|
||||||
}
|
}
|
||||||
err = util.DecodeWithError(response, &res, "SubmitFreePublish")
|
err = util.DecodeWithError(response, &res, "SubmitFreePublish")
|
||||||
if err != nil {
|
return res.PublishID, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
publishID = res.PublishID
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// PublishStatusList 发布任务状态列表
|
// PublishStatusList 发布任务状态列表
|
||||||
@@ -191,12 +186,7 @@ func (freePublish *FreePublish) First(articleID string) (list []Article, err err
|
|||||||
NewsItem []Article `json:"news_item"`
|
NewsItem []Article `json:"news_item"`
|
||||||
}
|
}
|
||||||
err = util.DecodeWithError(response, &res, "FirstFreePublish")
|
err = util.DecodeWithError(response, &res, "FirstFreePublish")
|
||||||
if err != nil {
|
return res.NewsItem, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
list = res.NewsItem
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ArticleList 发布列表
|
// ArticleList 发布列表
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package js
|
package js
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
context2 "context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/credential"
|
"github.com/silenceper/wechat/v2/credential"
|
||||||
@@ -39,14 +40,31 @@ func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
|
|||||||
// GetConfig 获取jssdk需要的配置参数
|
// GetConfig 获取jssdk需要的配置参数
|
||||||
// uri 为当前网页地址
|
// uri 为当前网页地址
|
||||||
func (js *Js) GetConfig(uri string) (config *Config, err error) {
|
func (js *Js) GetConfig(uri string) (config *Config, err error) {
|
||||||
config = new(Config)
|
return js.GetConfigContext(context2.Background(), uri)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetConfigContext 新方法,允许传入上下文,避免协程泄漏
|
||||||
|
func (js *Js) GetConfigContext(ctx context2.Context, uri string) (config *Config, err error) {
|
||||||
var accessToken string
|
var accessToken string
|
||||||
accessToken, err = js.GetAccessToken()
|
// 类型断言,如果断言成功,调用安全的 GetAccessTokenContext 方法
|
||||||
|
if ctxHandle, ok := js.Context.AccessTokenHandle.(credential.AccessTokenContextHandle); ok {
|
||||||
|
accessToken, err = ctxHandle.GetAccessTokenContext(ctx)
|
||||||
|
} else {
|
||||||
|
// 如果没有实现 AccessTokenContextHandle 接口,调用旧的 GetAccessToken 方法
|
||||||
|
accessToken, err = js.Context.GetAccessToken()
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var ticketStr string
|
var ticketStr string
|
||||||
ticketStr, err = js.GetTicket(accessToken)
|
// 类型断言 jsTicket
|
||||||
|
if ticketCtxHandle, ok := js.JsTicketHandle.(credential.JsTicketContextHandle); ok {
|
||||||
|
ticketStr, err = ticketCtxHandle.GetTicketContext(ctx, accessToken)
|
||||||
|
} else {
|
||||||
|
// 如果没有实现 JsTicketContextHandle 接口,调用旧的 GetTicket 方法
|
||||||
|
ticketStr, err = js.GetTicket(accessToken)
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -56,6 +74,7 @@ func (js *Js) GetConfig(uri string) (config *Config, err error) {
|
|||||||
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s×tamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
|
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s×tamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
|
||||||
sigStr := util.Signature(str)
|
sigStr := util.Signature(str)
|
||||||
|
|
||||||
|
config = new(Config)
|
||||||
config.AppID = js.AppID
|
config.AppID = js.AppID
|
||||||
config.NonceStr = nonceStr
|
config.NonceStr = nonceStr
|
||||||
config.Timestamp = timestamp
|
config.Timestamp = timestamp
|
||||||
|
|||||||
@@ -4,6 +4,9 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/officialaccount/context"
|
"github.com/silenceper/wechat/v2/officialaccount/context"
|
||||||
"github.com/silenceper/wechat/v2/util"
|
"github.com/silenceper/wechat/v2/util"
|
||||||
@@ -160,8 +163,8 @@ type resAddMaterial struct {
|
|||||||
URL string `json:"url"`
|
URL string `json:"url"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddMaterial 上传永久性素材(处理视频需要单独上传)
|
// AddMaterialFromReader 上传永久性素材(处理视频需要单独上传),从 io.Reader 中读取
|
||||||
func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
|
func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath string, reader io.Reader) (mediaID string, url string, err error) {
|
||||||
if mediaType == MediaTypeVideo {
|
if mediaType == MediaTypeVideo {
|
||||||
err = errors.New("永久视频素材上传使用 AddVideo 方法")
|
err = errors.New("永久视频素材上传使用 AddVideo 方法")
|
||||||
return
|
return
|
||||||
@@ -173,8 +176,10 @@ func (material *Material) AddMaterial(mediaType MediaType, filename string) (med
|
|||||||
}
|
}
|
||||||
|
|
||||||
uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType)
|
uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType)
|
||||||
|
// 获取文件名
|
||||||
|
filename := path.Base(filePath)
|
||||||
var response []byte
|
var response []byte
|
||||||
response, err = util.PostFile("media", filename, uri)
|
response, err = util.PostFileFromReader("media", filePath, filename, uri, reader)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -192,13 +197,24 @@ func (material *Material) AddMaterial(mediaType MediaType, filename string) (med
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AddMaterial 上传永久性素材(处理视频需要单独上传)
|
||||||
|
func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
|
||||||
|
f, err := os.Open(filename)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer func() { _ = f.Close() }()
|
||||||
|
|
||||||
|
return material.AddMaterialFromReader(mediaType, filename, f)
|
||||||
|
}
|
||||||
|
|
||||||
type reqVideo struct {
|
type reqVideo struct {
|
||||||
Title string `json:"title"`
|
Title string `json:"title"`
|
||||||
Introduction string `json:"introduction"`
|
Introduction string `json:"introduction"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddVideo 永久视频素材文件上传
|
// AddVideoFromReader 永久视频素材文件上传,从 io.Reader 中读取
|
||||||
func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) {
|
func (material *Material) AddVideoFromReader(filePath, title, introduction string, reader io.Reader) (mediaID string, url string, err error) {
|
||||||
var accessToken string
|
var accessToken string
|
||||||
accessToken, err = material.GetAccessToken()
|
accessToken, err = material.GetAccessToken()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -216,16 +232,19 @@ func (material *Material) AddVideo(filename, title, introduction string) (mediaI
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
fileName := path.Base(filePath)
|
||||||
fields := []util.MultipartFormField{
|
fields := []util.MultipartFormField{
|
||||||
{
|
{
|
||||||
IsFile: true,
|
IsFile: true,
|
||||||
Fieldname: "media",
|
Fieldname: "media",
|
||||||
Filename: filename,
|
FilePath: filePath,
|
||||||
|
Filename: fileName,
|
||||||
|
FileReader: reader,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
IsFile: false,
|
IsFile: false,
|
||||||
Fieldname: "description",
|
Fieldname: "description",
|
||||||
|
Filename: fileName,
|
||||||
Value: fieldValue,
|
Value: fieldValue,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@@ -250,6 +269,17 @@ func (material *Material) AddVideo(filename, title, introduction string) (mediaI
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AddVideo 永久视频素材文件上传
|
||||||
|
func (material *Material) AddVideo(directory, title, introduction string) (mediaID string, url string, err error) {
|
||||||
|
f, err := os.Open(directory)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
defer func() { _ = f.Close() }()
|
||||||
|
|
||||||
|
return material.AddVideoFromReader(directory, title, introduction, f)
|
||||||
|
}
|
||||||
|
|
||||||
type reqDeleteMaterial struct {
|
type reqDeleteMaterial struct {
|
||||||
MediaID string `json:"media_id"`
|
MediaID string `json:"media_id"`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package material
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/util"
|
"github.com/silenceper/wechat/v2/util"
|
||||||
)
|
)
|
||||||
@@ -62,6 +63,38 @@ func (material *Material) MediaUpload(mediaType MediaType, filename string) (med
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MediaUploadFromReader 临时素材上传
|
||||||
|
func (material *Material) MediaUploadFromReader(mediaType MediaType, filename string, reader io.Reader) (media Media, err error) {
|
||||||
|
var accessToken string
|
||||||
|
accessToken, err = material.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf("%s?access_token=%s&type=%s", mediaUploadURL, accessToken, mediaType)
|
||||||
|
|
||||||
|
var byteData []byte
|
||||||
|
byteData, err = io.ReadAll(reader)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var response []byte
|
||||||
|
response, err = util.PostFileByStream("media", filename, uri, byteData)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = json.Unmarshal(response, &media)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if media.ErrCode != 0 {
|
||||||
|
err = fmt.Errorf("MediaUpload error : errcode=%v , errmsg=%v", media.ErrCode, media.ErrMsg)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// GetMediaURL 返回临时素材的下载地址供用户自己处理
|
// GetMediaURL 返回临时素材的下载地址供用户自己处理
|
||||||
// NOTICE: URL 不可公开,因为含access_token 需要立即另存文件
|
// NOTICE: URL 不可公开,因为含access_token 需要立即另存文件
|
||||||
func (material *Material) GetMediaURL(mediaID string) (mediaURL string, err error) {
|
func (material *Material) GetMediaURL(mediaID string) (mediaURL string, err error) {
|
||||||
|
|||||||
@@ -27,15 +27,15 @@ const (
|
|||||||
MsgTypeVideo MsgType = "video"
|
MsgTypeVideo MsgType = "video"
|
||||||
// MsgTypeMiniprogrampage 表示小程序卡片消息
|
// MsgTypeMiniprogrampage 表示小程序卡片消息
|
||||||
MsgTypeMiniprogrampage MsgType = "miniprogrampage"
|
MsgTypeMiniprogrampage MsgType = "miniprogrampage"
|
||||||
// MsgTypeShortVideo 表示短视频消息[限接收]
|
// MsgTypeShortVideo 表示短视频消息 [限接收]
|
||||||
MsgTypeShortVideo MsgType = "shortvideo"
|
MsgTypeShortVideo MsgType = "shortvideo"
|
||||||
// MsgTypeLocation 表示坐标消息[限接收]
|
// MsgTypeLocation 表示坐标消息 [限接收]
|
||||||
MsgTypeLocation MsgType = "location"
|
MsgTypeLocation MsgType = "location"
|
||||||
// MsgTypeLink 表示链接消息[限接收]
|
// MsgTypeLink 表示链接消息 [限接收]
|
||||||
MsgTypeLink MsgType = "link"
|
MsgTypeLink MsgType = "link"
|
||||||
// MsgTypeMusic 表示音乐消息[限回复]
|
// MsgTypeMusic 表示音乐消息 [限回复]
|
||||||
MsgTypeMusic MsgType = "music"
|
MsgTypeMusic MsgType = "music"
|
||||||
// MsgTypeNews 表示图文消息[限回复]
|
// MsgTypeNews 表示图文消息 [限回复]
|
||||||
MsgTypeNews MsgType = "news"
|
MsgTypeNews MsgType = "news"
|
||||||
// MsgTypeTransfer 表示消息消息转发到客服
|
// MsgTypeTransfer 表示消息消息转发到客服
|
||||||
MsgTypeTransfer MsgType = "transfer_customer_service"
|
MsgTypeTransfer MsgType = "transfer_customer_service"
|
||||||
@@ -91,7 +91,7 @@ const (
|
|||||||
const (
|
const (
|
||||||
// 微信开放平台需要用到
|
// 微信开放平台需要用到
|
||||||
|
|
||||||
// InfoTypeVerifyTicket 返回ticket
|
// InfoTypeVerifyTicket 返回 ticket
|
||||||
InfoTypeVerifyTicket InfoType = "component_verify_ticket"
|
InfoTypeVerifyTicket InfoType = "component_verify_ticket"
|
||||||
// InfoTypeAuthorized 授权
|
// InfoTypeAuthorized 授权
|
||||||
InfoTypeAuthorized InfoType = "authorized"
|
InfoTypeAuthorized InfoType = "authorized"
|
||||||
@@ -108,8 +108,8 @@ type MixMessage struct {
|
|||||||
CommonToken
|
CommonToken
|
||||||
|
|
||||||
// 基本消息
|
// 基本消息
|
||||||
MsgID int64 `xml:"MsgId"` // 其他消息推送过来是MsgId
|
MsgID int64 `xml:"MsgId"` // 其他消息推送过来是 MsgId
|
||||||
TemplateMsgID int64 `xml:"MsgID"` // 模板消息推送成功的消息是MsgID
|
TemplateMsgID int64 `xml:"MsgID"` // 模板消息推送成功的消息是 MsgID
|
||||||
Content string `xml:"Content"`
|
Content string `xml:"Content"`
|
||||||
Recognition string `xml:"Recognition"`
|
Recognition string `xml:"Recognition"`
|
||||||
PicURL string `xml:"PicUrl"`
|
PicURL string `xml:"PicUrl"`
|
||||||
@@ -166,17 +166,17 @@ type MixMessage struct {
|
|||||||
|
|
||||||
// 事件相关:发布能力
|
// 事件相关:发布能力
|
||||||
PublishEventInfo struct {
|
PublishEventInfo struct {
|
||||||
PublishID int64 `xml:"publish_id"` // 发布任务id
|
PublishID int64 `xml:"publish_id"` // 发布任务 id
|
||||||
PublishStatus freepublish.PublishStatus `xml:"publish_status"` // 发布状态
|
PublishStatus freepublish.PublishStatus `xml:"publish_status"` // 发布状态
|
||||||
ArticleID string `xml:"article_id"` // 当发布状态为0时(即成功)时,返回图文的 article_id,可用于“客服消息”场景
|
ArticleID string `xml:"article_id"` // 当发布状态为 0 时(即成功)时,返回图文的 article_id,可用于“客服消息”场景
|
||||||
ArticleDetail struct {
|
ArticleDetail struct {
|
||||||
Count uint `xml:"count"` // 文章数量
|
Count uint `xml:"count"` // 文章数量
|
||||||
Item []struct {
|
Item []struct {
|
||||||
Index uint `xml:"idx"` // 文章对应的编号
|
Index uint `xml:"idx"` // 文章对应的编号
|
||||||
ArticleURL string `xml:"article_url"` // 图文的永久链接
|
ArticleURL string `xml:"article_url"` // 图文的永久链接
|
||||||
} `xml:"item"`
|
} `xml:"item"`
|
||||||
} `xml:"article_detail"` // 当发布状态为0时(即成功)时,返回内容
|
} `xml:"article_detail"` // 当发布状态为 0 时(即成功)时,返回内容
|
||||||
FailIndex []uint `xml:"fail_idx"` // 当发布状态为2或4时,返回不通过的文章编号,第一篇为 1;其他发布状态则为空
|
FailIndex []uint `xml:"fail_idx"` // 当发布状态为 2 或 4 时,返回不通过的文章编号,第一篇为 1;其他发布状态则为空
|
||||||
} `xml:"PublishEventInfo"`
|
} `xml:"PublishEventInfo"`
|
||||||
|
|
||||||
// 第三方平台相关
|
// 第三方平台相关
|
||||||
@@ -222,19 +222,19 @@ type MixMessage struct {
|
|||||||
TraceID string `xml:"trace_id"`
|
TraceID string `xml:"trace_id"`
|
||||||
StatusCode int `xml:"status_code"`
|
StatusCode int `xml:"status_code"`
|
||||||
|
|
||||||
//小程序名称审核结果事件推送
|
// 小程序名称审核结果事件推送
|
||||||
Ret int32 `xml:"ret"` //审核结果 2:失败,3:成功
|
Ret int32 `xml:"ret"` // 审核结果 2:失败,3:成功
|
||||||
NickName string `xml:"nickname"` //小程序昵称
|
NickName string `xml:"nickname"` // 小程序昵称
|
||||||
|
|
||||||
// 设备相关
|
// 设备相关
|
||||||
device.MsgDevice
|
device.MsgDevice
|
||||||
|
|
||||||
//小程序审核通知
|
// 小程序审核通知
|
||||||
SuccTime int `xml:"SuccTime"` //审核成功时的时间戳
|
SuccTime int `xml:"SuccTime"` // 审核成功时的时间戳
|
||||||
FailTime int `xml:"FailTime"` //审核不通过的时间戳
|
FailTime int `xml:"FailTime"` // 审核不通过的时间戳
|
||||||
DelayTime int `xml:"DelayTime"` //审核延后时的时间戳
|
DelayTime int `xml:"DelayTime"` // 审核延后时的时间戳
|
||||||
Reason string `xml:"Reason"` //审核不通过的原因
|
Reason string `xml:"Reason"` // 审核不通过的原因
|
||||||
ScreenShot string `xml:"ScreenShot"` //审核不通过的截图示例。用 | 分隔的 media_id 的列表,可通过获取永久素材接口拉取截图内容
|
ScreenShot string `xml:"ScreenShot"` // 审核不通过的截图示例。用 | 分隔的 media_id 的列表,可通过获取永久素材接口拉取截图内容
|
||||||
}
|
}
|
||||||
|
|
||||||
// SubscribeMsgPopupEvent 订阅通知事件推送的消息体
|
// SubscribeMsgPopupEvent 订阅通知事件推送的消息体
|
||||||
@@ -282,7 +282,7 @@ type ResponseEncryptedXMLMsg struct {
|
|||||||
Nonce string `xml:"Nonce" json:"Nonce"`
|
Nonce string `xml:"Nonce" json:"Nonce"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// CDATA 使用该类型,在序列化为 xml 文本时文本会被解析器忽略
|
// CDATA 使用该类型,在序列化为 xml 文本时文本会被解析器忽略
|
||||||
type CDATA string
|
type CDATA string
|
||||||
|
|
||||||
// MarshalXML 实现自己的序列化方法
|
// MarshalXML 实现自己的序列化方法
|
||||||
|
|||||||
@@ -90,11 +90,7 @@ func (tpl *Subscribe) List() (templateList []*PrivateSubscribeItem, err error) {
|
|||||||
}
|
}
|
||||||
var res resPrivateSubscribeList
|
var res resPrivateSubscribeList
|
||||||
err = util.DecodeWithError(response, &res, "ListSubscribe")
|
err = util.DecodeWithError(response, &res, "ListSubscribe")
|
||||||
if err != nil {
|
return res.SubscriptionList, err
|
||||||
return
|
|
||||||
}
|
|
||||||
templateList = res.SubscriptionList
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type resSubscribeAdd struct {
|
type resSubscribeAdd struct {
|
||||||
@@ -123,11 +119,7 @@ func (tpl *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (temp
|
|||||||
}
|
}
|
||||||
var result resSubscribeAdd
|
var result resSubscribeAdd
|
||||||
err = util.DecodeWithError(response, &result, "AddSubscribe")
|
err = util.DecodeWithError(response, &result, "AddSubscribe")
|
||||||
if err != nil {
|
return result.TemplateID, err
|
||||||
return
|
|
||||||
}
|
|
||||||
templateID = result.TemplateID
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete 删除私有模板
|
// Delete 删除私有模板
|
||||||
@@ -175,11 +167,7 @@ func (tpl *Subscribe) GetCategory() (categoryList []*PublicTemplateCategory, err
|
|||||||
}
|
}
|
||||||
var result resSubscribeCategoryList
|
var result resSubscribeCategoryList
|
||||||
err = util.DecodeWithError(response, &result, "GetCategory")
|
err = util.DecodeWithError(response, &result, "GetCategory")
|
||||||
if err != nil {
|
return result.CategoryList, err
|
||||||
return
|
|
||||||
}
|
|
||||||
categoryList = result.CategoryList
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// PublicTemplateKeyWords 模板中的关键词
|
// PublicTemplateKeyWords 模板中的关键词
|
||||||
@@ -210,11 +198,7 @@ func (tpl *Subscribe) GetPubTplKeyWordsByID(titleID string) (keyWordsList []*Pub
|
|||||||
}
|
}
|
||||||
var result resPublicTemplateKeyWordsList
|
var result resPublicTemplateKeyWordsList
|
||||||
err = util.DecodeWithError(response, &result, "GetPublicTemplateKeyWords")
|
err = util.DecodeWithError(response, &result, "GetPublicTemplateKeyWords")
|
||||||
if err != nil {
|
return result.KeyWordsList, err
|
||||||
return
|
|
||||||
}
|
|
||||||
keyWordsList = result.KeyWordsList
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// PublicTemplateTitle 类目下的公共模板
|
// PublicTemplateTitle 类目下的公共模板
|
||||||
@@ -246,10 +230,5 @@ func (tpl *Subscribe) GetPublicTemplateTitleList(ids string, start int, limit in
|
|||||||
}
|
}
|
||||||
var result resPublicTemplateTitleList
|
var result resPublicTemplateTitleList
|
||||||
err = util.DecodeWithError(response, &result, "GetPublicTemplateTitle")
|
err = util.DecodeWithError(response, &result, "GetPublicTemplateTitle")
|
||||||
if err != nil {
|
return result.Count, result.TemplateTitleList, err
|
||||||
return
|
|
||||||
}
|
|
||||||
count = result.Count
|
|
||||||
templateTitleList = result.TemplateTitleList
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
@@ -61,15 +61,15 @@ func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
|
var (
|
||||||
var response []byte
|
uri = fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
|
||||||
response, err = util.PostJSON(uri, msg)
|
response []byte
|
||||||
if err != nil {
|
)
|
||||||
|
if response, err = util.PostJSON(uri, msg); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var result resTemplateSend
|
var result resTemplateSend
|
||||||
err = json.Unmarshal(response, &result)
|
if err = json.Unmarshal(response, &result); err != nil {
|
||||||
if err != nil {
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if result.ErrCode != 0 {
|
if result.ErrCode != 0 {
|
||||||
@@ -103,19 +103,16 @@ func (tpl *Template) List() (templateList []*TemplateItem, err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
uri := fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
|
var (
|
||||||
var response []byte
|
uri = fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
|
||||||
response, err = util.HTTPGet(uri)
|
response []byte
|
||||||
if err != nil {
|
)
|
||||||
|
if response, err = util.HTTPGet(uri); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var res resTemplateList
|
var res resTemplateList
|
||||||
err = util.DecodeWithError(response, &res, "ListTemplate")
|
err = util.DecodeWithError(response, &res, "ListTemplate")
|
||||||
if err != nil {
|
return res.TemplateList, err
|
||||||
return
|
|
||||||
}
|
|
||||||
templateList = res.TemplateList
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type resTemplateAdd struct {
|
type resTemplateAdd struct {
|
||||||
@@ -125,29 +122,26 @@ type resTemplateAdd struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add 添加模板.
|
// Add 添加模板.
|
||||||
func (tpl *Template) Add(shortID string) (templateID string, err error) {
|
func (tpl *Template) Add(shortID string, keyNameList []string) (templateID string, err error) {
|
||||||
var accessToken string
|
var accessToken string
|
||||||
accessToken, err = tpl.GetAccessToken()
|
accessToken, err = tpl.GetAccessToken()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var msg = struct {
|
var (
|
||||||
ShortID string `json:"template_id_short"`
|
msg = struct {
|
||||||
}{ShortID: shortID}
|
ShortID string `json:"template_id_short"`
|
||||||
uri := fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
|
KeyNameList []string `json:"keyword_name_list"`
|
||||||
var response []byte
|
}{ShortID: shortID, KeyNameList: keyNameList}
|
||||||
response, err = util.PostJSON(uri, msg)
|
uri = fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
|
||||||
if err != nil {
|
response []byte
|
||||||
|
)
|
||||||
|
if response, err = util.PostJSON(uri, msg); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var result resTemplateAdd
|
var result resTemplateAdd
|
||||||
err = util.DecodeWithError(response, &result, "AddTemplate")
|
err = util.DecodeWithError(response, &result, "AddTemplate")
|
||||||
if err != nil {
|
return result.TemplateID, err
|
||||||
return
|
|
||||||
}
|
|
||||||
templateID = result.TemplateID
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete 删除私有模板.
|
// Delete 删除私有模板.
|
||||||
@@ -157,14 +151,14 @@ func (tpl *Template) Delete(templateID string) (err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
var msg = struct {
|
var (
|
||||||
TemplateID string `json:"template_id"`
|
msg = struct {
|
||||||
}{TemplateID: templateID}
|
TemplateID string `json:"template_id"`
|
||||||
|
}{TemplateID: templateID}
|
||||||
uri := fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
|
uri = fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
|
||||||
var response []byte
|
response []byte
|
||||||
response, err = util.PostJSON(uri, msg)
|
)
|
||||||
if err != nil {
|
if response, err = util.PostJSON(uri, msg); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
return util.DecodeWithCommonError(response, "DeleteTemplate")
|
return util.DecodeWithCommonError(response, "DeleteTemplate")
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package oauth
|
package oauth
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
ctx2 "context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -73,11 +74,28 @@ type ResAccessToken struct {
|
|||||||
UnionID string `json:"unionid"`
|
UnionID string `json:"unionid"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetUserInfoByCodeContext 通过网页授权的code 换取用户的信息
|
||||||
|
func (oauth *Oauth) GetUserInfoByCodeContext(ctx ctx2.Context, code string) (result UserInfo, err error) {
|
||||||
|
var (
|
||||||
|
token ResAccessToken
|
||||||
|
)
|
||||||
|
if token, err = oauth.GetUserAccessTokenContext(ctx, code); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
return oauth.GetUserInfoContext(ctx, token.AccessToken, token.OpenID, "")
|
||||||
|
}
|
||||||
|
|
||||||
// GetUserAccessToken 通过网页授权的code 换取access_token(区别于context中的access_token)
|
// GetUserAccessToken 通过网页授权的code 换取access_token(区别于context中的access_token)
|
||||||
func (oauth *Oauth) GetUserAccessToken(code string) (result ResAccessToken, err error) {
|
func (oauth *Oauth) GetUserAccessToken(code string) (result ResAccessToken, err error) {
|
||||||
|
return oauth.GetUserAccessTokenContext(ctx2.Background(), code)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserAccessTokenContext 通过网页授权的code 换取access_token(区别于context中的access_token) with context
|
||||||
|
func (oauth *Oauth) GetUserAccessTokenContext(ctx ctx2.Context, code string) (result ResAccessToken, err error) {
|
||||||
urlStr := fmt.Sprintf(accessTokenURL, oauth.AppID, oauth.AppSecret, code)
|
urlStr := fmt.Sprintf(accessTokenURL, oauth.AppID, oauth.AppSecret, code)
|
||||||
var response []byte
|
var response []byte
|
||||||
response, err = util.HTTPGet(urlStr)
|
response, err = util.HTTPGetContext(ctx, urlStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -94,9 +112,14 @@ func (oauth *Oauth) GetUserAccessToken(code string) (result ResAccessToken, err
|
|||||||
|
|
||||||
// RefreshAccessToken 刷新access_token
|
// RefreshAccessToken 刷新access_token
|
||||||
func (oauth *Oauth) RefreshAccessToken(refreshToken string) (result ResAccessToken, err error) {
|
func (oauth *Oauth) RefreshAccessToken(refreshToken string) (result ResAccessToken, err error) {
|
||||||
|
return oauth.RefreshAccessTokenContext(ctx2.Background(), refreshToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RefreshAccessTokenContext 刷新access_token with context
|
||||||
|
func (oauth *Oauth) RefreshAccessTokenContext(ctx ctx2.Context, refreshToken string) (result ResAccessToken, err error) {
|
||||||
urlStr := fmt.Sprintf(refreshAccessTokenURL, oauth.AppID, refreshToken)
|
urlStr := fmt.Sprintf(refreshAccessTokenURL, oauth.AppID, refreshToken)
|
||||||
var response []byte
|
var response []byte
|
||||||
response, err = util.HTTPGet(urlStr)
|
response, err = util.HTTPGetContext(ctx, urlStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -113,9 +136,14 @@ func (oauth *Oauth) RefreshAccessToken(refreshToken string) (result ResAccessTok
|
|||||||
|
|
||||||
// CheckAccessToken 检验access_token是否有效
|
// CheckAccessToken 检验access_token是否有效
|
||||||
func (oauth *Oauth) CheckAccessToken(accessToken, openID string) (b bool, err error) {
|
func (oauth *Oauth) CheckAccessToken(accessToken, openID string) (b bool, err error) {
|
||||||
|
return oauth.CheckAccessTokenContext(ctx2.Background(), accessToken, openID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// CheckAccessTokenContext 检验access_token是否有效 with context
|
||||||
|
func (oauth *Oauth) CheckAccessTokenContext(ctx ctx2.Context, accessToken, openID string) (b bool, err error) {
|
||||||
urlStr := fmt.Sprintf(checkAccessTokenURL, accessToken, openID)
|
urlStr := fmt.Sprintf(checkAccessTokenURL, accessToken, openID)
|
||||||
var response []byte
|
var response []byte
|
||||||
response, err = util.HTTPGet(urlStr)
|
response, err = util.HTTPGetContext(ctx, urlStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -149,12 +177,17 @@ type UserInfo struct {
|
|||||||
|
|
||||||
// GetUserInfo 如果scope为 snsapi_userinfo 则可以通过此方法获取到用户基本信息
|
// GetUserInfo 如果scope为 snsapi_userinfo 则可以通过此方法获取到用户基本信息
|
||||||
func (oauth *Oauth) GetUserInfo(accessToken, openID, lang string) (result UserInfo, err error) {
|
func (oauth *Oauth) GetUserInfo(accessToken, openID, lang string) (result UserInfo, err error) {
|
||||||
|
return oauth.GetUserInfoContext(ctx2.Background(), accessToken, openID, lang)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetUserInfoContext 如果scope为 snsapi_userinfo 则可以通过此方法获取到用户基本信息 with context
|
||||||
|
func (oauth *Oauth) GetUserInfoContext(ctx ctx2.Context, accessToken, openID, lang string) (result UserInfo, err error) {
|
||||||
if lang == "" {
|
if lang == "" {
|
||||||
lang = "zh_CN"
|
lang = "zh_CN"
|
||||||
}
|
}
|
||||||
urlStr := fmt.Sprintf(userInfoURL, accessToken, openID, lang)
|
urlStr := fmt.Sprintf(userInfoURL, accessToken, openID, lang)
|
||||||
var response []byte
|
var response []byte
|
||||||
response, err = util.HTTPGet(urlStr)
|
response, err = util.HTTPGetContext(ctx, urlStr)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,13 @@ type OfficialAccount struct {
|
|||||||
|
|
||||||
// NewOfficialAccount 实例化公众号API
|
// NewOfficialAccount 实例化公众号API
|
||||||
func NewOfficialAccount(cfg *config.Config) *OfficialAccount {
|
func NewOfficialAccount(cfg *config.Config) *OfficialAccount {
|
||||||
defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyOfficialAccountPrefix, cfg.Cache)
|
var defaultAkHandle credential.AccessTokenContextHandle
|
||||||
|
const cacheKeyPrefix = credential.CacheKeyOfficialAccountPrefix
|
||||||
|
if cfg.UseStableAK {
|
||||||
|
defaultAkHandle = credential.NewStableAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
|
||||||
|
} else {
|
||||||
|
defaultAkHandle = credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
|
||||||
|
}
|
||||||
ctx := &context.Context{
|
ctx := &context.Context{
|
||||||
Config: cfg,
|
Config: cfg,
|
||||||
AccessTokenHandle: defaultAkHandle,
|
AccessTokenHandle: defaultAkHandle,
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ func (srv *Server) Serve() error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// 非安全模式下,请求处理方法返回为nil则直接回复success给微信服务器
|
// 非安全模式下,请求处理方法返回为 nil 则直接回复 success 给微信服务器
|
||||||
if response == nil && !srv.isSafeMode {
|
if response == nil && !srv.isSafeMode {
|
||||||
srv.String("success")
|
srv.String("success")
|
||||||
return nil
|
return nil
|
||||||
@@ -198,7 +198,7 @@ func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg *message.MixM
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// nonstandard json, 目前小程序订阅消息返回数据格式不标准,订阅消息模板单个List返回是对象,多个List返回是数组。
|
// nonstandard json, 目前小程序订阅消息返回数据格式不标准,订阅消息模板单个 List 返回是对象,多个 List 返回是数组。
|
||||||
if msg.MsgType == message.MsgTypeEvent {
|
if msg.MsgType == message.MsgTypeEvent {
|
||||||
listData := gjson.Get(string(rawXMLMsgBytes), "List")
|
listData := gjson.Get(string(rawXMLMsgBytes), "List")
|
||||||
if listData.IsObject() {
|
if listData.IsObject() {
|
||||||
@@ -284,7 +284,7 @@ func (srv *Server) Send() (err error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
// TODO 如果获取不到timestamp nonce 则自己生成
|
// TODO 如果获取不到 timestamp nonce 则自己生成
|
||||||
timestamp := srv.timestamp
|
timestamp := srv.timestamp
|
||||||
timestampStr := strconv.FormatInt(timestamp, 10)
|
timestampStr := strconv.FormatInt(timestamp, 10)
|
||||||
msgSignature := util.Signature(srv.Token, timestampStr, srv.nonce, string(encryptedMsg))
|
msgSignature := util.Signature(srv.Token, timestampStr, srv.nonce, string(encryptedMsg))
|
||||||
|
|||||||
@@ -62,10 +62,6 @@ func (user *User) ListChangeOpenIDs(fromAppID string, openIDs ...string) (list *
|
|||||||
}
|
}
|
||||||
|
|
||||||
err = util.DecodeWithError(resp, list, "ListChangeOpenIDs")
|
err = util.DecodeWithError(resp, list, "ListChangeOpenIDs")
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -126,10 +126,7 @@ func (user *User) GetTag() (tags []*TagInfo, err error) {
|
|||||||
Tags []*TagInfo `json:"tags"`
|
Tags []*TagInfo `json:"tags"`
|
||||||
}
|
}
|
||||||
err = json.Unmarshal(response, &result)
|
err = json.Unmarshal(response, &result)
|
||||||
if err != nil {
|
return result.Tags, err
|
||||||
return
|
|
||||||
}
|
|
||||||
return result.Tags, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// OpenIDListByTag 获取标签下粉丝列表
|
// OpenIDListByTag 获取标签下粉丝列表
|
||||||
@@ -154,9 +151,6 @@ func (user *User) OpenIDListByTag(tagID int32, nextOpenID ...string) (userList *
|
|||||||
}
|
}
|
||||||
userList = new(TagOpenIDList)
|
userList = new(TagOpenIDList)
|
||||||
err = json.Unmarshal(response, &userList)
|
err = json.Unmarshal(response, &userList)
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package account
|
|||||||
|
|
||||||
import "github.com/silenceper/wechat/v2/openplatform/context"
|
import "github.com/silenceper/wechat/v2/openplatform/context"
|
||||||
|
|
||||||
// Account 开放平台张哈管理
|
// Account 开放平台帐号管理
|
||||||
// TODO 实现方法
|
// TODO 实现方法
|
||||||
type Account struct {
|
type Account struct {
|
||||||
*context.Context
|
*context.Context
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ const (
|
|||||||
getComponentInfoURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s"
|
getComponentInfoURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s"
|
||||||
componentLoginURL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=%d&biz_appid=%s"
|
componentLoginURL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=%d&biz_appid=%s"
|
||||||
bindComponentURL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
|
bindComponentURL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
|
||||||
|
bindComponentURLV2 = "https://open.weixin.qq.com/wxaopen/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
|
||||||
// TODO 获取授权方选项信息
|
// TODO 获取授权方选项信息
|
||||||
// getComponentConfigURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
|
// getComponentConfigURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
|
||||||
// TODO 获取已授权的账号信息
|
// TODO 获取已授权的账号信息
|
||||||
@@ -100,11 +101,8 @@ func (ctx *Context) GetPreCodeContext(stdCtx context.Context) (string, error) {
|
|||||||
var ret struct {
|
var ret struct {
|
||||||
PreCode string `json:"pre_auth_code"`
|
PreCode string `json:"pre_auth_code"`
|
||||||
}
|
}
|
||||||
if err := json.Unmarshal(body, &ret); err != nil {
|
err = json.Unmarshal(body, &ret)
|
||||||
return "", err
|
return ret.PreCode, err
|
||||||
}
|
|
||||||
|
|
||||||
return ret.PreCode, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetPreCode 获取预授权码
|
// GetPreCode 获取预授权码
|
||||||
@@ -140,6 +138,20 @@ func (ctx *Context) GetBindComponentURL(redirectURI string, authType int, bizApp
|
|||||||
return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
|
return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetBindComponentURLV2Context 获取新版本第三方公众号授权链接(链接跳转,适用移动端)
|
||||||
|
func (ctx *Context) GetBindComponentURLV2Context(stdCtx context.Context, redirectURI string, authType int, bizAppID string) (string, error) {
|
||||||
|
code, err := ctx.GetPreCodeContext(stdCtx)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return fmt.Sprintf(bindComponentURLV2, authType, ctx.AppID, code, url.QueryEscape(redirectURI), bizAppID), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetBindComponentURLV2 获取新版本第三方公众号授权链接(链接跳转,适用移动端)
|
||||||
|
func (ctx *Context) GetBindComponentURLV2(redirectURI string, authType int, bizAppID string) (string, error) {
|
||||||
|
return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
|
||||||
|
}
|
||||||
|
|
||||||
// ID 微信返回接口中各种类型字段
|
// ID 微信返回接口中各种类型字段
|
||||||
type ID struct {
|
type ID struct {
|
||||||
ID int `json:"id"`
|
ID int `json:"id"`
|
||||||
@@ -228,6 +240,10 @@ func (ctx *Context) RefreshAuthrTokenContext(stdCtx context.Context, appid, refr
|
|||||||
if err := cache.SetContext(stdCtx, ctx.Cache, authrTokenKey, ret.AccessToken, time.Second*time.Duration(ret.ExpiresIn-30)); err != nil {
|
if err := cache.SetContext(stdCtx, ctx.Cache, authrTokenKey, ret.AccessToken, time.Second*time.Duration(ret.ExpiresIn-30)); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
refreshTokenKey := "authorizer_refresh_token_" + appid
|
||||||
|
if err := cache.SetContext(stdCtx, ctx.Cache, refreshTokenKey, ret.RefreshToken, 10*365*24*60*60*time.Second); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
return ret, nil
|
return ret, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -241,8 +257,18 @@ func (ctx *Context) GetAuthrAccessTokenContext(stdCtx context.Context, appid str
|
|||||||
authrTokenKey := "authorizer_access_token_" + appid
|
authrTokenKey := "authorizer_access_token_" + appid
|
||||||
val := cache.GetContext(stdCtx, ctx.Cache, authrTokenKey)
|
val := cache.GetContext(stdCtx, ctx.Cache, authrTokenKey)
|
||||||
if val == nil {
|
if val == nil {
|
||||||
return "", fmt.Errorf("cannot get authorizer %s access token", appid)
|
refreshTokenKey := "authorizer_refresh_token_" + appid
|
||||||
|
val := cache.GetContext(stdCtx, ctx.Cache, refreshTokenKey)
|
||||||
|
if val == nil {
|
||||||
|
return "", fmt.Errorf("cannot get authorizer %s refresh token", appid)
|
||||||
|
}
|
||||||
|
token, err := ctx.RefreshAuthrTokenContext(stdCtx, appid, val.(string))
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return token.AccessToken, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return val.(string), nil
|
return val.(string), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,12 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
getAccountBasicInfoURL = "https://api.weixin.qq.com/cgi-bin/account/getaccountbasicinfo"
|
getAccountBasicInfoURL = "https://api.weixin.qq.com/cgi-bin/account/getaccountbasicinfo"
|
||||||
|
checkNickNameURL = "https://api.weixin.qq.com/cgi-bin/wxverify/checkwxverifynickname"
|
||||||
|
setNickNameURL = "https://api.weixin.qq.com/wxa/setnickname"
|
||||||
|
setSignatureURL = "https://api.weixin.qq.com/cgi-bin/account/modifysignature"
|
||||||
|
setHeadImageURL = "https://api.weixin.qq.com/cgi-bin/account/modifyheadimage"
|
||||||
|
getSearchStatusURL = "https://api.weixin.qq.com/wxa/getwxasearchstatus"
|
||||||
|
setSearchStatusURL = "https://api.weixin.qq.com/wxa/changewxasearchstatus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Basic 基础信息设置
|
// Basic 基础信息设置
|
||||||
@@ -51,3 +57,181 @@ func (basic *Basic) GetAccountBasicInfo() (*AccountBasicInfo, error) {
|
|||||||
// TODO
|
// TODO
|
||||||
// func (encryptor *Basic) modifyDomain() {
|
// func (encryptor *Basic) modifyDomain() {
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
// CheckNickNameResp 小程序名称检测结果
|
||||||
|
type CheckNickNameResp struct {
|
||||||
|
util.CommonError
|
||||||
|
HitCondition bool `json:"hit_condition"` // 是否命中关键字策略。若命中,可以选填关键字材料
|
||||||
|
Wording string `json:"wording"` // 命中关键字的说明描述
|
||||||
|
}
|
||||||
|
|
||||||
|
// CheckNickName 检测微信认证的名称是否符合规则
|
||||||
|
// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/checkNickName.html
|
||||||
|
func (basic *Basic) CheckNickName(nickname string) (*CheckNickNameResp, error) {
|
||||||
|
ak, err := basic.GetAuthrAccessToken(basic.AppID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf("%s?access_token=%s", checkNickNameURL, ak)
|
||||||
|
data, err := util.PostJSON(url, map[string]string{
|
||||||
|
"nick_name": nickname,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
res := &CheckNickNameResp{}
|
||||||
|
err = util.DecodeWithError(data, res, "CheckNickName")
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetNickNameResp 设置小程序名称结果
|
||||||
|
type SetNickNameResp struct {
|
||||||
|
util.CommonError
|
||||||
|
AuditID int64 `json:"audit_id"` // 审核单Id,通过用于查询改名审核状态
|
||||||
|
Wording string `json:"wording"` // 材料说明
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetNickNameParam 设置小程序名称参数
|
||||||
|
type SetNickNameParam struct {
|
||||||
|
NickName string `json:"nick_name"` // 昵称,不支持包含“小程序”关键字的昵称
|
||||||
|
IDCard string `json:"id_card,omitempty"` // 身份证照片 mediaid,个人号必填
|
||||||
|
License string `json:"license,omitempty"` // 组织机构代码证或营业执照 mediaid,组织号必填
|
||||||
|
NameingOtherStuff1 string `json:"naming_other_stuff_1,omitempty"` // 其他证明材料 mediaid,选填
|
||||||
|
NameingOtherStuff2 string `json:"naming_other_stuff_2,omitempty"` // 其他证明材料 mediaid,选填
|
||||||
|
NameingOtherStuff3 string `json:"naming_other_stuff_3,omitempty"` // 其他证明材料 mediaid,选填
|
||||||
|
NameingOtherStuff4 string `json:"naming_other_stuff_4,omitempty"` // 其他证明材料 mediaid,选填
|
||||||
|
NameingOtherStuff5 string `json:"naming_other_stuff_5,omitempty"` // 其他证明材料 mediaid,选填
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetNickName 设置小程序名称
|
||||||
|
func (basic *Basic) SetNickName(nickname string) (*SetNickNameResp, error) {
|
||||||
|
return basic.SetNickNameFull(&SetNickNameParam{
|
||||||
|
NickName: nickname,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetNickNameFull 设置小程序名称
|
||||||
|
// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/setNickName.html
|
||||||
|
func (basic *Basic) SetNickNameFull(param *SetNickNameParam) (*SetNickNameResp, error) {
|
||||||
|
ak, err := basic.GetAuthrAccessToken(basic.AppID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf("%s?access_token=%s", setNickNameURL, ak)
|
||||||
|
data, err := util.PostJSON(url, param)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
res := &SetNickNameResp{}
|
||||||
|
err = util.DecodeWithError(data, res, "SetNickName")
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSignatureResp 小程序功能介绍修改结果
|
||||||
|
type SetSignatureResp struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSignature 小程序修改功能介绍
|
||||||
|
// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/setSignature.html
|
||||||
|
func (basic *Basic) SetSignature(signature string) error {
|
||||||
|
ak, err := basic.GetAuthrAccessToken(basic.AppID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf("%s?access_token=%s", setSignatureURL, ak)
|
||||||
|
data, err := util.PostJSON(url, map[string]string{
|
||||||
|
"signature": signature,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithError(data, &SetSignatureResp{}, "SetSignature")
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSearchStatusResp 查询小程序当前是否可被搜索
|
||||||
|
type GetSearchStatusResp struct {
|
||||||
|
util.CommonError
|
||||||
|
Status int `json:"status"` // 1 表示不可搜索,0 表示可搜索
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSearchStatus 查询小程序当前是否可被搜索
|
||||||
|
// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/getSearchStatus.html
|
||||||
|
func (basic *Basic) GetSearchStatus(signature string) (*GetSearchStatusResp, error) {
|
||||||
|
ak, err := basic.GetAuthrAccessToken(basic.AppID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf("%s?access_token=%s", getSearchStatusURL, ak)
|
||||||
|
data, err := util.HTTPGet(url)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
res := &GetSearchStatusResp{}
|
||||||
|
err = util.DecodeWithError(data, res, "GetSearchStatus")
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSearchStatusResp 小程序是否可被搜索修改结果
|
||||||
|
type SetSearchStatusResp struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetSearchStatus 修改小程序是否可被搜索
|
||||||
|
// status: 1 表示不可搜索,0 表示可搜索
|
||||||
|
// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/setSearchStatus.html
|
||||||
|
func (basic *Basic) SetSearchStatus(status int) error {
|
||||||
|
ak, err := basic.GetAuthrAccessToken(basic.AppID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf("%s?access_token=%s", setSearchStatusURL, ak)
|
||||||
|
data, err := util.PostJSON(url, map[string]int{
|
||||||
|
"status": status,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithError(data, &SetSearchStatusResp{}, "SetSearchStatus")
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetHeadImageResp 小程序头像修改结果
|
||||||
|
type SetHeadImageResp struct {
|
||||||
|
util.CommonError
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetHeadImageParam 小程序头像修改参数
|
||||||
|
type SetHeadImageParam struct {
|
||||||
|
HeadImageMediaID string `json:"head_img_media_id"` // 头像素材 media_id
|
||||||
|
X1 string `json:"x1"` // 裁剪框左上角 x 坐标(取值范围:[0, 1])
|
||||||
|
Y1 string `json:"y1"` // 裁剪框左上角 y 坐标(取值范围:[0, 1])
|
||||||
|
X2 string `json:"x2"` // 裁剪框右下角 x 坐标(取值范围:[0, 1])
|
||||||
|
Y2 string `json:"y2"` // 裁剪框右下角 y 坐标(取值范围:[0, 1])
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetHeadImage 修改小程序头像
|
||||||
|
func (basic *Basic) SetHeadImage(imgMediaID string) error {
|
||||||
|
return basic.SetHeadImageFull(&SetHeadImageParam{
|
||||||
|
HeadImageMediaID: imgMediaID,
|
||||||
|
X1: "0",
|
||||||
|
Y1: "0",
|
||||||
|
X2: "1",
|
||||||
|
Y2: "1",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetHeadImageFull 修改小程序头像
|
||||||
|
// 新增临时素材: https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html
|
||||||
|
// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/setHeadImage.html
|
||||||
|
func (basic *Basic) SetHeadImageFull(param *SetHeadImageParam) error {
|
||||||
|
ak, err := basic.GetAuthrAccessToken(basic.AppID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
url := fmt.Sprintf("%s?access_token=%s", setHeadImageURL, ak)
|
||||||
|
data, err := util.PostJSON(url, param)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithError(data, &SetHeadImageResp{}, "account/setheadimage")
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package miniprogram
|
package miniprogram
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
originalContext "context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/credential"
|
"github.com/silenceper/wechat/v2/credential"
|
||||||
@@ -37,6 +38,22 @@ func (miniProgram *MiniProgram) GetAccessToken() (string, error) {
|
|||||||
return akRes.AccessToken, nil
|
return akRes.AccessToken, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetAccessTokenContext 利用ctx获取ak
|
||||||
|
func (miniProgram *MiniProgram) GetAccessTokenContext(ctx originalContext.Context) (string, error) {
|
||||||
|
ak, akErr := miniProgram.openContext.GetAuthrAccessTokenContext(ctx, miniProgram.AppID)
|
||||||
|
if akErr == nil {
|
||||||
|
return ak, nil
|
||||||
|
}
|
||||||
|
if miniProgram.authorizerRefreshToken == "" {
|
||||||
|
return "", fmt.Errorf("please set the authorizer_refresh_token first")
|
||||||
|
}
|
||||||
|
akRes, akResErr := miniProgram.GetComponent().RefreshAuthrTokenContext(ctx, miniProgram.AppID, miniProgram.authorizerRefreshToken)
|
||||||
|
if akResErr != nil {
|
||||||
|
return "", akResErr
|
||||||
|
}
|
||||||
|
return akRes.AccessToken, nil
|
||||||
|
}
|
||||||
|
|
||||||
// SetAuthorizerRefreshToken 设置代执操作业务授权账号authorizer_refresh_token
|
// SetAuthorizerRefreshToken 设置代执操作业务授权账号authorizer_refresh_token
|
||||||
func (miniProgram *MiniProgram) SetAuthorizerRefreshToken(authorizerRefreshToken string) *MiniProgram {
|
func (miniProgram *MiniProgram) SetAuthorizerRefreshToken(authorizerRefreshToken string) *MiniProgram {
|
||||||
miniProgram.authorizerRefreshToken = authorizerRefreshToken
|
miniProgram.authorizerRefreshToken = authorizerRefreshToken
|
||||||
@@ -68,7 +85,7 @@ func (miniProgram *MiniProgram) GetBasic() *basic.Basic {
|
|||||||
// GetURLLink 小程序URL Link接口 调用前需确认已调用 SetAuthorizerRefreshToken 避免由于缓存中 authorizer_access_token 过期执行中断
|
// GetURLLink 小程序URL Link接口 调用前需确认已调用 SetAuthorizerRefreshToken 避免由于缓存中 authorizer_access_token 过期执行中断
|
||||||
func (miniProgram *MiniProgram) GetURLLink() *urllink.URLLink {
|
func (miniProgram *MiniProgram) GetURLLink() *urllink.URLLink {
|
||||||
return urllink.NewURLLink(&miniContext.Context{
|
return urllink.NewURLLink(&miniContext.Context{
|
||||||
AccessTokenHandle: miniProgram,
|
AccessTokenContextHandle: miniProgram,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package js
|
package js
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
context2 "context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/silenceper/wechat/v2/credential"
|
"github.com/silenceper/wechat/v2/credential"
|
||||||
@@ -32,14 +33,31 @@ func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
|
|||||||
// GetConfig 第三方平台 - 获取jssdk需要的配置参数
|
// GetConfig 第三方平台 - 获取jssdk需要的配置参数
|
||||||
// uri 为当前网页地址
|
// uri 为当前网页地址
|
||||||
func (js *Js) GetConfig(uri, appid string) (config *officialJs.Config, err error) {
|
func (js *Js) GetConfig(uri, appid string) (config *officialJs.Config, err error) {
|
||||||
config = new(officialJs.Config)
|
return js.GetConfigContext(context2.Background(), uri, appid)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetConfigContext 新方法,允许传入上下文,避免协程泄漏
|
||||||
|
func (js *Js) GetConfigContext(ctx context2.Context, uri, appid string) (config *officialJs.Config, err error) {
|
||||||
var accessToken string
|
var accessToken string
|
||||||
accessToken, err = js.GetAccessToken()
|
// 类型断言,如果断言成功,调用安全的 GetAccessTokenContext 方法
|
||||||
|
if ctxHandle, ok := js.Context.AccessTokenHandle.(credential.AccessTokenContextHandle); ok {
|
||||||
|
accessToken, err = ctxHandle.GetAccessTokenContext(ctx)
|
||||||
|
} else {
|
||||||
|
// 如果没有实现 AccessTokenContextHandle 接口,调用旧的 GetAccessToken 方法
|
||||||
|
accessToken, err = js.Context.GetAccessToken()
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var ticketStr string
|
var ticketStr string
|
||||||
ticketStr, err = js.GetTicket(accessToken)
|
// 类型断言 jsTicket
|
||||||
|
if ticketCtxHandle, ok := js.JsTicketHandle.(credential.JsTicketContextHandle); ok {
|
||||||
|
ticketStr, err = ticketCtxHandle.GetTicketContext(ctx, accessToken)
|
||||||
|
} else {
|
||||||
|
// 如果没有实现 JsTicketContextHandle 接口,调用旧的 GetTicket 方法
|
||||||
|
ticketStr, err = js.GetTicket(accessToken)
|
||||||
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -49,6 +67,7 @@ func (js *Js) GetConfig(uri, appid string) (config *officialJs.Config, err error
|
|||||||
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s×tamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
|
str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s×tamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
|
||||||
sigStr := util.Signature(str)
|
sigStr := util.Signature(str)
|
||||||
|
|
||||||
|
config = new(officialJs.Config)
|
||||||
config.AppID = appid
|
config.AppID = appid
|
||||||
config.NonceStr = nonceStr
|
config.NonceStr = nonceStr
|
||||||
config.Timestamp = timestamp
|
config.Timestamp = timestamp
|
||||||
|
|||||||
@@ -0,0 +1,147 @@
|
|||||||
|
// 验证 js.GetConfigContext 是否能正确传递上下文到 HTTP 请求,确保上下文正确传播,防止在获取 JSSDK 配置时发生协程泄露。
|
||||||
|
package js
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
context2 "context"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/cache"
|
||||||
|
"github.com/silenceper/wechat/v2/credential"
|
||||||
|
"github.com/silenceper/wechat/v2/officialaccount/config"
|
||||||
|
"github.com/silenceper/wechat/v2/officialaccount/context"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
// mockAccessTokenHandle 模拟 AccessTokenHandle
|
||||||
|
type mockAccessTokenHandle struct{}
|
||||||
|
|
||||||
|
func (m *mockAccessTokenHandle) GetAccessToken() (string, error) {
|
||||||
|
return "mock-access-token", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mockAccessTokenHandle) GetAccessTokenContext(_ context2.Context) (string, error) {
|
||||||
|
return "mock-access-token", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// contextCheckingRoundTripper 自定义 RoundTripper 用于检查 context
|
||||||
|
type contextCheckingRoundTripper struct {
|
||||||
|
originalCtx context2.Context
|
||||||
|
t *testing.T
|
||||||
|
key interface{}
|
||||||
|
expectedVal interface{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rt *contextCheckingRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||||
|
// 获取请求中的 context
|
||||||
|
reqCtx := req.Context()
|
||||||
|
|
||||||
|
// 打印 context 比较结果
|
||||||
|
rt.t.Logf("比较上下文的内存地址:\n")
|
||||||
|
if reqCtx == rt.originalCtx {
|
||||||
|
rt.t.Logf("上下文具有相同的内存地址。原始上下文: %p, 请求上下文: %p\n", rt.originalCtx, reqCtx)
|
||||||
|
} else {
|
||||||
|
rt.t.Logf("上下文具有不同的内存地址。原始上下文: %p, 请求上下文: %p\n", rt.originalCtx, reqCtx)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查 context 中的键值对
|
||||||
|
if rt.key != nil {
|
||||||
|
value := reqCtx.Value(rt.key)
|
||||||
|
rt.t.Logf("检查请求上下文中的键 %v:\n", rt.key)
|
||||||
|
if value != rt.expectedVal {
|
||||||
|
rt.t.Errorf("上下文键 %v 的值不匹配: 预期 %v, 实际 %v\n", rt.key, rt.expectedVal, value)
|
||||||
|
} else {
|
||||||
|
rt.t.Logf("上下文键 %v 的值匹配: 预期 %v, 实际 %v\n", rt.key, rt.expectedVal, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查上下文是否已取消
|
||||||
|
select {
|
||||||
|
case <-reqCtx.Done():
|
||||||
|
return nil, reqCtx.Err() // 返回上下文取消错误
|
||||||
|
default:
|
||||||
|
// 返回模拟的 HTTP 响应,包含有效的 JSON
|
||||||
|
responseBody := `{"ticket":"mock-ticket","expires_in":7200}`
|
||||||
|
response := &http.Response{
|
||||||
|
Status: "200 OK",
|
||||||
|
StatusCode: http.StatusOK,
|
||||||
|
Proto: "HTTP/1.1",
|
||||||
|
ProtoMajor: 1,
|
||||||
|
ProtoMinor: 1,
|
||||||
|
Body: io.NopCloser(bytes.NewReader([]byte(responseBody))),
|
||||||
|
ContentLength: int64(len(responseBody)),
|
||||||
|
Header: make(http.Header),
|
||||||
|
}
|
||||||
|
response.Header.Set("Content-Type", "application/json")
|
||||||
|
return response, nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// contextKey 定义自定义上下文键类型,避免使用内置 string 类型
|
||||||
|
type contextKey string
|
||||||
|
|
||||||
|
// setupJsInstance 初始化 Js 实例和 HTTP 客户端
|
||||||
|
func setupJsInstance(t *testing.T, ctx context2.Context, key, val interface{}) (*Js, func()) {
|
||||||
|
cfg := &config.Config{
|
||||||
|
AppID: "test-app-id",
|
||||||
|
AppSecret: "test-app-secret",
|
||||||
|
Cache: cache.NewMemory(),
|
||||||
|
}
|
||||||
|
cacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", credential.CacheKeyOfficialAccountPrefix, cfg.AppID)
|
||||||
|
if err := cfg.Cache.Delete(cacheKey); err != nil {
|
||||||
|
t.Fatalf("清除缓存失败: %v", err)
|
||||||
|
}
|
||||||
|
t.Log("清除 jsapi_ticket 的缓存:", cacheKey)
|
||||||
|
|
||||||
|
ctxHandle := &context.Context{Config: cfg, AccessTokenHandle: &mockAccessTokenHandle{}}
|
||||||
|
jsInstance := NewJs(ctxHandle, cfg.AppID)
|
||||||
|
jsInstance.SetJsTicketHandle(credential.NewDefaultJsTicket(cfg.AppID, credential.CacheKeyOfficialAccountPrefix, cfg.Cache))
|
||||||
|
|
||||||
|
originalClient := util.DefaultHTTPClient
|
||||||
|
util.DefaultHTTPClient = &http.Client{
|
||||||
|
Transport: &contextCheckingRoundTripper{originalCtx: ctx, t: t, key: key, expectedVal: val},
|
||||||
|
}
|
||||||
|
return jsInstance, func() { util.DefaultHTTPClient = originalClient }
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestGetConfigContext 测试GetConfigContext的上下文传递和取消行为。
|
||||||
|
func TestGetConfigContext(t *testing.T) {
|
||||||
|
t.Run("ContextPassing", func(t *testing.T) {
|
||||||
|
ctxKey := contextKey("testKey111") // 使用自定义类型 contextKey
|
||||||
|
ctxValue := "testValue222"
|
||||||
|
ctx := context2.WithValue(context2.Background(), ctxKey, ctxValue)
|
||||||
|
t.Logf("创建的测试上下文: %p, 添加的键值对: %v=%v\n", ctx, ctxKey, ctxValue)
|
||||||
|
|
||||||
|
jsInstance, cleanup := setupJsInstance(t, ctx, ctxKey, ctxValue)
|
||||||
|
defer cleanup()
|
||||||
|
t.Log("调用 GetConfigContext")
|
||||||
|
config2, err := jsInstance.GetConfigContext(ctx, "https://www.baidu.com", "test-app-id")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("GetConfigContext 失败: %v", err)
|
||||||
|
}
|
||||||
|
if config2.AppID != "test-app-id" {
|
||||||
|
t.Errorf("预期 AppID 为 %s,实际为 %s", "test-app-id", config2.AppID)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("ContextCancellation", func(t *testing.T) {
|
||||||
|
ctx, cancel := context2.WithCancel(context2.Background())
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
jsInstance, cleanup := setupJsInstance(t, ctx, nil, nil)
|
||||||
|
defer cleanup()
|
||||||
|
|
||||||
|
cancel()
|
||||||
|
t.Log("调用 GetConfigContext(已取消上下文)")
|
||||||
|
_, err := jsInstance.GetConfigContext(ctx, "https://www.baidu.com", "test-app-id")
|
||||||
|
if err == nil {
|
||||||
|
t.Error("预期上下文取消错误,但 GetConfigContext 未返回错误")
|
||||||
|
} else if !errors.Is(err, context2.Canceled) {
|
||||||
|
t.Errorf("预期错误为 context.Canceled,实际为: %v", err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -68,3 +68,18 @@ func DecodeWithError(response []byte, obj interface{}, apiName string) error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// HandleFileResponse 通用处理微信等接口返回:有时 JSON 错误,有时文件内容
|
||||||
|
func HandleFileResponse(response []byte, apiName string) ([]byte, error) {
|
||||||
|
var commErr CommonError
|
||||||
|
if err := json.Unmarshal(response, &commErr); err == nil {
|
||||||
|
// 能解析成 JSON,判断是否为错误
|
||||||
|
if commErr.ErrCode != 0 {
|
||||||
|
commErr.apiName = apiName
|
||||||
|
return nil, &commErr
|
||||||
|
}
|
||||||
|
// 能解析成 JSON 且没错误码,极少情况(比如微信返回的业务数据是 JSON 但无 errcode 字段),可根据需要调整
|
||||||
|
}
|
||||||
|
// 不能解析成 JSON,或没错误码,直接返回原始内容
|
||||||
|
return response, nil
|
||||||
|
}
|
||||||
+106
-27
@@ -17,6 +17,19 @@ import (
|
|||||||
"golang.org/x/crypto/pkcs12"
|
"golang.org/x/crypto/pkcs12"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// URIModifier URI修改器
|
||||||
|
type URIModifier func(uri string) string
|
||||||
|
|
||||||
|
var uriModifier URIModifier
|
||||||
|
|
||||||
|
// DefaultHTTPClient 默认httpClient
|
||||||
|
var DefaultHTTPClient = http.DefaultClient
|
||||||
|
|
||||||
|
// SetURIModifier 设置URI修改器
|
||||||
|
func SetURIModifier(fn URIModifier) {
|
||||||
|
uriModifier = fn
|
||||||
|
}
|
||||||
|
|
||||||
// HTTPGet get 请求
|
// HTTPGet get 请求
|
||||||
func HTTPGet(uri string) ([]byte, error) {
|
func HTTPGet(uri string) ([]byte, error) {
|
||||||
return HTTPGetContext(context.Background(), uri)
|
return HTTPGetContext(context.Background(), uri)
|
||||||
@@ -24,11 +37,14 @@ func HTTPGet(uri string) ([]byte, error) {
|
|||||||
|
|
||||||
// HTTPGetContext get 请求
|
// HTTPGetContext get 请求
|
||||||
func HTTPGetContext(ctx context.Context, uri string) ([]byte, error) {
|
func HTTPGetContext(ctx context.Context, uri string) ([]byte, error) {
|
||||||
|
if uriModifier != nil {
|
||||||
|
uri = uriModifier(uri)
|
||||||
|
}
|
||||||
request, err := http.NewRequestWithContext(ctx, http.MethodGet, uri, nil)
|
request, err := http.NewRequestWithContext(ctx, http.MethodGet, uri, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
response, err := http.DefaultClient.Do(request)
|
response, err := DefaultHTTPClient.Do(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -47,6 +63,9 @@ func HTTPPost(uri string, data string) ([]byte, error) {
|
|||||||
|
|
||||||
// HTTPPostContext post 请求
|
// HTTPPostContext post 请求
|
||||||
func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[string]string) ([]byte, error) {
|
func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[string]string) ([]byte, error) {
|
||||||
|
if uriModifier != nil {
|
||||||
|
uri = uriModifier(uri)
|
||||||
|
}
|
||||||
body := bytes.NewBuffer(data)
|
body := bytes.NewBuffer(data)
|
||||||
request, err := http.NewRequestWithContext(ctx, http.MethodPost, uri, body)
|
request, err := http.NewRequestWithContext(ctx, http.MethodPost, uri, body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -57,7 +76,7 @@ func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[st
|
|||||||
request.Header.Set(key, value)
|
request.Header.Set(key, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
response, err := http.DefaultClient.Do(request)
|
response, err := DefaultHTTPClient.Do(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -71,6 +90,9 @@ func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[st
|
|||||||
|
|
||||||
// PostJSONContext post json 数据请求
|
// PostJSONContext post json 数据请求
|
||||||
func PostJSONContext(ctx context.Context, uri string, obj interface{}) ([]byte, error) {
|
func PostJSONContext(ctx context.Context, uri string, obj interface{}) ([]byte, error) {
|
||||||
|
if uriModifier != nil {
|
||||||
|
uri = uriModifier(uri)
|
||||||
|
}
|
||||||
jsonBuf := new(bytes.Buffer)
|
jsonBuf := new(bytes.Buffer)
|
||||||
enc := json.NewEncoder(jsonBuf)
|
enc := json.NewEncoder(jsonBuf)
|
||||||
enc.SetEscapeHTML(false)
|
enc.SetEscapeHTML(false)
|
||||||
@@ -83,7 +105,7 @@ func PostJSONContext(ctx context.Context, uri string, obj interface{}) ([]byte,
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
req.Header.Set("Content-Type", "application/json;charset=utf-8")
|
req.Header.Set("Content-Type", "application/json;charset=utf-8")
|
||||||
response, err := http.DefaultClient.Do(req)
|
response, err := DefaultHTTPClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -110,7 +132,7 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
|
|||||||
return nil, "", err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
response, err := http.Post(uri, "application/json;charset=utf-8", jsonBuf)
|
response, err := DefaultHTTPClient.Post(uri, "application/json;charset=utf-8", jsonBuf)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, "", err
|
return nil, "", err
|
||||||
}
|
}
|
||||||
@@ -124,13 +146,41 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
|
|||||||
return responseData, contentType, err
|
return responseData, contentType, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PostFileByStream 上传文件
|
||||||
|
func PostFileByStream(fieldName, fileName, uri string, byteData []byte) ([]byte, error) {
|
||||||
|
fields := []MultipartFormField{
|
||||||
|
{
|
||||||
|
IsFile: false,
|
||||||
|
Fieldname: fieldName,
|
||||||
|
Filename: fileName,
|
||||||
|
Value: byteData,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
return PostMultipartForm(fields, uri)
|
||||||
|
}
|
||||||
|
|
||||||
// PostFile 上传文件
|
// PostFile 上传文件
|
||||||
func PostFile(fieldName, filename, uri string) ([]byte, error) {
|
func PostFile(fieldName, filePath, uri string) ([]byte, error) {
|
||||||
fields := []MultipartFormField{
|
fields := []MultipartFormField{
|
||||||
{
|
{
|
||||||
IsFile: true,
|
IsFile: true,
|
||||||
Fieldname: fieldName,
|
Fieldname: fieldName,
|
||||||
Filename: filename,
|
FilePath: filePath,
|
||||||
|
Filename: filePath,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
return PostMultipartForm(fields, uri)
|
||||||
|
}
|
||||||
|
|
||||||
|
// PostFileFromReader 上传文件,从 io.Reader 中读取
|
||||||
|
func PostFileFromReader(filedName, filePath, fileName, uri string, reader io.Reader) ([]byte, error) {
|
||||||
|
fields := []MultipartFormField{
|
||||||
|
{
|
||||||
|
IsFile: true,
|
||||||
|
Fieldname: filedName,
|
||||||
|
FilePath: filePath,
|
||||||
|
Filename: fileName,
|
||||||
|
FileReader: reader,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
return PostMultipartForm(fields, uri)
|
return PostMultipartForm(fields, uri)
|
||||||
@@ -138,14 +188,19 @@ func PostFile(fieldName, filename, uri string) ([]byte, error) {
|
|||||||
|
|
||||||
// MultipartFormField 保存文件或其他字段信息
|
// MultipartFormField 保存文件或其他字段信息
|
||||||
type MultipartFormField struct {
|
type MultipartFormField struct {
|
||||||
IsFile bool
|
IsFile bool
|
||||||
Fieldname string
|
Fieldname string
|
||||||
Value []byte
|
Value []byte
|
||||||
Filename string
|
FilePath string
|
||||||
|
Filename string
|
||||||
|
FileReader io.Reader
|
||||||
}
|
}
|
||||||
|
|
||||||
// PostMultipartForm 上传文件或其他多个字段
|
// PostMultipartForm 上传文件或其他多个字段
|
||||||
func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte, err error) {
|
func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte, err error) {
|
||||||
|
if uriModifier != nil {
|
||||||
|
uri = uriModifier(uri)
|
||||||
|
}
|
||||||
bodyBuf := &bytes.Buffer{}
|
bodyBuf := &bytes.Buffer{}
|
||||||
bodyWriter := multipart.NewWriter(bodyBuf)
|
bodyWriter := multipart.NewWriter(bodyBuf)
|
||||||
|
|
||||||
@@ -157,18 +212,24 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
fh, e := os.Open(field.Filename)
|
if field.FileReader == nil {
|
||||||
if e != nil {
|
fh, e := os.Open(field.FilePath)
|
||||||
err = fmt.Errorf("error opening file , err=%v", e)
|
if e != nil {
|
||||||
return
|
err = fmt.Errorf("error opening file , err=%v", e)
|
||||||
}
|
return
|
||||||
defer fh.Close()
|
}
|
||||||
|
_, err = io.Copy(fileWriter, fh)
|
||||||
if _, err = io.Copy(fileWriter, fh); err != nil {
|
_ = fh.Close()
|
||||||
return
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if _, err = io.Copy(fileWriter, field.FileReader); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
partWriter, e := bodyWriter.CreateFormField(field.Fieldname)
|
partWriter, e := bodyWriter.CreateFormFile(field.Fieldname, field.Filename)
|
||||||
if e != nil {
|
if e != nil {
|
||||||
err = e
|
err = e
|
||||||
return
|
return
|
||||||
@@ -183,14 +244,14 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
|
|||||||
contentType := bodyWriter.FormDataContentType()
|
contentType := bodyWriter.FormDataContentType()
|
||||||
bodyWriter.Close()
|
bodyWriter.Close()
|
||||||
|
|
||||||
resp, e := http.Post(uri, contentType, bodyBuf)
|
resp, e := DefaultHTTPClient.Post(uri, contentType, bodyBuf)
|
||||||
if e != nil {
|
if e != nil {
|
||||||
err = e
|
err = e
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
if resp.StatusCode != http.StatusOK {
|
if resp.StatusCode != http.StatusOK {
|
||||||
return nil, err
|
return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, resp.StatusCode)
|
||||||
}
|
}
|
||||||
respBody, err = io.ReadAll(resp.Body)
|
respBody, err = io.ReadAll(resp.Body)
|
||||||
return
|
return
|
||||||
@@ -198,13 +259,16 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
|
|||||||
|
|
||||||
// PostXML perform a HTTP/POST request with XML body
|
// PostXML perform a HTTP/POST request with XML body
|
||||||
func PostXML(uri string, obj interface{}) ([]byte, error) {
|
func PostXML(uri string, obj interface{}) ([]byte, error) {
|
||||||
|
if uriModifier != nil {
|
||||||
|
uri = uriModifier(uri)
|
||||||
|
}
|
||||||
xmlData, err := xml.Marshal(obj)
|
xmlData, err := xml.Marshal(obj)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
body := bytes.NewBuffer(xmlData)
|
body := bytes.NewBuffer(xmlData)
|
||||||
response, err := http.Post(uri, "application/xml;charset=utf-8", body)
|
response, err := DefaultHTTPClient.Post(uri, "application/xml;charset=utf-8", body)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -227,11 +291,23 @@ func httpWithTLS(rootCa, key string) (*http.Client, error) {
|
|||||||
config := &tls.Config{
|
config := &tls.Config{
|
||||||
Certificates: []tls.Certificate{cert},
|
Certificates: []tls.Certificate{cert},
|
||||||
}
|
}
|
||||||
tr := &http.Transport{
|
|
||||||
TLSClientConfig: config,
|
// 安全地获取 *http.Transport
|
||||||
DisableCompression: true,
|
var trans *http.Transport
|
||||||
|
// 尝试从 DefaultHTTPClient 获取 Transport,如果失败则使用默认值
|
||||||
|
if DefaultHTTPClient.Transport != nil {
|
||||||
|
if t, ok := DefaultHTTPClient.Transport.(*http.Transport); ok {
|
||||||
|
trans = t.Clone()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
client = &http.Client{Transport: tr}
|
// 如果无法获取有效的 Transport,使用默认值
|
||||||
|
if trans == nil {
|
||||||
|
trans = http.DefaultTransport.(*http.Transport).Clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
trans.TLSClientConfig = config
|
||||||
|
trans.DisableCompression = true
|
||||||
|
client = &http.Client{Transport: trans}
|
||||||
return client, nil
|
return client, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,6 +335,9 @@ func pkcs12ToPem(p12 []byte, password string) tls.Certificate {
|
|||||||
|
|
||||||
// PostXMLWithTLS perform a HTTP/POST request with XML body and TLS
|
// PostXMLWithTLS perform a HTTP/POST request with XML body and TLS
|
||||||
func PostXMLWithTLS(uri string, obj interface{}, ca, key string) ([]byte, error) {
|
func PostXMLWithTLS(uri string, obj interface{}, ca, key string) ([]byte, error) {
|
||||||
|
if uriModifier != nil {
|
||||||
|
uri = uriModifier(uri)
|
||||||
|
}
|
||||||
xmlData, err := xml.Marshal(obj)
|
xmlData, err := xml.Marshal(obj)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
|||||||
@@ -0,0 +1,81 @@
|
|||||||
|
package util
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// TestHttpWithTLS_NilTransport tests the scenario where DefaultHTTPClient.Transport is nil
|
||||||
|
func TestHttpWithTLS_NilTransport(t *testing.T) {
|
||||||
|
// Save original transport
|
||||||
|
originalTransport := DefaultHTTPClient.Transport
|
||||||
|
defer func() {
|
||||||
|
DefaultHTTPClient.Transport = originalTransport
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Set Transport to nil to simulate the bug scenario
|
||||||
|
DefaultHTTPClient.Transport = nil
|
||||||
|
|
||||||
|
// This should not panic after the fix
|
||||||
|
// Note: This will fail due to invalid cert path, but shouldn't panic on type assertion
|
||||||
|
_, err := httpWithTLS("./testdata/invalid_cert.p12", "password")
|
||||||
|
|
||||||
|
// We expect an error (cert file not found), but NOT a panic
|
||||||
|
if err == nil {
|
||||||
|
t.Error("Expected error due to invalid cert path, but got nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestHttpWithTLS_CustomTransport tests the scenario where DefaultHTTPClient has a custom Transport
|
||||||
|
func TestHttpWithTLS_CustomTransport(t *testing.T) {
|
||||||
|
// Save original transport
|
||||||
|
originalTransport := DefaultHTTPClient.Transport
|
||||||
|
defer func() {
|
||||||
|
DefaultHTTPClient.Transport = originalTransport
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Set a custom http.Transport
|
||||||
|
customTransport := &http.Transport{
|
||||||
|
MaxIdleConns: 100,
|
||||||
|
}
|
||||||
|
DefaultHTTPClient.Transport = customTransport
|
||||||
|
|
||||||
|
// This should not panic
|
||||||
|
_, err := httpWithTLS("./testdata/invalid_cert.p12", "password")
|
||||||
|
|
||||||
|
// We expect an error (cert file not found), but NOT a panic
|
||||||
|
if err == nil {
|
||||||
|
t.Error("Expected error due to invalid cert path, but got nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// CustomRoundTripper is a custom implementation of http.RoundTripper
|
||||||
|
type CustomRoundTripper struct{}
|
||||||
|
|
||||||
|
func (c *CustomRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
|
||||||
|
return http.DefaultTransport.RoundTrip(req)
|
||||||
|
}
|
||||||
|
|
||||||
|
// TestHttpWithTLS_CustomRoundTripper tests the edge case where DefaultHTTPClient has a custom RoundTripper
|
||||||
|
// that is NOT *http.Transport
|
||||||
|
func TestHttpWithTLS_CustomRoundTripper(t *testing.T) {
|
||||||
|
// Save original transport
|
||||||
|
originalTransport := DefaultHTTPClient.Transport
|
||||||
|
defer func() {
|
||||||
|
DefaultHTTPClient.Transport = originalTransport
|
||||||
|
}()
|
||||||
|
|
||||||
|
// Set a custom RoundTripper that is NOT *http.Transport
|
||||||
|
customRoundTripper := &CustomRoundTripper{}
|
||||||
|
DefaultHTTPClient.Transport = customRoundTripper
|
||||||
|
|
||||||
|
// Create a recovery handler to catch potential panic
|
||||||
|
defer func() {
|
||||||
|
if r := recover(); r != nil {
|
||||||
|
t.Errorf("httpWithTLS panicked with custom RoundTripper: %v", r)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
|
// This might panic if the code doesn't handle non-*http.Transport RoundTripper properly
|
||||||
|
_, _ = httpWithTLS("./testdata/invalid_cert.p12", "password")
|
||||||
|
}
|
||||||
@@ -1,10 +1,13 @@
|
|||||||
package wechat
|
package wechat
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/aispeech"
|
||||||
|
aispeechConfig "github.com/silenceper/wechat/v2/aispeech/config"
|
||||||
"github.com/silenceper/wechat/v2/cache"
|
"github.com/silenceper/wechat/v2/cache"
|
||||||
"github.com/silenceper/wechat/v2/miniprogram"
|
"github.com/silenceper/wechat/v2/miniprogram"
|
||||||
miniConfig "github.com/silenceper/wechat/v2/miniprogram/config"
|
miniConfig "github.com/silenceper/wechat/v2/miniprogram/config"
|
||||||
@@ -14,6 +17,7 @@ import (
|
|||||||
openConfig "github.com/silenceper/wechat/v2/openplatform/config"
|
openConfig "github.com/silenceper/wechat/v2/openplatform/config"
|
||||||
"github.com/silenceper/wechat/v2/pay"
|
"github.com/silenceper/wechat/v2/pay"
|
||||||
payConfig "github.com/silenceper/wechat/v2/pay/config"
|
payConfig "github.com/silenceper/wechat/v2/pay/config"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
"github.com/silenceper/wechat/v2/work"
|
"github.com/silenceper/wechat/v2/work"
|
||||||
workConfig "github.com/silenceper/wechat/v2/work/config"
|
workConfig "github.com/silenceper/wechat/v2/work/config"
|
||||||
)
|
)
|
||||||
@@ -81,3 +85,16 @@ func (wc *Wechat) GetWork(cfg *workConfig.Config) *work.Work {
|
|||||||
}
|
}
|
||||||
return work.NewWork(cfg)
|
return work.NewWork(cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetAISpeech 获取微信智能对话的实例
|
||||||
|
func (wc *Wechat) GetAISpeech(cfg *aispeechConfig.Config) *aispeech.AISpeech {
|
||||||
|
if cfg.Cache == nil {
|
||||||
|
cfg.Cache = wc.cache
|
||||||
|
}
|
||||||
|
return aispeech.NewAISpeech(cfg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetHTTPClient 设置HTTPClient
|
||||||
|
func (wc *Wechat) SetHTTPClient(client *http.Client) {
|
||||||
|
util.DefaultHTTPClient = client
|
||||||
|
}
|
||||||
@@ -9,11 +9,16 @@ import (
|
|||||||
const (
|
const (
|
||||||
// departmentCreateURL 创建部门
|
// departmentCreateURL 创建部门
|
||||||
departmentCreateURL = "https://qyapi.weixin.qq.com/cgi-bin/department/create?access_token=%s"
|
departmentCreateURL = "https://qyapi.weixin.qq.com/cgi-bin/department/create?access_token=%s"
|
||||||
|
// departmentUpdateURL 更新部门
|
||||||
|
departmentUpdateURL = "https://qyapi.weixin.qq.com/cgi-bin/department/update?access_token=%s"
|
||||||
|
// departmentDeleteURL 删除部门
|
||||||
|
departmentDeleteURL = "https://qyapi.weixin.qq.com/cgi-bin/department/delete?access_token=%s&id=%d"
|
||||||
// departmentSimpleListURL 获取子部门ID列表
|
// departmentSimpleListURL 获取子部门ID列表
|
||||||
departmentSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/simplelist?access_token=%s&id=%d"
|
departmentSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/simplelist?access_token=%s&id=%d"
|
||||||
// departmentListURL 获取部门列表
|
// departmentListURL 获取部门列表
|
||||||
departmentListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s"
|
departmentListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s"
|
||||||
// departmentGetURL 获取单个部门详情 https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=ACCESS_TOKEN&id=ID
|
departmentListByIDURL = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s&id=%d"
|
||||||
|
// departmentGetURL 获取单个部门详情
|
||||||
departmentGetURL = "https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=%s&id=%d"
|
departmentGetURL = "https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=%s&id=%d"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -58,6 +63,11 @@ type (
|
|||||||
ParentID int `json:"parentid"` // 父部门id。根部门为1
|
ParentID int `json:"parentid"` // 父部门id。根部门为1
|
||||||
Order int `json:"order"` // 在父部门中的次序值。order值大的排序靠前
|
Order int `json:"order"` // 在父部门中的次序值。order值大的排序靠前
|
||||||
}
|
}
|
||||||
|
// DepartmentGetResponse 获取单个部门详情
|
||||||
|
DepartmentGetResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Department Department `json:"department"`
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
// DepartmentCreate 创建部门
|
// DepartmentCreate 创建部门
|
||||||
@@ -75,10 +85,51 @@ func (r *Client) DepartmentCreate(req *DepartmentCreateRequest) (*DepartmentCrea
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &DepartmentCreateResponse{}
|
result := &DepartmentCreateResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "DepartmentCreate"); err != nil {
|
err = util.DecodeWithError(response, result, "DepartmentCreate")
|
||||||
return nil, err
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// DepartmentUpdateRequest 更新部门请求
|
||||||
|
type DepartmentUpdateRequest struct {
|
||||||
|
ID int `json:"id"`
|
||||||
|
Name string `json:"name,omitempty"`
|
||||||
|
NameEn string `json:"name_en,omitempty"`
|
||||||
|
ParentID int `json:"parentid,omitempty"`
|
||||||
|
Order int `json:"order,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DepartmentUpdate 更新部门
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/90206
|
||||||
|
func (r *Client) DepartmentUpdate(req *DepartmentUpdateRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
return result, nil
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(departmentUpdateURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "DepartmentUpdate")
|
||||||
|
}
|
||||||
|
|
||||||
|
// DepartmentDelete 删除部门
|
||||||
|
// @see https://developer.work.weixin.qq.com/document/path/90207
|
||||||
|
func (r *Client) DepartmentDelete(departmentID int) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPGet(fmt.Sprintf(departmentDeleteURL, accessToken, departmentID)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "DepartmentDelete")
|
||||||
}
|
}
|
||||||
|
|
||||||
// DepartmentSimpleList 获取子部门ID列表
|
// DepartmentSimpleList 获取子部门ID列表
|
||||||
@@ -96,30 +147,44 @@ func (r *Client) DepartmentSimpleList(departmentID int) ([]*DepartmentID, error)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &DepartmentSimpleListResponse{}
|
result := &DepartmentSimpleListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "DepartmentSimpleList"); err != nil {
|
err = util.DecodeWithError(response, result, "DepartmentSimpleList")
|
||||||
return nil, err
|
return result.DepartmentID, err
|
||||||
}
|
|
||||||
return result.DepartmentID, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DepartmentList 获取部门列表
|
// DepartmentList 获取部门列表
|
||||||
// @desc https://developer.work.weixin.qq.com/document/path/90208
|
// @desc https://developer.work.weixin.qq.com/document/path/90208
|
||||||
func (r *Client) DepartmentList() ([]*Department, error) {
|
func (r *Client) DepartmentList() ([]*Department, error) {
|
||||||
|
return r.DepartmentListByID(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// DepartmentListByID 获取部门列表
|
||||||
|
//
|
||||||
|
// departmentID 部门id。获取指定部门及其下的子部门(以及子部门的子部门等等,递归)
|
||||||
|
//
|
||||||
|
// @desc https://developer.work.weixin.qq.com/document/path/90208
|
||||||
|
func (r *Client) DepartmentListByID(departmentID int) ([]*Department, error) {
|
||||||
|
var formatURL string
|
||||||
|
|
||||||
// 获取accessToken
|
// 获取accessToken
|
||||||
accessToken, err := r.GetAccessToken()
|
accessToken, err := r.GetAccessToken()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if departmentID > 0 {
|
||||||
|
formatURL = fmt.Sprintf(departmentListByIDURL, accessToken, departmentID)
|
||||||
|
} else {
|
||||||
|
formatURL = fmt.Sprintf(departmentListURL, accessToken)
|
||||||
|
}
|
||||||
|
|
||||||
// 发起http请求
|
// 发起http请求
|
||||||
response, err := util.HTTPGet(fmt.Sprintf(departmentListURL, accessToken))
|
response, err := util.HTTPGet(formatURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
// 按照结构体解析返回值
|
// 按照结构体解析返回值
|
||||||
result := &DepartmentListResponse{}
|
result := &DepartmentListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "DepartmentList"); err != nil {
|
err = util.DecodeWithError(response, result, "DepartmentList")
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
// 返回数据
|
// 返回数据
|
||||||
return result.Department, err
|
return result.Department, err
|
||||||
}
|
}
|
||||||
@@ -138,9 +203,7 @@ func (r *Client) DepartmentGet(departmentID int) (*Department, error) {
|
|||||||
if response, err = util.HTTPGet(fmt.Sprintf(departmentGetURL, accessToken, departmentID)); err != nil {
|
if response, err = util.HTTPGet(fmt.Sprintf(departmentGetURL, accessToken, departmentID)); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &Department{}
|
result := &DepartmentGetResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "DepartmentGet"); err != nil {
|
err = util.DecodeWithError(response, result, "DepartmentGet")
|
||||||
return nil, err
|
return &result.Department, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
@@ -41,10 +41,8 @@ func (r *Client) GetPermList() (*GetPermListResponse, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetPermListResponse{}
|
result := &GetPermListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetPermList"); err != nil {
|
err = util.DecodeWithError(response, result, "GetPermList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetLinkedCorpUserRequest 获取互联企业成员详细信息请求
|
// GetLinkedCorpUserRequest 获取互联企业成员详细信息请求
|
||||||
@@ -111,10 +109,8 @@ func (r *Client) GetLinkedCorpUser(req *GetLinkedCorpUserRequest) (*GetLinkedCor
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetLinkedCorpUserResponse{}
|
result := &GetLinkedCorpUserResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetLinkedCorpUser"); err != nil {
|
err = util.DecodeWithError(response, result, "GetLinkedCorpUser")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// LinkedCorpSimpleListRequest 获取互联企业部门成员请求
|
// LinkedCorpSimpleListRequest 获取互联企业部门成员请求
|
||||||
@@ -151,10 +147,8 @@ func (r *Client) LinkedCorpSimpleList(req *LinkedCorpSimpleListRequest) (*Linked
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &LinkedCorpSimpleListResponse{}
|
result := &LinkedCorpSimpleListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "LinkedCorpSimpleList"); err != nil {
|
err = util.DecodeWithError(response, result, "LinkedCorpSimpleList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// LinkedCorpUserListRequest 获取互联企业部门成员详情请求
|
// LinkedCorpUserListRequest 获取互联企业部门成员详情请求
|
||||||
@@ -183,10 +177,8 @@ func (r *Client) LinkedCorpUserList(req *LinkedCorpUserListRequest) (*LinkedCorp
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &LinkedCorpUserListResponse{}
|
result := &LinkedCorpUserListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "LinkedCorpUserList"); err != nil {
|
err = util.DecodeWithError(response, result, "LinkedCorpUserList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// LinkedCorpDepartmentListRequest 获取互联企业部门列表请求
|
// LinkedCorpDepartmentListRequest 获取互联企业部门列表请求
|
||||||
@@ -223,8 +215,6 @@ func (r *Client) LinkedCorpDepartmentList(req *LinkedCorpDepartmentListRequest)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &LinkedCorpDepartmentListResponse{}
|
result := &LinkedCorpDepartmentListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "LinkedCorpDepartmentList"); err != nil {
|
err = util.DecodeWithError(response, result, "LinkedCorpDepartmentList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
+10
-20
@@ -51,10 +51,8 @@ func (r *Client) CreateTag(req *CreateTagRequest) (*CreateTagResponse, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &CreateTagResponse{}
|
result := &CreateTagResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "CreateTag"); err != nil {
|
err = util.DecodeWithError(response, result, "CreateTag")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -129,10 +127,8 @@ func (r *Client) GetTag(tagID int) (*GetTagResponse, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetTagResponse{}
|
result := &GetTagResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetTag"); err != nil {
|
err = util.DecodeWithError(response, result, "GetTag")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -165,10 +161,8 @@ func (r *Client) AddTagUsers(req *AddTagUsersRequest) (*AddTagUsersResponse, err
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &AddTagUsersResponse{}
|
result := &AddTagUsersResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "AddTagUsers"); err != nil {
|
err = util.DecodeWithError(response, result, "AddTagUsers")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -201,10 +195,8 @@ func (r *Client) DelTagUsers(req *DelTagUsersRequest) (*DelTagUsersResponse, err
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &DelTagUsersResponse{}
|
result := &DelTagUsersResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "DelTagUsers"); err != nil {
|
err = util.DecodeWithError(response, result, "DelTagUsers")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -235,8 +227,6 @@ func (r *Client) ListTag() (*ListTagResponse, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &ListTagResponse{}
|
result := &ListTagResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ListTag"); err != nil {
|
err = util.DecodeWithError(response, result, "ListTag")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
Loaded 100 of 129 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user