mirror of
https://github.com/silenceper/wechat.git
synced 2026-02-04 12:52:27 +08:00
Compare commits
26 Commits
v2.1.6-rc.
...
v2.1.7-rc.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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 |
6
.github/ISSUE_TEMPLATE/bug.md
vendored
6
.github/ISSUE_TEMPLATE/bug.md
vendored
@@ -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]
|
||||||
|
|||||||
8
.github/ISSUE_TEMPLATE/feature.md
vendored
8
.github/ISSUE_TEMPLATE/feature.md
vendored
@@ -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**
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
6
.github/ISSUE_TEMPLATE/question.md
vendored
6
.github/ISSUE_TEMPLATE/question.md
vendored
@@ -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/
|
||||||
-->
|
-->
|
||||||
**请描述您的问题**
|
**请描述您的问题**
|
||||||
|
|||||||
18
.github/workflows/go.yml
vendored
18
.github/workflows/go.yml
vendored
@@ -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
|
||||||
|
|||||||
29
.github/workflows/release.yml
vendored
29
.github/workflows/release.yml
vendored
@@ -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:'
|
|
||||||
@@ -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
|
||||||
}
|
}
|
||||||
@@ -138,7 +141,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
|
||||||
@@ -216,9 +219,7 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
|
|||||||
|
|
||||||
expires := resAccessToken.ExpiresIn - 1500
|
expires := resAccessToken.ExpiresIn - 1500
|
||||||
err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
|
err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
accessToken = resAccessToken.AccessToken
|
accessToken = resAccessToken.AccessToken
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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 对应的请求详情
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -138,10 +138,8 @@ 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获取用户手机号
|
||||||
|
|||||||
@@ -45,10 +45,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
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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"` // 可选
|
||||||
|
|||||||
@@ -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,27 @@ 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"
|
||||||
|
// 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 +73,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 +123,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 +159,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 +203,104 @@ 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 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)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 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 +310,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 +366,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 +375,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 +398,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 +412,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,9 +427,9 @@ 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"` // 道具参数信息
|
||||||
}
|
}
|
||||||
@@ -344,14 +438,14 @@ type PushDataXpayGoodsDeliverNotify struct {
|
|||||||
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 +453,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 +463,117 @@ 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 int `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
|
||||||
|
}
|
||||||
|
|||||||
15
miniprogram/message/reply.go
Normal file
15
miniprogram/message/reply.go
Normal file
@@ -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{}
|
||||||
|
}
|
||||||
102
miniprogram/message/updatable_msg.go
Normal file
102
miniprogram/message/updatable_msg.go
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
package message
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/miniprogram/context"
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// createActivityURL 创建activity_id
|
||||||
|
createActivityURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?access_token=%s"
|
||||||
|
// SendUpdatableMsgURL 修改动态消息
|
||||||
|
setUpdatableMsgURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/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,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// CreateActivityID 创建activity_id
|
||||||
|
func (updatableMessage *UpdatableMessage) CreateActivityID() (res CreateActivityIDResponse, err error) {
|
||||||
|
accessToken, err := updatableMessage.GetAccessToken()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
uri := fmt.Sprintf(createActivityURL, accessToken)
|
||||||
|
response, err := util.HTTPGet(uri)
|
||||||
|
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"`
|
||||||
|
}
|
||||||
@@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import (
|
|||||||
"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"
|
||||||
@@ -155,3 +156,13 @@ 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)
|
||||||
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
59
miniprogram/redpacketcover/redpacketcover.go
Normal file
59
miniprogram/redpacketcover/redpacketcover.go
Normal file
@@ -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
|
||||||
|
}
|
||||||
@@ -51,12 +51,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 图片/音频异步校验请求参数
|
||||||
@@ -93,12 +88,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 校验一张图片是否含有违法违规内容(同步)
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -168,11 +168,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 删除私有模板
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ type SchemeInfo struct {
|
|||||||
// 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,没有用户访问过则为空字符串
|
||||||
@@ -62,9 +62,5 @@ func (u *URLScheme) QueryScheme(querySchemeParams QueryScheme) (schemeInfo Schem
|
|||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
var res resQueryScheme
|
var res resQueryScheme
|
||||||
err = util.DecodeWithError(response, &res, "QueryScheme")
|
err = util.DecodeWithError(response, &res, "QueryScheme")
|
||||||
if err != nil {
|
return res.SchemeInfo, res.VisitOpenid, err
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
return res.SchemeInfo, res.VisitOpenid, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,8 +78,5 @@ 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
|
||||||
return "", err
|
|
||||||
}
|
|
||||||
return resp.OpenLink, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -60,12 +60,12 @@ func (s *VirtualPayment) QueryUserBalance(ctx context.Context, in *QueryUserBala
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -88,12 +88,12 @@ func (s *VirtualPayment) CurrencyPay(ctx context.Context, in *CurrencyPayRequest
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -116,12 +116,12 @@ func (s *VirtualPayment) QueryOrder(ctx context.Context, in *QueryOrderRequest)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -144,13 +144,13 @@ func (s *VirtualPayment) CancelCurrencyPay(ctx context.Context, in *CancelCurren
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -174,12 +174,12 @@ func (s *VirtualPayment) NotifyProvideGoods(ctx context.Context, in *NotifyProvi
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -203,12 +203,12 @@ func (s *VirtualPayment) PresentCurrency(ctx context.Context, in *PresentCurrenc
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -232,12 +232,12 @@ func (s *VirtualPayment) DownloadBill(ctx context.Context, in *DownloadBillReque
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -261,12 +261,12 @@ func (s *VirtualPayment) RefundOrder(ctx context.Context, in *RefundOrderRequest
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -290,12 +290,12 @@ func (s *VirtualPayment) CreateWithdrawOrder(ctx context.Context, in *CreateWith
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -319,12 +319,12 @@ func (s *VirtualPayment) QueryWithdrawOrder(ctx context.Context, in *QueryWithdr
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -348,12 +348,12 @@ func (s *VirtualPayment) StartUploadGoods(ctx context.Context, in *StartUploadGo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -377,12 +377,12 @@ func (s *VirtualPayment) QueryUploadGoods(ctx context.Context, in *QueryUploadGo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -406,12 +406,12 @@ func (s *VirtualPayment) StartPublishGoods(ctx context.Context, in *StartPublish
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
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
|
||||||
@@ -435,7 +435,7 @@ func (s *VirtualPayment) QueryPublishGoods(ctx context.Context, in *QueryPublish
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 使用通用方法返回错误
|
// 使用通用方法返回错误
|
||||||
err = util.DecodeWithError(response, out, "QueryPublishGoods")
|
err = util.DecodeWithError(response, &out, "QueryPublishGoods")
|
||||||
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,
|
||||||
|
|||||||
@@ -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 发布列表
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,11 +111,7 @@ func (tpl *Template) List() (templateList []*TemplateItem, err error) {
|
|||||||
}
|
}
|
||||||
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 {
|
||||||
@@ -143,11 +139,7 @@ func (tpl *Template) Add(shortID string) (templateID string, err error) {
|
|||||||
|
|
||||||
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 删除私有模板.
|
||||||
|
|||||||
@@ -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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -100,11 +100,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 获取预授权码
|
||||||
|
|||||||
@@ -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")
|
||||||
|
}
|
||||||
|
|||||||
52
util/http.go
52
util/http.go
@@ -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
|
||||||
}
|
}
|
||||||
@@ -146,6 +168,9 @@ type MultipartFormField struct {
|
|||||||
|
|
||||||
// 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)
|
||||||
|
|
||||||
@@ -183,7 +208,7 @@ 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
|
||||||
@@ -198,13 +223,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 +255,10 @@ 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{
|
trans := (DefaultHTTPClient.Transport.(*http.Transport)).Clone()
|
||||||
TLSClientConfig: config,
|
trans.TLSClientConfig = config
|
||||||
DisableCompression: true,
|
trans.DisableCompression = true
|
||||||
}
|
client = &http.Client{Transport: trans}
|
||||||
client = &http.Client{Transport: tr}
|
|
||||||
return client, nil
|
return client, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -259,6 +286,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
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package wechat
|
package wechat
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
@@ -14,6 +15,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 +83,8 @@ func (wc *Wechat) GetWork(cfg *workConfig.Config) *work.Work {
|
|||||||
}
|
}
|
||||||
return work.NewWork(cfg)
|
return work.NewWork(cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetHTTPClient 设置HTTPClient
|
||||||
|
func (wc *Wechat) SetHTTPClient(client *http.Client) {
|
||||||
|
util.DefaultHTTPClient = client
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ const (
|
|||||||
// 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"
|
||||||
|
departmentListByIDURL = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s&id=%d"
|
||||||
// departmentGetURL 获取单个部门详情 https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=ACCESS_TOKEN&id=ID
|
// departmentGetURL 获取单个部门详情 https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=ACCESS_TOKEN&id=ID
|
||||||
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 +59,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 +81,8 @@ 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
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DepartmentSimpleList 获取子部门ID列表
|
// DepartmentSimpleList 获取子部门ID列表
|
||||||
@@ -96,30 +100,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 +156,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
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,10 +61,7 @@ func (r *Client) UserSimpleList(departmentID int) ([]*UserList, error) {
|
|||||||
}
|
}
|
||||||
result := &UserSimpleListResponse{}
|
result := &UserSimpleListResponse{}
|
||||||
err = util.DecodeWithError(response, result, "UserSimpleList")
|
err = util.DecodeWithError(response, result, "UserSimpleList")
|
||||||
if err != nil {
|
return result.UserList, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result.UserList, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -153,10 +150,8 @@ func (r *Client) UserCreate(req *UserCreateRequest) (*UserCreateResponse, error)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &UserCreateResponse{}
|
result := &UserCreateResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "UserCreate"); err != nil {
|
err = util.DecodeWithError(response, result, "UserCreate")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UserGetResponse 获取部门成员响应
|
// UserGetResponse 获取部门成员响应
|
||||||
@@ -245,10 +240,7 @@ func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
|
|||||||
}
|
}
|
||||||
result := &UserGetResponse{}
|
result := &UserGetResponse{}
|
||||||
err = util.DecodeWithError(response, result, "UserGet")
|
err = util.DecodeWithError(response, result, "UserGet")
|
||||||
if err != nil {
|
return result, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -279,10 +271,8 @@ func (r *Client) UserDelete(userID string) (*UserDeleteResponse, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &UserDeleteResponse{}
|
result := &UserDeleteResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "UserDelete"); err != nil {
|
err = util.DecodeWithError(response, result, "UserDelete")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UserListIDRequest 获取成员ID列表请求
|
// UserListIDRequest 获取成员ID列表请求
|
||||||
@@ -324,10 +314,8 @@ func (r *Client) UserListID(req *UserListIDRequest) (*UserListIDResponse, error)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &UserListIDResponse{}
|
result := &UserListIDResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "UserListID"); err != nil {
|
err = util.DecodeWithError(response, result, "UserListID")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -366,10 +354,8 @@ func (r *Client) ConvertToOpenID(userID string) (string, error) {
|
|||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
result := &convertToOpenIDResponse{}
|
result := &convertToOpenIDResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ConvertToOpenID"); err != nil {
|
err = util.DecodeWithError(response, result, "ConvertToOpenID")
|
||||||
return "", err
|
return result.OpenID, err
|
||||||
}
|
|
||||||
return result.OpenID, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -408,8 +394,6 @@ func (r *Client) ConvertToUserID(openID string) (string, error) {
|
|||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
result := &convertToUserIDResponse{}
|
result := &convertToUserIDResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ConvertToUserID"); err != nil {
|
err = util.DecodeWithError(response, result, "ConvertToUserID")
|
||||||
return "", err
|
return result.UserID, err
|
||||||
}
|
|
||||||
return result.UserID, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,11 +82,9 @@ func (r *Client) Send(apiName string, request interface{}) (*SendResponse, error
|
|||||||
}
|
}
|
||||||
// 按照结构体解析返回值
|
// 按照结构体解析返回值
|
||||||
result := &SendResponse{}
|
result := &SendResponse{}
|
||||||
if err = util.DecodeWithError(response, result, apiName); err != nil {
|
err = util.DecodeWithError(response, result, apiName)
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
// 返回数据
|
// 返回数据
|
||||||
return result, nil
|
return result, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendText 发送文本消息
|
// SendText 发送文本消息
|
||||||
|
|||||||
@@ -7,63 +7,381 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// getCheckinDataURL 获取打卡记录数据
|
// setScheduleListURL 为打卡人员排班
|
||||||
getCheckinDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckindata?access_token=%s"
|
setScheduleListURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/setcheckinschedulist?access_token=%s"
|
||||||
|
// punchCorrectionURL 为打卡人员补卡
|
||||||
|
punchCorrectionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/punch_correction?access_token=%s"
|
||||||
|
// addUserFaceURL 录入打卡人员人脸信息
|
||||||
|
addUserFaceURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/addcheckinuserface?access_token=%s"
|
||||||
|
// addOptionURL 创建打卡规则
|
||||||
|
addOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/add_checkin_option?access_token=%s"
|
||||||
|
// updateOptionURL 修改打卡规则
|
||||||
|
updateOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/update_checkin_option?access_token=%s"
|
||||||
|
// clearOptionURL 清空打卡规则数组元素
|
||||||
|
clearOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/clear_checkin_option_array_field?access_token=%s"
|
||||||
|
// delOptionURL 删除打卡规则
|
||||||
|
delOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/del_checkin_option?access_token=%s"
|
||||||
)
|
)
|
||||||
|
|
||||||
type (
|
// SetScheduleListRequest 为打卡人员排班请求
|
||||||
// GetCheckinDataRequest 获取打卡记录数据请求
|
type SetScheduleListRequest struct {
|
||||||
GetCheckinDataRequest struct {
|
GroupID int64 `json:"groupid"`
|
||||||
OpenCheckinDataType int64 `json:"opencheckindatatype"`
|
Items []SetScheduleListItem `json:"items"`
|
||||||
StartTime int64 `json:"starttime"`
|
YearMonth int64 `json:"yearmonth"`
|
||||||
EndTime int64 `json:"endtime"`
|
}
|
||||||
UserIDList []string `json:"useridlist"`
|
|
||||||
}
|
|
||||||
// GetCheckinDataResponse 获取打卡记录数据响应
|
|
||||||
GetCheckinDataResponse struct {
|
|
||||||
util.CommonError
|
|
||||||
CheckinData []*GetCheckinDataItem `json:"checkindata"`
|
|
||||||
}
|
|
||||||
// GetCheckinDataItem 打卡记录数据
|
|
||||||
GetCheckinDataItem struct {
|
|
||||||
UserID string `json:"userid"`
|
|
||||||
GroupName string `json:"groupname"`
|
|
||||||
CheckinType string `json:"checkin_type"`
|
|
||||||
ExceptionType string `json:"exception_type"`
|
|
||||||
CheckinTime int64 `json:"checkin_time"`
|
|
||||||
LocationTitle string `json:"location_title"`
|
|
||||||
LocationDetail string `json:"location_detail"`
|
|
||||||
WifiName string `json:"wifiname"`
|
|
||||||
Notes string `json:"notes"`
|
|
||||||
WifiMac string `json:"wifimac"`
|
|
||||||
MediaIDs []string `json:"mediaids"`
|
|
||||||
SchCheckinTime int64 `json:"sch_checkin_time"`
|
|
||||||
GroupID int64 `json:"groupid"`
|
|
||||||
ScheduleID int64 `json:"schedule_id"`
|
|
||||||
TimelineID int64 `json:"timeline_id"`
|
|
||||||
Lat int64 `json:"lat,omitempty"`
|
|
||||||
Lng int64 `json:"lng,omitempty"`
|
|
||||||
DeviceID string `json:"deviceid,omitempty"`
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
// GetCheckinData 获取打卡记录数据
|
// SetScheduleListItem 排班表信息
|
||||||
// @see https://developer.work.weixin.qq.com/document/path/90262
|
type SetScheduleListItem struct {
|
||||||
func (r *Client) GetCheckinData(req *GetCheckinDataRequest) (*GetCheckinDataResponse, error) {
|
UserID string `json:"userid"`
|
||||||
|
Day int64 `json:"day"`
|
||||||
|
ScheduleID int64 `json:"schedule_id"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetScheduleList 为打卡人员排班
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/93385
|
||||||
|
func (r *Client) SetScheduleList(req *SetScheduleListRequest) error {
|
||||||
var (
|
var (
|
||||||
accessToken string
|
accessToken string
|
||||||
err error
|
err error
|
||||||
)
|
)
|
||||||
if accessToken, err = r.GetAccessToken(); err != nil {
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.PostJSON(fmt.Sprintf(getCheckinDataURL, accessToken), req); err != nil {
|
if response, err = util.PostJSON(fmt.Sprintf(setScheduleListURL, accessToken), req); err != nil {
|
||||||
return nil, err
|
return err
|
||||||
}
|
}
|
||||||
result := &GetCheckinDataResponse{}
|
return util.DecodeWithCommonError(response, "SetScheduleList")
|
||||||
if err = util.DecodeWithError(response, result, "GetCheckinData"); err != nil {
|
}
|
||||||
return nil, err
|
|
||||||
}
|
// PunchCorrectionRequest 为打卡人员补卡请求
|
||||||
return result, nil
|
type PunchCorrectionRequest struct {
|
||||||
|
UserID string `json:"userid"`
|
||||||
|
ScheduleDateTime int64 `json:"schedule_date_time"`
|
||||||
|
ScheduleCheckinTime int64 `json:"schedule_checkin_time"`
|
||||||
|
CheckinTime int64 `json:"checkin_time"`
|
||||||
|
Remark string `json:"remark"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// PunchCorrection 为打卡人员补卡
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/95803
|
||||||
|
func (r *Client) PunchCorrection(req *PunchCorrectionRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(punchCorrectionURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "PunchCorrection")
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddUserFaceRequest 录入打卡人员人脸信息请求
|
||||||
|
type AddUserFaceRequest struct {
|
||||||
|
UserID string `json:"userid"`
|
||||||
|
UserFace string `json:"userface"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddUserFace 录入打卡人员人脸信息
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/93378
|
||||||
|
func (r *Client) AddUserFace(req *AddUserFaceRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(addUserFaceURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "AddUserFace")
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddOptionRequest 创建打卡规则请求
|
||||||
|
type AddOptionRequest struct {
|
||||||
|
EffectiveNow bool `json:"effective_now,omitempty"`
|
||||||
|
Group OptionGroupRule `json:"group,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupRule 打卡规则字段
|
||||||
|
type OptionGroupRule struct {
|
||||||
|
GroupID int64 `json:"groupid,omitempty"`
|
||||||
|
GroupType int64 `json:"grouptype"`
|
||||||
|
GroupName string `json:"groupname"`
|
||||||
|
CheckinDate []OptionGroupRuleCheckinDate `json:"checkindate,omitempty"`
|
||||||
|
SpeWorkdays []OptionGroupSpeWorkdays `json:"spe_workdays,omitempty"`
|
||||||
|
SpeOffDays []OptionGroupSpeOffDays `json:"spe_offdays,omitempty"`
|
||||||
|
SyncHolidays bool `json:"sync_holidays,omitempty"`
|
||||||
|
NeedPhoto bool `json:"need_photo,omitempty"`
|
||||||
|
NoteCanUseLocalPic bool `json:"note_can_use_local_pic,omitempty"`
|
||||||
|
WifiMacInfos []OptionGroupWifiMacInfos `json:"wifimac_infos,omitempty"`
|
||||||
|
LocInfos []OptionGroupLocInfos `json:"loc_infos,omitempty"`
|
||||||
|
AllowCheckinOffWorkday bool `json:"allow_checkin_offworkday,omitempty"`
|
||||||
|
AllowApplyOffWorkday bool `json:"allow_apply_offworkday,omitempty"`
|
||||||
|
Range []OptionGroupRange `json:"range"`
|
||||||
|
WhiteUsers []string `json:"white_users,omitempty"`
|
||||||
|
Type int64 `json:"type,omitempty"`
|
||||||
|
ReporterInfo OptionGroupReporterInfo `json:"reporterinfo,omitempty"`
|
||||||
|
AllowApplyBkCnt int64 `json:"allow_apply_bk_cnt,omitempty"`
|
||||||
|
AllowApplyBkDayLimit int64 `json:"allow_apply_bk_day_limit,omitempty"`
|
||||||
|
BukaLimitNextMonth int64 `json:"buka_limit_next_month,omitempty"`
|
||||||
|
OptionOutRange int64 `json:"option_out_range,omitempty"`
|
||||||
|
ScheduleList []OptionGroupScheduleList `json:"schedulelist,omitempty"`
|
||||||
|
OffWorkIntervalTime int64 `json:"offwork_interval_time,omitempty"`
|
||||||
|
UseFaceDetect bool `json:"use_face_detect,omitempty"`
|
||||||
|
OpenFaceLiveDetect bool `json:"open_face_live_detect,omitempty"`
|
||||||
|
OtInfoV2 OptionGroupOtInfoV2 `json:"ot_info_v2,omitempty"`
|
||||||
|
SyncOutCheckin bool `json:"sync_out_checkin,omitempty"`
|
||||||
|
BukaRemind OptionGroupBukaRemind `json:"buka_remind,omitempty"`
|
||||||
|
BukaRestriction int64 `json:"buka_restriction,omitempty"`
|
||||||
|
SpanDayTime int64 `json:"span_day_time,omitempty"`
|
||||||
|
StandardWorkDuration int64 `json:"standard_work_duration,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupRuleCheckinDate 固定时间上下班打卡时间
|
||||||
|
type OptionGroupRuleCheckinDate struct {
|
||||||
|
Workdays []int64 `json:"workdays"`
|
||||||
|
CheckinTime []OptionGroupRuleCheckinTime `json:"checkintime"`
|
||||||
|
FlexTime int64 `json:"flex_time"`
|
||||||
|
AllowFlex bool `json:"allow_flex"`
|
||||||
|
FlexOnDutyTime int64 `json:"flex_on_duty_time"`
|
||||||
|
FlexOffDutyTime int64 `json:"flex_off_duty_time"`
|
||||||
|
MaxAllowArriveEarly int64 `json:"max_allow_arrive_early"`
|
||||||
|
MaxAllowArriveLate int64 `json:"max_allow_arrive_late"`
|
||||||
|
LateRule OptionGroupLateRule `json:"late_rule"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupRuleCheckinTime 工作日上下班打卡时间信息
|
||||||
|
type OptionGroupRuleCheckinTime struct {
|
||||||
|
TimeID int64 `json:"time_id"`
|
||||||
|
WorkSec int64 `json:"work_sec"`
|
||||||
|
OffWorkSec int64 `json:"off_work_sec"`
|
||||||
|
RemindWorkSec int64 `json:"remind_work_sec"`
|
||||||
|
RemindOffWorkSec int64 `json:"remind_off_work_sec"`
|
||||||
|
AllowRest bool `json:"allow_rest"`
|
||||||
|
RestBeginTime int64 `json:"rest_begin_time"`
|
||||||
|
RestEndTime int64 `json:"rest_end_time"`
|
||||||
|
EarliestWorkSec int64 `json:"earliest_work_sec"`
|
||||||
|
LatestWorkSec int64 `json:"latest_work_sec"`
|
||||||
|
EarliestOffWorkSec int64 `json:"earliest_off_work_sec"`
|
||||||
|
LatestOffWorkSec int64 `json:"latest_off_work_sec"`
|
||||||
|
NoNeedCheckOn bool `json:"no_need_checkon"`
|
||||||
|
NoNeedCheckOff bool `json:"no_need_checkoff"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupLateRule 晚走晚到时间规则信息
|
||||||
|
type OptionGroupLateRule struct {
|
||||||
|
OffWorkAfterTime int64 `json:"offwork_after_time"`
|
||||||
|
OnWorkFlexTime int64 `json:"onwork_flex_time"`
|
||||||
|
AllowOffWorkAfterTime int64 `json:"allow_offwork_after_time"`
|
||||||
|
TimeRules []OptionGroupTimeRule `json:"timerules"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupTimeRule 晚走晚到时间规则
|
||||||
|
type OptionGroupTimeRule struct {
|
||||||
|
OffWorkAfterTime int64 `json:"offwork_after_time"`
|
||||||
|
OnWorkFlexTime int64 `json:"onwork_flex_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupSpeWorkdays 特殊工作日
|
||||||
|
type OptionGroupSpeWorkdays struct {
|
||||||
|
Timestamp int64 `json:"timestamp"`
|
||||||
|
Notes string `json:"notes"`
|
||||||
|
CheckinTime []OptionGroupCheckinTime `json:"checkintime"`
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
BegTime int64 `json:"begtime"`
|
||||||
|
EndTime int64 `json:"endtime"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupCheckinTime 特殊工作日的上下班打卡时间配置
|
||||||
|
type OptionGroupCheckinTime struct {
|
||||||
|
TimeID int64 `json:"time_id"`
|
||||||
|
WorkSec int64 `json:"work_sec"`
|
||||||
|
OffWorkSec int64 `json:"off_work_sec"`
|
||||||
|
RemindWorkSec int64 `json:"remind_work_sec"`
|
||||||
|
RemindOffWorkSec int64 `json:"remind_off_work_sec"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupSpeOffDays 特殊非工作日
|
||||||
|
type OptionGroupSpeOffDays struct {
|
||||||
|
Timestamp int64 `json:"timestamp"`
|
||||||
|
Notes string `json:"notes"`
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
BegTime int64 `json:"begtime"`
|
||||||
|
EndTime int64 `json:"endtime"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupWifiMacInfos WIFI信息
|
||||||
|
type OptionGroupWifiMacInfos struct {
|
||||||
|
WifiName string `json:"wifiname"`
|
||||||
|
WifiMac string `json:"wifimac"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupLocInfos 地点信息
|
||||||
|
type OptionGroupLocInfos struct {
|
||||||
|
Lat int64 `json:"lat"`
|
||||||
|
Lng int64 `json:"lng"`
|
||||||
|
LocTitle string `json:"loc_title"`
|
||||||
|
LocDetail string `json:"loc_detail"`
|
||||||
|
Distance int64 `json:"distance"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupRange 人员信息
|
||||||
|
type OptionGroupRange struct {
|
||||||
|
PartyID []string `json:"party_id"`
|
||||||
|
UserID []string `json:"userid"`
|
||||||
|
TagID []int64 `json:"tagid"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupReporterInfo 汇报人
|
||||||
|
type OptionGroupReporterInfo struct {
|
||||||
|
Reporters []OptionGroupReporters `json:"reporters"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupReporters 汇报对象
|
||||||
|
type OptionGroupReporters struct {
|
||||||
|
UserID string `json:"userid"`
|
||||||
|
TagID int64 `json:"tagid"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupScheduleList 自定义排班规则所有排班
|
||||||
|
type OptionGroupScheduleList struct {
|
||||||
|
ScheduleID int64 `json:"schedule_id"`
|
||||||
|
ScheduleName string `json:"schedule_name"`
|
||||||
|
TimeSection []OptionGroupTimeSection `json:"time_section"`
|
||||||
|
AllowFlex bool `json:"allow_flex"`
|
||||||
|
FlexOnDutyTime int64 `json:"flex_on_duty_time"`
|
||||||
|
FlexOffDutyTime int64 `json:"flex_off_duty_time"`
|
||||||
|
LateRule OptionGroupLateRule `json:"late_rule"`
|
||||||
|
MaxAllowArriveEarly int64 `json:"max_allow_arrive_early"`
|
||||||
|
MaxAllowArriveLate int64 `json:"max_allow_arrive_late"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupTimeSection 班次上下班时段信息
|
||||||
|
type OptionGroupTimeSection struct {
|
||||||
|
TimeID int64 `json:"time_id"`
|
||||||
|
WorkSec int64 `json:"work_sec"`
|
||||||
|
OffWorkSec int64 `json:"off_work_sec"`
|
||||||
|
RemindWorkSec int64 `json:"remind_work_sec"`
|
||||||
|
RemindOffWorkSec int64 `json:"remind_off_work_sec"`
|
||||||
|
RestBeginTime int64 `json:"rest_begin_time"`
|
||||||
|
RestEndTime int64 `json:"rest_end_time"`
|
||||||
|
AllowRest bool `json:"allow_rest"`
|
||||||
|
EarliestWorkSec int64 `json:"earliest_work_sec"`
|
||||||
|
LatestWorkSec int64 `json:"latest_work_sec"`
|
||||||
|
EarliestOffWorkSec int64 `json:"earliest_off_work_sec"`
|
||||||
|
LatestOffWorkSec int64 `json:"latest_off_work_sec"`
|
||||||
|
NoNeedCheckOn bool `json:"no_need_checkon"`
|
||||||
|
NoNeedCheckOff bool `json:"no_need_checkoff"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupOtInfoV2 加班配置
|
||||||
|
type OptionGroupOtInfoV2 struct {
|
||||||
|
WorkdayConf OptionGroupWorkdayConf `json:"workdayconf"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupWorkdayConf 工作日加班配置
|
||||||
|
type OptionGroupWorkdayConf struct {
|
||||||
|
AllowOt bool `json:"allow_ot"`
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroupBukaRemind 补卡提醒
|
||||||
|
type OptionGroupBukaRemind struct {
|
||||||
|
OpenRemind bool `json:"open_remind"`
|
||||||
|
BukaRemindDay int64 `json:"buka_remind_day"`
|
||||||
|
BukaRemindMonth int64 `json:"buka_remind_month"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// AddOption 创建打卡规则
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/98041#%E5%88%9B%E5%BB%BA%E6%89%93%E5%8D%A1%E8%A7%84%E5%88%99
|
||||||
|
func (r *Client) AddOption(req *AddOptionRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(addOptionURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "AddOption")
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateOptionRequest 修改打卡规则请求
|
||||||
|
type UpdateOptionRequest struct {
|
||||||
|
EffectiveNow bool `json:"effective_now,omitempty"`
|
||||||
|
Group OptionGroupRule `json:"group,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// UpdateOption 修改打卡规则
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/98041#%E4%BF%AE%E6%94%B9%E6%89%93%E5%8D%A1%E8%A7%84%E5%88%99
|
||||||
|
func (r *Client) UpdateOption(req *UpdateOptionRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(updateOptionURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "UpdateOption")
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearOptionRequest 清空打卡规则数组元素请求
|
||||||
|
type ClearOptionRequest struct {
|
||||||
|
GroupID int64 `json:"groupid"`
|
||||||
|
ClearField []int64 `json:"clear_field"`
|
||||||
|
EffectiveNow bool `json:"effective_now"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ClearOption 清空打卡规则数组元素
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/98041#%E6%B8%85%E7%A9%BA%E6%89%93%E5%8D%A1%E8%A7%84%E5%88%99%E6%95%B0%E7%BB%84%E5%85%83%E7%B4%A0
|
||||||
|
func (r *Client) ClearOption(req *ClearOptionRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(clearOptionURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "ClearOption")
|
||||||
|
}
|
||||||
|
|
||||||
|
// DelOptionRequest 删除打卡规则请求
|
||||||
|
type DelOptionRequest struct {
|
||||||
|
GroupID int64 `json:"groupid"`
|
||||||
|
EffectiveNow bool `json:"effective_now"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DelOption 删除打卡规则
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/98041#%E5%88%A0%E9%99%A4%E6%89%93%E5%8D%A1%E8%A7%84%E5%88%99
|
||||||
|
func (r *Client) DelOption(req *DelOptionRequest) error {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(delOptionURL, accessToken), req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return util.DecodeWithCommonError(response, "DelOption")
|
||||||
}
|
}
|
||||||
|
|||||||
660
work/checkin/record.go
Normal file
660
work/checkin/record.go
Normal file
@@ -0,0 +1,660 @@
|
|||||||
|
package checkin
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/silenceper/wechat/v2/util"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// getCheckinDataURL 获取打卡记录数据
|
||||||
|
getCheckinDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckindata?access_token=%s"
|
||||||
|
// getDayDataURL 获取打卡日报数据
|
||||||
|
getDayDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckin_daydata?access_token=%s"
|
||||||
|
// getMonthDataURL 获取打卡月报数据
|
||||||
|
getMonthDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckin_monthdata?access_token=%s"
|
||||||
|
// getCorpOptionURL 获取企业所有打卡规则
|
||||||
|
getCorpOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcorpcheckinoption?access_token=%s"
|
||||||
|
// getOptionURL 获取员工打卡规则
|
||||||
|
getOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckinoption?access_token=%s"
|
||||||
|
// getScheduleListURL 获取打卡人员排班信息
|
||||||
|
getScheduleListURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckinschedulist?access_token=%s"
|
||||||
|
// getHardwareDataURL获取设备打卡数据
|
||||||
|
getHardwareDataURL = "https://qyapi.weixin.qq.com/cgi-bin/hardware/get_hardware_checkin_data?access_token=%s"
|
||||||
|
)
|
||||||
|
|
||||||
|
type (
|
||||||
|
// GetCheckinDataRequest 获取打卡记录数据请求
|
||||||
|
GetCheckinDataRequest struct {
|
||||||
|
OpenCheckinDataType int64 `json:"opencheckindatatype"`
|
||||||
|
StartTime int64 `json:"starttime"`
|
||||||
|
EndTime int64 `json:"endtime"`
|
||||||
|
UserIDList []string `json:"useridlist"`
|
||||||
|
}
|
||||||
|
// GetCheckinDataResponse 获取打卡记录数据响应
|
||||||
|
GetCheckinDataResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
CheckinData []*GetCheckinDataItem `json:"checkindata"`
|
||||||
|
}
|
||||||
|
// GetCheckinDataItem 打卡记录数据
|
||||||
|
GetCheckinDataItem struct {
|
||||||
|
UserID string `json:"userid"`
|
||||||
|
GroupName string `json:"groupname"`
|
||||||
|
CheckinType string `json:"checkin_type"`
|
||||||
|
ExceptionType string `json:"exception_type"`
|
||||||
|
CheckinTime int64 `json:"checkin_time"`
|
||||||
|
LocationTitle string `json:"location_title"`
|
||||||
|
LocationDetail string `json:"location_detail"`
|
||||||
|
WifiName string `json:"wifiname"`
|
||||||
|
Notes string `json:"notes"`
|
||||||
|
WifiMac string `json:"wifimac"`
|
||||||
|
MediaIDs []string `json:"mediaids"`
|
||||||
|
SchCheckinTime int64 `json:"sch_checkin_time"`
|
||||||
|
GroupID int64 `json:"groupid"`
|
||||||
|
ScheduleID int64 `json:"schedule_id"`
|
||||||
|
TimelineID int64 `json:"timeline_id"`
|
||||||
|
Lat int64 `json:"lat,omitempty"`
|
||||||
|
Lng int64 `json:"lng,omitempty"`
|
||||||
|
DeviceID string `json:"deviceid,omitempty"`
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetCheckinData 获取打卡记录数据
|
||||||
|
// @see https://developer.work.weixin.qq.com/document/path/90262
|
||||||
|
func (r *Client) GetCheckinData(req *GetCheckinDataRequest) (*GetCheckinDataResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getCheckinDataURL, accessToken), req); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetCheckinDataResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetCheckinData")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
type (
|
||||||
|
// GetDayDataResponse 获取打卡日报数据
|
||||||
|
GetDayDataResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Datas []DayDataItem `json:"datas"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DayDataItem 日报
|
||||||
|
DayDataItem struct {
|
||||||
|
BaseInfo DayBaseInfo `json:"base_info"`
|
||||||
|
SummaryInfo DaySummaryInfo `json:"summary_info"`
|
||||||
|
HolidayInfos []HolidayInfo `json:"holiday_infos"`
|
||||||
|
ExceptionInfos []ExceptionInfo `json:"exception_infos"`
|
||||||
|
OtInfo OtInfo `json:"ot_info"`
|
||||||
|
SpItems []SpItem `json:"sp_items"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DayBaseInfo 基础信息
|
||||||
|
DayBaseInfo struct {
|
||||||
|
Date int64 `json:"date"`
|
||||||
|
RecordType int64 `json:"record_type"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
NameEx string `json:"name_ex"`
|
||||||
|
DepartsName string `json:"departs_name"`
|
||||||
|
AcctID string `json:"acctid"`
|
||||||
|
DayType int64 `json:"day_type"`
|
||||||
|
RuleInfo DayRuleInfo `json:"rule_info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DayCheckInTime 当日打卡时间
|
||||||
|
DayCheckInTime struct {
|
||||||
|
WorkSec int64 `json:"work_sec"`
|
||||||
|
OffWorkSec int64 `json:"off_work_sec"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DayRuleInfo 打卡人员所属规则信息
|
||||||
|
DayRuleInfo struct {
|
||||||
|
GroupID int64 `json:"groupid"`
|
||||||
|
GroupName string `json:"groupname"`
|
||||||
|
ScheduleID int64 `json:"scheduleid"`
|
||||||
|
ScheduleName string `json:"schedulename"`
|
||||||
|
CheckInTimes []DayCheckInTime `json:"checkintime"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// DaySummaryInfo 汇总信息
|
||||||
|
DaySummaryInfo struct {
|
||||||
|
CheckinCount int64 `json:"checkin_count"`
|
||||||
|
RegularWorkSec int64 `json:"regular_work_sec"`
|
||||||
|
StandardWorkSec int64 `json:"standard_work_sec"`
|
||||||
|
EarliestTime int64 `json:"earliest_time"`
|
||||||
|
LastestTime int64 `json:"lastest_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// HolidayInfo 假勤相关信息
|
||||||
|
HolidayInfo struct {
|
||||||
|
SpNumber string `json:"sp_number"`
|
||||||
|
SpTitle SpTitle `json:"sp_title"`
|
||||||
|
SpDescription SpDescription `json:"sp_description"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SpTitle 假勤信息摘要-标题信息
|
||||||
|
SpTitle struct {
|
||||||
|
Data []SpData `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SpDescription 假勤信息摘要-描述信息
|
||||||
|
SpDescription struct {
|
||||||
|
Data []SpData `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SpData 假勤信息(多种语言描述,目前只有中文一种)
|
||||||
|
SpData struct {
|
||||||
|
Lang string `json:"lang"`
|
||||||
|
Text string `json:"text"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SpItem 假勤统计信息
|
||||||
|
SpItem struct {
|
||||||
|
Count int64 `json:"count"`
|
||||||
|
Duration int64 `json:"duration"`
|
||||||
|
TimeType int64 `json:"time_type"`
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
VacationID int64 `json:"vacation_id"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExceptionInfo 校准状态信息
|
||||||
|
ExceptionInfo struct {
|
||||||
|
Count int64 `json:"count"`
|
||||||
|
Duration int64 `json:"duration"`
|
||||||
|
Exception int64 `json:"exception"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OtInfo 加班信息
|
||||||
|
OtInfo struct {
|
||||||
|
OtStatus int64 `json:"ot_status"`
|
||||||
|
OtDuration int64 `json:"ot_duration"`
|
||||||
|
ExceptionDuration []uint64 `json:"exception_duration"`
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetDayData 获取打卡日报数据
|
||||||
|
// @see https://developer.work.weixin.qq.com/document/path/96498
|
||||||
|
func (r *Client) GetDayData(req *GetCheckinDataRequest) (result *GetDayDataResponse, err error) {
|
||||||
|
var (
|
||||||
|
response []byte
|
||||||
|
accessToken string
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getDayDataURL, accessToken), req); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
result = new(GetDayDataResponse)
|
||||||
|
err = util.DecodeWithError(response, result, "GetDayData")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
type (
|
||||||
|
// GetMonthDataResponse 获取打卡月报数据
|
||||||
|
GetMonthDataResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Datas []MonthDataItem `json:"datas"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// MonthDataItem 月报数据
|
||||||
|
MonthDataItem struct {
|
||||||
|
BaseInfo MonthBaseInfo `json:"base_info"`
|
||||||
|
SummaryInfo MonthSummaryInfo `json:"summary_info"`
|
||||||
|
ExceptionInfos []ExceptionInfo `json:"exception_infos"`
|
||||||
|
SpItems []SpItem `json:"sp_items"`
|
||||||
|
OverWorkInfo OverWorkInfo `json:"overwork_info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// MonthBaseInfo 基础信息
|
||||||
|
MonthBaseInfo struct {
|
||||||
|
RecordType int64 `json:"record_type"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
NameEx string `json:"name_ex"`
|
||||||
|
DepartsName string `json:"departs_name"`
|
||||||
|
AcctID string `json:"acctid"`
|
||||||
|
RuleInfo MonthRuleInfo `json:"rule_info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// MonthRuleInfo 打卡人员所属规则信息
|
||||||
|
MonthRuleInfo struct {
|
||||||
|
GroupID int64 `json:"groupid"`
|
||||||
|
GroupName string `json:"groupname"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// MonthSummaryInfo 汇总信息
|
||||||
|
MonthSummaryInfo struct {
|
||||||
|
WorkDays int64 `json:"work_days"`
|
||||||
|
ExceptDays int64 `json:"except_days"`
|
||||||
|
RegularDays int64 `json:"regular_days"`
|
||||||
|
RegularWorkSec int64 `json:"regular_work_sec"`
|
||||||
|
StandardWorkSec int64 `json:"standard_work_sec"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OverWorkInfo 加班情况
|
||||||
|
OverWorkInfo struct {
|
||||||
|
WorkdayOverSec int64 `json:"workday_over_sec"`
|
||||||
|
HolidayOverSec int64 `json:"holidays_over_sec"`
|
||||||
|
RestDayOverSec int64 `json:"restdays_over_sec"`
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetMonthData 获取打卡月报数据
|
||||||
|
// @see https://developer.work.weixin.qq.com/document/path/96499
|
||||||
|
func (r *Client) GetMonthData(req *GetCheckinDataRequest) (result *GetMonthDataResponse, err error) {
|
||||||
|
var (
|
||||||
|
response []byte
|
||||||
|
accessToken string
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getMonthDataURL, accessToken), req); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
result = new(GetMonthDataResponse)
|
||||||
|
err = util.DecodeWithError(response, result, "GetMonthData")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetCorpOptionResponse 获取企业所有打卡规则响应
|
||||||
|
type GetCorpOptionResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Group []CorpOptionGroup `json:"group"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CorpOptionGroup 企业规则信息列表
|
||||||
|
type CorpOptionGroup struct {
|
||||||
|
GroupType int64 `json:"grouptype"`
|
||||||
|
GroupID int64 `json:"groupid"`
|
||||||
|
GroupName string `json:"groupname"`
|
||||||
|
CheckinDate []GroupCheckinDate `json:"checkindate"`
|
||||||
|
SpeWorkdays []SpeWorkdays `json:"spe_workdays"`
|
||||||
|
SpeOffDays []SpeOffDays `json:"spe_offdays"`
|
||||||
|
SyncHolidays bool `json:"sync_holidays"`
|
||||||
|
NeedPhoto bool `json:"need_photo"`
|
||||||
|
NoteCanUseLocalPic bool `json:"note_can_use_local_pic"`
|
||||||
|
AllowCheckinOffWorkday bool `json:"allow_checkin_offworkday"`
|
||||||
|
AllowApplyOffWorkday bool `json:"allow_apply_offworkday"`
|
||||||
|
WifiMacInfos []WifiMacInfos `json:"wifimac_infos"`
|
||||||
|
LocInfos []LocInfos `json:"loc_infos"`
|
||||||
|
Range []Range `json:"range"`
|
||||||
|
CreateTime int64 `json:"create_time"`
|
||||||
|
WhiteUsers []string `json:"white_users"`
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
ReporterInfo ReporterInfo `json:"reporterinfo"`
|
||||||
|
OtInfo GroupOtInfo `json:"ot_info"`
|
||||||
|
OtApplyInfo OtApplyInfo `json:"otapplyinfo"`
|
||||||
|
Uptime int64 `json:"uptime"`
|
||||||
|
AllowApplyBkCnt int64 `json:"allow_apply_bk_cnt"`
|
||||||
|
OptionOutRange int64 `json:"option_out_range"`
|
||||||
|
CreateUserID string `json:"create_userid"`
|
||||||
|
UseFaceDetect bool `json:"use_face_detect"`
|
||||||
|
AllowApplyBkDayLimit int64 `json:"allow_apply_bk_day_limit"`
|
||||||
|
UpdateUserID string `json:"update_userid"`
|
||||||
|
BukaRestriction int64 `json:"buka_restriction"`
|
||||||
|
ScheduleList []ScheduleList `json:"schedulelist"`
|
||||||
|
OffWorkIntervalTime int64 `json:"offwork_interval_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GroupCheckinDate 打卡时间,当规则类型为排班时没有意义
|
||||||
|
type GroupCheckinDate struct {
|
||||||
|
Workdays []int64 `json:"workdays"`
|
||||||
|
CheckinTime []GroupCheckinTime `json:"checkintime"`
|
||||||
|
NoNeedOffWork bool `json:"noneed_offwork"`
|
||||||
|
LimitAheadTime int64 `json:"limit_aheadtime"`
|
||||||
|
FlexOnDutyTime int64 `json:"flex_on_duty_time"`
|
||||||
|
FlexOffDutyTime int64 `json:"flex_off_duty_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GroupCheckinTime 工作日上下班打卡时间信息
|
||||||
|
type GroupCheckinTime struct {
|
||||||
|
WorkSec int64 `json:"work_sec"`
|
||||||
|
OffWorkSec int64 `json:"off_work_sec"`
|
||||||
|
RemindWorkSec int64 `json:"remind_work_sec"`
|
||||||
|
RemindOffWorkSec int64 `json:"remind_off_work_sec"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SpeWorkdays 特殊日期-必须打卡日期信息
|
||||||
|
type SpeWorkdays struct {
|
||||||
|
Timestamp int64 `json:"timestamp"`
|
||||||
|
Notes string `json:"notes"`
|
||||||
|
CheckinTime []GroupCheckinTime `json:"checkintime"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// SpeOffDays 特殊日期-不用打卡日期信息
|
||||||
|
type SpeOffDays struct {
|
||||||
|
Timestamp int64 `json:"timestamp"`
|
||||||
|
Notes string `json:"notes"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// WifiMacInfos 打卡地点-WiFi打卡信息
|
||||||
|
type WifiMacInfos struct {
|
||||||
|
WifiName string `json:"wifiname"`
|
||||||
|
WifiMac string `json:"wifimac"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// LocInfos 打卡地点-位置打卡信息
|
||||||
|
type LocInfos struct {
|
||||||
|
Lat int64 `json:"lat"`
|
||||||
|
Lng int64 `json:"lng"`
|
||||||
|
LocTitle string `json:"loc_title"`
|
||||||
|
LocDetail string `json:"loc_detail"`
|
||||||
|
Distance int64 `json:"distance"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Range 打卡人员信息
|
||||||
|
type Range struct {
|
||||||
|
PartyID []string `json:"partyid"`
|
||||||
|
UserID []string `json:"userid"`
|
||||||
|
TagID []int64 `json:"tagid"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReporterInfo 汇报对象信息
|
||||||
|
type ReporterInfo struct {
|
||||||
|
Reporters []Reporters `json:"reporters"`
|
||||||
|
UpdateTime int64 `json:"updatetime"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reporters 汇报对象,每个汇报人用userid表示
|
||||||
|
type Reporters struct {
|
||||||
|
UserID string `json:"userid"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GroupOtInfo 加班信息
|
||||||
|
type GroupOtInfo struct {
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
AllowOtWorkingDay bool `json:"allow_ot_workingday"`
|
||||||
|
AllowOtNonWorkingDay bool `json:"allow_ot_nonworkingday"`
|
||||||
|
OtCheckInfo OtCheckInfo `json:"otcheckinfo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OtCheckInfo 以打卡时间为准-加班时长计算规则信息
|
||||||
|
type OtCheckInfo struct {
|
||||||
|
OtWorkingDayTimeStart int64 `json:"ot_workingday_time_start"`
|
||||||
|
OtWorkingDayTimeMin int64 `json:"ot_workingday_time_min"`
|
||||||
|
OtWorkingDayTimeMax int64 `json:"ot_workingday_time_max"`
|
||||||
|
OtNonworkingDayTimeMin int64 `json:"ot_nonworkingday_time_min"`
|
||||||
|
OtNonworkingDayTimeMax int64 `json:"ot_nonworkingday_time_max"`
|
||||||
|
OtNonworkingDaySpanDayTime int64 `json:"ot_nonworkingday_spanday_time"`
|
||||||
|
OtWorkingDayRestInfo OtRestInfo `json:"ot_workingday_restinfo"`
|
||||||
|
OtNonWorkingDayRestInfo OtRestInfo `json:"ot_nonworkingday_restinfo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OtRestInfo 加班-休息扣除配置信息
|
||||||
|
type OtRestInfo struct {
|
||||||
|
Type int64 `json:"type"`
|
||||||
|
FixTimeRule FixTimeRule `json:"fix_time_rule"`
|
||||||
|
CalOtTimeRule CalOtTimeRule `json:"cal_ottime_rule"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// FixTimeRule 工作日加班-指定休息时间配置信息
|
||||||
|
type FixTimeRule struct {
|
||||||
|
FixTimeBeginSec int64 `json:"fix_time_begin_sec"`
|
||||||
|
FixTimeEndSec int64 `json:"fix_time_end_sec"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CalOtTimeRule 工作日加班-按加班时长扣除配置信息
|
||||||
|
type CalOtTimeRule struct {
|
||||||
|
Items []CalOtTimeRuleItem `json:"items"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// CalOtTimeRuleItem 工作日加班-按加班时长扣除条件信息
|
||||||
|
type CalOtTimeRuleItem struct {
|
||||||
|
OtTime int64 `json:"ot_time"`
|
||||||
|
RestTime int64 `json:"rest_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OtApplyInfo 以加班申请核算打卡记录相关信息
|
||||||
|
type OtApplyInfo struct {
|
||||||
|
AllowOtWorkingDay bool `json:"allow_ot_workingday"`
|
||||||
|
AllowOtNonWorkingDay bool `json:"allow_ot_nonworkingday"`
|
||||||
|
Uiptime int64 `json:"uptime"`
|
||||||
|
OtNonworkingDaySpanDayTime int64 `json:"ot_nonworkingday_spanday_time"`
|
||||||
|
OtWorkingDayRestInfo OtRestInfo `json:"ot_workingday_restinfo"`
|
||||||
|
OtNonWorkingDayRestInfo OtRestInfo `json:"ot_nonworkingday_restinfo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ScheduleList 排班信息列表
|
||||||
|
type ScheduleList struct {
|
||||||
|
ScheduleID int64 `json:"schedule_id"`
|
||||||
|
ScheduleName string `json:"schedule_name"`
|
||||||
|
TimeSection []TimeSection `json:"time_section"`
|
||||||
|
LimitAheadTime int64 `json:"limit_aheadtime"`
|
||||||
|
NoNeedOffWork bool `json:"noneed_offwork"`
|
||||||
|
LimitOffTime int64 `json:"limit_offtime"`
|
||||||
|
FlexOnDutyTime int64 `json:"flex_on_duty_time"`
|
||||||
|
FlexOffDutyTime int64 `json:"flex_off_duty_time"`
|
||||||
|
AllowFlex bool `json:"allow_flex"`
|
||||||
|
LateRule LateRule `json:"late_rule"`
|
||||||
|
MaxAllowArriveEarly int64 `json:"max_allow_arrive_early"`
|
||||||
|
MaxAllowArriveLate int64 `json:"max_allow_arrive_late"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// TimeSection 班次上下班时段信息
|
||||||
|
type TimeSection struct {
|
||||||
|
TimeID int64 `json:"time_id"`
|
||||||
|
WorkSec int64 `json:"work_sec"`
|
||||||
|
OffWorkSec int64 `json:"off_work_sec"`
|
||||||
|
RemindWorkSec int64 `json:"remind_work_sec"`
|
||||||
|
RemindOffWorkSec int64 `json:"remind_off_work_sec"`
|
||||||
|
RestBeginTime int64 `json:"rest_begin_time"`
|
||||||
|
RestEndTime int64 `json:"rest_end_time"`
|
||||||
|
AllowRest bool `json:"allow_rest"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// LateRule 晚走晚到时间规则信息
|
||||||
|
type LateRule struct {
|
||||||
|
AllowOffWorkAfterTime bool `json:"allow_offwork_after_time"`
|
||||||
|
TimeRules []TimeRule `json:"timerules"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// TimeRule 迟到规则时间
|
||||||
|
type TimeRule struct {
|
||||||
|
OffWorkAfterTime int64 `json:"offwork_after_time"`
|
||||||
|
OnWorkFlexTime int64 `json:"onwork_flex_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetCorpOption 获取企业所有打卡规则
|
||||||
|
// @see https://developer.work.weixin.qq.com/document/path/93384
|
||||||
|
func (r *Client) GetCorpOption() (*GetCorpOptionResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.HTTPPost(fmt.Sprintf(getCorpOptionURL, accessToken), ""); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetCorpOptionResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetCorpOption")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetOptionRequest 获取员工打卡规则请求
|
||||||
|
type GetOptionRequest struct {
|
||||||
|
Datetime int64 `json:"datetime"`
|
||||||
|
UserIDList []string `json:"useridlist"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetOptionResponse 获取员工打卡规则响应
|
||||||
|
type GetOptionResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
Info []OptionInfo `json:"info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionInfo 打卡规则列表
|
||||||
|
type OptionInfo struct {
|
||||||
|
UserID string `json:"userid"`
|
||||||
|
Group OptionGroup `json:"group"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionGroup 打卡规则相关信息
|
||||||
|
type OptionGroup struct {
|
||||||
|
GroupType int64 `json:"grouptype"`
|
||||||
|
GroupID int64 `json:"groupid"`
|
||||||
|
GroupName string `json:"groupname"`
|
||||||
|
CheckinDate []OptionCheckinDate `json:"checkindate"`
|
||||||
|
SpeWorkdays []SpeWorkdays `json:"spe_workdays"`
|
||||||
|
SpeOffDays []SpeOffDays `json:"spe_offdays"`
|
||||||
|
SyncHolidays bool `json:"sync_holidays"`
|
||||||
|
NeedPhoto bool `json:"need_photo"`
|
||||||
|
WifiMacInfos []WifiMacInfos `json:"wifimac_infos"`
|
||||||
|
NoteCanUseLocalPic bool `json:"note_can_use_local_pic"`
|
||||||
|
AllowCheckinOffWorkday bool `json:"allow_checkin_offworkday"`
|
||||||
|
AllowApplyOffWorkday bool `json:"allow_apply_offworkday"`
|
||||||
|
LocInfos []LocInfos `json:"loc_infos"`
|
||||||
|
ScheduleList []ScheduleList `json:"schedulelist"`
|
||||||
|
BukaRestriction int64 `json:"buka_restriction"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// OptionCheckinDate 打卡时间配置
|
||||||
|
type OptionCheckinDate struct {
|
||||||
|
Workdays []int64 `json:"workdays"`
|
||||||
|
CheckinTime []GroupCheckinTime `json:"checkintime"`
|
||||||
|
FlexTime int64 `json:"flex_time"`
|
||||||
|
NoNeedOffWork bool `json:"noneed_offwork"`
|
||||||
|
LimitAheadTime int64 `json:"limit_aheadtime"`
|
||||||
|
FlexOnDutyTime int64 `json:"flex_on_duty_time"`
|
||||||
|
FlexOffDutyTime int64 `json:"flex_off_duty_time"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetOption 获取员工打卡规则
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/90263
|
||||||
|
func (r *Client) GetOption(req *GetOptionRequest) (*GetOptionResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getOptionURL, accessToken), req); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetOptionResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetOption")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetScheduleListRequest 获取打卡人员排班信息请求
|
||||||
|
type GetScheduleListRequest struct {
|
||||||
|
StartTime int64 `json:"starttime"`
|
||||||
|
EndTime int64 `json:"endtime"`
|
||||||
|
UserIDList []string `json:"useridlist"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetScheduleListResponse 获取打卡人员排班信息响应
|
||||||
|
type GetScheduleListResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
ScheduleList []ScheduleItem `json:"schedule_list"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ScheduleItem 排班表信息
|
||||||
|
type ScheduleItem struct {
|
||||||
|
UserID string `json:"userid"`
|
||||||
|
YearMonth int64 `json:"yearmonth"`
|
||||||
|
GroupID int64 `json:"groupid"`
|
||||||
|
GroupName string `json:"groupname"`
|
||||||
|
Schedule Schedule `json:"schedule"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Schedule 个人排班信息
|
||||||
|
type Schedule struct {
|
||||||
|
ScheduleList []ScheduleListItem `json:"scheduleList"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ScheduleListItem 个人排班表信息
|
||||||
|
type ScheduleListItem struct {
|
||||||
|
Day int64 `json:"day"`
|
||||||
|
ScheduleInfo ScheduleInfo `json:"schedule_info"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ScheduleInfo 个人当日排班信息
|
||||||
|
type ScheduleInfo struct {
|
||||||
|
ScheduleID int64 `json:"schedule_id"`
|
||||||
|
ScheduleName string `json:"schedule_name"`
|
||||||
|
TimeSection []ScheduleTimeSection `json:"time_section"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ScheduleTimeSection 班次上下班时段信息
|
||||||
|
type ScheduleTimeSection struct {
|
||||||
|
ID int64 `json:"id"`
|
||||||
|
WorkSec int64 `json:"work_sec"`
|
||||||
|
OffWorkSec int64 `json:"off_work_sec"`
|
||||||
|
RemindWorkSec int64 `json:"remind_work_sec"`
|
||||||
|
RemindOffWorkSec int64 `json:"remind_off_work_sec"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetScheduleList 获取打卡人员排班信息
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/93380
|
||||||
|
func (r *Client) GetScheduleList(req *GetScheduleListRequest) (*GetScheduleListResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getScheduleListURL, accessToken), req); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetScheduleListResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetScheduleList")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetHardwareDataRequest 获取设备打卡数据请求
|
||||||
|
type GetHardwareDataRequest struct {
|
||||||
|
FilterType int64 `json:"filter_type"`
|
||||||
|
StartTime int64 `json:"starttime"`
|
||||||
|
EndTime int64 `json:"endtime"`
|
||||||
|
UserIDList []string `json:"useridlist"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetHardwareDataResponse 获取设备打卡数据响应
|
||||||
|
type GetHardwareDataResponse struct {
|
||||||
|
util.CommonError
|
||||||
|
CheckinData []HardwareCheckinData `json:"checkindata"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// HardwareCheckinData 设备打卡数据
|
||||||
|
type HardwareCheckinData struct {
|
||||||
|
UserID string `json:"userid"`
|
||||||
|
CheckinTime int64 `json:"checkin_time"`
|
||||||
|
DeviceSn string `json:"device_sn"`
|
||||||
|
DeviceName string `json:"device_name"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetHardwareData 获取设备打卡数据
|
||||||
|
// see https://developer.work.weixin.qq.com/document/path/94126
|
||||||
|
func (r *Client) GetHardwareData(req *GetHardwareDataRequest) (*GetHardwareDataResponse, error) {
|
||||||
|
var (
|
||||||
|
accessToken string
|
||||||
|
err error
|
||||||
|
)
|
||||||
|
if accessToken, err = r.GetAccessToken(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
var response []byte
|
||||||
|
if response, err = util.PostJSON(fmt.Sprintf(getHardwareDataURL, accessToken), req); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result := &GetHardwareDataResponse{}
|
||||||
|
err = util.DecodeWithError(response, result, "GetHardwareData")
|
||||||
|
return result, err
|
||||||
|
}
|
||||||
@@ -38,8 +38,6 @@ func (r *Client) GetCallbackMessage(encryptedMsg []byte) (msg EventCallbackMessa
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err = xml.Unmarshal(bData, &msg); err != nil {
|
err = xml.Unmarshal(bData, &msg)
|
||||||
return
|
|
||||||
}
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,10 +102,8 @@ func (r *Client) AddContactWay(req *AddContactWayRequest) (*AddContactWayRespons
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &AddContactWayResponse{}
|
result := &AddContactWayResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "AddContactWay"); err != nil {
|
err = util.DecodeWithError(response, result, "AddContactWay")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -153,10 +151,8 @@ func (r *Client) GetContactWay(req *GetContactWayRequest) (*GetContactWayRespons
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetContactWayResponse{}
|
result := &GetContactWayResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetContactWay"); err != nil {
|
err = util.DecodeWithError(response, result, "GetContactWay")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -195,10 +191,8 @@ func (r *Client) UpdateContactWay(req *UpdateContactWayRequest) (*UpdateContactW
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &UpdateContactWayResponse{}
|
result := &UpdateContactWayResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "UpdateContactWay"); err != nil {
|
err = util.DecodeWithError(response, result, "UpdateContactWay")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -236,10 +230,8 @@ func (r *Client) ListContactWay(req *ListContactWayRequest) (*ListContactWayResp
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &ListContactWayResponse{}
|
result := &ListContactWayResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ListContactWay"); err != nil {
|
err = util.DecodeWithError(response, result, "ListContactWay")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -268,8 +260,6 @@ func (r *Client) DelContactWay(req *DelContactWayRequest) (*DelContactWayRespons
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &DelContactWayResponse{}
|
result := &DelContactWayResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "DelContactWay"); err != nil {
|
err = util.DecodeWithError(response, result, "DelContactWay")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,10 +54,8 @@ func (r *Client) ListLink(req *ListLinkRequest) (*ListLinkResponse, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &ListLinkResponse{}
|
result := &ListLinkResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ListLink"); err != nil {
|
err = util.DecodeWithError(response, result, "ListLink")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -102,10 +100,8 @@ func (r *Client) GetCustomerAcquisition(req *GetCustomerAcquisitionRequest) (*Ge
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetCustomerAcquisitionResponse{}
|
result := &GetCustomerAcquisitionResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetCustomerAcquisition"); err != nil {
|
err = util.DecodeWithError(response, result, "GetCustomerAcquisition")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -137,10 +133,8 @@ func (r *Client) CreateCustomerAcquisitionLink(req *CreateCustomerAcquisitionLin
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &CreateCustomerAcquisitionLinkResponse{}
|
result := &CreateCustomerAcquisitionLinkResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink"); err != nil {
|
err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -172,10 +166,8 @@ func (r *Client) UpdateCustomerAcquisitionLink(req *UpdateCustomerAcquisitionLin
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &UpdateCustomerAcquisitionLinkResponse{}
|
result := &UpdateCustomerAcquisitionLinkResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink"); err != nil {
|
err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -204,10 +196,8 @@ func (r *Client) DeleteCustomerAcquisitionLink(req *DeleteCustomerAcquisitionLin
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &DeleteCustomerAcquisitionLinkResponse{}
|
result := &DeleteCustomerAcquisitionLinkResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink"); err != nil {
|
err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -247,10 +237,8 @@ func (r *Client) GetCustomerInfoWithCustomerAcquisitionLink(req *GetCustomerInfo
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetCustomerInfoWithCustomerAcquisitionLinkResponse{}
|
result := &GetCustomerInfoWithCustomerAcquisitionLinkResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink"); err != nil {
|
err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -279,14 +267,12 @@ func (r *Client) CustomerAcquisitionQuota() (*CustomerAcquisitionQuotaResponse,
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
var response []byte
|
var response []byte
|
||||||
if response, err = util.HTTPGet((fmt.Sprintf(customerAcquisitionQuotaURL, accessToken))); err != nil {
|
if response, err = util.HTTPGet(fmt.Sprintf(customerAcquisitionQuotaURL, accessToken)); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &CustomerAcquisitionQuotaResponse{}
|
result := &CustomerAcquisitionQuotaResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota"); err != nil {
|
err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -319,8 +305,6 @@ func (r *Client) CustomerAcquisitionStatistic(req *CustomerAcquisitionStatisticR
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &CustomerAcquisitionStatisticResponse{}
|
result := &CustomerAcquisitionStatisticResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic"); err != nil {
|
err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,10 +50,7 @@ func (r *Client) GetExternalUserList(userID string) ([]string, error) {
|
|||||||
}
|
}
|
||||||
var result ExternalUserListResponse
|
var result ExternalUserListResponse
|
||||||
err = util.DecodeWithError(response, &result, "GetExternalUserList")
|
err = util.DecodeWithError(response, &result, "GetExternalUserList")
|
||||||
if err != nil {
|
return result.ExternalUserID, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result.ExternalUserID, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ExternalUserDetailResponse 外部联系人详情响应
|
// ExternalUserDetailResponse 外部联系人详情响应
|
||||||
@@ -66,16 +63,16 @@ type ExternalUserDetailResponse struct {
|
|||||||
|
|
||||||
// ExternalUser 外部联系人
|
// ExternalUser 外部联系人
|
||||||
type ExternalUser struct {
|
type ExternalUser struct {
|
||||||
ExternalUserID string `json:"external_userid"`
|
ExternalUserID string `json:"external_userid"`
|
||||||
Name string `json:"name"`
|
Name string `json:"name"`
|
||||||
Avatar string `json:"avatar"`
|
Avatar string `json:"avatar"`
|
||||||
Type int64 `json:"type"`
|
Type int64 `json:"type"`
|
||||||
Gender int64 `json:"gender"`
|
Gender int64 `json:"gender"`
|
||||||
UnionID string `json:"unionid"`
|
UnionID string `json:"unionid"`
|
||||||
Position string `json:"position"`
|
Position string `json:"position"`
|
||||||
CorpName string `json:"corp_name"`
|
CorpName string `json:"corp_name"`
|
||||||
CorpFullName string `json:"corp_full_name"`
|
CorpFullName string `json:"corp_full_name"`
|
||||||
ExternalProfile string `json:"external_profile"`
|
ExternalProfile *ExternalProfile `json:"external_profile,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// FollowUser 跟进用户(指企业内部用户)
|
// FollowUser 跟进用户(指企业内部用户)
|
||||||
@@ -104,7 +101,47 @@ type Tag struct {
|
|||||||
// WechatChannel 视频号添加的场景
|
// WechatChannel 视频号添加的场景
|
||||||
type WechatChannel struct {
|
type WechatChannel struct {
|
||||||
NickName string `json:"nickname"`
|
NickName string `json:"nickname"`
|
||||||
Source string `json:"source"`
|
Source int `json:"source"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExternalProfile 外部联系人的自定义展示信息,可以有多个字段和多种类型,包括文本,网页和小程序
|
||||||
|
type ExternalProfile struct {
|
||||||
|
ExternalCorpName string `json:"external_corp_name"`
|
||||||
|
WechatChannels WechatChannels `json:"wechat_channels"`
|
||||||
|
ExternalAttr []ExternalAttr `json:"external_attr"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// WechatChannels 视频号属性。须从企业绑定到企业微信的视频号中选择,可在“我的企业”页中查看绑定的视频号
|
||||||
|
type WechatChannels struct {
|
||||||
|
Nickname string `json:"nickname"`
|
||||||
|
Status int `json:"status"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ExternalAttr 属性列表,目前支持文本、网页、小程序三种类型
|
||||||
|
type ExternalAttr struct {
|
||||||
|
Type int `json:"type"`
|
||||||
|
Name string `json:"name"`
|
||||||
|
Text *Text `json:"text,omitempty"`
|
||||||
|
Web *Web `json:"web,omitempty"`
|
||||||
|
MiniProgram *MiniProgram `json:"miniprogram,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Text 文本
|
||||||
|
type Text struct {
|
||||||
|
Value string `json:"value"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// Web 网页
|
||||||
|
type Web struct {
|
||||||
|
URL string `json:"url"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// MiniProgram 小程序
|
||||||
|
type MiniProgram struct {
|
||||||
|
AppID string `json:"appid"`
|
||||||
|
Pagepath string `json:"pagepath"`
|
||||||
|
Title string `json:"title"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetExternalUserDetail 获取外部联系人详情
|
// GetExternalUserDetail 获取外部联系人详情
|
||||||
@@ -125,10 +162,7 @@ func (r *Client) GetExternalUserDetail(externalUserID string, nextCursor ...stri
|
|||||||
}
|
}
|
||||||
result := &ExternalUserDetailResponse{}
|
result := &ExternalUserDetailResponse{}
|
||||||
err = util.DecodeWithError(response, result, "get_external_user_detail")
|
err = util.DecodeWithError(response, result, "get_external_user_detail")
|
||||||
if err != nil {
|
return result, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// BatchGetExternalUserDetailsRequest 批量获取外部联系人详情请求
|
// BatchGetExternalUserDetailsRequest 批量获取外部联系人详情请求
|
||||||
@@ -196,10 +230,7 @@ func (r *Client) BatchGetExternalUserDetails(request BatchGetExternalUserDetails
|
|||||||
}
|
}
|
||||||
var result ExternalUserDetailListResponse
|
var result ExternalUserDetailListResponse
|
||||||
err = util.DecodeWithError(response, &result, "BatchGetExternalUserDetails")
|
err = util.DecodeWithError(response, &result, "BatchGetExternalUserDetails")
|
||||||
if err != nil {
|
return result.ExternalContactList, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result.ExternalContactList, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateUserRemarkRequest 修改客户备注信息请求体
|
// UpdateUserRemarkRequest 修改客户备注信息请求体
|
||||||
@@ -265,10 +296,8 @@ func (r *Client) ListCustomerStrategy(req *ListCustomerStrategyRequest) (*ListCu
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &ListCustomerStrategyResponse{}
|
result := &ListCustomerStrategyResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ListCustomerStrategy"); err != nil {
|
err = util.DecodeWithError(response, result, "ListCustomerStrategy")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetCustomerStrategyRequest 获取规则组详情请求
|
// GetCustomerStrategyRequest 获取规则组详情请求
|
||||||
@@ -332,10 +361,8 @@ func (r *Client) GetCustomerStrategy(req *GetCustomerStrategyRequest) (*GetCusto
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetCustomerStrategyResponse{}
|
result := &GetCustomerStrategyResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetCustomerStrategy"); err != nil {
|
err = util.DecodeWithError(response, result, "GetCustomerStrategy")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRangeCustomerStrategyRequest 获取规则组管理范围请求
|
// GetRangeCustomerStrategyRequest 获取规则组管理范围请求
|
||||||
@@ -374,10 +401,8 @@ func (r *Client) GetRangeCustomerStrategy(req *GetRangeCustomerStrategyRequest)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetRangeCustomerStrategyResponse{}
|
result := &GetRangeCustomerStrategyResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetRangeCustomerStrategy"); err != nil {
|
err = util.DecodeWithError(response, result, "GetRangeCustomerStrategy")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CreateCustomerStrategyRequest 创建新的规则组请求
|
// CreateCustomerStrategyRequest 创建新的规则组请求
|
||||||
@@ -410,10 +435,8 @@ func (r *Client) CreateCustomerStrategy(req *CreateCustomerStrategyRequest) (*Cr
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &CreateCustomerStrategyResponse{}
|
result := &CreateCustomerStrategyResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "CreateCustomerStrategy"); err != nil {
|
err = util.DecodeWithError(response, result, "CreateCustomerStrategy")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EditCustomerStrategyRequest 编辑规则组及其管理范围请求
|
// EditCustomerStrategyRequest 编辑规则组及其管理范围请求
|
||||||
|
|||||||
@@ -31,8 +31,5 @@ func (r *Client) GetFollowUserList() ([]string, error) {
|
|||||||
}
|
}
|
||||||
var result followerUserResponse
|
var result followerUserResponse
|
||||||
err = util.DecodeWithError(response, &result, "GetFollowUserList")
|
err = util.DecodeWithError(response, &result, "GetFollowUserList")
|
||||||
if err != nil {
|
return result.FollowUser, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result.FollowUser, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,10 +44,8 @@ func (r *Client) GetGroupChatList(req *GroupChatListRequest) (*GroupChatListResp
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GroupChatListResponse{}
|
result := &GroupChatListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetGroupChatList"); err != nil {
|
err = util.DecodeWithError(response, result, "GetGroupChatList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -78,13 +76,14 @@ type (
|
|||||||
}
|
}
|
||||||
//GroupChat 客户群详情
|
//GroupChat 客户群详情
|
||||||
GroupChat struct {
|
GroupChat struct {
|
||||||
ChatID string `json:"chat_id"` //客户群ID
|
ChatID string `json:"chat_id"` //客户群ID
|
||||||
Name string `json:"name"` //群名
|
Name string `json:"name"` //群名
|
||||||
Owner string `json:"owner"` //群主ID
|
Owner string `json:"owner"` //群主ID
|
||||||
CreateTime int64 `json:"create_time"` //群的创建时间
|
CreateTime int64 `json:"create_time"` //群的创建时间
|
||||||
Notice string `json:"notice"` //群公告
|
Notice string `json:"notice"` //群公告
|
||||||
MemberList []GroupChatMember `json:"member_list"` //群成员列表
|
MemberList []GroupChatMember `json:"member_list"` //群成员列表
|
||||||
AdminList []GroupChatAdmin `json:"admin_list"` //群管理员列表
|
AdminList []GroupChatAdmin `json:"admin_list"` //群管理员列表
|
||||||
|
MemberVersion string `json:"member_version"` //当前群成员版本号。可以配合客户群变更事件减少主动调用本接口的次数
|
||||||
}
|
}
|
||||||
//GroupChatDetailResponse 客户群详情 返回值
|
//GroupChatDetailResponse 客户群详情 返回值
|
||||||
GroupChatDetailResponse struct {
|
GroupChatDetailResponse struct {
|
||||||
@@ -106,10 +105,8 @@ func (r *Client) GetGroupChatDetail(req *GroupChatDetailRequest) (*GroupChatDeta
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GroupChatDetailResponse{}
|
result := &GroupChatDetailResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
|
err = util.DecodeWithError(response, result, "GetGroupChatDetail")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -137,8 +134,6 @@ func (r *Client) OpengIDToChatID(req *OpengIDToChatIDRequest) (*OpengIDToChatIDR
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &OpengIDToChatIDResponse{}
|
result := &OpengIDToChatIDResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
|
err = util.DecodeWithError(response, result, "GetGroupChatDetail")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,10 +44,8 @@ func (r *Client) AddJoinWay(req *AddJoinWayRequest) (*AddJoinWayResponse, error)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &AddJoinWayResponse{}
|
result := &AddJoinWayResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "AddJoinWay"); err != nil {
|
err = util.DecodeWithError(response, result, "AddJoinWay")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -91,10 +89,8 @@ func (r *Client) GetJoinWay(req *JoinWayConfigRequest) (*GetJoinWayResponse, err
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetJoinWayResponse{}
|
result := &GetJoinWayResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetJoinWay"); err != nil {
|
err = util.DecodeWithError(response, result, "GetJoinWay")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateJoinWayRequest 更新群配置的请求参数
|
// UpdateJoinWayRequest 更新群配置的请求参数
|
||||||
|
|||||||
@@ -112,10 +112,8 @@ func (r *Client) AddMomentTask(req *AddMomentTaskRequest) (*AddMomentTaskRespons
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &AddMomentTaskResponse{}
|
result := &AddMomentTaskResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "AddMomentTask"); err != nil {
|
err = util.DecodeWithError(response, result, "AddMomentTask")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMomentTaskResultResponse 获取任务创建结果响应
|
// GetMomentTaskResultResponse 获取任务创建结果响应
|
||||||
@@ -161,10 +159,8 @@ func (r *Client) GetMomentTaskResult(jobID string) (*GetMomentTaskResultResponse
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetMomentTaskResultResponse{}
|
result := &GetMomentTaskResultResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetMomentTaskResult"); err != nil {
|
err = util.DecodeWithError(response, result, "GetMomentTaskResult")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CancelMomentTaskRequest 停止发表企业朋友圈请求
|
// CancelMomentTaskRequest 停止发表企业朋友圈请求
|
||||||
@@ -264,10 +260,8 @@ func (r *Client) GetMomentList(req *GetMomentListRequest) (*GetMomentListRespons
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetMomentListResponse{}
|
result := &GetMomentListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetMomentList"); err != nil {
|
err = util.DecodeWithError(response, result, "GetMomentList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMomentTaskRequest 获取客户朋友圈企业发表的列表请求
|
// GetMomentTaskRequest 获取客户朋友圈企业发表的列表请求
|
||||||
@@ -305,10 +299,8 @@ func (r *Client) GetMomentTask(req *GetMomentTaskRequest) (*GetMomentTaskRespons
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetMomentTaskResponse{}
|
result := &GetMomentTaskResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetMomentTask"); err != nil {
|
err = util.DecodeWithError(response, result, "GetMomentTask")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMomentCustomerListRequest 获取客户朋友圈发表时选择的可见范围请求
|
// GetMomentCustomerListRequest 获取客户朋友圈发表时选择的可见范围请求
|
||||||
@@ -347,10 +339,8 @@ func (r *Client) GetMomentCustomerList(req *GetMomentCustomerListRequest) (*GetM
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetMomentCustomerListResponse{}
|
result := &GetMomentCustomerListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetMomentCustomerList"); err != nil {
|
err = util.DecodeWithError(response, result, "GetMomentCustomerList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMomentSendResultRequest 获取客户朋友圈发表后的可见客户列表请求
|
// GetMomentSendResultRequest 获取客户朋友圈发表后的可见客户列表请求
|
||||||
@@ -388,10 +378,8 @@ func (r *Client) GetMomentSendResult(req *GetMomentSendResultRequest) (*GetMomen
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetMomentSendResultResponse{}
|
result := &GetMomentSendResultResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetMomentSendResult"); err != nil {
|
err = util.DecodeWithError(response, result, "GetMomentSendResult")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMomentCommentsRequest 获取客户朋友圈的互动数据请求
|
// GetMomentCommentsRequest 获取客户朋友圈的互动数据请求
|
||||||
@@ -436,10 +424,8 @@ func (r *Client) GetMomentComments(req *GetMomentCommentsRequest) (*GetMomentCom
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetMomentCommentsResponse{}
|
result := &GetMomentCommentsResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetMomentComments"); err != nil {
|
err = util.DecodeWithError(response, result, "GetMomentComments")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ListMomentStrategyRequest 获取规则组列表请求
|
// ListMomentStrategyRequest 获取规则组列表请求
|
||||||
@@ -475,10 +461,8 @@ func (r *Client) ListMomentStrategy(req *ListMomentStrategyRequest) (*ListMoment
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &ListMomentStrategyResponse{}
|
result := &ListMomentStrategyResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ListMomentStrategy"); err != nil {
|
err = util.DecodeWithError(response, result, "ListMomentStrategy")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetMomentStrategyRequest 获取规则组详情请求
|
// GetMomentStrategyRequest 获取规则组详情请求
|
||||||
@@ -524,10 +508,8 @@ func (r *Client) GetMomentStrategy(req *GetMomentStrategyRequest) (*GetMomentStr
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetMomentStrategyResponse{}
|
result := &GetMomentStrategyResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetMomentStrategy"); err != nil {
|
err = util.DecodeWithError(response, result, "GetMomentStrategy")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetRangeMomentStrategyRequest 获取规则组管理范围请求
|
// GetRangeMomentStrategyRequest 获取规则组管理范围请求
|
||||||
@@ -566,10 +548,8 @@ func (r *Client) GetRangeMomentStrategy(req *GetRangeMomentStrategyRequest) (*Ge
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetRangeMomentStrategyResponse{}
|
result := &GetRangeMomentStrategyResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetRangeMomentStrategy"); err != nil {
|
err = util.DecodeWithError(response, result, "GetRangeMomentStrategy")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// CreateMomentStrategyRequest 创建新的规则组请求
|
// CreateMomentStrategyRequest 创建新的规则组请求
|
||||||
@@ -602,10 +582,8 @@ func (r *Client) CreateMomentStrategy(req *CreateMomentStrategyRequest) (*Create
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &CreateMomentStrategyResponse{}
|
result := &CreateMomentStrategyResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "CreateMomentStrategy"); err != nil {
|
err = util.DecodeWithError(response, result, "CreateMomentStrategy")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EditMomentStrategyRequest 编辑规则组及其管理范围请求
|
// EditMomentStrategyRequest 编辑规则组及其管理范围请求
|
||||||
|
|||||||
@@ -38,8 +38,23 @@ type AddMsgTemplateRequest struct {
|
|||||||
Sender string `json:"sender,omitempty"`
|
Sender string `json:"sender,omitempty"`
|
||||||
Text MsgText `json:"text"`
|
Text MsgText `json:"text"`
|
||||||
Attachments []*Attachment `json:"attachments"`
|
Attachments []*Attachment `json:"attachments"`
|
||||||
|
AllowSelect bool `json:"allow_select,omitempty"`
|
||||||
|
ChatIDList []string `json:"chat_id_list,omitempty"`
|
||||||
|
TagFilter TagFilter `json:"tag_filter,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type (
|
||||||
|
// TagFilter 标签过滤
|
||||||
|
TagFilter struct {
|
||||||
|
GroupList []TagGroupList `json:"group_list"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// TagGroupList 标签组
|
||||||
|
TagGroupList struct {
|
||||||
|
TagList []string `json:"tag_list"`
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
// MsgText 文本消息
|
// MsgText 文本消息
|
||||||
type MsgText struct {
|
type MsgText struct {
|
||||||
Content string `json:"content"`
|
Content string `json:"content"`
|
||||||
@@ -106,10 +121,8 @@ func (r *Client) AddMsgTemplate(req *AddMsgTemplateRequest) (*AddMsgTemplateResp
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &AddMsgTemplateResponse{}
|
result := &AddMsgTemplateResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "AddMsgTemplate"); err != nil {
|
err = util.DecodeWithError(response, result, "AddMsgTemplate")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetGroupMsgListV2Request 获取群发记录列表请求
|
// GetGroupMsgListV2Request 获取群发记录列表请求
|
||||||
@@ -155,10 +168,8 @@ func (r *Client) GetGroupMsgListV2(req *GetGroupMsgListV2Request) (*GetGroupMsgL
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetGroupMsgListV2Response{}
|
result := &GetGroupMsgListV2Response{}
|
||||||
if err = util.DecodeWithError(response, result, "GetGroupMsgListV2"); err != nil {
|
err = util.DecodeWithError(response, result, "GetGroupMsgListV2")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetGroupMsgTaskRequest 获取群发成员发送任务列表请求
|
// GetGroupMsgTaskRequest 获取群发成员发送任务列表请求
|
||||||
@@ -197,10 +208,8 @@ func (r *Client) GetGroupMsgTask(req *GetGroupMsgTaskRequest) (*GetGroupMsgTaskR
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetGroupMsgTaskResponse{}
|
result := &GetGroupMsgTaskResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetGroupMsgTask"); err != nil {
|
err = util.DecodeWithError(response, result, "GetGroupMsgTask")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetGroupMsgSendResultRequest 获取企业群发成员执行结果请求
|
// GetGroupMsgSendResultRequest 获取企业群发成员执行结果请求
|
||||||
@@ -242,10 +251,8 @@ func (r *Client) GetGroupMsgSendResult(req *GetGroupMsgSendResultRequest) (*GetG
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetGroupMsgSendResultResponse{}
|
result := &GetGroupMsgSendResultResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetGroupMsgSendResult"); err != nil {
|
err = util.DecodeWithError(response, result, "GetGroupMsgSendResult")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendWelcomeMsgRequest 发送新客户欢迎语请求
|
// SendWelcomeMsgRequest 发送新客户欢迎语请求
|
||||||
@@ -275,22 +282,19 @@ func (r *Client) SendWelcomeMsg(req *SendWelcomeMsgRequest) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
result := &SendWelcomeMsgResponse{}
|
result := &SendWelcomeMsgResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "SendWelcomeMsg"); err != nil {
|
return util.DecodeWithError(response, result, "SendWelcomeMsg")
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddGroupWelcomeTemplateRequest 添加入群欢迎语素材请求
|
// AddGroupWelcomeTemplateRequest 添加入群欢迎语素材请求
|
||||||
type AddGroupWelcomeTemplateRequest struct {
|
type AddGroupWelcomeTemplateRequest struct {
|
||||||
Text MsgText `json:"text"`
|
Text MsgText `json:"text"`
|
||||||
Image AttachmentImg `json:"image"`
|
Image *AttachmentImg `json:"image,omitempty"`
|
||||||
Link AttachmentLink `json:"link"`
|
Link *AttachmentLink `json:"link,omitempty"`
|
||||||
MiniProgram AttachmentMiniProgram `json:"miniprogram"`
|
MiniProgram *AttachmentMiniProgram `json:"miniprogram,omitempty"`
|
||||||
File AttachmentFile `json:"file"`
|
File *AttachmentFile `json:"file,omitempty"`
|
||||||
Video AttachmentVideo `json:"video"`
|
Video *AttachmentVideo `json:"video,omitempty"`
|
||||||
AgentID int `json:"agentid"`
|
AgentID int `json:"agentid,omitempty"`
|
||||||
Notify int `json:"notify"`
|
Notify int `json:"notify,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddGroupWelcomeTemplateResponse 添加入群欢迎语素材响应
|
// AddGroupWelcomeTemplateResponse 添加入群欢迎语素材响应
|
||||||
@@ -314,22 +318,20 @@ func (r *Client) AddGroupWelcomeTemplate(req *AddGroupWelcomeTemplateRequest) (*
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &AddGroupWelcomeTemplateResponse{}
|
result := &AddGroupWelcomeTemplateResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "AddGroupWelcomeTemplate"); err != nil {
|
err = util.DecodeWithError(response, result, "AddGroupWelcomeTemplate")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EditGroupWelcomeTemplateRequest 编辑入群欢迎语素材请求
|
// EditGroupWelcomeTemplateRequest 编辑入群欢迎语素材请求
|
||||||
type EditGroupWelcomeTemplateRequest struct {
|
type EditGroupWelcomeTemplateRequest struct {
|
||||||
TemplateID string `json:"template_id"`
|
TemplateID string `json:"template_id"`
|
||||||
Text MsgText `json:"text"`
|
Text MsgText `json:"text"`
|
||||||
Image AttachmentImg `json:"image"`
|
Image *AttachmentImg `json:"image"`
|
||||||
Link AttachmentLink `json:"link"`
|
Link *AttachmentLink `json:"link"`
|
||||||
MiniProgram AttachmentMiniProgram `json:"miniprogram"`
|
MiniProgram *AttachmentMiniProgram `json:"miniprogram"`
|
||||||
File AttachmentFile `json:"file"`
|
File *AttachmentFile `json:"file"`
|
||||||
Video AttachmentVideo `json:"video"`
|
Video *AttachmentVideo `json:"video"`
|
||||||
AgentID int `json:"agentid"`
|
AgentID int `json:"agentid"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// EditGroupWelcomeTemplateResponse 编辑入群欢迎语素材响应
|
// EditGroupWelcomeTemplateResponse 编辑入群欢迎语素材响应
|
||||||
@@ -352,10 +354,7 @@ func (r *Client) EditGroupWelcomeTemplate(req *EditGroupWelcomeTemplateRequest)
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
result := &EditGroupWelcomeTemplateResponse{}
|
result := &EditGroupWelcomeTemplateResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "EditGroupWelcomeTemplate"); err != nil {
|
return util.DecodeWithError(response, result, "EditGroupWelcomeTemplate")
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetGroupWelcomeTemplateRequest 获取入群欢迎语素材请求
|
// GetGroupWelcomeTemplateRequest 获取入群欢迎语素材请求
|
||||||
@@ -367,11 +366,11 @@ type GetGroupWelcomeTemplateRequest struct {
|
|||||||
type GetGroupWelcomeTemplateResponse struct {
|
type GetGroupWelcomeTemplateResponse struct {
|
||||||
util.CommonError
|
util.CommonError
|
||||||
Text MsgText `json:"text"`
|
Text MsgText `json:"text"`
|
||||||
Image AttachmentImg `json:"image"`
|
Image AttachmentImg `json:"image,omitempty"`
|
||||||
Link AttachmentLink `json:"link"`
|
Link AttachmentLink `json:"link,omitempty"`
|
||||||
MiniProgram AttachmentMiniProgram `json:"miniprogram"`
|
MiniProgram AttachmentMiniProgram `json:"miniprogram,omitempty"`
|
||||||
File AttachmentFile `json:"file"`
|
File AttachmentFile `json:"file,omitempty"`
|
||||||
Video AttachmentVideo `json:"video"`
|
Video AttachmentVideo `json:"video,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetGroupWelcomeTemplate 获取入群欢迎语素材
|
// GetGroupWelcomeTemplate 获取入群欢迎语素材
|
||||||
@@ -389,10 +388,8 @@ func (r *Client) GetGroupWelcomeTemplate(req *GetGroupWelcomeTemplateRequest) (*
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetGroupWelcomeTemplateResponse{}
|
result := &GetGroupWelcomeTemplateResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetGroupWelcomeTemplate"); err != nil {
|
err = util.DecodeWithError(response, result, "GetGroupWelcomeTemplate")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DelGroupWelcomeTemplateRequest 删除入群欢迎语素材请求
|
// DelGroupWelcomeTemplateRequest 删除入群欢迎语素材请求
|
||||||
@@ -421,10 +418,7 @@ func (r *Client) DelGroupWelcomeTemplate(req *DelGroupWelcomeTemplateRequest) er
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
result := &DelGroupWelcomeTemplateResponse{}
|
result := &DelGroupWelcomeTemplateResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "DelGroupWelcomeTemplate"); err != nil {
|
return util.DecodeWithError(response, result, "DelGroupWelcomeTemplate")
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// RemindGroupMsgSendRequest 提醒成员群发请求
|
// RemindGroupMsgSendRequest 提醒成员群发请求
|
||||||
|
|||||||
@@ -60,10 +60,7 @@ func (r *Client) GetUserBehaviorData(req *GetUserBehaviorRequest) ([]BehaviorDat
|
|||||||
}
|
}
|
||||||
var result GetUserBehaviorResponse
|
var result GetUserBehaviorResponse
|
||||||
err = util.DecodeWithError(response, &result, "GetUserBehaviorData")
|
err = util.DecodeWithError(response, &result, "GetUserBehaviorData")
|
||||||
if err != nil {
|
return result.BehaviorData, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result.BehaviorData, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -126,10 +123,7 @@ func (r *Client) GetGroupChatStat(req *GetGroupChatStatRequest) (*GetGroupChatSt
|
|||||||
}
|
}
|
||||||
result := &GetGroupChatStatResponse{}
|
result := &GetGroupChatStatResponse{}
|
||||||
err = util.DecodeWithError(response, result, "GetGroupChatStat")
|
err = util.DecodeWithError(response, result, "GetGroupChatStat")
|
||||||
if err != nil {
|
return result, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type (
|
type (
|
||||||
@@ -169,8 +163,5 @@ func (r *Client) GetGroupChatStatByDay(req *GetGroupChatStatByDayRequest) ([]Get
|
|||||||
}
|
}
|
||||||
var result GetGroupChatStatByDayResponse
|
var result GetGroupChatStatByDayResponse
|
||||||
err = util.DecodeWithError(response, &result, "GetGroupChatStatByDay")
|
err = util.DecodeWithError(response, &result, "GetGroupChatStatByDay")
|
||||||
if err != nil {
|
return result.Items, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result.Items, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,10 +77,7 @@ func (r *Client) GetCropTagList(req GetCropTagRequest) ([]TagGroup, error) {
|
|||||||
}
|
}
|
||||||
var result GetCropTagListResponse
|
var result GetCropTagListResponse
|
||||||
err = util.DecodeWithError(response, &result, "GetCropTagList")
|
err = util.DecodeWithError(response, &result, "GetCropTagList")
|
||||||
if err != nil {
|
return result.TagGroup, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return result.TagGroup, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddCropTagRequest 添加企业标签请求
|
// AddCropTagRequest 添加企业标签请求
|
||||||
@@ -123,10 +120,7 @@ func (r *Client) AddCropTag(req AddCropTagRequest) (*TagGroup, error) {
|
|||||||
}
|
}
|
||||||
var result AddCropTagResponse
|
var result AddCropTagResponse
|
||||||
err = util.DecodeWithError(response, &result, "AddCropTag")
|
err = util.DecodeWithError(response, &result, "AddCropTag")
|
||||||
if err != nil {
|
return &result.TagGroup, err
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return &result.TagGroup, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EditCropTagRequest 编辑客户企业标签请求
|
// EditCropTagRequest 编辑客户企业标签请求
|
||||||
@@ -256,10 +250,8 @@ func (r *Client) GetStrategyTagList(req *GetStrategyTagListRequest) (*GetStrateg
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetStrategyTagListResponse{}
|
result := &GetStrategyTagListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetStrategyTagList"); err != nil {
|
err = util.DecodeWithError(response, result, "GetStrategyTagList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AddStrategyTagRequest 为指定规则组创建企业客户标签请求
|
// AddStrategyTagRequest 为指定规则组创建企业客户标签请求
|
||||||
@@ -315,10 +307,8 @@ func (r *Client) AddStrategyTag(req *AddStrategyTagRequest) (*AddStrategyTagResp
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &AddStrategyTagResponse{}
|
result := &AddStrategyTagResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "AddStrategyTag"); err != nil {
|
err = util.DecodeWithError(response, result, "AddStrategyTag")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// EditStrategyTagRequest 编辑指定规则组下的企业客户标签请求
|
// EditStrategyTagRequest 编辑指定规则组下的企业客户标签请求
|
||||||
|
|||||||
@@ -58,10 +58,8 @@ func (r *Client) TransferCustomer(req *TransferCustomerRequest) (*TransferCustom
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &TransferCustomerResponse{}
|
result := &TransferCustomerResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "TransferCustomer"); err != nil {
|
err = util.DecodeWithError(response, result, "TransferCustomer")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TransferResultRequest 查询客户接替状态请求
|
// TransferResultRequest 查询客户接替状态请求
|
||||||
@@ -100,10 +98,8 @@ func (r *Client) TransferResult(req *TransferResultRequest) (*TransferResultResp
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &TransferResultResponse{}
|
result := &TransferResultResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "TransferResult"); err != nil {
|
err = util.DecodeWithError(response, result, "TransferResult")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GroupChatOnJobTransferRequest 分配在职成员的客户群请求
|
// GroupChatOnJobTransferRequest 分配在职成员的客户群请求
|
||||||
@@ -140,10 +136,8 @@ func (r *Client) GroupChatOnJobTransfer(req *GroupChatOnJobTransferRequest) (*Gr
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GroupChatOnJobTransferResponse{}
|
result := &GroupChatOnJobTransferResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GroupChatOnJobTransfer"); err != nil {
|
err = util.DecodeWithError(response, result, "GroupChatOnJobTransfer")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetUnassignedListRequest 获取待分配的离职成员列表请求
|
// GetUnassignedListRequest 获取待分配的离职成员列表请求
|
||||||
@@ -182,10 +176,8 @@ func (r *Client) GetUnassignedList(req *GetUnassignedListRequest) (*GetUnassigne
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetUnassignedListResponse{}
|
result := &GetUnassignedListResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetUnassignedList"); err != nil {
|
err = util.DecodeWithError(response, result, "GetUnassignedList")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResignedTransferCustomerRequest 分配离职成员的客户请求
|
// ResignedTransferCustomerRequest 分配离职成员的客户请求
|
||||||
@@ -216,10 +208,8 @@ func (r *Client) ResignedTransferCustomer(req *ResignedTransferCustomerRequest)
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &ResignedTransferCustomerResponse{}
|
result := &ResignedTransferCustomerResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ResignedTransferCustomer"); err != nil {
|
err = util.DecodeWithError(response, result, "ResignedTransferCustomer")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ResignedTransferResultRequest 查询离职客户接替状态请求
|
// ResignedTransferResultRequest 查询离职客户接替状态请求
|
||||||
@@ -251,10 +241,8 @@ func (r *Client) ResignedTransferResult(req *ResignedTransferResultRequest) (*Re
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &ResignedTransferResultResponse{}
|
result := &ResignedTransferResultResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "ResignedTransferResult"); err != nil {
|
err = util.DecodeWithError(response, result, "ResignedTransferResult")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GroupChatTransferRequest 分配离职成员的客户群请求
|
// GroupChatTransferRequest 分配离职成员的客户群请求
|
||||||
@@ -284,8 +272,6 @@ func (r *Client) GroupChatTransfer(req *GroupChatTransferRequest) (*GroupChatTra
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GroupChatTransferResponse{}
|
result := &GroupChatTransferResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GroupChatTransfer"); err != nil {
|
err = util.DecodeWithError(response, result, "GroupChatTransfer")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,10 +86,8 @@ func (r *Client) GetInvoiceInfo(req *GetInvoiceInfoRequest) (*GetInvoiceInfoResp
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetInvoiceInfoResponse{}
|
result := &GetInvoiceInfoResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetInvoiceInfo"); err != nil {
|
err = util.DecodeWithError(response, result, "GetInvoiceInfo")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UpdateInvoiceStatusRequest 更新发票状态请求
|
// UpdateInvoiceStatusRequest 更新发票状态请求
|
||||||
@@ -184,8 +182,6 @@ func (r *Client) GetInvoiceInfoBatch(req *GetInvoiceInfoBatchRequest) (*GetInvoi
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetInvoiceInfoBatchResponse{}
|
result := &GetInvoiceInfoBatchResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetInvoiceInfoBatch"); err != nil {
|
err = util.DecodeWithError(response, result, "GetInvoiceInfoBatch")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,8 +92,6 @@ func (r *Client) GetCallbackMessage(encryptedMsg []byte) (msg CallbackMessage, e
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return msg, NewSDKErr(40016)
|
return msg, NewSDKErr(40016)
|
||||||
}
|
}
|
||||||
if err = xml.Unmarshal(bData, &msg); err != nil {
|
err = xml.Unmarshal(bData, &msg)
|
||||||
return msg, err
|
|
||||||
}
|
|
||||||
return msg, err
|
return msg, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,10 +59,8 @@ func (r *Client) GetCorpStatistic(req *GetCorpStatisticRequest) (*GetCorpStatist
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetCorpStatisticResponse{}
|
result := &GetCorpStatisticResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetCorpStatistic"); err != nil {
|
err = util.DecodeWithError(response, result, "GetCorpStatistic")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetServicerStatisticRequest 获取「客户数据统计」接待人员明细数据请求
|
// GetServicerStatisticRequest 获取「客户数据统计」接待人员明细数据请求
|
||||||
@@ -120,8 +118,6 @@ func (r *Client) GetServicerStatistic(req *GetServicerStatisticRequest) (*GetSer
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetServicerStatisticResponse{}
|
result := &GetServicerStatisticResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetServicerStatistic"); err != nil {
|
err = util.DecodeWithError(response, result, "GetServicerStatistic")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,10 +52,8 @@ func (r *Client) UploadImg(filename string) (*UploadImgResponse, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &UploadImgResponse{}
|
result := &UploadImgResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "UploadImg"); err != nil {
|
err = util.DecodeWithError(response, result, "UploadImg")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UploadTempFile 上传临时素材
|
// UploadTempFile 上传临时素材
|
||||||
@@ -74,10 +72,8 @@ func (r *Client) UploadTempFile(filename string, mediaType string) (*UploadTempF
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &UploadTempFileResponse{}
|
result := &UploadTempFileResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "UploadTempFile"); err != nil {
|
err = util.DecodeWithError(response, result, "UploadTempFile")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// UploadAttachment 上传附件资源
|
// UploadAttachment 上传附件资源
|
||||||
@@ -97,8 +93,6 @@ func (r *Client) UploadAttachment(filename string, mediaType string, attachmentT
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &UploadAttachmentResponse{}
|
result := &UploadAttachmentResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "UploadAttachment"); err != nil {
|
err = util.DecodeWithError(response, result, "UploadAttachment")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -99,11 +99,9 @@ func (r *Client) Send(apiName string, request interface{}) (*SendResponse, error
|
|||||||
}
|
}
|
||||||
// 按照结构体解析返回值
|
// 按照结构体解析返回值
|
||||||
result := &SendResponse{}
|
result := &SendResponse{}
|
||||||
if err = util.DecodeWithError(response, result, apiName); err != nil {
|
err = util.DecodeWithError(response, result, apiName)
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
// 返回数据
|
// 返回数据
|
||||||
return result, nil
|
return result, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendText 发送文本消息
|
// SendText 发送文本消息
|
||||||
|
|||||||
@@ -149,10 +149,7 @@ func (s *Client) GetRawChatData(seq uint64, limit uint64, proxy string, passwd s
|
|||||||
|
|
||||||
var data ChatDataResponse
|
var data ChatDataResponse
|
||||||
err := json.Unmarshal(buf, &data)
|
err := json.Unmarshal(buf, &data)
|
||||||
if err != nil {
|
return data, err
|
||||||
return ChatDataResponse{}, err
|
|
||||||
}
|
|
||||||
return data, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// DecryptData 解析密文.企业微信自有解密内容
|
// DecryptData 解析密文.企业微信自有解密内容
|
||||||
|
|||||||
@@ -123,10 +123,8 @@ func (ctr *Oauth) GetUserInfo(code string) (*GetUserInfoResponse, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetUserInfoResponse{}
|
result := &GetUserInfoResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetUserInfo"); err != nil {
|
err = util.DecodeWithError(response, result, "GetUserInfo")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetUserDetailRequest 获取访问用户敏感信息请求
|
// GetUserDetailRequest 获取访问用户敏感信息请求
|
||||||
@@ -162,8 +160,6 @@ func (ctr *Oauth) GetUserDetail(req *GetUserDetailRequest) (*GetUserDetailRespon
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
result := &GetUserDetailResponse{}
|
result := &GetUserDetailResponse{}
|
||||||
if err = util.DecodeWithError(response, result, "GetUserDetail"); err != nil {
|
err = util.DecodeWithError(response, result, "GetUserDetail")
|
||||||
return nil, err
|
return result, err
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user