企业微信userid与openid互换 (#676)

* 企业微信-客户联系-统计管理

* 企业微信-客户联系-统计管理

* 企业微信-客户联系-统计管理

* debug

* rollback

* debug

* debug

* 获取用户信息

* token

* json.Marshal错误输出

* debug

* bugfix

* 企业微信-通讯录管理相关接口

* 企业微信-通讯录管理

* 企业微信-通讯录管理

* 企业微信-通讯录管理

* 企业微信-[联系我]方式新增和查询

* 企业微信-[联系我]方式新增和获取

* 企业微信-[联系我]方式更新

* 企业微信-[联系我]方式列表、删除

* json.Marshal错误输出

* 已实现接口bug修改

* 历史接口bugfix

* 历史接口bugfix

* comment

* 企业微信:客户联系-消息推送;素材管理-上传图片

* fix

* 企业微信-获取群发记录列表

* 历史接口bugfix

* 1.企业微信-客户联系-消息推送-入群欢迎语素材管理
2.企业微信-通讯录管理-成员管理-获取成员ID列表

* golangci-lint

* gofmt

* 方法访问命名

* 企业微信-批量获取客户详情入参优化

* 企业微信-通讯录管理-标签管理-创建/更新/删除标签

* 请求地址常量无需导出

* 企业微信保持代码风格统一,接口URL不导出

* 企业微信-通讯录管理-标签管理-获取/增加/删除标签成员、获取标签列表

* feat:企业微信userid与openid互换

---------

Co-authored-by: wang.yu <wangyu@uniondrug.com>
Co-authored-by: markwang <www.wang61@qq.com>

.github/ISSUE_TEMPLATE.md

@@ -1,2 +1,3 @@
 ## 问题及现象
+
 <!-- 描述你的问题现象，报错**贴截图**粘贴或者贴具体信息，提供**必要的代码段**

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,21 @@
+---
+name: 报告Bug
+about: 反馈BUG信息
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**描述**
+
+**如何复现**
+步骤：
+1、
+2、
+
+**关联日志信息**
+
+
+**使用的版本**
+ - SDK版本: [比如 v0.0.0]

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,15 @@
+---
+name: API需求
+about: 待实现的API接口，SDK的强大离不开社区的帮助，欢迎为项目贡献PR
+title: "[Feature]"
+labels: enhancement
+assignees: ''
+
+---
+
+<!--
+!!!SDK的强大离不开社区的帮助，欢迎为本项目贡献PR!!!
+-->
+**你想要实现的模块或API**
+
+

.github/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,15 @@
+---
+name: 使用咨询
+about: 关于SDK使用相关的咨询，在使用前请先阅读官方微信文档
+title: "[咨询]"
+labels: question
+assignees: ''
+
+---
+
+<!--
+重要：
+1、在使用本SDK前请先阅读对应的官方微信API文档：https://developers.weixin.qq.com/doc/offiaccount/Getting_Started/Overview.html
+2、本SDK部分接口文档： https://silenceper.com/wechat/
+-->
+**请描述您的问题**

.github/workflows/go.yml

@@ -0,0 +1,51 @@
+name: Go
+
+on:
+  push:
+    branches: [ master,release-*,v2 ]
+  pull_request:
+    branches: [ master,release-*,v2 ]
+
+jobs:
+  golangci:
+    strategy:
+      matrix:
+        go-version: [1.16.x,1.17.x,1.18.x]
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3.2.0
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: latest
+  build:
+    name: Test
+    runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis
+        ports:
+        - 6379:6379
+        options: --entrypoint redis-server
+      memcached:
+        image: memcached
+        ports:
+          - 11211:11211
+
+    # strategy set
+    strategy:
+      matrix:
+        go: ["1.16", "1.17", "1.18"]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go }}
+        id: go
+      - name: Test
+        run: go test -v -race ./...

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.15
+      -
+        name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -26,4 +26,5 @@ _testmain.go
 .vscode/
 vendor
 .idea/
-examples/tcb/*
+example/*
+/test

.golangci.yml

@@ -0,0 +1,66 @@
+linters:
+  # please, do not use `enable-all`: it's deprecated and will be removed soon.
+  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
+  disable-all: true
+  enable:
+    - bodyclose
+    - deadcode
+    - depguard
+    - dogsled
+    - dupl
+    - errcheck
+    - funlen
+    - goconst
+      # - gocritic
+    - gocyclo
+    - gofmt
+    - goimports
+    - golint
+    - goprintffuncname
+    - gosimple
+    - govet
+    - ineffassign
+    - interfacer
+    - misspell
+    - nolintlint
+    - rowserrcheck
+    - scopelint
+    - staticcheck
+    - structcheck
+    - stylecheck
+    - typecheck
+    - unconvert
+    - unparam
+    - unused
+    - varcheck
+    - whitespace
+
+issues:
+  include:
+    - EXC0002 # disable excluding of issues about comments from golint
+  exclude-rules:
+    - linters:
+        - stylecheck
+      text: "ST1000:"
+  # Excluding configuration per-path, per-linter, per-text and per-source
+    - path: _test\.go
+      linters:
+        - gomnd
+
+    # https://github.com/go-critic/go-critic/issues/926
+    - linters:
+        - gocritic
+      text: "unnecessaryDefer:"
+
+linters-settings:
+  funlen:
+    lines: 66
+    statements: 40
+
+#issues:
+#  include:
+#  - EXC0002 # disable excluding of issues about comments from golint
+#  exclude-rules:
+#    - linters:
+#       - stylecheck
+#      text: "ST1000:"

.goreleaser.yml

@@ -0,0 +1,29 @@
+# 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:'

.travis.yml

@@ -1,20 +0,0 @@
-language: go
-
-go:
-  - 1.13.x
-  - 1.12.x
-  - 1.11.x
-  - 1.10.x
-
-services:
-  - memcached
-  - redis-server
-
-before_script:
-  - GO_FILES=$(find . -iname '*.go' -type f | grep -v /vendor/)
-  - go get golang.org/x/lint/golint
-    
-script:
-  - go test -v -race ./...
-  - go vet ./...
-  - golint -set_exit_status $(go list ./...)

README.md

@@ -1,646 +1,83 @@
 # WeChat SDK for Go
-[![Build Status](https://travis-ci.org/silenceper/wechat.svg?branch=master)](https://travis-ci.org/silenceper/wechat)
+
+![Go](https://github.com/silenceper/wechat/workflows/Go/badge.svg?branch=release-2.0)
 [![Go Report Card](https://goreportcard.com/badge/github.com/silenceper/wechat)](https://goreportcard.com/report/github.com/silenceper/wechat)
-[![GoDoc](http://godoc.org/github.com/silenceper/wechat?status.svg)](http://godoc.org/github.com/silenceper/wechat)
+[![pkg](https://img.shields.io/badge/dev-reference-007d9c?logo=go&logoColor=white&style=flat)](https://pkg.go.dev/github.com/silenceper/wechat/v2?tab=doc)
+![version](https://img.shields.io/badge/version-v2-green)
 
 使用Golang开发的微信SDK，简单、易用。
+> 注意：当前版本为v2版本，v1版本已废弃
+
+## 文档 && 例子
+
+[API列表](https://github.com/silenceper/wechat/tree/v2/doc/api)
+
+[Wechat SDK 2.0 文档](https://silenceper.com/wechat)
+
+[Wechat SDK 2.0 例子](https://github.com/gowechat/example)
 
 ## 快速开始
 
-以下是一个处理消息接收以及回复的例子：
+```
+import "github.com/silenceper/wechat/v2"
+```
+
+以下是一个微信公众号处理消息接收以及回复的例子：
 
 ```go
-//使用memcache保存access_token，也可选择redis或自定义cache
-memCache=cache.NewMemcache("127.0.0.1:11211")
-
-//配置微信参数
-config := &wechat.Config{
-	AppID:          "xxxx",
-	AppSecret:      "xxxx",
-	Token:          "xxxx",
-	EncodingAESKey: "xxxx",
-	Cache:          memCache
+// 使用memcache保存access_token，也可选择redis或自定义cache
+wc := wechat.NewWechat()
+memory := cache.NewMemory()
+cfg := &offConfig.Config{
+    AppID:     "xxx",
+    AppSecret: "xxx",
+    Token:     "xxx",
+    // EncodingAESKey: "xxxx",
+    Cache: memory,
 }
-wc := wechat.NewWechat(config)
+officialAccount := wc.GetOfficialAccount(cfg)
 
 // 传入request和responseWriter
-server := wc.GetServer(request, responseWriter)
-server.SetMessageHandler(func(msg message.MixMessage) *message.Reply {
+server := officialAccount.GetServer(req, rw)
+// 设置接收消息的处理方法
+server.SetMessageHandler(func(msg *message.MixMessage) *message.Reply {
 
-	//回复消息：演示回复用户发送的消息
-	text := message.NewText(msg.Content)
-	return &message.Reply{message.MsgTypeText, text}
+    // 回复消息：演示回复用户发送的消息
+    text := message.NewText(msg.Content)
+    return &message.Reply{MsgType: message.MsgTypeText, MsgData: text}
 })
 
-server.Serve()
+// 处理消息接收以及回复
+err := server.Serve()
+if err != nil {
+    fmt.Println(err)
+    return
+}
+// 发送回复的消息
 server.Send()
 
 ```
-完整代码：[examples/http/http.go](./examples/http/http.go)
 
-#### 和主流框架配合使用
+## 目录说明
 
-主要是request和responseWriter在不同框架中获取方式可能不一样：
+- officialaccount: 微信公众号API
+- miniprogram: 小程序API
+- minigame:小游戏API
+- pay:微信支付API
+- openplatform:开放平台API
+- work:企业微信
+- aispeech:智能对话
+- doc: api文档
 
-- Beego: [./examples/beego/beego.go](./examples/beego/beego.go)
-- Gin Framework: [./examples/gin/gin.go](./examples/gin/gin.go)
+## 贡献
 
-## 交流群：
-![关注公众号入群交流](https://silenceper.oss-cn-beijing.aliyuncs.com/qrcode/qr_code_study_program_258.jpg)
->关注公众号并回复“入群”
+- 在[API列表](https://github.com/silenceper/wechat/tree/v2/doc/api)中查看哪些API未实现
+- 提交issue，描述需要贡献的内容
+- 完成更改后，提交PR
 
-## 基本配置
+## 公众号
 
-```go
-memcache := cache.NewMemcache("127.0.0.1:11211")
-
-wcConfig := &wechat.Config{
-	AppID:          cfg.AppID,
-	AppSecret:      cfg.AppSecret,
-	Token:          cfg.Token,
-	EncodingAESKey: cfg.EncodingAESKey,//消息加解密时用到
-	Cache:          memcache,
-}
-```
-
-**Cache 设置**
-
-Cache主要用来保存全局access_token以及js-sdk中的ticket：
-默认采用memcache存储。当然也可以直接实现`cache/cache.go`中的接口
-
-
-## 基本API使用
-
-- [消息管理](#消息管理)
-	- 接收普通消息
-	- 接收事件推送
-	- 被动回复消息
-		- 回复文本消息
-		- 回复图片消息
-		- 回复视频消息
-		- 回复音乐消息
-		- 回复图文消息
-- [自定义菜单](#自定义菜单)
-	- 自定义菜单创建接口
-	- 自定义菜单查询接口
-	- 自定义菜单删除接口
-	- 自定义菜单事件推送
-	- 个性化菜单接口
-		- 添加个性化菜单
-		- 删除个性化菜单
-		- 测试个性化菜单匹配结果
-	- 获取公众号菜单配置
-- [微信网页开发](#微信网页开发)
-	- Oauth2 授权
-		- 发起授权
-		- 通过code换取access_token
-		- 拉取用户信息
-		- 刷新access_token
-		- 检验access_token是否有效
-	- 获取js-sdk配置
-- [素材管理](#素材管理)
-- [小程序开发](#小程序开发)
-- [小程序-云开发](./tcb)
-
-## 消息管理
-
-通过`wechat.GetServer(request,responseWriter)`获取到server对象之后
-
-调用`SetMessageHandler(func(msg message.MixMessage){})`设置消息的处理函数，函数参数为message.MixMessage 结构如下：
-
-```go
-//MixMessage 存放所有微信发送过来的消息和事件
-type MixMessage struct {
-	CommonToken
-
-	//基本消息
-	MsgID        int64   `xml:"MsgId"`
-	Content      string  `xml:"Content"`
-	PicURL       string  `xml:"PicUrl"`
-	MediaID      string  `xml:"MediaId"`
-	Format       string  `xml:"Format"`
-	ThumbMediaID string  `xml:"ThumbMediaId"`
-	LocationX    float64 `xml:"Location_X"`
-	LocationY    float64 `xml:"Location_Y"`
-	Scale        float64 `xml:"Scale"`
-	Label        string  `xml:"Label"`
-	Title        string  `xml:"Title"`
-	Description  string  `xml:"Description"`
-	URL          string  `xml:"Url"`
-
-	//事件相关
-	Event     string `xml:"Event"`
-	EventKey  string `xml:"EventKey"`
-	Ticket    string `xml:"Ticket"`
-	Latitude  string `xml:"Latitude"`
-	Longitude string `xml:"Longitude"`
-	Precision string `xml:"Precision"`
-
-	MenuID    string `xml:"MenuId"`
-
-	//扫码事件
-	ScanCodeInfo struct {
-		ScanType   string `xml:"ScanType"`
-		ScanResult string `xml:"ScanResult"`
-	} `xml:"ScanCodeInfo"`
-
-	//发图事件
-	SendPicsInfo struct {
-		Count   int32      `xml:"Count"`
-		PicList []EventPic `xml:"PicList>item"`
-	} `xml:"SendPicsInfo"`
-
-	//发送地理位置事件
-	SendLocationInfo struct {
-		LocationX float64 `xml:"Location_X"`
-		LocationY float64 `xml:"Location_Y"`
-		Scale     float64 `xml:"Scale"`
-		Label     string  `xml:"Label"`
-		Poiname   string  `xml:"Poiname"`
-	}
-}
-
-```
-
-具体参数请参考微信文档：[接收普通消息
-](http://mp.weixin.qq.com/wiki/17/f298879f8fb29ab98b2f2971d42552fd.html)
-
-### 接收普通消息
-```go
-server.SetMessageHandler(func(v message.MixMessage) *message.Reply {
-		switch v.MsgType {
-		//文本消息
-		case message.MsgTypeText:
-			//do something
-
-			//图片消息
-		case message.MsgTypeImage:
-			//do something
-
-			//语音消息
-		case message.MsgTypeVoice:
-			//do something
-
-			//视频消息
-		case message.MsgTypeVideo:
-			//do something
-
-			//小视频消息
-		case message.MsgTypeShortVideo:
-			//do something
-
-			//地理位置消息
-		case message.MsgTypeLocation:
-			//do something
-
-			//链接消息
-		case message.MsgTypeLink:
-			//do something
-
-			//事件推送消息
-		case message.MsgTypeEvent:
-
-		}
-}
-
-
-```
-
-
-### 接收事件推送
-```go
-//事件推送消息
-case message.MsgTypeEvent:
-	switch v.Event {
-		//EventSubscribe 订阅
-		case message.EventSubscribe:
-			//do something
-
-			//取消订阅
-		case message.EventUnsubscribe:
-			//do something
-
-			//用户已经关注公众号，则微信会将带场景值扫描事件推送给开发者
-		case message.EventScan:
-			//do something
-
-			// 上报地理位置事件
-		case message.EventLocation:
-			//do something
-
-			// 点击菜单拉取消息时的事件推送
-		case message.EventClick:
-			//do something
-
-			// 点击菜单跳转链接时的事件推送
-		case message.EventView:
-			//do something
-
-			// 扫码推事件的事件推送
-		case message.EventScancodePush:
-			//do something
-
-			// 扫码推事件且弹出“消息接收中”提示框的事件推送
-		case message.EventScancodeWaitmsg:
-			//do something
-
-			// 弹出系统拍照发图的事件推送
-		case message.EventPicSysphoto:
-			//do something
-
-			// 弹出拍照或者相册发图的事件推送
-		case message.EventPicPhotoOrAlbum:
-			//do something
-
-			// 弹出微信相册发图器的事件推送
-		case message.EventPicWeixin:
-			//do something
-
-			// 弹出地理位置选择器的事件推送
-		case message.EventLocationSelect:
-			//do something
-
-	}
-
-
-```
-
-
-### 被动回复消息
-
-回复消息需要返回 `*message.Reply` 对象结构体如下：
-
-```go
-type Reply struct {
-	MsgType MsgType  //消息类型
-	MsgData interface{}  //消息结构
-}
-
-```
-注意：`return nil`表示什么也不做
-
-####  回复文本消息
-```go
-	text := message.NewText("回复文本消息")
-	return &message.Reply{message.MsgTypeText, text}
-```
-####  回复图片消息
-```go
-//mediaID 可通过素材管理-上上传多媒体文件获得
-image :=message.NewImage("mediaID")
-return &message.Reply{message.MsgTypeImage, image}
-```
-####  回复视频消息
-```go
-video := message.NewVideo("mediaID", "视频标题", "视频描述")
-return &message.Reply{message.MsgTypeVideo, video}
-```
-####  回复音乐消息
-```go
-music := message.NewMusic("title", "description", "musicURL", "hQMusicURL", "thumbMediaID")
-return &message.Reply{message.MsgTypeMusic,music}
-```
-**字段说明：**
-
-Title:音乐标题
-
-Description:音乐描述
-
-MusicURL:音乐链接
-
-HQMusicUrl：高质量音乐链接，WIFI环境优先使用该链接播放音乐
-
-ThumbMediaId：缩略图的媒体id，通过素材管理接口上传多媒体文件，得到的id
-
-####  回复图文消息
-
-```go
-articles := make([]*message.Article, 1)
-
-article := new(message.Article)
-article.Title = "标题"
-article.Description = "描述信息信息信息"
-article.PicURL = "http://ww1.sinaimg.cn/large/65209136gw1f7vhjw95eqj20wt0zk40z.jpg"
-article.URL = "https://github.com/silenceper/wechat"
-articles[0] = article
-
-news := message.NewNews(articles)
-return &message.Reply{message.MsgTypeNews,news}
-```
-**字段说明：**
-
-Title：图文消息标题
-
-Description：图文消息描述
-
-PicUrl	：图片链接，支持JPG、PNG格式，较好的效果为大图360*200，小图200*200
-
-Url	：点击图文消息跳转链接
-
-
-## 自定义菜单
-
-通过` wechat.GetMenu()`获取menu的实例
-
-### 自定义菜单创建接口
-
-以下是一个创建二级菜单的例子
-
-```go
-mu := wc.GetMenu()
-
-buttons := make([]*menu.Button, 1)
-btn := new(menu.Button)
-
-//创建click类型菜单
-btn.SetClickButton("name", "key123")
-buttons[0] = btn
-
-//设置btn为二级菜单
-btn2 := new(menu.Button)
-btn2.SetSubButton("subButton", buttons)
-
-buttons2 := make([]*menu.Button, 1)
-buttons2[0] = btn2
-
-//发送请求
-err := mu.SetMenu(buttons2)
-if err != nil {
-	fmt.Printf("err= %v", err)
-	return
-}
-
-```
-
-**创建其他类型的菜单：**
-
-```go
-//SetViewButton view类型
-func (btn *Button) SetViewButton(name, url string)
-
-// SetScanCodePushButton 扫码推事件
-func (btn *Button) SetScanCodePushButton(name, key string)
-
-//SetScanCodeWaitMsgButton 设置 扫码推事件且弹出"消息接收中"提示框
-func (btn *Button) SetScanCodeWaitMsgButton(name, key string)
-
-//SetPicSysPhotoButton 设置弹出系统拍照发图按钮
-func (btn *Button) SetPicSysPhotoButton(name, key string)
-
-//SetPicPhotoOrAlbumButton 设置弹出拍照或者相册发图类型按钮
-func (btn *Button) SetPicPhotoOrAlbumButton(name, key string) {
-
-// SetPicWeixinButton 设置弹出微信相册发图器类型按钮
-func (btn *Button) SetPicWeixinButton(name, key string)
-
-// SetLocationSelectButton 设置 弹出地理位置选择器 类型按钮
-func (btn *Button) SetLocationSelectButton(name, key string)
-
-//SetMediaIDButton  设置 下发消息(除文本消息) 类型按钮
-func (btn *Button) SetMediaIDButton(name, mediaID string)
-
-//SetViewLimitedButton  设置 跳转图文消息URL 类型按钮
-func (btn *Button) SetViewLimitedButton(name, mediaID string) {
-
-```
-
-### 自定义菜单查询接口
-
-```go
-mu := wc.GetMenu()
-resMenu,err:=mu.GetMenu()
-```
->返回结果 resMenu 结构参考 ./menu/menu.go 中ResMenu 结构体
-
-### 自定义菜单删除接口
-
-```go
-mu := wc.GetMenu()
-err:=mu.DeleteMenu()
-```
-
-### 自定义菜单事件推送
-
- 请参考 消息管理 - 事件推送
-
-### 个性化菜单接口
-**添加个性化菜单**
-
-```go
-
-func (menu *Menu) AddConditional(buttons []*Button, matchRule *MatchRule) error
-```
-
-**删除个性化菜单**
-
-```go
-//删除个性化菜单
-func (menu *Menu) DeleteConditional(menuID int64) error
-
-```
-**测试个性化菜单匹配结果**
-
-```go
-//菜单匹配
-func (menu *Menu) MenuTryMatch(userID string) (buttons []Button, err error) {
-
-```
-
-### 获取公众号菜单配置
-
-```go
-//获取自定义菜单配置接口
-func (menu *Menu) GetCurrentSelfMenuInfo() (resSelfMenuInfo ResSelfMenuInfo, err error)
-
-```
-
-## 微信网页开发
-
-### Oauth2 授权
-
-具体授权流程请参考微信文档：[网页授权](http://mp.weixin.qq.com/wiki/4/9ac2e7b1f1d22e9e57260f6553822520.html)
-
-**1.发起授权**
-
-```go
-oauth := wc.GetOauth()
-err := oauth.Redirect("跳转的绝对地址", "snsapi_userinfo", "123dd123")
-if err != nil {
-	fmt.Println(err)
-}
-
-```
-> 如果不希望直接跳转，可通过 oauth.GetRedirectURL 获取跳转的url
-
-**2.通过code换取access_token**
-
-```go
-code := c.Query("code")
-resToken, err := oauth.GetUserAccessToken(code)
-if err != nil {
-	fmt.Println(err)
-	return
-}
-
-```
-**3.拉取用户信息(需scope为 snsapi_userinfo)**
-
-```go
-//getUserInfo
-userInfo, err := oauth.GetUserInfo(resToken.AccessToken, resToken.OpenID)
-if err != nil {
-	fmt.Println(err)
-	return
-}
-fmt.Println(userInfo)
-
-```
-**刷新access_token**
-
-```go
-func (oauth *Oauth) RefreshAccessToken(refreshToken string) (result ResAccessToken, err error)
-
-```
-**检验access_token是否有效**
-
-```go
-func (oauth *Oauth) CheckAccessToken(accessToken, openID string) (b bool, err error)
-```
-
-### 获取js-sdk配置
-
-```go
-js := wc.GetJs()
-cfg, err := js.GetConfig("传入需要的调用js-sdk的url地址")
-if err != nil {
-	fmt.Println(err)
-	return
-}
-fmt.Println(cfg)
-```
-其中返回的cfg结构体如下：
-
-```go
-type Config struct {
-	AppID     string `json:"app_id"`
-	Timestamp int64  `json:"timestamp"`
-	NonceStr  string `json:"nonce_str"`
-	Signature string `json:"signature"`
-}
-
-```
-
-## 素材管理
-
-[素材管理API](https://godoc.org/github.com/silenceper/wechat/material#Material)
-
-## 小程序开发
-
-获取小程序操作对象
-
-``` go
-memCache=cache.NewMemcache("127.0.0.1:11211")
-config := &wechat.Config{
-	AppID:     "xxx",
-	AppSecret: "xxx",
-	Cache:     memCache=cache.NewMemcache("127.0.0.1:11211"),
-}
-wc := wechat.NewWechat(config)
-
-wxa := wc.GetMiniProgram()
-```
-
-### 小程序登录凭证校验
-
-``` go
-func (wxa *MiniProgram) Code2Session(jsCode string) (result ResCode2Session, err error)
-```
-
-### 小程序数据统计
-
-**获取用户访问小程序日留存**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisDailyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error)
-```
-
-**获取用户访问小程序月留存**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisMonthlyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error)
-```
-
-**获取用户访问小程序周留存**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisWeeklyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error)
-```
-
-**获取用户访问小程序数据概况**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisDailySummary(beginDate, endDate string) (result ResAnalysisDailySummary, err error)
-```
-
-**获取用户访问小程序数据日趋势**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisDailyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error)
-```
-
-**获取用户访问小程序数据月趋势**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisMonthlyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error)
-```
-
-**获取用户访问小程序数据周趋势**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisWeeklyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error)
-```
-
-**获取小程序新增或活跃用户的画像分布数据**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisUserPortrait(beginDate, endDate string) (result ResAnalysisUserPortrait, err error)
-```
-
-**获取用户小程序访问分布数据**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisVisitDistribution(beginDate, endDate string) (result ResAnalysisVisitDistribution, err error)
-```
-
-**获取小程序页面访问数据**
-
-``` go
-func (wxa *MiniProgram) GetAnalysisVisitPage(beginDate, endDate string) (result ResAnalysisVisitPage, err error)
-```
-
-### 小程序二维码生成
-
-**获取小程序二维码，适用于需要的码数量较少的业务场景**
-
-``` go
-func (wxa *MiniProgram) CreateWXAQRCode(coderParams QRCoder) (response []byte, err error)
-```
-
-**获取小程序码，适用于需要的码数量较少的业务场景**
-
-``` go
-func (wxa *MiniProgram) GetWXACode(coderParams QRCoder) (response []byte, err error)
-```
-
-**获取小程序码，适用于需要的码数量极多的业务场景**
-
-``` go
-func (wxa *MiniProgram) GetWXACodeUnlimit(coderParams QRCoder) (response []byte, err error)
-```
-
-
-更多API使用请参考 godoc ：
-[https://godoc.org/github.com/silenceper/wechat](https://godoc.org/github.com/silenceper/wechat)
+![img](https://silenceper.oss-cn-beijing.aliyuncs.com/qrcode/search_study_program.png)
 
 ## License
 

aispeech/README.md

@@ -0,0 +1,5 @@
+# 智能对话
+
+[官方文档](https://developers.weixin.qq.com/doc/aispeech/platform/INTERFACEDOCUMENT.html)
+
+## 快速入门

cache/cache.go

@@ -1,11 +1,55 @@
 package cache
 
-import "time"
+import (
+	"context"
+	"time"
+)
 
-//Cache interface
+// Cache interface
 type Cache interface {
 	Get(key string) interface{}
 	Set(key string, val interface{}, timeout time.Duration) error
 	IsExist(key string) bool
 	Delete(key string) error
 }
+
+// ContextCache interface
+type ContextCache interface {
+	Cache
+	GetContext(ctx context.Context, key string) interface{}
+	SetContext(ctx context.Context, key string, val interface{}, timeout time.Duration) error
+	IsExistContext(ctx context.Context, key string) bool
+	DeleteContext(ctx context.Context, key string) error
+}
+
+// GetContext get value from cache
+func GetContext(ctx context.Context, cache Cache, key string) interface{} {
+	if cache, ok := cache.(ContextCache); ok {
+		return cache.GetContext(ctx, key)
+	}
+	return cache.Get(key)
+}
+
+// SetContext set value to cache
+func SetContext(ctx context.Context, cache Cache, key string, val interface{}, timeout time.Duration) error {
+	if cache, ok := cache.(ContextCache); ok {
+		return cache.SetContext(ctx, key, val, timeout)
+	}
+	return cache.Set(key, val, timeout)
+}
+
+// IsExistContext check value exists in cache.
+func IsExistContext(ctx context.Context, cache Cache, key string) bool {
+	if cache, ok := cache.(ContextCache); ok {
+		return cache.IsExistContext(ctx, key)
+	}
+	return cache.IsExist(key)
+}
+
+// DeleteContext delete value in cache.
+func DeleteContext(ctx context.Context, cache Cache, key string) error {
+	if cache, ok := cache.(ContextCache); ok {
+		return cache.DeleteContext(ctx, key)
+	}
+	return cache.Delete(key)
+}

cache/memcache.go

@@ -7,18 +7,18 @@ import (
 	"github.com/bradfitz/gomemcache/memcache"
 )
 
-//Memcache struct contains *memcache.Client
+// Memcache struct contains *memcache.Client
 type Memcache struct {
 	conn *memcache.Client
 }
 
-//NewMemcache create new memcache
+// NewMemcache create new memcache
 func NewMemcache(server ...string) *Memcache {
 	mc := memcache.New(server...)
 	return &Memcache{mc}
 }
 
-//Get return cached value
+// Get return cached value
 func (mem *Memcache) Get(key string) interface{} {
 	var err error
 	var item *memcache.Item
@@ -40,7 +40,7 @@ func (mem *Memcache) IsExist(key string) bool {
 	return true
 }
 
-//Set cached value with key and expire time.
+// Set cached value with key and expire time.
 func (mem *Memcache) Set(key string, val interface{}, timeout time.Duration) (err error) {
 	var data []byte
 	if data, err = json.Marshal(val); err != nil {
@@ -51,7 +51,7 @@ func (mem *Memcache) Set(key string, val interface{}, timeout time.Duration) (er
 	return mem.conn.Set(item)
 }
 
-//Delete delete value in memcache.
+// Delete delete value in memcache.
 func (mem *Memcache) Delete(key string) error {
 	return mem.conn.Delete(key)
 }

cache/memcache_test.go

@@ -3,6 +3,9 @@ package cache
 import (
 	"testing"
 	"time"
+
+	"github.com/bradfitz/gomemcache/memcache"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestMemcache(t *testing.T) {
@@ -16,13 +19,22 @@ func TestMemcache(t *testing.T) {
 	if !mem.IsExist("username") {
 		t.Error("IsExist Error")
 	}
+	exists := mem.IsExist("unknown-key")
+	assert.Equal(t, false, exists)
 
 	name := mem.Get("username").(string)
-	if name != "silenceper" {
-		t.Error("get Error")
+	if name != "" {
+		if name != "silenceper" {
+			t.Error("get Error")
+		}
 	}
+	data := mem.Get("unknown-key")
+	assert.Nil(t, data)
 
 	if err = mem.Delete("username"); err != nil {
 		t.Errorf("delete Error , err=%v", err)
 	}
+
+	err = mem.Delete("unknown-key")
+	assert.Equal(t, memcache.ErrCacheMiss, err)
 }

cache/memory.go

@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-//Memory struct contains *memcache.Client
+// Memory struct contains *memcache.Client
 type Memory struct {
 	sync.Mutex
 
@@ -17,14 +17,14 @@ type data struct {
 	Expired time.Time
 }
 
-//NewMemory create new memcache
+// NewMemory create new memcache
 func NewMemory() *Memory {
 	return &Memory{
 		data: map[string]*data{},
 	}
 }
 
-//Get return cached value
+// Get return cached value
 func (mem *Memory) Get(key string) interface{} {
 	if ret, ok := mem.data[key]; ok {
 		if ret.Expired.Before(time.Now()) {
@@ -48,7 +48,7 @@ func (mem *Memory) IsExist(key string) bool {
 	return false
 }
 
-//Set cached value with key and expire time.
+// Set cached value with key and expire time.
 func (mem *Memory) Set(key string, val interface{}, timeout time.Duration) (err error) {
 	mem.Lock()
 	defer mem.Unlock()
@@ -60,15 +60,15 @@ func (mem *Memory) Set(key string, val interface{}, timeout time.Duration) (err
 	return nil
 }
 
-//Delete delete value in memcache.
+// Delete delete value in memcache.
 func (mem *Memory) Delete(key string) error {
-	return mem.deleteKey(key)
+	mem.deleteKey(key)
+	return nil
 }
 
 // deleteKey
-func (mem *Memory) deleteKey(key string) error {
+func (mem *Memory) deleteKey(key string) {
 	mem.Lock()
 	defer mem.Unlock()
 	delete(mem.data, key)
-	return nil
 }

cache/redis.go

@@ -1,109 +1,92 @@
 package cache
 
 import (
-	"encoding/json"
+	"context"
 	"time"
 
-	"github.com/gomodule/redigo/redis"
+	"github.com/go-redis/redis/v8"
 )
 
-//Redis redis cache
+// Redis .redis cache
 type Redis struct {
-	conn *redis.Pool
+	ctx  context.Context
+	conn redis.UniversalClient
 }
 
-//RedisOpts redis 连接属性
+// RedisOpts redis 连接属性
 type RedisOpts struct {
 	Host        string `yml:"host" json:"host"`
 	Password    string `yml:"password" json:"password"`
 	Database    int    `yml:"database" json:"database"`
 	MaxIdle     int    `yml:"max_idle" json:"max_idle"`
 	MaxActive   int    `yml:"max_active" json:"max_active"`
-	IdleTimeout int32  `yml:"idle_timeout" json:"idle_timeout"` //second
+	IdleTimeout int    `yml:"idle_timeout" json:"idle_timeout"` // second
 }
 
-//NewRedis 实例化
-func NewRedis(opts *RedisOpts) *Redis {
-	pool := &redis.Pool{
-		MaxActive:   opts.MaxActive,
-		MaxIdle:     opts.MaxIdle,
-		IdleTimeout: time.Second * time.Duration(opts.IdleTimeout),
-		Dial: func() (redis.Conn, error) {
-			return redis.Dial("tcp", opts.Host,
-				redis.DialDatabase(opts.Database),
-				redis.DialPassword(opts.Password),
-			)
-		},
-		TestOnBorrow: func(conn redis.Conn, t time.Time) error {
-			if time.Since(t) < time.Minute {
-				return nil
-			}
-			_, err := conn.Do("PING")
-			return err
-		},
-	}
-	return &Redis{pool}
+// NewRedis 实例化
+func NewRedis(ctx context.Context, opts *RedisOpts) *Redis {
+	conn := redis.NewUniversalClient(&redis.UniversalOptions{
+		Addrs:        []string{opts.Host},
+		DB:           opts.Database,
+		Password:     opts.Password,
+		IdleTimeout:  time.Second * time.Duration(opts.IdleTimeout),
+		MinIdleConns: opts.MaxIdle,
+	})
+	return &Redis{ctx: ctx, conn: conn}
 }
 
-//SetConn 设置conn
-func (r *Redis) SetConn(conn *redis.Pool) {
+// SetConn 设置conn
+func (r *Redis) SetConn(conn redis.UniversalClient) {
 	r.conn = conn
 }
 
-//Get 获取一个值
+// SetRedisCtx 设置redis ctx 参数
+func (r *Redis) SetRedisCtx(ctx context.Context) {
+	r.ctx = ctx
+}
+
+// Get 获取一个值
 func (r *Redis) Get(key string) interface{} {
-	conn := r.conn.Get()
-	defer conn.Close()
-
-	var data []byte
-	var err error
-	if data, err = redis.Bytes(conn.Do("GET", key)); err != nil {
-		return nil
-	}
-	var reply interface{}
-	if err = json.Unmarshal(data, &reply); err != nil {
-		return nil
-	}
-
-	return reply
+	return r.GetContext(r.ctx, key)
 }
 
-//Set 设置一个值
-func (r *Redis) Set(key string, val interface{}, timeout time.Duration) (err error) {
-	conn := r.conn.Get()
-	defer conn.Close()
-
-	var data []byte
-	if data, err = json.Marshal(val); err != nil {
-		return
+// GetContext 获取一个值
+func (r *Redis) GetContext(ctx context.Context, key string) interface{} {
+	result, err := r.conn.Do(ctx, "GET", key).Result()
+	if err != nil {
+		return nil
 	}
-
-	_, err = conn.Do("SETEX", key, int64(timeout/time.Second), data)
-
-	return
+	return result
 }
 
-//IsExist 判断key是否存在
+// Set 设置一个值
+func (r *Redis) Set(key string, val interface{}, timeout time.Duration) error {
+	return r.SetContext(r.ctx, key, val, timeout)
+}
+
+// SetContext 设置一个值
+func (r *Redis) SetContext(ctx context.Context, key string, val interface{}, timeout time.Duration) error {
+	return r.conn.SetEX(ctx, key, val, timeout).Err()
+}
+
+// IsExist 判断key是否存在
 func (r *Redis) IsExist(key string) bool {
-	conn := r.conn.Get()
-	defer conn.Close()
-
-	a, _ := conn.Do("EXISTS", key)
-	i := a.(int64)
-	if i > 0 {
-		return true
-	}
-	return false
+	return r.IsExistContext(r.ctx, key)
 }
 
-//Delete 删除
+// IsExistContext 判断key是否存在
+func (r *Redis) IsExistContext(ctx context.Context, key string) bool {
+	result, _ := r.conn.Exists(ctx, key).Result()
+
+	return result > 0
+}
+
+// Delete 删除
 func (r *Redis) Delete(key string) error {
-	conn := r.conn.Get()
-	defer conn.Close()
-
-	if _, err := conn.Do("DEL", key); err != nil {
-		return err
-	}
-
-	return nil
+	return r.DeleteContext(r.ctx, key)
+}
+
+// DeleteContext 删除
+func (r *Redis) DeleteContext(ctx context.Context, key string) error {
+	return r.conn.Del(ctx, key).Err()
 }

cache/redis_test.go

@@ -1,32 +1,46 @@
 package cache
 
 import (
+	"context"
 	"testing"
 	"time"
+
+	"github.com/alicebob/miniredis/v2"
 )
 
 func TestRedis(t *testing.T) {
-	opts := &RedisOpts{
-		Host: "127.0.0.1:6379",
+	server, err := miniredis.Run()
+	if err != nil {
+		t.Error("miniredis.Run Error", err)
 	}
-	redis := NewRedis(opts)
-	var err error
-	timeoutDuration := 1 * time.Second
+	t.Cleanup(server.Close)
+	var (
+		timeoutDuration = time.Second
+		ctx             = context.Background()
+		opts            = &RedisOpts{
+			Host: server.Addr(),
+		}
+		redis = NewRedis(ctx, opts)
+		val   = "silenceper"
+		key   = "username"
+	)
+	redis.SetConn(redis.conn)
+	redis.SetRedisCtx(ctx)
 
-	if err = redis.Set("username", "silenceper", timeoutDuration); err != nil {
+	if err = redis.Set(key, val, timeoutDuration); err != nil {
 		t.Error("set Error", err)
 	}
 
-	if !redis.IsExist("username") {
+	if !redis.IsExist(key) {
 		t.Error("IsExist Error")
 	}
 
-	name := redis.Get("username").(string)
-	if name != "silenceper" {
+	name := redis.Get(key).(string)
+	if name != val {
 		t.Error("get Error")
 	}
 
-	if err = redis.Delete("username"); err != nil {
+	if err = redis.Delete(key); err != nil {
 		t.Errorf("delete Error , err=%v", err)
 	}
 }

context/access_token.go

@@ -1,85 +0,0 @@
-package context
-
-import (
-	"encoding/json"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/silenceper/wechat/util"
-)
-
-const (
-	//AccessTokenURL 获取access_token的接口
-	AccessTokenURL = "https://api.weixin.qq.com/cgi-bin/token"
-)
-
-//ResAccessToken struct
-type ResAccessToken struct {
-	util.CommonError
-
-	AccessToken string `json:"access_token"`
-	ExpiresIn   int64  `json:"expires_in"`
-}
-
-//GetAccessTokenFunc 获取 access token 的函数签名
-type GetAccessTokenFunc func(ctx *Context) (accessToken string, err error)
-
-//SetAccessTokenLock 设置读写锁（一个appID一个读写锁）
-func (ctx *Context) SetAccessTokenLock(l *sync.RWMutex) {
-	ctx.accessTokenLock = l
-}
-
-//SetGetAccessTokenFunc 设置自定义获取accessToken的方式, 需要自己实现缓存
-func (ctx *Context) SetGetAccessTokenFunc(f GetAccessTokenFunc) {
-	ctx.accessTokenFunc = f
-}
-
-//GetAccessToken 获取access_token
-func (ctx *Context) GetAccessToken() (accessToken string, err error) {
-	ctx.accessTokenLock.Lock()
-	defer ctx.accessTokenLock.Unlock()
-
-	if ctx.accessTokenFunc != nil {
-		return ctx.accessTokenFunc(ctx)
-	}
-	accessTokenCacheKey := fmt.Sprintf("access_token_%s", ctx.AppID)
-	val := ctx.Cache.Get(accessTokenCacheKey)
-	if val != nil {
-		accessToken = val.(string)
-		return
-	}
-
-	//从微信服务器获取
-	var resAccessToken ResAccessToken
-	resAccessToken, err = ctx.GetAccessTokenFromServer()
-	if err != nil {
-		return
-	}
-
-	accessToken = resAccessToken.AccessToken
-	return
-}
-
-//GetAccessTokenFromServer 强制从微信服务器获取token
-func (ctx *Context) GetAccessTokenFromServer() (resAccessToken ResAccessToken, err error) {
-	url := fmt.Sprintf("%s?grant_type=client_credential&appid=%s&secret=%s", AccessTokenURL, ctx.AppID, ctx.AppSecret)
-	var body []byte
-	body, err = util.HTTPGet(url)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(body, &resAccessToken)
-	if err != nil {
-		return
-	}
-	if resAccessToken.ErrMsg != "" {
-		err = fmt.Errorf("get access_token error : errcode=%v , errormsg=%v", resAccessToken.ErrCode, resAccessToken.ErrMsg)
-		return
-	}
-
-	accessTokenCacheKey := fmt.Sprintf("access_token_%s", ctx.AppID)
-	expires := resAccessToken.ExpiresIn - 1500
-	err = ctx.Cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
-	return
-}

context/access_token_test.go

@@ -1,30 +0,0 @@
-package context
-
-import (
-	"sync"
-	"testing"
-)
-
-func TestContext_SetCustomAccessTokenFunc(t *testing.T) {
-	ctx := Context{
-		accessTokenLock: new(sync.RWMutex),
-	}
-	f := func(ctx *Context) (accessToken string, err error) {
-		return "fake token", nil
-	}
-	ctx.SetGetAccessTokenFunc(f)
-	res, err := ctx.GetAccessToken()
-	if res != "fake token" || err != nil {
-		t.Error("expect fake token but error")
-	}
-}
-
-func TestContext_NoSetCustomAccessTokenFunc(t *testing.T) {
-	ctx := Context{
-		accessTokenLock: new(sync.RWMutex),
-	}
-
-	if ctx.accessTokenFunc != nil {
-		t.Error("error accessTokenFunc")
-	}
-}

context/component_access_token.go

@@ -1,221 +0,0 @@
-package context
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/silenceper/wechat/util"
-)
-
-const (
-	componentAccessTokenURL = "https://api.weixin.qq.com/cgi-bin/component/api_component_token"
-	getPreCodeURL           = "https://api.weixin.qq.com/cgi-bin/component/api_create_preauthcode?component_access_token=%s"
-	queryAuthURL            = "https://api.weixin.qq.com/cgi-bin/component/api_query_auth?component_access_token=%s"
-	refreshTokenURL         = "https://api.weixin.qq.com/cgi-bin/component/api_authorizer_token?component_access_token=%s"
-	getComponentInfoURL     = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s"
-	getComponentConfigURL   = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
-)
-
-// ComponentAccessToken 第三方平台
-type ComponentAccessToken struct {
-	AccessToken string `json:"component_access_token"`
-	ExpiresIn   int64  `json:"expires_in"`
-}
-
-// GetComponentAccessToken 获取 ComponentAccessToken
-func (ctx *Context) GetComponentAccessToken() (string, error) {
-	accessTokenCacheKey := fmt.Sprintf("component_access_token_%s", ctx.AppID)
-	val := ctx.Cache.Get(accessTokenCacheKey)
-	if val == nil {
-		return "", fmt.Errorf("cann't get component access token")
-	}
-	return val.(string), nil
-}
-
-// SetComponentAccessToken 通过component_verify_ticket 获取 ComponentAccessToken
-func (ctx *Context) SetComponentAccessToken(verifyTicket string) (*ComponentAccessToken, error) {
-	body := map[string]string{
-		"component_appid":         ctx.AppID,
-		"component_appsecret":     ctx.AppSecret,
-		"component_verify_ticket": verifyTicket,
-	}
-	respBody, err := util.PostJSON(componentAccessTokenURL, body)
-	if err != nil {
-		return nil, err
-	}
-
-	at := &ComponentAccessToken{}
-	if err := json.Unmarshal(respBody, at); err != nil {
-		return nil, err
-	}
-
-	accessTokenCacheKey := fmt.Sprintf("component_access_token_%s", ctx.AppID)
-	expires := at.ExpiresIn - 1500
-	ctx.Cache.Set(accessTokenCacheKey, at.AccessToken, time.Duration(expires)*time.Second)
-	return at, nil
-}
-
-// GetPreCode 获取预授权码
-func (ctx *Context) GetPreCode() (string, error) {
-	cat, err := ctx.GetComponentAccessToken()
-	if err != nil {
-		return "", err
-	}
-	req := map[string]string{
-		"component_appid": ctx.AppID,
-	}
-	uri := fmt.Sprintf(getPreCodeURL, cat)
-	body, err := util.PostJSON(uri, req)
-	if err != nil {
-		return "", err
-	}
-
-	var ret struct {
-		PreCode string `json:"pre_auth_code"`
-	}
-	if err := json.Unmarshal(body, &ret); err != nil {
-		return "", err
-	}
-
-	return ret.PreCode, nil
-}
-
-// ID 微信返回接口中各种类型字段
-type ID struct {
-	ID int `json:"id"`
-}
-
-// AuthBaseInfo 授权的基本信息
-type AuthBaseInfo struct {
-	AuthrAccessToken
-	FuncInfo []AuthFuncInfo `json:"func_info"`
-}
-
-// AuthFuncInfo 授权的接口内容
-type AuthFuncInfo struct {
-	FuncscopeCategory ID `json:"funcscope_category"`
-}
-
-// AuthrAccessToken 授权方AccessToken
-type AuthrAccessToken struct {
-	Appid        string `json:"authorizer_appid"`
-	AccessToken  string `json:"authorizer_access_token"`
-	ExpiresIn    int64  `json:"expires_in"`
-	RefreshToken string `json:"authorizer_refresh_token"`
-}
-
-// QueryAuthCode 使用授权码换取公众号或小程序的接口调用凭据和授权信息
-func (ctx *Context) QueryAuthCode(authCode string) (*AuthBaseInfo, error) {
-	cat, err := ctx.GetComponentAccessToken()
-	if err != nil {
-		return nil, err
-	}
-
-	req := map[string]string{
-		"component_appid":    ctx.AppID,
-		"authorization_code": authCode,
-	}
-	uri := fmt.Sprintf(queryAuthURL, cat)
-	body, err := util.PostJSON(uri, req)
-	if err != nil {
-		return nil, err
-	}
-
-	var ret struct {
-		Info *AuthBaseInfo `json:"authorization_info"`
-	}
-
-	if err := json.Unmarshal(body, &ret); err != nil {
-		return nil, err
-	}
-
-	return ret.Info, nil
-}
-
-// RefreshAuthrToken 获取（刷新）授权公众号或小程序的接口调用凭据（令牌）
-func (ctx *Context) RefreshAuthrToken(appid, refreshToken string) (*AuthrAccessToken, error) {
-	cat, err := ctx.GetComponentAccessToken()
-	if err != nil {
-		return nil, err
-	}
-
-	req := map[string]string{
-		"component_appid":          ctx.AppID,
-		"authorizer_appid":         appid,
-		"authorizer_refresh_token": refreshToken,
-	}
-	uri := fmt.Sprintf(refreshTokenURL, cat)
-	body, err := util.PostJSON(uri, req)
-	if err != nil {
-		return nil, err
-	}
-
-	ret := &AuthrAccessToken{}
-	if err := json.Unmarshal(body, ret); err != nil {
-		return nil, err
-	}
-
-	authrTokenKey := "authorizer_access_token_" + appid
-	ctx.Cache.Set(authrTokenKey, ret.AccessToken, time.Minute*80)
-
-	return ret, nil
-}
-
-// GetAuthrAccessToken 获取授权方AccessToken
-func (ctx *Context) GetAuthrAccessToken(appid string) (string, error) {
-	authrTokenKey := "authorizer_access_token_" + appid
-	val := ctx.Cache.Get(authrTokenKey)
-	if val == nil {
-		return "", fmt.Errorf("cannot get authorizer %s access token", appid)
-	}
-	return val.(string), nil
-}
-
-// AuthorizerInfo 授权方详细信息
-type AuthorizerInfo struct {
-	NickName        string `json:"nick_name"`
-	HeadImg         string `json:"head_img"`
-	ServiceTypeInfo ID     `json:"service_type_info"`
-	VerifyTypeInfo  ID     `json:"verify_type_info"`
-	UserName        string `json:"user_name"`
-	PrincipalName   string `json:"principal_name"`
-	BusinessInfo    struct {
-		OpenStore string `json:"open_store"`
-		OpenScan  string `json:"open_scan"`
-		OpenPay   string `json:"open_pay"`
-		OpenCard  string `json:"open_card"`
-		OpenShake string `json:"open_shake"`
-	}
-	Alias     string `json:"alias"`
-	QrcodeURL string `json:"qrcode_url"`
-}
-
-// GetAuthrInfo 获取授权方的帐号基本信息
-func (ctx *Context) GetAuthrInfo(appid string) (*AuthorizerInfo, *AuthBaseInfo, error) {
-	cat, err := ctx.GetComponentAccessToken()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	req := map[string]string{
-		"component_appid":  ctx.AppID,
-		"authorizer_appid": appid,
-	}
-
-	uri := fmt.Sprintf(getComponentInfoURL, cat)
-	body, err := util.PostJSON(uri, req)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var ret struct {
-		AuthorizerInfo    *AuthorizerInfo `json:"authorizer_info"`
-		AuthorizationInfo *AuthBaseInfo   `json:"authorization_info"`
-	}
-	if err := json.Unmarshal(body, &ret); err != nil {
-		return nil, nil, err
-	}
-
-	return ret.AuthorizerInfo, ret.AuthorizationInfo, nil
-}

context/component_test.go

@@ -1,19 +0,0 @@
-package context
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-var testdata = `{"authorizer_info":{"nick_name":"就爱浪","head_img":"http:\/\/wx.qlogo.cn\/mmopen\/xPKCxELaaj6hiaTZGv19oQPBJibb7hBoKmNOjQibCNOUycE8iaBhiaHOA6eC8hadQSAUZTuHUJl4qCIbCQGjSWialicfzWh4mdxuejY\/0","service_type_info":{"id":1},"verify_type_info":{"id":-1},"user_name":"gh_dcdbaa6f1687","alias":"ckeyer","qrcode_url":"http:\/\/mmbiz.qpic.cn\/mmbiz_jpg\/FribWCoIzQbAX7R1PQ8iaxGonqKp0doYD2ibhC0uhx11LrRcblASiazsbQJTJ4icQnMzfH7G0SUPuKbibTA8Cs4uk5WQ\/0","business_info":{"open_pay":0,"open_shake":0,"open_scan":0,"open_card":0,"open_store":0},"idc":1,"principal_name":"个人","signature":"不折腾会死。"},"authorization_info":{"authorizer_appid":"yyyyy","authorizer_refresh_token":"xxxx","func_info":[{"funcscope_category":{"id":1}},{"funcscope_category":{"id":15}},{"funcscope_category":{"id":4}},{"funcscope_category":{"id":7}},{"funcscope_category":{"id":2}},{"funcscope_category":{"id":3}},{"funcscope_category":{"id":11}},{"funcscope_category":{"id":6}},{"funcscope_category":{"id":5}},{"funcscope_category":{"id":8}},{"funcscope_category":{"id":13}},{"funcscope_category":{"id":9}},{"funcscope_category":{"id":12}},{"funcscope_category":{"id":22}},{"funcscope_category":{"id":23}},{"funcscope_category":{"id":24},"confirm_info":{"need_confirm":0,"already_confirm":0,"can_confirm":0}},{"funcscope_category":{"id":26}},{"funcscope_category":{"id":27},"confirm_info":{"need_confirm":0,"already_confirm":0,"can_confirm":0}},{"funcscope_category":{"id":33},"confirm_info":{"need_confirm":0,"already_confirm":0,"can_confirm":0}},{"funcscope_category":{"id":35}}]}}`
-
-// TestDecode
-func TestDecode(t *testing.T) {
-	var ret struct {
-		AuthorizerInfo    *AuthorizerInfo `json:"authorizer_info"`
-		AuthorizationInfo *AuthBaseInfo   `json:"authorization_info"`
-	}
-	json.Unmarshal([]byte(testdata), &ret)
-	t.Logf("%+v", ret.AuthorizerInfo)
-	t.Logf("%+v", ret.AuthorizationInfo)
-}

context/context.go

@@ -1,58 +0,0 @@
-package context
-
-import (
-	"net/http"
-	"sync"
-
-	"github.com/silenceper/wechat/cache"
-)
-
-// Context struct
-type Context struct {
-	AppID          string
-	AppSecret      string
-	Token          string
-	EncodingAESKey string
-	PayMchID       string
-	PayNotifyURL   string
-	PayKey         string
-
-	Cache cache.Cache
-
-	Writer  http.ResponseWriter
-	Request *http.Request
-
-	//accessTokenLock 读写锁 同一个AppID一个
-	accessTokenLock *sync.RWMutex
-
-	//jsAPITicket 读写锁 同一个AppID一个
-	jsAPITicketLock *sync.RWMutex
-
-	//accessTokenFunc 自定义获取 access token 的方法
-	accessTokenFunc GetAccessTokenFunc
-}
-
-// Query returns the keyed url query value if it exists
-func (ctx *Context) Query(key string) string {
-	value, _ := ctx.GetQuery(key)
-	return value
-}
-
-// GetQuery is like Query(), it returns the keyed url query value
-func (ctx *Context) GetQuery(key string) (string, bool) {
-	req := ctx.Request
-	if values, ok := req.URL.Query()[key]; ok && len(values) > 0 {
-		return values[0], true
-	}
-	return "", false
-}
-
-// SetJsAPITicketLock 设置jsAPITicket的lock
-func (ctx *Context) SetJsAPITicketLock(lock *sync.RWMutex) {
-	ctx.jsAPITicketLock = lock
-}
-
-// GetJsAPITicketLock 获取jsAPITicket 的lock
-func (ctx *Context) GetJsAPITicketLock() *sync.RWMutex {
-	return ctx.jsAPITicketLock
-}

context/qy_access_token.go

@@ -1,76 +0,0 @@
-package context
-
-import (
-	"encoding/json"
-	"fmt"
-	"log"
-	"sync"
-	"time"
-
-	"github.com/silenceper/wechat/util"
-)
-
-const (
-	//qyAccessTokenURL 获取access_token的接口
-	qyAccessTokenURL = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=%s&corpsecret=%s"
-)
-
-//ResQyAccessToken struct
-type ResQyAccessToken struct {
-	util.CommonError
-
-	AccessToken string `json:"access_token"`
-	ExpiresIn   int64  `json:"expires_in"`
-}
-
-//SetQyAccessTokenLock 设置读写锁（一个appID一个读写锁）
-func (ctx *Context) SetQyAccessTokenLock(l *sync.RWMutex) {
-	ctx.accessTokenLock = l
-}
-
-//GetQyAccessToken 获取access_token
-func (ctx *Context) GetQyAccessToken() (accessToken string, err error) {
-	ctx.accessTokenLock.Lock()
-	defer ctx.accessTokenLock.Unlock()
-
-	accessTokenCacheKey := fmt.Sprintf("qy_access_token_%s", ctx.AppID)
-	val := ctx.Cache.Get(accessTokenCacheKey)
-	if val != nil {
-		accessToken = val.(string)
-		return
-	}
-
-	//从微信服务器获取
-	var resQyAccessToken ResQyAccessToken
-	resQyAccessToken, err = ctx.GetQyAccessTokenFromServer()
-	if err != nil {
-		return
-	}
-
-	accessToken = resQyAccessToken.AccessToken
-	return
-}
-
-//GetQyAccessTokenFromServer 强制从微信服务器获取token
-func (ctx *Context) GetQyAccessTokenFromServer() (resQyAccessToken ResQyAccessToken, err error) {
-	log.Printf("GetQyAccessTokenFromServer")
-	url := fmt.Sprintf(qyAccessTokenURL, ctx.AppID, ctx.AppSecret)
-	var body []byte
-	body, err = util.HTTPGet(url)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(body, &resQyAccessToken)
-	if err != nil {
-		return
-	}
-	if resQyAccessToken.ErrCode != 0 {
-		err = fmt.Errorf("get qy_access_token error : errcode=%v , errormsg=%v", resQyAccessToken.ErrCode, resQyAccessToken.ErrMsg)
-		return
-	}
-
-	qyAccessTokenCacheKey := fmt.Sprintf("qy_access_token_%s", ctx.AppID)
-	expires := resQyAccessToken.ExpiresIn - 1500
-	err = ctx.Cache.Set(qyAccessTokenCacheKey, resQyAccessToken.AccessToken, time.Duration(expires)*time.Second)
-	return
-}

context/render.go

@@ -1,43 +0,0 @@
-package context
-
-import (
-	"encoding/xml"
-	"net/http"
-)
-
-var xmlContentType = []string{"application/xml; charset=utf-8"}
-var plainContentType = []string{"text/plain; charset=utf-8"}
-
-//Render render from bytes
-func (ctx *Context) Render(bytes []byte) {
-	//debug
-	//fmt.Println("response msg = ", string(bytes))
-	ctx.Writer.WriteHeader(200)
-	_, err := ctx.Writer.Write(bytes)
-	if err != nil {
-		panic(err)
-	}
-}
-
-//String render from string
-func (ctx *Context) String(str string) {
-	writeContextType(ctx.Writer, plainContentType)
-	ctx.Render([]byte(str))
-}
-
-//XML render to xml
-func (ctx *Context) XML(obj interface{}) {
-	writeContextType(ctx.Writer, xmlContentType)
-	bytes, err := xml.Marshal(obj)
-	if err != nil {
-		panic(err)
-	}
-	ctx.Render(bytes)
-}
-
-func writeContextType(w http.ResponseWriter, value []string) {
-	header := w.Header()
-	if val := header["Content-Type"]; len(val) == 0 {
-		header["Content-Type"] = value
-	}
-}

credential/access_token.go

@@ -0,0 +1,14 @@
+package credential
+
+import "context"
+
+// AccessTokenHandle AccessToken 接口
+type AccessTokenHandle interface {
+	GetAccessToken() (accessToken string, err error)
+}
+
+// AccessTokenContextHandle AccessToken 接口
+type AccessTokenContextHandle interface {
+	AccessTokenHandle
+	GetAccessTokenContext(ctx context.Context) (accessToken string, err error)
+}

credential/default_access_token.go

@@ -0,0 +1,245 @@
+package credential
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/silenceper/wechat/v2/cache"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// accessTokenURL 获取access_token的接口
+	accessTokenURL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"
+	// stableAccessTokenURL 获取稳定版access_token的接口
+	stableAccessTokenURL = "https://api.weixin.qq.com/cgi-bin/stable_token"
+	// workAccessTokenURL 企业微信获取access_token的接口
+	workAccessTokenURL = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=%s&corpsecret=%s"
+	// CacheKeyOfficialAccountPrefix 微信公众号cache key前缀
+	CacheKeyOfficialAccountPrefix = "gowechat_officialaccount_"
+	// CacheKeyMiniProgramPrefix 小程序cache key前缀
+	CacheKeyMiniProgramPrefix = "gowechat_miniprogram_"
+	// CacheKeyWorkPrefix 企业微信cache key前缀
+	CacheKeyWorkPrefix = "gowechat_work_"
+)
+
+// DefaultAccessToken 默认AccessToken 获取
+type DefaultAccessToken struct {
+	appID           string
+	appSecret       string
+	cacheKeyPrefix  string
+	cache           cache.Cache
+	accessTokenLock *sync.Mutex
+}
+
+// NewDefaultAccessToken new DefaultAccessToken
+func NewDefaultAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
+	if cache == nil {
+		panic("cache is ineed")
+	}
+	return &DefaultAccessToken{
+		appID:           appID,
+		appSecret:       appSecret,
+		cache:           cache,
+		cacheKeyPrefix:  cacheKeyPrefix,
+		accessTokenLock: new(sync.Mutex),
+	}
+}
+
+// ResAccessToken struct
+type ResAccessToken struct {
+	util.CommonError
+
+	AccessToken string `json:"access_token"`
+	ExpiresIn   int64  `json:"expires_in"`
+}
+
+// GetAccessToken 获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
+	return ak.GetAccessTokenContext(context.Background())
+}
+
+// GetAccessTokenContext 获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
+	// 先从cache中取
+	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.appID)
+	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
+		return val.(string), nil
+	}
+
+	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
+	ak.accessTokenLock.Lock()
+	defer ak.accessTokenLock.Unlock()
+
+	// 双检，防止重复从微信服务器获取
+	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
+		return val.(string), nil
+	}
+
+	// cache失效，从微信服务器获取
+	var resAccessToken ResAccessToken
+	if resAccessToken, err = GetTokenFromServerContext(ctx, fmt.Sprintf(accessTokenURL, ak.appID, ak.appSecret)); err != nil {
+		return
+	}
+
+	if err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(resAccessToken.ExpiresIn-1500)*time.Second); err != nil {
+		return
+	}
+	accessToken = resAccessToken.AccessToken
+	return
+}
+
+// StableAccessToken 获取稳定版接口调用凭据(与getAccessToken获取的调用凭证完全隔离，互不影响)
+// 不强制更新access_token,可用于不同环境不同服务而不需要分布式锁以及公用缓存，避免access_token争抢
+// https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getStableAccessToken.html
+type StableAccessToken struct {
+	appID          string
+	appSecret      string
+	cacheKeyPrefix string
+	cache          cache.Cache
+}
+
+// NewStableAccessToken new StableAccessToken
+func NewStableAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
+	if cache == nil {
+		panic("cache is need")
+	}
+	return &StableAccessToken{
+		appID:          appID,
+		appSecret:      appSecret,
+		cache:          cache,
+		cacheKeyPrefix: cacheKeyPrefix,
+	}
+}
+
+// GetAccessToken 获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *StableAccessToken) GetAccessToken() (accessToken string, err error) {
+	return ak.GetAccessTokenContext(context.Background())
+}
+
+// GetAccessTokenContext 获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *StableAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
+	// 先从cache中取
+	accessTokenCacheKey := fmt.Sprintf("%s_stable_access_token_%s", ak.cacheKeyPrefix, ak.appID)
+	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
+		return val.(string), nil
+	}
+
+	// cache失效，从微信服务器获取
+	var resAccessToken ResAccessToken
+	resAccessToken, err = ak.GetAccessTokenDirectly(ctx, false)
+	if err != nil {
+		return
+	}
+
+	expires := resAccessToken.ExpiresIn - 300
+	_ = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
+
+	accessToken = resAccessToken.AccessToken
+	return
+}
+
+// GetAccessTokenDirectly 从微信获取access_token
+func (ak *StableAccessToken) GetAccessTokenDirectly(ctx context.Context, forceRefresh bool) (resAccessToken ResAccessToken, err error) {
+	b, err := util.PostJSONContext(ctx, stableAccessTokenURL, map[string]interface{}{
+		"grant_type":    "client_credential",
+		"appid":         ak.appID,
+		"secret":        ak.appSecret,
+		"force_refresh": forceRefresh,
+	})
+	if err != nil {
+		return
+	}
+
+	if err = json.Unmarshal(b, &resAccessToken); err != nil {
+		return
+	}
+
+	if resAccessToken.ErrCode != 0 {
+		err = fmt.Errorf("get stable access_token error : errcode=%v , errormsg=%v", resAccessToken.ErrCode, resAccessToken.ErrMsg)
+		return
+	}
+	return
+}
+
+// WorkAccessToken 企业微信AccessToken 获取
+type WorkAccessToken struct {
+	CorpID          string
+	CorpSecret      string
+	cacheKeyPrefix  string
+	cache           cache.Cache
+	accessTokenLock *sync.Mutex
+}
+
+// NewWorkAccessToken new WorkAccessToken
+func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
+	if cache == nil {
+		panic("cache the not exist")
+	}
+	return &WorkAccessToken{
+		CorpID:          corpID,
+		CorpSecret:      corpSecret,
+		cache:           cache,
+		cacheKeyPrefix:  cacheKeyPrefix,
+		accessTokenLock: new(sync.Mutex),
+	}
+}
+
+// GetAccessToken 企业微信获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
+	return ak.GetAccessTokenContext(context.Background())
+}
+
+// GetAccessTokenContext 企业微信获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
+	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
+	ak.accessTokenLock.Lock()
+	defer ak.accessTokenLock.Unlock()
+	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
+	val := ak.cache.Get(accessTokenCacheKey)
+	if val != nil {
+		accessToken = val.(string)
+		return
+	}
+
+	// cache失效，从微信服务器获取
+	var resAccessToken ResAccessToken
+	resAccessToken, err = GetTokenFromServerContext(ctx, fmt.Sprintf(workAccessTokenURL, ak.CorpID, ak.CorpSecret))
+	if err != nil {
+		return
+	}
+
+	expires := resAccessToken.ExpiresIn - 1500
+	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
+	if err != nil {
+		return
+	}
+	accessToken = resAccessToken.AccessToken
+	return
+}
+
+// GetTokenFromServer 强制从微信服务器获取token
+func GetTokenFromServer(url string) (resAccessToken ResAccessToken, err error) {
+	return GetTokenFromServerContext(context.Background(), url)
+}
+
+// GetTokenFromServerContext 强制从微信服务器获取token
+func GetTokenFromServerContext(ctx context.Context, url string) (resAccessToken ResAccessToken, err error) {
+	var body []byte
+	body, err = util.HTTPGetContext(ctx, url)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(body, &resAccessToken)
+	if err != nil {
+		return
+	}
+	if resAccessToken.ErrCode != 0 {
+		err = fmt.Errorf("get access_token error : errcode=%v , errormsg=%v", resAccessToken.ErrCode, resAccessToken.ErrMsg)
+		return
+	}
+	return
+}

credential/default_access_token_test.go

@@ -0,0 +1,19 @@
+package credential
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"gopkg.in/h2non/gock.v1"
+)
+
+// TestGetTicketFromServer .
+func TestGetTicketFromServer(t *testing.T) {
+	defer gock.Off()
+	gock.New(getTicketURL).Reply(200).JSON(&ResTicket{Ticket: "mock-ticket", ExpiresIn: 10})
+	ticket, err := GetTicketFromServer("arg-ak")
+	assert.Nil(t, err)
+	assert.Equal(t, int64(0), ticket.ErrCode)
+	assert.Equal(t, "mock-ticket", ticket.Ticket, "they should be equal")
+	assert.Equal(t, int64(10), ticket.ExpiresIn, "they should be equal")
+}

credential/default_js_ticket.go

@@ -0,0 +1,87 @@
+package credential
+
+import (
+	"encoding/json"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/silenceper/wechat/v2/cache"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// getTicketURL 获取ticket的url
+const getTicketURL = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi"
+
+// DefaultJsTicket 默认获取js ticket方法
+type DefaultJsTicket struct {
+	appID          string
+	cacheKeyPrefix string
+	cache          cache.Cache
+	// jsAPITicket 读写锁 同一个AppID一个
+	jsAPITicketLock *sync.Mutex
+}
+
+// NewDefaultJsTicket new
+func NewDefaultJsTicket(appID string, cacheKeyPrefix string, cache cache.Cache) JsTicketHandle {
+	return &DefaultJsTicket{
+		appID:           appID,
+		cache:           cache,
+		cacheKeyPrefix:  cacheKeyPrefix,
+		jsAPITicketLock: new(sync.Mutex),
+	}
+}
+
+// ResTicket 请求jsapi_tikcet返回结果
+type ResTicket struct {
+	util.CommonError
+
+	Ticket    string `json:"ticket"`
+	ExpiresIn int64  `json:"expires_in"`
+}
+
+// GetTicket 获取jsapi_ticket
+func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err error) {
+	// 先从cache中取
+	jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", js.cacheKeyPrefix, js.appID)
+	if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
+		return val.(string), nil
+	}
+
+	js.jsAPITicketLock.Lock()
+	defer js.jsAPITicketLock.Unlock()
+
+	// 双检，防止重复从微信服务器获取
+	if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
+		return val.(string), nil
+	}
+
+	var ticket ResTicket
+	ticket, err = GetTicketFromServer(accessToken)
+	if err != nil {
+		return
+	}
+	expires := ticket.ExpiresIn - 1500
+	err = js.cache.Set(jsAPITicketCacheKey, ticket.Ticket, time.Duration(expires)*time.Second)
+	ticketStr = ticket.Ticket
+	return
+}
+
+// GetTicketFromServer 从服务器中获取ticket
+func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
+	var response []byte
+	url := fmt.Sprintf(getTicketURL, accessToken)
+	response, err = util.HTTPGet(url)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(response, &ticket)
+	if err != nil {
+		return
+	}
+	if ticket.ErrCode != 0 {
+		err = fmt.Errorf("getTicket Error : errcode=%d , errmsg=%s", ticket.ErrCode, ticket.ErrMsg)
+		return
+	}
+	return
+}

credential/js_ticket.go

@@ -0,0 +1,7 @@
+package credential
+
+// JsTicketHandle js ticket获取
+type JsTicketHandle interface {
+	// GetTicket 获取ticket
+	GetTicket(accessToken string) (ticket string, err error)
+}

doc.go

@@ -3,31 +3,10 @@ Package wechat provide wechat sdk for go
 
 使用Golang开发的微信SDK，简单、易用。
 
-以下是一个处理消息接收以及回复的例子：
-
-	//配置微信参数
-	config := &wechat.Config{
-		AppID:          "xxxx",
-		AppSecret:      "xxxx",
-		Token:          "xxxx",
-		EncodingAESKey: "xxxx",
-	}
-	wc := wechat.NewWechat(config)
-
-	// 传入request和responseWriter
-	server := wc.GetServer(request, responseWriter)
-	server.SetMessageHandler(func(msg message.MixMessage) *message.Reply {
-
-		//回复消息：演示回复用户发送的消息
-		text := message.NewText(msg.Content)
-		return &message.Reply{message.MsgText, text}
-	})
-
-	server.Serve()
-	server.Send()
-
 
 更多信息：https://github.com/silenceper/wechat
 
 */
+
+// Package wechat provide wechat sdk for go
 package wechat

doc/api/README.md

@@ -0,0 +1,17 @@
+# API 文档
+
+已完成以及未完成API列表汇总
+
+如果有兴趣参与贡献，可以在具体的API表格后面标识自己为贡献者以及完成时间，例如：
+
+|          名称           | 请求方式 | URL                        | 是否已实现 | 使用方法 |贡献者|完成时间|
+| :---------------------: | -------- | :------------------------- | ---------- | -------- |-------- |-------- |
+| 获取公众号类目       | GET      | /wxaapi/newtmpl/getcategory            | NO         |   |silenceper| 2021-12-20|
+
+- [微信公众号](./officialaccount.md)
+- [小程序](./miniprogram.md)
+- [小游戏](./minigame.md)
+- [开放平台](./oplatform.md)
+- [微信支付](./wxpay.md)
+- [企业微信](./work.md)
+- [智能对话](./aispeech.md)

doc/api/aispeech.md

@@ -0,0 +1,3 @@
+# 智能对话
+
+TODO

doc/api/minigame.md

@@ -0,0 +1,3 @@
+# 小游戏
+
+TODO

doc/api/miniprogram.md

@@ -0,0 +1,50 @@
+# 小程序
+
+## 基础接口
+
+TODO
+
+## 内容安全
+
+[官方文档](https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/sec-check/security.mediaCheckAsync.html)
+
+|               名称                | 请求方式 | URL                              | 是否已实现 | 使用方法                               |
+| :-------------------------------: | -------- | :------------------------------- | ---------- | -------------------------------------- |
+| 异步校验图片/音频 <sub>v1.0</sub> | POST     | /wxa/media_check_async           | YES        | (security *Security) MediaCheckAsyncV1 |
+| 同步校验一张图片 <sub>v1.0</sub>  | POST     | /wxa/img_sec_check               | YES        | (security *Security) ImageCheckV1      |
+|         异步校验图片/音频         | POST     | /wxa/media_check_async?version=2 | YES        | (security *Security) MediaCheckAsync   |
+| 同步检查一段文本 <sub>v1.0</sub>  | POST     | /wxa/msg_sec_check               | YES        | (security *Security) MsgCheckV1        |
+|         同步检查一段文本          | POST     | /wxa/msg_sec_check?version=2     | YES        | (security *Security) MsgCheck          |
+
+
+## OCR
+
+[官方文档](https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/ocr/ocr.bankcard.html)
+
+|      名称      | 请求方式 | URL                    | 是否已实现 | 使用方法 |
+| :------------: | -------- | :--------------------- | ---------- | -------- |
+|   银行卡识别   | POST     | /cv/ocr/bankcard       |            |          |
+|  营业执照识别  | POST     | /cv/ocr/bizlicense     |            |          |
+|   驾驶证识别   | POST     | /cv/ocr/drivinglicense |            |          |
+|   身份证识别   | POST     | /cv/ocr/idcard         |            |          |
+| 通用印刷体识别 | POST     | /cv/ocr/comm           |            |          |
+|   行驶证识别   | POST     | /cv/ocr/driving        |            |          |
+
+
+## 手机号
+
+[官方文档](https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/phonenumber/phonenumber.getPhoneNumber.html)
+
+|        名称        | 请求方式 | URL                              | 是否已实现 | 使用方法                            |
+| :----------------: | -------- | :------------------------------- | ---------- | ----------------------------------- |
+| code换取用户手机号 | POST     | /wxa/business/getuserphonenumber | YES        | (business *Business) GetPhoneNumber |
+
+
+## 安全风控
+
+[官方文档](https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/safety-control-capability/riskControl.getUserRiskRank.html)
+
+|        名称        | 请求方式 | URL                  | 是否已实现 | 使用方法                                   |
+| :----------------: | -------- | :------------------- | ---------- | ------------------------------------------ |
+| 获取用户的安全等级 | POST     | /wxa/getuserriskrank | YES        | (riskControl *RiskControl) GetUserRiskRank |
+

doc/api/officialaccount.md

@@ -0,0 +1,238 @@
+# 微信公众号 API 列表
+
+## 基础接口
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Get_access_token.html)
+
+|           名称            | 请求方式 | URL                        | 是否已实现 | 使用方法 |
+| :-----------------------: | -------- | :------------------------- | ---------- | -------- |
+|     获取 Access token     | GET      | /cgi-bin/token             | YES        |          |
+|  获取微信服务器 IP 地址   | GET      | /cgi-bin/get_api_domain_ip | YES        |          |
+| 获取微信 callback IP 地址 | GET      | /cgi-bin/getcallbackip     | YES        |          |
+|     清理接口调用次数      | POST     | /cgi-bin/clear_quota       | YES        |          |
+
+## 订阅通知
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Subscription_Messages/api.html)
+
+| 名称                 | 请求方式 | URL                                    | 是否已实现 | 使用方法                                     |
+| -------------------- | -------- | -------------------------------------- | ---------- | -------------------------------------------- |
+| 选用模板             | POST     | /wxaapi/newtmpl/addtemplate            | YES        | (tpl \*Subscribe) Add                        |
+| 删除模板             | POST     | /wxaapi/newtmpl/deltemplate            | YES        | (tpl \*Subscribe) Delete                     |
+| 获取公众号类目       | GET      | /wxaapi/newtmpl/getcategory            | YES        | (tpl \*Subscribe) GetCategory                |
+| 获取模板中的关键词   | GET      | /wxaapi/newtmpl/getpubtemplatekeywords | YES        | (tpl \*Subscribe) GetPubTplKeyWordsByID      |
+| 获取类目下的公共模板 | GET      | /wxaapi/newtmpl/getpubtemplatetitles   | YES        | (tpl \*Subscribe) GetPublicTemplateTitleList |
+| 获取私有模板列表     | GET      | /wxaapi/newtmpl/gettemplate            | YES        | (tpl \*Subscribe) List()                     |
+| 发送订阅通知         | POST     | /cgi-bin/message/subscribe/bizsend     | YES        | (tpl \*Subscribe) Send                       |
+
+## 客服消息
+
+### PC 客服能力
+
+#### 客服管理
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Customer_Service/Customer_Service_Management.html)
+
+| 名称             | 请求方式  | URL                                    | 是否已实现 | 使用方法                         |
+| ---------------- | --------- | -------------------------------------- | ---------- | -------------------------------- |
+| 获取客服基本信息 | GET       | /cgi-bin/customservice/getkflist       | YES        | (csm \*Manager) List             |
+| 添加客服帐号     | POST      | /customservice/kfaccount/add           | YES        | (csm \*Manager) Add              |
+| 邀请绑定客服帐号 | POST      | /customservice/kfaccount/inviteworker  | YES        | (csm \*Manager) InviteBind       |
+| 设置客服信息     | POST      | /customservice/kfaccount/update        | YES        | (csm \*Manager) Update           |
+| 上传客服头像     | POST/FORM | /customservice/kfaccount/uploadheadimg | YES        | (csm \*Manager) UploadHeadImg    |
+| 删除客服帐号     | POST      | /customservice/kfaccount/del           | YES        | (csm \*Manager) Delete           |
+| 获取在线客服     | POST      | /cgi-bin/customservice/getonlinekflist | YES        | (csm \*Manager) OnlineList       |
+| 下发客服输入状态 | POST      | /cgi-bin/message/custom/typing         | YES        | (csm \*Manager) SendTypingStatus |
+
+#### 会话控制
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Customer_Service/Session_control.html)
+
+| 名称               | 请求方式 | URL                                     | 是否已实现 | 使用方法 |
+| ------------------ | -------- | --------------------------------------- | ---------- | -------- |
+| 创建会话           | POST     | /customservice/kfsession/create         | NO         |          |
+| 获取客户会话状态   | GET      | /customservice/kfsession/getsession     | NO         |          |
+| 获取客服会话列表   | GET      | /customservice/kfsession/getsessionlist | NO         |          |
+| 获取未接入会话列表 | POST     | /customservice/kfsession/getwaitcase    | NO         |          |
+
+#### 获取聊天记录
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Customer_Service/Obtain_chat_transcript.html)
+
+| 名称         | 请求方式 | URL                                 | 是否已实现 | 使用方法 |
+| ------------ | -------- | ----------------------------------- | ---------- | -------- |
+| 获取聊天记录 | POST     | /customservice/msgrecord/getmsglist | NO         |          |
+
+### 对话能力
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Shopping_Guide/guide.html)
+
+#### 顾问管理
+
+| 名称                           | 请求方式 | URL                                    | 是否已实现 | 使用方法 |
+| ------------------------------ | -------- | -------------------------------------- | ---------- | -------- |
+| 添加顾问                       | POST     | /cgi-bin/guide/addguideacct            | NO         |          |
+| 获取顾问信息                   | POST     | /cgi-bin/guide/getguideacct            | NO         |          |
+| 修改顾问信息                   | POST     | /cgi-bin/guide/updateguideacct         | NO         |          |
+| 删除顾问                       | POST     | /cgi-bin/guide/delguideacct            | NO         |          |
+| 获取服务号顾问列表             | POST     | /cgi-bin/guide/getguideacctlist        | NO         |          |
+| 生成顾问二维码                 | POST     | /cgi-bin/guide/guidecreateqrcode       | NO         |          |
+| 获取顾问聊天记录               | POST     | /cgi-bin/guide/getguidebuyerchatrecord | NO         |          |
+| 设置快捷回复与关注自动回复     | POST     | /cgi-bin/guide/setguideconfig          | NO         |          |
+| 获取快捷回复与关注自动回复     | POST     | /cgi-bin/guide/getguideconfig          | NO         |          |
+| 设置敏感词与离线自动回复       | POST     | /cgi-bin/guide/setguideacctconfig      | NO         |          |
+| 获取离线自动回复与敏感词       | POST     | /cgi-bin/guide/getguideacctconfig      | NO         |          |
+| 允许微信用户复制小程序页面路径 | POST     | /cgi-bin/guide/pushshowwxapathmenu     | NO         |          |
+| 新建顾问分组                   | POST     | /cgi-bin/guide/newguidegroup           | NO         |          |
+| 获取顾问分组列表               | POST     | /cgi-bin/guide/getguidegrouplist       | NO         |          |
+| 获取顾问分组信息               | POST     | /cgi-bin/guide/getgroupinfo            | NO         |          |
+| 分组内添加顾问                 | POST     | /cgi-bin/guide/addguide2guidegroup     | NO         |          |
+| 分组内删除顾问                 | POST     | /cgi-bin/guide/delguide2guidegroup     | NO         |          |
+| 获取顾问所在分组               | POST     | /cgi-bin/guide/getgroupbyguide         | NO         |          |
+| 删除指定顾问分组               | POST     | /cgi-bin/guide/delguidegroup           | NO         |          |
+
+#### 客户管理
+
+| 名称                     | 请求方式 | URL                                         | 是否已实现 | 使用方法 |
+| ------------------------ | -------- | ------------------------------------------- | ---------- | -------- |
+| 为顾问分配客户           | POST     | /cgi-bin/guide/addguidebuyerrelation        | NO         |          |
+| 为顾问移除客户           | POST     | /cgi-bin/guide/delguidebuyerrelation        | NO         |          |
+| 获取顾问的客户列表       | POST     | /cgi-bin/guide/getguidebuyerrelationlist    | NO         |          |
+| 为客户更换顾问           | POST     | /cgi-bin/guide/rebindguideacctforbuyer      | NO         |          |
+| 修改客户昵称             | POST     | /cgi-bin/guide/updateguidebuyerrelation     | NO         |          |
+| 查询客户所属顾问         | POST     | /cgi-bin/guide/getguidebuyerrelationbybuyer | NO         |          |
+| 查询指定顾问和客户的关系 | POST     | /cgi-bin/guide/getguidebuyerrelation        | NO         |          |
+
+#### 标签管理
+
+| 名称               | 请求方式 | URL                                    | 是否已实现 | 使用方法 |
+| ------------------ | -------- | -------------------------------------- | ---------- | -------- |
+| 新建标签类型       | POST     | /cgi-bin/guide/newguidetagoption       | NO         |          |
+| 删除标签类型       | POST     | /cgi-bin/guide/delguidetagoption       | NO         |          |
+| 为标签添加可选值   | POST     | /cgi-bin/guide/addguidetagoption       | NO         |          |
+| 获取标签和可选值   | POST     | /cgi-bin/guide/getguidetagoption       | NO         |          |
+| 为客户设置标签     | POST     | /cgi-bin/guide/addguidebuyertag        | NO         |          |
+| 查询客户标签       | POST     | /cgi-bin/guide/getguidebuyertag        | NO         |          |
+| 根据标签值筛选客户 | POST     | /cgi-bin/guide/queryguidebuyerbytag    | NO         |          |
+| 删除客户标签       | POST     | /cgi-bin/guide/delguidebuyertag        | NO         |          |
+| 设置自定义客户信息 | POST     | /cgi-bin/guide/addguidebuyerdisplaytag | NO         |          |
+| 获取自定义客户信息 | POST     | /cgi-bin/guide/getguidebuyerdisplaytag | NO         |          |
+
+#### 素材管理
+
+| 名称               | 请求方式 | URL                                  | 是否已实现 | 使用方法 |
+| ------------------ | -------- | ------------------------------------ | ---------- | -------- |
+| 添加小程序卡片素材 | POST     | /cgi-bin/guide/setguidecardmaterial  | NO         |          |
+| 查询小程序卡片素材 | POST     | /cgi-bin/guide/getguidecardmaterial  | NO         |          |
+| 删除小程序卡片素材 | POST     | /cgi-bin/guide/delguidecardmaterial  | NO         |          |
+| 添加图片素材       | POST     | /cgi-bin/guide/setguideimagematerial | NO         |          |
+| 查询图片素材       | POST     | /cgi-bin/guide/getguideimagematerial | NO         |          |
+| 删除图片素材       | POST     | /cgi-bin/guide/delguideimagematerial | NO         |          |
+| 添加文字素材       | POST     | /cgi-bin/guide/setguidewordmaterial  | NO         |          |
+| 查询文字素材       | POST     | /cgi-bin/guide/getguidewordmaterial  | NO         |          |
+| 删除文字素材       | POST     | /cgi-bin/guide/delguidewordmaterial  | NO         |          |
+
+#### 群发任务管理
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Shopping_Guide/task-account/shopping-guide.addGuideMassendJob.html)
+
+| 名称                 | 请求方式 | URL                                   | 是否已实现 | 使用方法 |
+| -------------------- | -------- | ------------------------------------- | ---------- | -------- |
+| 添加群发任务         | POST     | /cgi-bin/guide/addguidemassendjob     | NO         |          |
+| 获取群发任务列表     | POST     | /cgi-bin/guide/getguidemassendjoblist | NO         |          |
+| 获取指定群发任务信息 | POST     | /cgi-bin/guide/getguidemassendjob     | NO         |          |
+| 修改群发任务         | POST     | /cgi-bin/guide/updateguidemassendjob  | NO         |          |
+| 取消群发任务         | POST     | /cgi-bin/guide/cancelguidemassendjob  | NO         |          |
+
+## 微信网页开发
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/Wechat_webpage_authorization.html)
+
+| 名称                                                                    | 请求方式 | URL                                                 | 是否已实现 | 使用方法                             |
+| ----------------------------------------------------------------------- | -------- | --------------------------------------------------- | ---------- | ------------------------------------ |
+| 获取跳转的 url 地址                                                     | GET      | https://open.weixin.qq.com/connect/oauth2/authorize | YES        | (oauth \*Oauth) GetRedirectURL       |
+| 获取网页应用跳转的 url 地址                                             | GET      | https://open.weixin.qq.com/connect/qrconnect        | YES        | (oauth \*Oauth) GetWebAppRedirectURL |
+| 通过网页授权的 code 换取 access_token(区别于 context 中的 access_token) | GET      | /sns/oauth2/access_token                            | YES        | (oauth \*Oauth) GetUserAccessToken   |
+| 刷新 access_token                                                       | GET      | /sns/oauth2/refresh_token?                          | YES        | (oauth \*Oauth) RefreshAccessToken   |
+| 检验 access_token 是否有效                                              | GET      | /sns/auth                                           | YES        | (oauth \*Oauth) CheckAccessToken(    |
+| 拉取用户信息(需 scope 为 snsapi_userinfo)                               | GET      | /sns/userinfo                                       | YES        | (oauth \*Oauth) GetUserInfo          |
+| 获取 jssdk 需要的配置参数                                               | GET      | /cgi-bin/ticket/getticket                           | YES        | (js \*Js) GetConfig                  |
+
+## 素材管理
+
+## 草稿箱
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Add_draft.html)
+
+| 名称                        | 请求方式 | URL                                                          | 是否已实现 | 使用方法                      |
+| --------------------------- | -------- | ------------------------------------------------------------ | ---------- | ----------------------------- |
+| 新建草稿                    | POST     | /cgi-bin/draft/add                                           | YES        | (draft \*Draft) AddDraft      |
+| 获取草稿                    | POST     | /cgi-bin/draft/get                                           | YES        | (draft \*Draft) GetDraft      |
+| 删除草稿                    | POST     | /cgi-bin/draft/delete                                        | YES        | (draft \*Draft) DeleteDraft   |
+| 修改草稿                    | POST     | /cgi-bin/draft/update                                        | YES        | (draft \*Draft) UpdateDraft   |
+| 获取草稿总数                | GET      | /cgi-bin/draft/count                                         | YES        | (draft \*Draft) CountDraft    |
+| 获取草稿列表                | POST     | /cgi-bin/draft/batchget                                      | YES        | (draft \*Draft) PaginateDraft |
+| MP 端开关（仅内测期间使用） | POST     | /cgi-bin/draft/switch<br />/cgi-bin/draft/switch?checkonly=1 | NO         |                               |
+
+## 发布能力
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Publish/Publish.html)
+
+说明：「发表记录」包括群发和发布。
+
+注意：该接口，只能处理 "发布" 相关的信息，无法操作和获取 "群发" 相关内容！！[官方回复](https://developers.weixin.qq.com/community/develop/doc/0002a4fb2109d8f7a91d421c556c00)
+
+- 群发：主动推送给粉丝，历史消息可看，被搜一搜收录，可以限定部分的粉丝接收到。
+- 发布：不会主动推给粉丝，历史消息列表看不到，但是是公开给所有人的文章。也不会占用群发的次数。每天可以发布多篇内容。可以用于自动回复、自定义菜单、页面模板和话题中，发布成功时会生成一个永久链接。
+
+| 名称                           | 请求方式 | URL                             | 是否已实现 | 使用方法                                 |
+| ------------------------------ | -------- | ------------------------------- | ---------- | ---------------------------------------- |
+| 发布接口                       | POST     | /cgi-bin/freepublish/submit     | YES        | (freePublish \*FreePublish) Publish      |
+| 发布状态轮询接口               | POST     | /cgi-bin/freepublish/get        | YES        | (freePublish \*FreePublish) SelectStatus |
+| 事件推送发布结果               |          |                                 | YES        | EventPublishJobFinish                    |
+| 删除发布                       | POST     | /cgi-bin/freepublish/delete     | YES        | (freePublish \*FreePublish) Delete       |
+| 通过 article_id 获取已发布文章 | POST     | /cgi-bin/freepublish/getarticle | YES        | (freePublish \*FreePublish) First        |
+| 获取成功发布列表               | POST     | /cgi-bin/freepublish/batchget   | YES        | (freePublish \*FreePublish) Paginate     |
+
+## 图文消息留言管理
+
+## 用户管理
+
+| 名称                                       | 请求方式 | URL                                    | 是否已实现 | 使用方法                           |
+| ------------------------------------------ | -------- | -------------------------------------- | ---------- | ---------------------------------- |
+| 获取指定 OpenID 变化列表（公众号账号迁移） | POST     | /cgi-bin/changeopenid                  | YES        | (user \*User) ListChangeOpenIDs    |
+| 获取所有用户 OpenID 列表（公众号账号迁移） |          |                                        | YES        | (user \*User) ListAllChangeOpenIDs |
+| 获取用户基本信息                           | GET      | /cgi-bin/user/info                     | YES        | (user \*User) GetUserInfo          |
+| 设置用户备注名                             | POST     | /cgi-bin/user/info/updateremark        | YES        | (user \*User) UpdateRemark         |
+| 获取用户列表                               | GET      | /cgi-bin/user/get                      | YES        | (user \*User) ListUserOpenIDs      |
+| 获取所有用户 OpenID 列表                   |          |                                        | YES        | (user \*User) ListAllUserOpenIDs   |
+| 获取公众号的黑名单列表                     | POST     | /cgi-bin/tags/members/getblacklist     | YES        | (user \*User) GetBlackList         |
+| 获取公众号的所有黑名单列表                 |          |                                        | YES        | (user \*User) GetAllBlackList      |
+| 拉黑用户                                   | POST     | /cgi-bin/tags/members/batchblacklist   | YES        | (user \*User) BatchBlackList       |
+| 取消拉黑用户                               | POST     | /cgi-bin/tags/members/batchunblacklist | YES        | (user \*User) BatchUnBlackList     |
+| 创建标签                                   | POST     | /cgi-bin/tags/create                   | YES        | (user \*User) CreateTag            |
+| 删除标签                                   | POST     | /cgi-bin/tags/delete                   | YES        | (user \*User) DeleteTag            |
+| 编辑标签                                   | POST     | /cgi-bin/tags/update                   | YES        | (user \*User) UpdateTag            |
+| 获取公众号已创建的标签                     | GET      | /cgi-bin/tags/get                      | YES        | (user \*User) GetTag               |
+| 获取标签下粉丝列表                         | POST     | /cgi-bin/user/tag/get                  | YES        | (user \*User) OpenIDListByTag      |
+| 批量为用户打标签                           | POST     | /cgi-bin/tags/members/batchtagging     | YES        | (user \*User) BatchTag             |
+| 批量为用户取消标签                         | POST     | /cgi-bin/tags/members/batchuntagging   | YES        | (user \*User) BatchUntag           |
+| 获取用户身上的标签列表                     | POST     | /cgi-bin/tags/getidlist                | YES        | (user \*User) UserTidList          |
+
+## 账号管理
+
+## 数据统计
+
+## 微信卡券
+
+## 微信门店
+
+## 智能接口
+
+## 微信设备功能
+
+## 微信“一物一码”
+
+## 微信发票
+
+## 微信非税缴费

doc/api/oplatform.md

@@ -0,0 +1 @@
+# 开放平台

doc/api/work.md

@@ -0,0 +1,120 @@
+# 企业微信
+
+host: https://qyapi.weixin.qq.com/
+
+## 微信客服
+
+[官方文档](https://work.weixin.qq.com/api/doc/90000/90135/94638)
+
+### 客服账号管理
+
+[官方文档](https://open.work.weixin.qq.com/api/doc/90001/90143/94684)
+
+|       名称       | 请求方式 | URL                         | 是否已实现 | 使用方法                             |贡献者       |
+| :--------------: | -------- | :-------------------------- | ---------- | -------------------------------|------------|
+|   添加客服帐号   | POST     | /cgi-bin/kf/account/add     | YES        | (r *Client) AccountAdd           | NICEXAI    |
+|   删除客服帐号   | POST     | /cgi-bin/kf/account/del     | YES        | (r *Client) AccountDel           | NICEXAI    |
+|   修改客服帐号   | POST     | /cgi-bin/kf/account/update  | YES        | (r *Client) AccountUpdate        | NICEXAI    |
+| 获取客服帐号列表 | GET      | /cgi-bin/kf/account/list     | YES        | (r *Client) AccountList          | NICEXAI    |
+| 获取客服帐号链接 | GET      | /cgi-bin/kf/add_contact_way  | YES        | (r *Client) AddContactWay        | NICEXAI    |
+
+### 接待人员列表
+
+[官方文档](https://open.work.weixin.qq.com/api/doc/90001/90143/94693)
+
+|       名称       | 请求方式 | URL                         | 是否已实现 | 使用方法                             |贡献者       |
+| :--------------: | -------- | :-------------------------- | ---------- | -------------------------------|------------|
+|   添加接待人员     | POST     | /cgi-bin/kf/servicer/add    | YES        | (r *Client) ReceptionistAdd     | NICEXAI    |
+|   删除接待人员     | POST     | /cgi-bin/kf/servicer/del    | YES        | (r *Client) ReceptionistDel     | NICEXAI    |
+| 获取接待人员列表    | GET      | /cgi-bin/kf/servicer/list   | YES        | (r *Client) ReceptionistList    | NICEXAI    |
+
+### 会话分配与消息收发
+
+[官方文档](https://open.work.weixin.qq.com/api/doc/90001/90143/94694)
+
+|       名称       | 请求方式 | URL                               | 是否已实现   | 使用方法                          |贡献者       |
+| :--------------: | -------- | :-------------------------------| ---------- | ------------------------------- |------------|
+|   获取会话状态     | POST     | /cgi-bin/kf/service_state/get   | YES        | (r *Client) ServiceStateGet     | NICEXAI    |
+|   变更会话状态     | POST     | /cgi-bin/kf/service_state/trans | YES        | (r *Client) ServiceStateTrans   | NICEXAI    |
+|   读取消息        | POST     | /cgi-bin/kf/sync_msg            | YES        | (r *Client) SyncMsg             | NICEXAI    |
+|   发送消息        | POST     | /cgi-bin/kf/send_msg            | YES        | (r *Client) SendMsg             | NICEXAI    |
+|   发送事件响应消息 | POST     | /cgi-bin/kf/send_msg_on_event   | YES        | (r *Client) SendMsgOnEvent      | NICEXAI    |
+
+### 升级服务配置
+
+[官方文档](https://open.work.weixin.qq.com/api/doc/90001/90143/94702)
+
+|       名称                | 请求方式  | URL                                               | 是否已实现 | 使用方法                            |贡献者       |
+| :--------------:         | -------- | :-------------------------------------------------| ---------- | -------------------------------  |------------|
+| 获取配置的专员与客户群       | POST     | /cgi-bin/kf/customer/get_upgrade_service_config   | YES        | (r *Client) UpgradeServiceConfig | NICEXAI    |
+| 为客户升级为专员或客户群服务  | POST     | /cgi-bin/kf/customer/upgrade_service              | YES        | (r *Client) UpgradeService       | NICEXAI    |
+| 为客户取消推荐             | POST     | /cgi-bin/kf/customer/cancel_upgrade_service       | YES        | (r *Client) UpgradeServiceCancel  | NICEXAI    |
+
+### 其他基础信息获取
+
+[官方文档](https://open.work.weixin.qq.com/api/doc/90001/90143/95148)
+
+|       名称            | 请求方式  | URL                                     | 是否已实现   | 使用方法                            | 贡献者       |
+| :--------------:     | -------- | :---------------------------------------| ---------- | -------------------------------   |------------|
+| 获取客户基础信息        | POST     | /cgi-bin/kf/customer/batchget           | YES        | (r *Client) CustomerBatchGet      | NICEXAI    |
+| 获取视频号绑定状态      | GET      |  /cgi-bin/kf/get_corp_qualification      | YES        | (r *Client) GetCorpQualification  | NICEXAI    |
+
+### 客户联系
+[官方文档](https://developer.work.weixin.qq.com/document/path/92132/92133/92228)
+
+|            名称            | 请求方式  | URL                                                          | 是否已实现   | 使用方法                            | 贡献者      |
+|:------------------------:| -------- |:-------------------------------------------------------------| ---------- | -------------------------------   |----------|
+|       获取「联系客户统计」数据       | POST     | /cgi-bin/externalcontact/get_user_behavior_data              | YES        | (r *Client) GetUserBehaviorData      | MARKWANG |
+| 获取「群聊数据统计」数据 (按群主聚合的方式)  | POST      | /cgi-bin/externalcontact/groupchat/statistic                 | YES        | (r *Client) GetGroupChatStat  | MARKWANG  |
+| 获取「群聊数据统计」数据 (按自然日聚合的方式) | POST      | /cgi-bin/externalcontact/groupchat/statistic_group_by_day    | YES        | (r *Client) GetGroupChatStatByDay  | MARKWANG  |
+|      配置客户联系「联系我」方式       | POST      | /cgi-bin/externalcontact/add_contact_way                     | YES        | (r *Client) AddContactWay  | MARKWANG  |
+|     获取企业已配置的「联系我」方式      | POST      | /cgi-bin/externalcontact/get_contact_way                     | YES        | (r *Client) GetContactWay  | MARKWANG  |
+|     更新企业已配置的「联系我」方式      | POST      | /cgi-bin/externalcontact/update_contact_way                  | YES        | (r *Client) UpdateContactWay  | MARKWANG  |
+|     获取企业已配置的「联系我」列表      | POST      | /cgi-bin/externalcontact/list_contact_way                    | YES        | (r *Client) ListContactWay  | MARKWANG  |
+|     删除企业已配置的「联系我」方式      | POST      | /cgi-bin/externalcontact/del_contact_way                     | YES        | (r *Client) DelContactWay  | MARKWANG  |
+|          创建企业群发          | POST      | /cgi-bin/externalcontact/add_msg_template                    | YES        | (r *Client) AddMsgTemplate  | MARKWANG  |
+|          获取群发记录列表          | POST      | /cgi-bin/externalcontact/get_groupmsg_list_v2                | YES        | (r *Client) GetGroupMsgListV2  | MARKWANG  |
+|          获取群发成员发送任务列表          | POST      | /cgi-bin/externalcontact/get_groupmsg_task                   | YES        | (r *Client) GetGroupMsgTask  | MARKWANG  |
+|          获取企业群发成员执行结果          | POST      | /cgi-bin/externalcontact/get_groupmsg_send_result            | YES        | (r *Client) GetGroupMsgSendResult  | MARKWANG  |
+|          发送新客户欢迎语          | POST      | /cgi-bin/externalcontact/send_welcome_msg                    | YES        | (r *Client) SendWelcomeMsg  | MARKWANG  |
+|          添加入群欢迎语素材          | POST      | /cgi-bin/externalcontact/group_welcome_template/add          | YES        | (r *Client) AddGroupWelcomeTemplate  | MARKWANG  |
+|          编辑入群欢迎语素材          | POST      | /cgi-bin/externalcontact/group_welcome_template/edit         | YES        | (r *Client) EditGroupWelcomeTemplate  | MARKWANG  |
+|          获取入群欢迎语素材          | POST      | /cgi-bin/externalcontact/group_welcome_template/get          | YES        | (r *Client) GetGroupWelcomeTemplate  | MARKWANG  |
+|          删除入群欢迎语素材          | POST      | /cgi-bin/externalcontact/group_welcome_template/del          | YES        | (r *Client) DelGroupWelcomeTemplate  | MARKWANG  |
+
+## 通讯录管理
+[官方文档](https://developer.work.weixin.qq.com/document/path/90193)
+
+### 部门管理
+
+|    名称     | 请求方式 | URL                                     | 是否已实现   | 使用方法                            | 贡献者      |
+|:---------:|------|:----------------------------------------| ---------- | -------------------------------   |----------|
+| 获取子部门ID列表 | GET  | /cgi-bin/department/simplelist          | YES        | (r *Client) DepartmentSimpleList| MARKWANG |
+|  获取部门成员   | GET | /cgi-bin/user/simplelist                | YES        | (r *Client) UserSimpleList  | MARKWANG  |
+|  获取成员ID列表   | Post | /cgi-bin/user/list_id                | YES        | (r *Client) UserListId  | MARKWANG  |
+
+
+## 素材管理
+[官方文档](https://developer.work.weixin.qq.com/document/path/91054)
+
+|    名称     | 请求方式 | URL                                     | 是否已实现   | 使用方法                            | 贡献者      |
+|:---------:|------|:----------------------------------------| ---------- | -------------------------------   |----------|
+| 上传图片 | POST  | /cgi-bin/media/uploadimg          | YES        | (r *Client) UploadImg| MARKWANG |
+
+### 成员管理
+
+| 名称     | 请求方式 | URL               | 是否已实现 | 使用方法            | 贡献者   |
+| -------- | -------- | ----------------- | ---------- | ------------------- | -------- |
+| 读取成员 | GET      | /cgi-bin/user/get | YES        | (r *Client) UserGet | chcthink |
+
+
+## 群机器人
+
+[官方文档](https://developer.work.weixin.qq.com/document/path/91770)
+
+| 名称             | 请求方式 | URL                   | 是否已实现 | 使用方法                   | 贡献者   |
+| ---------------- | -------- | --------------------- | ---------- | -------------------------- | -------- |
+| 群机器人发送消息 | POST     | /cgi-bin/webhook/send | YES        | (r *Client) RobotBroadcast | chcthink |
+
+## 应用管理
+TODO

doc/api/wxpay.md

@@ -0,0 +1,3 @@
+# 微信支付
+
+TODO

examples/beego/beego.go

@@ -1,45 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/context"
-	"github.com/silenceper/wechat"
-	"github.com/silenceper/wechat/message"
-)
-
-func hello(ctx *context.Context) {
-	//配置微信参数
-	config := &wechat.Config{
-		AppID:          "your app id",
-		AppSecret:      "your app secret",
-		Token:          "your token",
-		EncodingAESKey: "your encoding aes key",
-	}
-	wc := wechat.NewWechat(config)
-
-	// 传入request和responseWriter
-	server := wc.GetServer(ctx.Request, ctx.ResponseWriter)
-	//设置接收消息的处理方法
-	server.SetMessageHandler(func(msg message.MixMessage) *message.Reply {
-
-		//回复消息：演示回复用户发送的消息
-		text := message.NewText(msg.Content)
-		return &message.Reply{MsgType: message.MsgTypeText, MsgData: text}
-	})
-
-	//处理消息接收以及回复
-	err := server.Serve()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	//发送回复的消息
-	server.Send()
-}
-
-func main() {
-	beego.Any("/", hello)
-	beego.Run(":8001")
-}

examples/gin/gin.go

@@ -1,47 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/gin-gonic/gin"
-	"github.com/silenceper/wechat"
-	"github.com/silenceper/wechat/message"
-)
-
-func main() {
-	router := gin.Default()
-
-	router.Any("/", hello)
-	router.Run(":8001")
-}
-
-func hello(c *gin.Context) {
-
-	//配置微信参数
-	config := &wechat.Config{
-		AppID:          "your app id",
-		AppSecret:      "your app secret",
-		Token:          "your token",
-		EncodingAESKey: "your encoding aes key",
-	}
-	wc := wechat.NewWechat(config)
-
-	// 传入request和responseWriter
-	server := wc.GetServer(c.Request, c.Writer)
-	//设置接收消息的处理方法
-	server.SetMessageHandler(func(msg message.MixMessage) *message.Reply {
-
-		//回复消息：演示回复用户发送的消息
-		text := message.NewText(msg.Content)
-		return &message.Reply{MsgType: message.MsgTypeText, MsgData: text}
-	})
-
-	//处理消息接收以及回复
-	err := server.Serve()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	//发送回复的消息
-	server.Send()
-}

examples/http/http.go

@@ -1,48 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/silenceper/wechat"
-	"github.com/silenceper/wechat/message"
-)
-
-func hello(rw http.ResponseWriter, req *http.Request) {
-
-	//配置微信参数
-	config := &wechat.Config{
-		AppID:          "your app id",
-		AppSecret:      "your app secret",
-		Token:          "your token",
-		EncodingAESKey: "your encoding aes key",
-	}
-	wc := wechat.NewWechat(config)
-
-	// 传入request和responseWriter
-	server := wc.GetServer(req, rw)
-	//设置接收消息的处理方法
-	server.SetMessageHandler(func(msg message.MixMessage) *message.Reply {
-
-		//回复消息：演示回复用户发送的消息
-		text := message.NewText(msg.Content)
-		return &message.Reply{MsgType: message.MsgTypeText, MsgData: text}
-	})
-
-	//处理消息接收以及回复
-	err := server.Serve()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	//发送回复的消息
-	server.Send()
-}
-
-func main() {
-	http.HandleFunc("/", hello)
-	err := http.ListenAndServe(":8001", nil)
-	if err != nil {
-		fmt.Printf("start server error , err=%v", err)
-	}
-}

go.mod

@@ -1,21 +1,16 @@
-module github.com/silenceper/wechat
+module github.com/silenceper/wechat/v2
 
-go 1.13
+go 1.16
 
 require (
-	github.com/astaxie/beego v1.7.1
-	github.com/bradfitz/gomemcache v0.0.0-20160117192205-fb1f79c6b65a
-	github.com/gin-gonic/gin v1.1.4
-	github.com/golang/protobuf v0.0.0-20161117033126-8ee79997227b // indirect
-	github.com/gomodule/redigo v2.0.1-0.20180627144507-2cd21d9966bf+incompatible
-	github.com/kr/pretty v0.1.0
-	github.com/manucorporat/sse v0.0.0-20160126180136-ee05b128a739 // indirect
-	github.com/mattn/go-isatty v0.0.0-20161123143637-30a891c33c7c // indirect
-	github.com/stretchr/testify v1.4.0 // indirect
-	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
-	golang.org/x/net v0.0.0-20191125084936-ffdde1057850 // indirect
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
-	gopkg.in/go-playground/validator.v8 v8.18.1 // indirect
+	github.com/alicebob/miniredis/v2 v2.30.0
+	github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
+	github.com/fatih/structs v1.1.0
+	github.com/go-redis/redis/v8 v8.11.5
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cast v1.4.1
+	github.com/stretchr/testify v1.7.1
+	github.com/tidwall/gjson v1.14.1
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
+	gopkg.in/h2non/gock.v1 v1.1.2
 )

go.sum

@@ -1,44 +1,147 @@
-github.com/astaxie/beego v1.7.1 h1:TuqX4F9e3ujVEycudgWrwUj11WMppLZyunJKIBoxTFw=
-github.com/astaxie/beego v1.7.1/go.mod h1:0R4++1tUqERR0WYFWdfkcrsyoVBCG4DgpDGokT3yb+U=
-github.com/bradfitz/gomemcache v0.0.0-20160117192205-fb1f79c6b65a h1:k5TuEkqEYCRs8+66WdOkswWOj+L/YbP5ruainvn94wg=
-github.com/bradfitz/gomemcache v0.0.0-20160117192205-fb1f79c6b65a/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
+github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
+github.com/alicebob/miniredis/v2 v2.30.0 h1:uA3uhDbCxfO9+DI/DuGeAMr9qI+noVWwGPNTFuKID5M=
+github.com/alicebob/miniredis/v2 v2.30.0/go.mod h1:84TWKZlxYkfgMucPBf5SOQBYJceZeQRFIaQgNMiCX6Q=
+github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw=
+github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gin-gonic/gin v1.1.4 h1:XLaCFbU39SSGRQrEeP7Z7mM3lvRqC4vE5tEaVdLDdSE=
-github.com/gin-gonic/gin v1.1.4/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
-github.com/golang/protobuf v0.0.0-20161117033126-8ee79997227b h1:fE/yi9pibxGEc0gSJuEShcsBXE2d5FW3OudsjE9tKzQ=
-github.com/golang/protobuf v0.0.0-20161117033126-8ee79997227b/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/gomodule/redigo v2.0.1-0.20180627144507-2cd21d9966bf+incompatible h1:QJ4V3LjaRe/6NKoaaj2QzQZcezt5gNXdPv0axxS4VNA=
-github.com/gomodule/redigo v2.0.1-0.20180627144507-2cd21d9966bf+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/manucorporat/sse v0.0.0-20160126180136-ee05b128a739 h1:ykXz+pRRTibcSjG1yRhpdSHInF8yZY/mfn+Rz2Nd1rE=
-github.com/manucorporat/sse v0.0.0-20160126180136-ee05b128a739/go.mod h1:zUx1mhth20V3VKgL5jbd1BSQcW4Fy6Qs4PZvQwRFwzM=
-github.com/mattn/go-isatty v0.0.0-20161123143637-30a891c33c7c h1:YHHK/dEmr2Jo1cWD1VMB2waEeHJhHFp3CEylwWy/VcY=
-github.com/mattn/go-isatty v0.0.0-20161123143637-30a891c33c7c/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
+github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
+github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ=
+github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20191125084936-ffdde1057850 h1:Vq85/r8R9IdcUHmZ0/nQlUg1v15rzvQ2sHdnZAj/x7s=
-golang.org/x/net v0.0.0-20191125084936-ffdde1057850/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
-gopkg.in/go-playground/validator.v8 v8.18.1 h1:F8SLY5Vqesjs1nI1EL4qmF1PQZ1sitsmq0rPYXLyfGU=
-gopkg.in/go-playground/validator.v8 v8.18.1/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/h2non/gock.v1 v1.1.2 h1:jBbHXgGBK/AoPVfJh5x4r/WxIrElvbLel8TCZkkZJoY=
+gopkg.in/h2non/gock.v1 v1.1.2/go.mod h1:n7UGz/ckNChHiK05rDoiC4MYSunEC/lyaUm2WWaDva0=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

js/js.go

@@ -1,109 +0,0 @@
-package js
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"github.com/silenceper/wechat/context"
-	"github.com/silenceper/wechat/util"
-)
-
-const getTicketURL = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi"
-
-// Js struct
-type Js struct {
-	*context.Context
-}
-
-// Config 返回给用户jssdk配置信息
-type Config struct {
-	AppID     string `json:"app_id"`
-	Timestamp int64  `json:"timestamp"`
-	NonceStr  string `json:"nonce_str"`
-	Signature string `json:"signature"`
-}
-
-// resTicket 请求jsapi_tikcet返回结果
-type resTicket struct {
-	util.CommonError
-
-	Ticket    string `json:"ticket"`
-	ExpiresIn int64  `json:"expires_in"`
-}
-
-//NewJs init
-func NewJs(context *context.Context) *Js {
-	js := new(Js)
-	js.Context = context
-	return js
-}
-
-//GetConfig 获取jssdk需要的配置参数
-//uri 为当前网页地址
-func (js *Js) GetConfig(uri string) (config *Config, err error) {
-	config = new(Config)
-	var ticketStr string
-	ticketStr, err = js.GetTicket()
-	if err != nil {
-		return
-	}
-
-	nonceStr := util.RandomStr(16)
-	timestamp := util.GetCurrTs()
-	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
-	sigStr := util.Signature(str)
-
-	config.AppID = js.AppID
-	config.NonceStr = nonceStr
-	config.Timestamp = timestamp
-	config.Signature = sigStr
-	return
-}
-
-//GetTicket 获取jsapi_ticket
-func (js *Js) GetTicket() (ticketStr string, err error) {
-	js.GetJsAPITicketLock().Lock()
-	defer js.GetJsAPITicketLock().Unlock()
-
-	//先从cache中取
-	jsAPITicketCacheKey := fmt.Sprintf("jsapi_ticket_%s", js.AppID)
-	val := js.Cache.Get(jsAPITicketCacheKey)
-	if val != nil {
-		ticketStr = val.(string)
-		return
-	}
-	var ticket resTicket
-	ticket, err = js.getTicketFromServer()
-	if err != nil {
-		return
-	}
-	ticketStr = ticket.Ticket
-	return
-}
-
-//getTicketFromServer 强制从服务器中获取ticket
-func (js *Js) getTicketFromServer() (ticket resTicket, err error) {
-	var accessToken string
-	accessToken, err = js.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	var response []byte
-	url := fmt.Sprintf(getTicketURL, accessToken)
-	response, err = util.HTTPGet(url)
-	err = json.Unmarshal(response, &ticket)
-	if err != nil {
-		return
-	}
-	if ticket.ErrCode != 0 {
-		err = fmt.Errorf("getTicket Error : errcode=%d , errmsg=%s", ticket.ErrCode, ticket.ErrMsg)
-		return
-	}
-
-	jsAPITicketCacheKey := fmt.Sprintf("jsapi_ticket_%s", js.AppID)
-	expires := ticket.ExpiresIn - 1500
-	err = js.Cache.Set(jsAPITicketCacheKey, ticket.Ticket, time.Duration(expires)*time.Second)
-	return
-}

material/material.go

@@ -1,218 +0,0 @@
-package material
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/silenceper/wechat/context"
-	"github.com/silenceper/wechat/util"
-)
-
-const (
-	addNewsURL     = "https://api.weixin.qq.com/cgi-bin/material/add_news"
-	addMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/add_material"
-	delMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/del_material"
-	getMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/get_material"
-)
-
-//Material 素材管理
-type Material struct {
-	*context.Context
-}
-
-//NewMaterial init
-func NewMaterial(context *context.Context) *Material {
-	material := new(Material)
-	material.Context = context
-	return material
-}
-
-//Article 永久图文素材
-type Article struct {
-	Title            string `json:"title"`
-	ThumbMediaID     string `json:"thumb_media_id"`
-	ThumbURL         string `json:"thumb_url"`
-	Author           string `json:"author"`
-	Digest           string `json:"digest"`
-	ShowCoverPic     int    `json:"show_cover_pic"`
-	Content          string `json:"content"`
-	ContentSourceURL string `json:"content_source_url"`
-	URL              string `json:"url"`
-	DownURL          string `json:"down_url"`
-}
-
-// GetNews 获取/下载永久素材
-func (material *Material) GetNews(id string) ([]*Article, error) {
-	accessToken, err := material.GetAccessToken()
-	if err != nil {
-		return nil, err
-	}
-	uri := fmt.Sprintf("%s?access_token=%s", getMaterialURL, accessToken)
-
-	var req struct {
-		MediaID string `json:"media_id"`
-	}
-	req.MediaID = id
-	responseBytes, err := util.PostJSON(uri, req)
-
-	var res struct {
-		NewsItem []*Article `json:"news_item"`
-	}
-	err = json.Unmarshal(responseBytes, &res)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.NewsItem, nil
-}
-
-//reqArticles 永久性图文素材请求信息
-type reqArticles struct {
-	Articles []*Article `json:"articles"`
-}
-
-//resArticles 永久性图文素材返回结果
-type resArticles struct {
-	util.CommonError
-
-	MediaID string `json:"media_id"`
-}
-
-//AddNews 新增永久图文素材
-func (material *Material) AddNews(articles []*Article) (mediaID string, err error) {
-	req := &reqArticles{articles}
-
-	var accessToken string
-	accessToken, err = material.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf("%s?access_token=%s", addNewsURL, accessToken)
-	responseBytes, err := util.PostJSON(uri, req)
-	var res resArticles
-	err = json.Unmarshal(responseBytes, &res)
-	if err != nil {
-		return
-	}
-	mediaID = res.MediaID
-	return
-}
-
-//resAddMaterial 永久性素材上传返回的结果
-type resAddMaterial struct {
-	util.CommonError
-
-	MediaID string `json:"media_id"`
-	URL     string `json:"url"`
-}
-
-//AddMaterial 上传永久性素材（处理视频需要单独上传）
-func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
-	if mediaType == MediaTypeVideo {
-		err = errors.New("永久视频素材上传使用 AddVideo 方法")
-	}
-	var accessToken string
-	accessToken, err = material.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType)
-	var response []byte
-	response, err = util.PostFile("media", filename, uri)
-	if err != nil {
-		return
-	}
-	var resMaterial resAddMaterial
-	err = json.Unmarshal(response, &resMaterial)
-	if err != nil {
-		return
-	}
-	if resMaterial.ErrCode != 0 {
-		err = fmt.Errorf("AddMaterial error : errcode=%v , errmsg=%v", resMaterial.ErrCode, resMaterial.ErrMsg)
-		return
-	}
-	mediaID = resMaterial.MediaID
-	url = resMaterial.URL
-	return
-}
-
-type reqVideo struct {
-	Title        string `json:"title"`
-	Introduction string `json:"introduction"`
-}
-
-//AddVideo 永久视频素材文件上传
-func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) {
-	var accessToken string
-	accessToken, err = material.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf("%s?access_token=%s&type=video", addMaterialURL, accessToken)
-
-	videoDesc := &reqVideo{
-		Title:        title,
-		Introduction: introduction,
-	}
-	var fieldValue []byte
-	fieldValue, err = json.Marshal(videoDesc)
-	if err != nil {
-		return
-	}
-
-	fields := []util.MultipartFormField{
-		{
-			IsFile:    true,
-			Fieldname: "media",
-			Filename:  filename,
-		},
-		{
-			IsFile:    false,
-			Fieldname: "description",
-			Value:     fieldValue,
-		},
-	}
-
-	var response []byte
-	response, err = util.PostMultipartForm(fields, uri)
-	if err != nil {
-		return
-	}
-
-	var resMaterial resAddMaterial
-	err = json.Unmarshal(response, &resMaterial)
-	if err != nil {
-		return
-	}
-	if resMaterial.ErrCode != 0 {
-		err = fmt.Errorf("AddMaterial error : errcode=%v , errmsg=%v", resMaterial.ErrCode, resMaterial.ErrMsg)
-		return
-	}
-	mediaID = resMaterial.MediaID
-	url = resMaterial.URL
-	return
-}
-
-type reqDeleteMaterial struct {
-	MediaID string `json:"media_id"`
-}
-
-//DeleteMaterial 删除永久素材
-func (material *Material) DeleteMaterial(mediaID string) error {
-	accessToken, err := material.GetAccessToken()
-	if err != nil {
-		return err
-	}
-
-	uri := fmt.Sprintf("%s?access_token=%s", delMaterialURL, accessToken)
-	response, err := util.PostJSON(uri, reqDeleteMaterial{mediaID})
-	if err != nil {
-		return err
-	}
-
-	return util.DecodeWithCommonError(response, "DeleteMaterial")
-}

menu/button.go

@@ -1,143 +0,0 @@
-package menu
-
-//Button 菜单按钮
-type Button struct {
-	Type       string    `json:"type,omitempty"`
-	Name       string    `json:"name,omitempty"`
-	Key        string    `json:"key,omitempty"`
-	URL        string    `json:"url,omitempty"`
-	MediaID    string    `json:"media_id,omitempty"`
-	AppID      string    `json:"appid,omitempty"`
-	PagePath   string    `json:"pagepath,omitempty"`
-	SubButtons []*Button `json:"sub_button,omitempty"`
-}
-
-//SetSubButton 设置二级菜单
-func (btn *Button) SetSubButton(name string, subButtons []*Button) {
-	btn.Name = name
-	btn.SubButtons = subButtons
-	btn.Type = ""
-	btn.Key = ""
-	btn.URL = ""
-	btn.MediaID = ""
-}
-
-//SetClickButton btn 为click类型
-func (btn *Button) SetClickButton(name, key string) {
-	btn.Type = "click"
-	btn.Name = name
-	btn.Key = key
-	btn.URL = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}
-
-//SetViewButton view类型
-func (btn *Button) SetViewButton(name, url string) {
-	btn.Type = "view"
-	btn.Name = name
-	btn.URL = url
-	btn.Key = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}
-
-// SetScanCodePushButton 扫码推事件
-func (btn *Button) SetScanCodePushButton(name, key string) {
-	btn.Type = "scancode_push"
-	btn.Name = name
-	btn.Key = key
-	btn.URL = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}
-
-//SetScanCodeWaitMsgButton 设置 扫码推事件且弹出"消息接收中"提示框
-func (btn *Button) SetScanCodeWaitMsgButton(name, key string) {
-	btn.Type = "scancode_waitmsg"
-	btn.Name = name
-	btn.Key = key
-
-	btn.URL = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}
-
-//SetPicSysPhotoButton 设置弹出系统拍照发图按钮
-func (btn *Button) SetPicSysPhotoButton(name, key string) {
-	btn.Type = "pic_sysphoto"
-	btn.Name = name
-	btn.Key = key
-
-	btn.URL = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}
-
-//SetPicPhotoOrAlbumButton 设置弹出拍照或者相册发图类型按钮
-func (btn *Button) SetPicPhotoOrAlbumButton(name, key string) {
-	btn.Type = "pic_photo_or_album"
-	btn.Name = name
-	btn.Key = key
-
-	btn.URL = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}
-
-// SetPicWeixinButton 设置弹出微信相册发图器类型按钮
-func (btn *Button) SetPicWeixinButton(name, key string) {
-	btn.Type = "pic_weixin"
-	btn.Name = name
-	btn.Key = key
-
-	btn.URL = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}
-
-// SetLocationSelectButton 设置 弹出地理位置选择器 类型按钮
-func (btn *Button) SetLocationSelectButton(name, key string) {
-	btn.Type = "location_select"
-	btn.Name = name
-	btn.Key = key
-
-	btn.URL = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}
-
-//SetMediaIDButton  设置 下发消息(除文本消息) 类型按钮
-func (btn *Button) SetMediaIDButton(name, mediaID string) {
-	btn.Type = "media_id"
-	btn.Name = name
-	btn.MediaID = mediaID
-
-	btn.Key = ""
-	btn.URL = ""
-	btn.SubButtons = nil
-}
-
-//SetViewLimitedButton  设置 跳转图文消息URL 类型按钮
-func (btn *Button) SetViewLimitedButton(name, mediaID string) {
-	btn.Type = "view_limited"
-	btn.Name = name
-	btn.MediaID = mediaID
-
-	btn.Key = ""
-	btn.URL = ""
-	btn.SubButtons = nil
-}
-
-//SetMiniprogramButton  设置 跳转小程序 类型按钮 (公众号后台必须已经关联小程序)
-func (btn *Button) SetMiniprogramButton(name, url, appID, pagePath string) {
-	btn.Type = "miniprogram"
-	btn.Name = name
-	btn.URL = url
-	btn.AppID = appID
-	btn.PagePath = pagePath
-
-	btn.Key = ""
-	btn.MediaID = ""
-	btn.SubButtons = nil
-}

message/message.go

@@ -1,222 +0,0 @@
-package message
-
-import (
-	"encoding/xml"
-
-	"github.com/silenceper/wechat/device"
-)
-
-// MsgType 基本消息类型
-type MsgType string
-
-// EventType 事件类型
-type EventType string
-
-// InfoType 第三方平台授权事件类型
-type InfoType string
-
-const (
-	//MsgTypeText 表示文本消息
-	MsgTypeText MsgType = "text"
-	//MsgTypeImage 表示图片消息
-	MsgTypeImage = "image"
-	//MsgTypeVoice 表示语音消息
-	MsgTypeVoice = "voice"
-	//MsgTypeVideo 表示视频消息
-	MsgTypeVideo = "video"
-	//MsgTypeShortVideo 表示短视频消息[限接收]
-	MsgTypeShortVideo = "shortvideo"
-	//MsgTypeLocation 表示坐标消息[限接收]
-	MsgTypeLocation = "location"
-	//MsgTypeLink 表示链接消息[限接收]
-	MsgTypeLink = "link"
-	//MsgTypeMusic 表示音乐消息[限回复]
-	MsgTypeMusic = "music"
-	//MsgTypeNews 表示图文消息[限回复]
-	MsgTypeNews = "news"
-	//MsgTypeTransfer 表示消息消息转发到客服
-	MsgTypeTransfer = "transfer_customer_service"
-	//MsgTypeEvent 表示事件推送消息
-	MsgTypeEvent = "event"
-)
-
-const (
-	//EventSubscribe 订阅
-	EventSubscribe EventType = "subscribe"
-	//EventUnsubscribe 取消订阅
-	EventUnsubscribe = "unsubscribe"
-	//EventScan 用户已经关注公众号，则微信会将带场景值扫描事件推送给开发者
-	EventScan = "SCAN"
-	//EventLocation 上报地理位置事件
-	EventLocation = "LOCATION"
-	//EventClick 点击菜单拉取消息时的事件推送
-	EventClick = "CLICK"
-	//EventView 点击菜单跳转链接时的事件推送
-	EventView = "VIEW"
-	//EventScancodePush 扫码推事件的事件推送
-	EventScancodePush = "scancode_push"
-	//EventScancodeWaitmsg 扫码推事件且弹出“消息接收中”提示框的事件推送
-	EventScancodeWaitmsg = "scancode_waitmsg"
-	//EventPicSysphoto 弹出系统拍照发图的事件推送
-	EventPicSysphoto = "pic_sysphoto"
-	//EventPicPhotoOrAlbum 弹出拍照或者相册发图的事件推送
-	EventPicPhotoOrAlbum = "pic_photo_or_album"
-	//EventPicWeixin 弹出微信相册发图器的事件推送
-	EventPicWeixin = "pic_weixin"
-	//EventLocationSelect 弹出地理位置选择器的事件推送
-	EventLocationSelect = "location_select"
-	//EventTemplateSendJobFinish 发送模板消息推送通知
-	EventTemplateSendJobFinish = "TEMPLATESENDJOBFINISH"
-	//EventWxaMediaCheck 异步校验图片/音频是否含有违法违规内容推送事件
-	EventWxaMediaCheck = "wxa_media_check"
-)
-
-const (
-	// InfoTypeVerifyTicket 返回ticket
-	InfoTypeVerifyTicket InfoType = "component_verify_ticket"
-	// InfoTypeAuthorized 授权
-	InfoTypeAuthorized = "authorized"
-	// InfoTypeUnauthorized 取消授权
-	InfoTypeUnauthorized = "unauthorized"
-	// InfoTypeUpdateAuthorized 更新授权
-	InfoTypeUpdateAuthorized = "updateauthorized"
-)
-
-//MixMessage 存放所有微信发送过来的消息和事件
-type MixMessage struct {
-	CommonToken
-
-	//基本消息
-	MsgID        int64   `xml:"MsgId"`
-	Content      string  `xml:"Content"`
-	Recognition  string  `xml:"Recognition"`
-	PicURL       string  `xml:"PicUrl"`
-	MediaID      string  `xml:"MediaId"`
-	Format       string  `xml:"Format"`
-	ThumbMediaID string  `xml:"ThumbMediaId"`
-	LocationX    float64 `xml:"Location_X"`
-	LocationY    float64 `xml:"Location_Y"`
-	Scale        float64 `xml:"Scale"`
-	Label        string  `xml:"Label"`
-	Title        string  `xml:"Title"`
-	Description  string  `xml:"Description"`
-	URL          string  `xml:"Url"`
-
-	//事件相关
-	Event       EventType `xml:"Event"`
-	EventKey    string    `xml:"EventKey"`
-	Ticket      string    `xml:"Ticket"`
-	Latitude    string    `xml:"Latitude"`
-	Longitude   string    `xml:"Longitude"`
-	Precision   string    `xml:"Precision"`
-	MenuID      string    `xml:"MenuId"`
-	Status      string    `xml:"Status"`
-	SessionFrom string    `xml:"SessionFrom"`
-
-	ScanCodeInfo struct {
-		ScanType   string `xml:"ScanType"`
-		ScanResult string `xml:"ScanResult"`
-	} `xml:"ScanCodeInfo"`
-
-	SendPicsInfo struct {
-		Count   int32      `xml:"Count"`
-		PicList []EventPic `xml:"PicList>item"`
-	} `xml:"SendPicsInfo"`
-
-	SendLocationInfo struct {
-		LocationX float64 `xml:"Location_X"`
-		LocationY float64 `xml:"Location_Y"`
-		Scale     float64 `xml:"Scale"`
-		Label     string  `xml:"Label"`
-		Poiname   string  `xml:"Poiname"`
-	}
-
-	// 第三方平台相关
-	InfoType                     InfoType `xml:"InfoType"`
-	AppID                        string   `xml:"AppId"`
-	ComponentVerifyTicket        string   `xml:"ComponentVerifyTicket"`
-	AuthorizerAppid              string   `xml:"AuthorizerAppid"`
-	AuthorizationCode            string   `xml:"AuthorizationCode"`
-	AuthorizationCodeExpiredTime int64    `xml:"AuthorizationCodeExpiredTime"`
-	PreAuthCode                  string   `xml:"PreAuthCode"`
-
-	// 卡券相关
-	CardID              string `xml:"CardId"`
-	RefuseReason        string `xml:"RefuseReason"`
-	IsGiveByFriend      int32  `xml:"IsGiveByFriend"`
-	FriendUserName      string `xml:"FriendUserName"`
-	UserCardCode        string `xml:"UserCardCode"`
-	OldUserCardCode     string `xml:"OldUserCardCode"`
-	OuterStr            string `xml:"OuterStr"`
-	IsRestoreMemberCard int32  `xml:"IsRestoreMemberCard"`
-	UnionID             string `xml:"UnionId"`
-
-	// 内容审核相关
-	IsRisky       bool   `xml:"isrisky"`
-	ExtraInfoJSON string `xml:"extra_info_json"`
-	TraceID       string `xml:"trace_id"`
-	StatusCode    int    `xml:"status_code"`
-
-	//设备相关
-	device.MsgDevice
-}
-
-//EventPic 发图事件推送
-type EventPic struct {
-	PicMd5Sum string `xml:"PicMd5Sum"`
-}
-
-//EncryptedXMLMsg 安全模式下的消息体
-type EncryptedXMLMsg struct {
-	XMLName      struct{} `xml:"xml" json:"-"`
-	ToUserName   string   `xml:"ToUserName" json:"ToUserName"`
-	EncryptedMsg string   `xml:"Encrypt"    json:"Encrypt"`
-}
-
-//ResponseEncryptedXMLMsg 需要返回的消息体
-type ResponseEncryptedXMLMsg struct {
-	XMLName      struct{} `xml:"xml" json:"-"`
-	EncryptedMsg string   `xml:"Encrypt"      json:"Encrypt"`
-	MsgSignature string   `xml:"MsgSignature" json:"MsgSignature"`
-	Timestamp    int64    `xml:"TimeStamp"    json:"TimeStamp"`
-	Nonce        string   `xml:"Nonce"        json:"Nonce"`
-}
-
-// CDATA  使用该类型,在序列化为 xml 文本时文本会被解析器忽略
-type CDATA string
-
-// MarshalXML 实现自己的序列化方法
-func (c CDATA) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
-	return e.EncodeElement(struct {
-		string `xml:",cdata"`
-	}{string(c)}, start)
-}
-
-// CommonToken 消息中通用的结构
-type CommonToken struct {
-	XMLName      xml.Name `xml:"xml"`
-	ToUserName   CDATA    `xml:"ToUserName"`
-	FromUserName CDATA    `xml:"FromUserName"`
-	CreateTime   int64    `xml:"CreateTime"`
-	MsgType      MsgType  `xml:"MsgType"`
-}
-
-//SetToUserName set ToUserName
-func (msg *CommonToken) SetToUserName(toUserName CDATA) {
-	msg.ToUserName = toUserName
-}
-
-//SetFromUserName set FromUserName
-func (msg *CommonToken) SetFromUserName(fromUserName CDATA) {
-	msg.FromUserName = fromUserName
-}
-
-//SetCreateTime set createTime
-func (msg *CommonToken) SetCreateTime(createTime int64) {
-	msg.CreateTime = createTime
-}
-
-//SetMsgType set MsgType
-func (msg *CommonToken) SetMsgType(msgType MsgType) {
-	msg.MsgType = msgType
-}

message/template.go

@@ -1,74 +0,0 @@
-package message
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/silenceper/wechat/context"
-	"github.com/silenceper/wechat/util"
-)
-
-const (
-	templateSendURL = "https://api.weixin.qq.com/cgi-bin/message/template/send"
-)
-
-//Template 模板消息
-type Template struct {
-	*context.Context
-}
-
-//NewTemplate 实例化
-func NewTemplate(context *context.Context) *Template {
-	tpl := new(Template)
-	tpl.Context = context
-	return tpl
-}
-
-//Message 发送的模板消息内容
-type Message struct {
-	ToUser     string               `json:"touser"`          // 必须, 接受者OpenID
-	TemplateID string               `json:"template_id"`     // 必须, 模版ID
-	URL        string               `json:"url,omitempty"`   // 可选, 用户点击后跳转的URL, 该URL必须处于开发者在公众平台网站中设置的域中
-	Color      string               `json:"color,omitempty"` // 可选, 整个消息的颜色, 可以不设置
-	Data       map[string]*DataItem `json:"data"`            // 必须, 模板数据
-
-	MiniProgram struct {
-		AppID    string `json:"appid"`    //所需跳转到的小程序appid（该小程序appid必须与发模板消息的公众号是绑定关联关系）
-		PagePath string `json:"pagepath"` //所需跳转到小程序的具体页面路径，支持带参数,（示例index?foo=bar）
-	} `json:"miniprogram"` //可选,跳转至小程序地址
-}
-
-//DataItem 模版内某个 .DATA 的值
-type DataItem struct {
-	Value string `json:"value"`
-	Color string `json:"color,omitempty"`
-}
-
-type resTemplateSend struct {
-	util.CommonError
-
-	MsgID int64 `json:"msgid"`
-}
-
-//Send 发送模板消息
-func (tpl *Template) Send(msg *Message) (msgID int64, err error) {
-	var accessToken string
-	accessToken, err = tpl.GetAccessToken()
-	if err != nil {
-		return
-	}
-	uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
-	response, err := util.PostJSON(uri, msg)
-
-	var result resTemplateSend
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	msgID = result.MsgID
-	return
-}

minigame/README.md

@@ -0,0 +1,9 @@
+# 微信小游戏
+
+[官方文档](https://developers.weixin.qq.com/minigame/dev/api-backend/)
+
+## 快速入门
+
+```go
+
+```

miniprogram/README.md

@@ -0,0 +1,21 @@
+# 微信小程序
+
+[官方文档](https://developers.weixin.qq.com/miniprogram/dev/framework/)
+
+## 包说明
+
+- analysis 数据分析相关API
+
+## 快速入门
+
+```go
+wc := wechat.NewWechat()
+memory := cache.NewMemory()
+cfg := &miniConfig.Config{
+    AppID:     "xxx",
+    AppSecret: "xxx",
+    Cache: memory,
+}
+miniprogram := wc.GetMiniProgram(cfg)
+miniprogram.GetAnalysis().GetAnalysisDailyRetain()
+```

miniprogram/analysis/analysis.go

@@ -1,10 +1,12 @@
-package miniprogram
+package analysis
 
 import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (
@@ -30,10 +32,20 @@ const (
 	getAnalysisVisitPageURL = "https://api.weixin.qq.com/datacube/getweanalysisappidvisitpage?access_token=%s"
 )
 
+// Analysis analyis 数据分析
+type Analysis struct {
+	*context.Context
+}
+
+// NewAnalysis new
+func NewAnalysis(ctx *context.Context) *Analysis {
+	return &Analysis{ctx}
+}
+
 // fetchData 拉取统计数据
-func (wxa *MiniProgram) fetchData(urlStr string, body interface{}) (response []byte, err error) {
+func (analysis *Analysis) fetchData(urlStr string, body interface{}) (response []byte, err error) {
 	var accessToken string
-	accessToken, err = wxa.GetAccessToken()
+	accessToken, err = analysis.GetAccessToken()
 	if err != nil {
 		return
 	}
@@ -42,8 +54,8 @@ func (wxa *MiniProgram) fetchData(urlStr string, body interface{}) (response []b
 	return
 }
 
-// AnalysisRetainItem 留存项结构
-type AnalysisRetainItem struct {
+// RetainItem 留存项结构
+type RetainItem struct {
 	Key   int `json:"key"`   // 标识，0开始表示当天，1表示1甜后，以此类推
 	Value int `json:"value"` // key对应日期的新增用户数/活跃用户数（key=0时）或留存用户数（k>0时）
 }
@@ -51,18 +63,18 @@ type AnalysisRetainItem struct {
 // ResAnalysisRetain 小程序留存数据返回
 type ResAnalysisRetain struct {
 	util.CommonError
-	RefDate    string               `json:"ref_date"`     // 日期
-	VisitUVNew []AnalysisRetainItem `json:"visit_uv_new"` // 新增用户留存
-	VisitUV    []AnalysisRetainItem `json:"visit_uv"`     // 活跃用户留存
+	RefDate    string       `json:"ref_date"`     // 日期
+	VisitUVNew []RetainItem `json:"visit_uv_new"` // 新增用户留存
+	VisitUV    []RetainItem `json:"visit_uv"`     // 活跃用户留存
 }
 
 // getAnalysisRetain 获取用户访问小程序留存数据(日、月、周)
-func (wxa *MiniProgram) getAnalysisRetain(urlStr string, beginDate, endDate string) (result ResAnalysisRetain, err error) {
+func (analysis *Analysis) getAnalysisRetain(urlStr string, beginDate, endDate string) (result ResAnalysisRetain, err error) {
 	body := map[string]string{
 		"begin_date": beginDate,
 		"end_date":   endDate,
 	}
-	response, err := wxa.fetchData(urlStr, body)
+	response, err := analysis.fetchData(urlStr, body)
 	if err != nil {
 		return
 	}
@@ -78,18 +90,18 @@ func (wxa *MiniProgram) getAnalysisRetain(urlStr string, beginDate, endDate stri
 }
 
 // GetAnalysisDailyRetain 获取用户访问小程序日留存
-func (wxa *MiniProgram) GetAnalysisDailyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error) {
-	return wxa.getAnalysisRetain(getAnalysisDailyRetainURL, beginDate, endDate)
+func (analysis *Analysis) GetAnalysisDailyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error) {
+	return analysis.getAnalysisRetain(getAnalysisDailyRetainURL, beginDate, endDate)
 }
 
 // GetAnalysisMonthlyRetain 获取用户访问小程序月留存
-func (wxa *MiniProgram) GetAnalysisMonthlyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error) {
-	return wxa.getAnalysisRetain(getAnalysisMonthlyRetainURL, beginDate, endDate)
+func (analysis *Analysis) GetAnalysisMonthlyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error) {
+	return analysis.getAnalysisRetain(getAnalysisMonthlyRetainURL, beginDate, endDate)
 }
 
 // GetAnalysisWeeklyRetain 获取用户访问小程序周留存
-func (wxa *MiniProgram) GetAnalysisWeeklyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error) {
-	return wxa.getAnalysisRetain(getAnalysisWeeklyRetainURL, beginDate, endDate)
+func (analysis *Analysis) GetAnalysisWeeklyRetain(beginDate, endDate string) (result ResAnalysisRetain, err error) {
+	return analysis.getAnalysisRetain(getAnalysisWeeklyRetainURL, beginDate, endDate)
 }
 
 // ResAnalysisDailySummary 小程序访问数据概况
@@ -104,16 +116,16 @@ type ResAnalysisDailySummary struct {
 }
 
 // GetAnalysisDailySummary 获取用户访问小程序数据概况
-func (wxa *MiniProgram) GetAnalysisDailySummary(beginDate, endDate string) (result ResAnalysisDailySummary, err error) {
+func (analysis *Analysis) GetAnalysisDailySummary(beginDate, endDate string) (result ResAnalysisDailySummary, err error) {
 	body := map[string]string{
 		"begin_date": beginDate,
 		"end_date":   endDate,
 	}
-	response, err := wxa.fetchData(getAnalysisDailySummaryURL, body)
+	response, err := analysis.fetchData(getAnalysisDailySummaryURL, body)
 	if err != nil {
 		return
 	}
-	fmt.Println(string(response))
+
 	err = json.Unmarshal(response, &result)
 	if err != nil {
 		return
@@ -141,12 +153,12 @@ type ResAnalysisVisitTrend struct {
 }
 
 // getAnalysisRetain 获取小程序访问数据趋势(日、月、周)
-func (wxa *MiniProgram) getAnalysisVisitTrend(urlStr string, beginDate, endDate string) (result ResAnalysisVisitTrend, err error) {
+func (analysis *Analysis) getAnalysisVisitTrend(urlStr string, beginDate, endDate string) (result ResAnalysisVisitTrend, err error) {
 	body := map[string]string{
 		"begin_date": beginDate,
 		"end_date":   endDate,
 	}
-	response, err := wxa.fetchData(urlStr, body)
+	response, err := analysis.fetchData(urlStr, body)
 	if err != nil {
 		return
 	}
@@ -162,25 +174,25 @@ func (wxa *MiniProgram) getAnalysisVisitTrend(urlStr string, beginDate, endDate
 }
 
 // GetAnalysisDailyVisitTrend 获取用户访问小程序数据日趋势
-func (wxa *MiniProgram) GetAnalysisDailyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error) {
-	return wxa.getAnalysisVisitTrend(getAnalysisDailyVisitTrendURL, beginDate, endDate)
+func (analysis *Analysis) GetAnalysisDailyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error) {
+	return analysis.getAnalysisVisitTrend(getAnalysisDailyVisitTrendURL, beginDate, endDate)
 }
 
 // GetAnalysisMonthlyVisitTrend 获取用户访问小程序数据月趋势
-func (wxa *MiniProgram) GetAnalysisMonthlyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error) {
-	return wxa.getAnalysisVisitTrend(getAnalysisMonthlyVisitTrendURL, beginDate, endDate)
+func (analysis *Analysis) GetAnalysisMonthlyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error) {
+	return analysis.getAnalysisVisitTrend(getAnalysisMonthlyVisitTrendURL, beginDate, endDate)
 }
 
 // GetAnalysisWeeklyVisitTrend 获取用户访问小程序数据周趋势
-func (wxa *MiniProgram) GetAnalysisWeeklyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error) {
-	return wxa.getAnalysisVisitTrend(getAnalysisWeeklyVisitTrendURL, beginDate, endDate)
+func (analysis *Analysis) GetAnalysisWeeklyVisitTrend(beginDate, endDate string) (result ResAnalysisVisitTrend, err error) {
+	return analysis.getAnalysisVisitTrend(getAnalysisWeeklyVisitTrendURL, beginDate, endDate)
 }
 
 // UserPortraitItem 用户画像项目
 type UserPortraitItem struct {
-	ID                  int    `json:"id"`                     // 属性值id
-	Name                string `json:"name"`                   // 属性值名称
-	AccessSourceVisitUV int    `json:"access_source_visit_uv"` // 该场景访问uv
+	ID    int    `json:"id"`    // 属性值id
+	Name  string `json:"name"`  // 属性值名称
+	Value int    `json:"value"` // 该场景访问uv
 }
 
 // UserPortrait 用户画像
@@ -203,12 +215,12 @@ type ResAnalysisUserPortrait struct {
 }
 
 // GetAnalysisUserPortrait 获取小程序新增或活跃用户的画像分布数据
-func (wxa *MiniProgram) GetAnalysisUserPortrait(beginDate, endDate string) (result ResAnalysisUserPortrait, err error) {
+func (analysis *Analysis) GetAnalysisUserPortrait(beginDate, endDate string) (result ResAnalysisUserPortrait, err error) {
 	body := map[string]string{
 		"begin_date": beginDate,
 		"end_date":   endDate,
 	}
-	response, err := wxa.fetchData(getAnalysisUserPortraitURL, body)
+	response, err := analysis.fetchData(getAnalysisUserPortraitURL, body)
 	if err != nil {
 		return
 	}
@@ -244,12 +256,12 @@ type ResAnalysisVisitDistribution struct {
 }
 
 // GetAnalysisVisitDistribution 获取用户小程序访问分布数据
-func (wxa *MiniProgram) GetAnalysisVisitDistribution(beginDate, endDate string) (result ResAnalysisVisitDistribution, err error) {
+func (analysis *Analysis) GetAnalysisVisitDistribution(beginDate, endDate string) (result ResAnalysisVisitDistribution, err error) {
 	body := map[string]string{
 		"begin_date": beginDate,
 		"end_date":   endDate,
 	}
-	response, err := wxa.fetchData(getAnalysisVisitDistributionURL, body)
+	response, err := analysis.fetchData(getAnalysisVisitDistributionURL, body)
 	if err != nil {
 		return
 	}
@@ -284,12 +296,12 @@ type ResAnalysisVisitPage struct {
 }
 
 // GetAnalysisVisitPage 获取小程序页面访问数据
-func (wxa *MiniProgram) GetAnalysisVisitPage(beginDate, endDate string) (result ResAnalysisVisitPage, err error) {
+func (analysis *Analysis) GetAnalysisVisitPage(beginDate, endDate string) (result ResAnalysisVisitPage, err error) {
 	body := map[string]string{
 		"begin_date": beginDate,
 		"end_date":   endDate,
 	}
-	response, err := wxa.fetchData(getAnalysisVisitPageURL, body)
+	response, err := analysis.fetchData(getAnalysisVisitPageURL, body)
 	if err != nil {
 		return
 	}

miniprogram/auth/auth.go

@@ -0,0 +1,150 @@
+package auth
+
+import (
+	context2 "context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	code2SessionURL = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code"
+
+	checkEncryptedDataURL = "https://api.weixin.qq.com/wxa/business/checkencryptedmsg?access_token=%s"
+
+	getPhoneNumber = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"
+)
+
+// Auth 登录/用户信息
+type Auth struct {
+	*context.Context
+}
+
+// NewAuth new auth
+func NewAuth(ctx *context.Context) *Auth {
+	return &Auth{ctx}
+}
+
+// ResCode2Session 登录凭证校验的返回结果
+type ResCode2Session struct {
+	util.CommonError
+
+	OpenID     string `json:"openid"`      // 用户唯一标识
+	SessionKey string `json:"session_key"` // 会话密钥
+	UnionID    string `json:"unionid"`     // 用户在开放平台的唯一标识符，在满足UnionID下发条件的情况下会返回
+}
+
+// RspCheckEncryptedData .
+type RspCheckEncryptedData struct {
+	util.CommonError
+
+	Vaild      bool `json:"vaild"`       // 是否是合法的数据
+	CreateTime uint `json:"create_time"` // 加密数据生成的时间戳
+}
+
+// Code2Session 登录凭证校验。
+func (auth *Auth) Code2Session(jsCode string) (result ResCode2Session, err error) {
+	return auth.Code2SessionContext(context2.Background(), jsCode)
+}
+
+// Code2SessionContext 登录凭证校验。
+func (auth *Auth) Code2SessionContext(ctx context2.Context, jsCode string) (result ResCode2Session, err error) {
+	var response []byte
+	if response, err = util.HTTPGetContext(ctx, fmt.Sprintf(code2SessionURL, auth.AppID, auth.AppSecret, jsCode)); err != nil {
+		return
+	}
+	if err = json.Unmarshal(response, &result); err != nil {
+		return
+	}
+	if result.ErrCode != 0 {
+		err = fmt.Errorf("Code2Session error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
+		return
+	}
+	return
+}
+
+// GetPaidUnionID 用户支付完成后，获取该用户的 UnionId，无需用户授权
+func (auth *Auth) GetPaidUnionID() {
+	// TODO
+}
+
+// CheckEncryptedData .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近3天生成的加密数据
+func (auth *Auth) CheckEncryptedData(encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
+	return auth.CheckEncryptedDataContext(context2.Background(), encryptedMsgHash)
+}
+
+// CheckEncryptedDataContext .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近3天生成的加密数据
+func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
+	var response []byte
+	var (
+		at string
+	)
+	if at, err = auth.GetAccessToken(); err != nil {
+		return
+	}
+
+	// 由于GetPhoneNumberContext需要传入JSON，所以HTTPPostContext入参改为[]byte
+	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), []byte("encrypted_msg_hash="+encryptedMsgHash), nil); err != nil {
+		return
+	}
+	if err = util.DecodeWithError(response, &result, "CheckEncryptedDataAuth"); err != nil {
+		return
+	}
+	return
+}
+
+// GetPhoneNumberResponse 新版获取用户手机号响应结构体
+type GetPhoneNumberResponse struct {
+	util.CommonError
+
+	PhoneInfo PhoneInfo `json:"phone_info"`
+}
+
+// PhoneInfo 获取用户手机号内容
+type PhoneInfo struct {
+	PhoneNumber     string `json:"phoneNumber"`     // 用户绑定的手机号
+	PurePhoneNumber string `json:"purePhoneNumber"` // 没有区号的手机号
+	CountryCode     string `json:"countryCode"`     // 区号
+	WaterMark       struct {
+		Timestamp int64  `json:"timestamp"`
+		AppID     string `json:"appid"`
+	} `json:"watermark"` // 数据水印
+}
+
+// GetPhoneNumberContext 小程序通过code获取用户手机号
+func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*GetPhoneNumberResponse, error) {
+	var response []byte
+	var (
+		at  string
+		err error
+	)
+	if at, err = auth.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	body := map[string]interface{}{
+		"code": code,
+	}
+
+	bodyBytes, err := json.Marshal(body)
+	if err != nil {
+		return nil, err
+	}
+
+	header := map[string]string{"Content-Type": "application/json;charset=utf-8"}
+	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, at), bodyBytes, header); err != nil {
+		return nil, err
+	}
+
+	var result GetPhoneNumberResponse
+	if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetPhoneNumber 小程序通过code获取用户手机号
+func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
+	return auth.GetPhoneNumberContext(context2.Background(), code)
+}

miniprogram/business/business.go

@@ -0,0 +1,13 @@
+package business
+
+import "github.com/silenceper/wechat/v2/miniprogram/context"
+
+// Business 业务
+type Business struct {
+	*context.Context
+}
+
+// NewBusiness init
+func NewBusiness(ctx *context.Context) *Business {
+	return &Business{ctx}
+}

miniprogram/business/phone_number.go

@@ -0,0 +1,54 @@
+package business
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	getPhoneNumberURL = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"
+)
+
+// GetPhoneNumberRequest 获取手机号请求
+type GetPhoneNumberRequest struct {
+	Code string `json:"code"` // 手机号获取凭证
+}
+
+// PhoneInfo 手机号信息
+type PhoneInfo struct {
+	PhoneNumber     string `json:"phoneNumber"`     // 用户绑定的手机号（国外手机号会有区号）
+	PurePhoneNumber string `json:"purePhoneNumber"` // 没有区号的手机号
+	CountryCode     string `json:"countryCode"`     // 区号
+	Watermark       struct {
+		AppID     string `json:"appid"`     // 小程序appid
+		Timestamp int64  `json:"timestamp"` // 用户获取手机号操作的时间戳
+	} `json:"watermark"`
+}
+
+// GetPhoneNumber code换取用户手机号。 每个code只能使用一次，code的有效期为5min
+func (business *Business) GetPhoneNumber(in *GetPhoneNumberRequest) (info PhoneInfo, err error) {
+	accessToken, err := business.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf(getPhoneNumberURL, accessToken)
+	response, err := util.PostJSON(uri, in)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	var resp struct {
+		util.CommonError
+		PhoneInfo PhoneInfo `json:"phone_info"`
+	}
+	err = util.DecodeWithError(response, &resp, "business.GetPhoneNumber")
+	if nil != err {
+		return
+	}
+
+	info = resp.PhoneInfo
+	return
+}

miniprogram/config/config.go

@@ -0,0 +1,13 @@
+// Package config 小程序config配置
+package config
+
+import (
+	"github.com/silenceper/wechat/v2/cache"
+)
+
+// Config .config for 小程序
+type Config struct {
+	AppID     string `json:"app_id"`     // appid
+	AppSecret string `json:"app_secret"` // appSecret
+	Cache     cache.Cache
+}

miniprogram/content/content.go

@@ -0,0 +1,65 @@
+package content
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	checkTextURL  = "https://api.weixin.qq.com/wxa/msg_sec_check?access_token=%s"
+	checkImageURL = "https://api.weixin.qq.com/wxa/img_sec_check?access_token=%s"
+)
+
+// Content 内容安全
+type Content struct {
+	*context.Context
+}
+
+// NewContent 内容安全接口
+func NewContent(ctx *context.Context) *Content {
+	return &Content{ctx}
+}
+
+// CheckText 检测文字
+// @text 需要检测的文字
+// Deprecated
+// 采用 security.MsgCheckV1 替代，返回值更加丰富
+func (content *Content) CheckText(text string) error {
+	accessToken, err := content.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	response, err := util.PostJSON(
+		fmt.Sprintf(checkTextURL, accessToken),
+		map[string]string{
+			"content": text,
+		},
+	)
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "ContentCheckText")
+}
+
+// CheckImage 检测图片
+// 所传参数为要检测的图片文件的绝对路径，图片格式支持PNG、JPEG、JPG、GIF, 像素不超过 750 x 1334，同时文件大小以不超过 300K 为宜，否则可能报错
+// @media 图片文件的绝对路径
+// Deprecated
+// 采用 security.ImageCheckV1 替代，返回值更加丰富
+func (content *Content) CheckImage(media string) error {
+	accessToken, err := content.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	response, err := util.PostFile(
+		"media",
+		media,
+		fmt.Sprintf(checkImageURL, accessToken),
+	)
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "ContentCheckImage")
+}

miniprogram/context/context.go

@@ -0,0 +1,12 @@
+package context
+
+import (
+	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/miniprogram/config"
+)
+
+// Context struct
+type Context struct {
+	*config.Config
+	credential.AccessTokenHandle
+}

miniprogram/encryptor/encryptor.go

@@ -1,4 +1,4 @@
-package miniprogram
+package encryptor
 
 import (
 	"crypto/aes"
@@ -6,8 +6,23 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
 )
 
+// Encryptor struct
+type Encryptor struct {
+	*context.Context
+}
+
+// NewEncryptor 实例
+func NewEncryptor(context *context.Context) *Encryptor {
+	basic := new(Encryptor)
+	basic.Context = context
+	return basic
+}
+
 var (
 	// ErrAppIDNotMatch appid不匹配
 	ErrAppIDNotMatch = errors.New("app id not match")
@@ -19,26 +34,20 @@ var (
 	ErrInvalidPKCS7Padding = errors.New("invalid padding on input")
 )
 
-// UserInfo 用户信息
-type UserInfo struct {
-	OpenID    string `json:"openId"`
-	UnionID   string `json:"unionId"`
-	NickName  string `json:"nickName"`
-	Gender    int    `json:"gender"`
-	City      string `json:"city"`
-	Province  string `json:"province"`
-	Country   string `json:"country"`
-	AvatarURL string `json:"avatarUrl"`
-	Language  string `json:"language"`
-	Watermark struct {
-		Timestamp int64  `json:"timestamp"`
-		AppID     string `json:"appid"`
-	} `json:"watermark"`
-}
-
-// PhoneInfo 用户手机号
-type PhoneInfo struct {
+// PlainData 用户信息/手机号信息
+type PlainData struct {
+	OpenID          string `json:"openId"`
+	UnionID         string `json:"unionId"`
+	NickName        string `json:"nickName"`
+	Gender          int    `json:"gender"`
+	City            string `json:"city"`
+	Province        string `json:"province"`
+	Country         string `json:"country"`
+	AvatarURL       string `json:"avatarUrl"`
+	Language        string `json:"language"`
 	PhoneNumber     string `json:"phoneNumber"`
+	OpenGID         string `json:"openGId"`
+	MsgTicket       string `json:"msgTicket"`
 	PurePhoneNumber string `json:"purePhoneNumber"`
 	CountryCode     string `json:"countryCode"`
 	Watermark       struct {
@@ -68,8 +77,8 @@ func pkcs7Unpad(data []byte, blockSize int) ([]byte, error) {
 	return data[:len(data)-n], nil
 }
 
-// getCipherText returns slice of the cipher text
-func getCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
+// GetCipherText returns slice of the cipher text
+func GetCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
 	aesKey, err := base64.StdEncoding.DecodeString(sessionKey)
 	if err != nil {
 		return nil, err
@@ -82,6 +91,9 @@ func getCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
+	if len(ivBytes) != aes.BlockSize {
+		return nil, fmt.Errorf("bad iv length %d", len(ivBytes))
+	}
 	block, err := aes.NewCipher(aesKey)
 	if err != nil {
 		return nil, err
@@ -96,35 +108,18 @@ func getCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
 }
 
 // Decrypt 解密数据
-func (wxa *MiniProgram) Decrypt(sessionKey, encryptedData, iv string) (*UserInfo, error) {
-	cipherText, err := getCipherText(sessionKey, encryptedData, iv)
+func (encryptor *Encryptor) Decrypt(sessionKey, encryptedData, iv string) (*PlainData, error) {
+	cipherText, err := GetCipherText(sessionKey, encryptedData, iv)
 	if err != nil {
 		return nil, err
 	}
-	var userInfo UserInfo
-	err = json.Unmarshal(cipherText, &userInfo)
+	var plainData PlainData
+	err = json.Unmarshal(cipherText, &plainData)
 	if err != nil {
 		return nil, err
 	}
-	if userInfo.Watermark.AppID != wxa.AppID {
+	if plainData.Watermark.AppID != encryptor.AppID {
 		return nil, ErrAppIDNotMatch
 	}
-	return &userInfo, nil
-}
-
-// DecryptPhone 解密数据(手机)
-func (wxa *MiniProgram) DecryptPhone(sessionKey, encryptedData, iv string) (*PhoneInfo, error) {
-	cipherText, err := getCipherText(sessionKey, encryptedData, iv)
-	if err != nil {
-		return nil, err
-	}
-	var phoneInfo PhoneInfo
-	err = json.Unmarshal(cipherText, &phoneInfo)
-	if err != nil {
-		return nil, err
-	}
-	if phoneInfo.Watermark.AppID != wxa.AppID {
-		return nil, ErrAppIDNotMatch
-	}
-	return &phoneInfo, nil
+	return &plainData, nil
 }

miniprogram/encryptor/encryptor_test.go

@@ -0,0 +1,15 @@
+package encryptor
+
+import (
+	"encoding/base64"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetCipherText_BadIV(t *testing.T) {
+	keyData := base64.StdEncoding.EncodeToString([]byte("1234567890123456"))
+	badData := base64.StdEncoding.EncodeToString([]byte("1"))
+	_, err := GetCipherText(keyData, badData, badData)
+	assert.Error(t, err)
+}

miniprogram/message/consts.go

@@ -0,0 +1,57 @@
+package message
+
+import "encoding/xml"
+
+// MsgType 基本消息类型
+type MsgType string
+
+// EventType 事件类型
+type EventType string
+
+// InfoType 第三方平台授权事件类型
+type InfoType string
+
+const (
+	// MsgTypeText 文本消息
+	MsgTypeText MsgType = "text"
+	// MsgTypeImage 图片消息
+	MsgTypeImage = "image"
+	// MsgTypeLink 图文链接
+	MsgTypeLink = "link"
+	// MsgTypeMiniProgramPage 小程序卡片
+	MsgTypeMiniProgramPage = "miniprogrampage"
+)
+
+// CommonToken 消息中通用的结构
+type CommonToken struct {
+	XMLName      xml.Name `xml:"xml"`
+	ToUserName   string   `xml:"ToUserName"`
+	FromUserName string   `xml:"FromUserName"`
+	CreateTime   int64    `xml:"CreateTime"`
+	MsgType      MsgType  `xml:"MsgType"`
+}
+
+// MiniProgramMixMessage 小程序回调的消息结构
+type MiniProgramMixMessage struct {
+	CommonToken
+
+	MsgID int64 `xml:"MsgId"`
+
+	// 文本消息
+	Content string `xml:"Content"`
+
+	// 图片消息
+	PicURL  string `xml:"PicUrl"`
+	MediaID string `xml:"MediaId"`
+
+	// 小程序卡片消息
+	Title        string `xml:"Title"`
+	AppID        string `xml:"AppId"`
+	PagePath     string `xml:"PagePath"`
+	ThumbURL     string `xml:"ThumbUrl"`
+	ThumbMediaID string `xml:"ThumbMediaId"`
+
+	// 进入会话事件
+	Event       string `xml:"Event"`
+	SessionFrom string `xml:"SessionFrom"`
+}

miniprogram/message/customer_message.go

@@ -0,0 +1,124 @@
+package message
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	customerSendMessage = "https://api.weixin.qq.com/cgi-bin/message/custom/send"
+)
+
+// Manager 消息管理者，可以发送消息
+type Manager struct {
+	*context.Context
+}
+
+// NewCustomerMessageManager 实例化消息管理者
+func NewCustomerMessageManager(context *context.Context) *Manager {
+	return &Manager{
+		context,
+	}
+}
+
+// MediaText 文本消息的文字
+type MediaText struct {
+	Content string `json:"content"`
+}
+
+// MediaResource  消息使用的临时素材id
+type MediaResource struct {
+	MediaID string `json:"media_id"`
+}
+
+// MediaMiniprogrampage 小程序卡片
+type MediaMiniprogrampage struct {
+	Title        string `json:"title"`
+	Appid        string `json:"appid"`
+	Pagepath     string `json:"pagepath"`
+	ThumbMediaID string `json:"thumb_media_id"`
+}
+
+// MediaLink 发送图文链接
+type MediaLink struct {
+	Title       string `json:"title"`
+	Description string `json:"description"`
+	URL         string `json:"url"`
+	ThumbURL    string `json:"thumb_url"`
+}
+
+// CustomerMessage  客服消息
+type CustomerMessage struct {
+	ToUser          string                `json:"touser"`                    // 接受者OpenID
+	Msgtype         MsgType               `json:"msgtype"`                   // 客服消息类型
+	Text            *MediaText            `json:"text,omitempty"`            // 可选
+	Image           *MediaResource        `json:"image,omitempty"`           // 可选
+	Link            *MediaLink            `json:"link,omitempty"`            // 可选
+	Miniprogrampage *MediaMiniprogrampage `json:"miniprogrampage,omitempty"` // 可选
+}
+
+// NewCustomerTextMessage 文本消息结构体构造方法
+func NewCustomerTextMessage(toUser, text string) *CustomerMessage {
+	return &CustomerMessage{
+		ToUser:  toUser,
+		Msgtype: MsgTypeText,
+		Text: &MediaText{
+			Content: text,
+		},
+	}
+}
+
+// NewCustomerImgMessage 图片消息的构造方法
+func NewCustomerImgMessage(toUser, mediaID string) *CustomerMessage {
+	return &CustomerMessage{
+		ToUser:  toUser,
+		Msgtype: MsgTypeImage,
+		Image: &MediaResource{
+			MediaID: mediaID,
+		},
+	}
+}
+
+// NewCustomerLinkMessage 图文链接消息的构造方法
+func NewCustomerLinkMessage(toUser, title, description, url, thumbURL string) *CustomerMessage {
+	return &CustomerMessage{
+		ToUser:  toUser,
+		Msgtype: MsgTypeLink,
+		Link: &MediaLink{
+			Title:       title,
+			Description: description,
+			URL:         url,
+			ThumbURL:    thumbURL,
+		},
+	}
+}
+
+// NewCustomerMiniprogrampageMessage 小程序卡片消息的构造方法
+func NewCustomerMiniprogrampageMessage(toUser, title, pagepath, thumbMediaID string) *CustomerMessage {
+	return &CustomerMessage{
+		ToUser:  toUser,
+		Msgtype: MsgTypeMiniProgramPage,
+		Miniprogrampage: &MediaMiniprogrampage{
+			Title:        title,
+			Pagepath:     pagepath,
+			ThumbMediaID: thumbMediaID,
+		},
+	}
+}
+
+// Send 发送客服消息
+func (manager *Manager) Send(msg *CustomerMessage) error {
+	accessToken, err := manager.Context.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", customerSendMessage, accessToken)
+	response, err := util.PostJSON(uri, msg)
+	if err != nil {
+		return err
+	}
+
+	return util.DecodeWithCommonError(response, "SendCustomerMessage")
+}

miniprogram/miniprogram.go

@@ -1,17 +1,128 @@
 package miniprogram
 
 import (
-	"github.com/silenceper/wechat/context"
+	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/miniprogram/analysis"
+	"github.com/silenceper/wechat/v2/miniprogram/auth"
+	"github.com/silenceper/wechat/v2/miniprogram/business"
+	"github.com/silenceper/wechat/v2/miniprogram/config"
+	"github.com/silenceper/wechat/v2/miniprogram/content"
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/miniprogram/encryptor"
+	"github.com/silenceper/wechat/v2/miniprogram/message"
+	"github.com/silenceper/wechat/v2/miniprogram/privacy"
+	"github.com/silenceper/wechat/v2/miniprogram/qrcode"
+	"github.com/silenceper/wechat/v2/miniprogram/riskcontrol"
+	"github.com/silenceper/wechat/v2/miniprogram/security"
+	"github.com/silenceper/wechat/v2/miniprogram/shortlink"
+	"github.com/silenceper/wechat/v2/miniprogram/subscribe"
+	"github.com/silenceper/wechat/v2/miniprogram/tcb"
+	"github.com/silenceper/wechat/v2/miniprogram/urllink"
+	"github.com/silenceper/wechat/v2/miniprogram/urlscheme"
+	"github.com/silenceper/wechat/v2/miniprogram/werun"
 )
 
-// MiniProgram struct extends context
+// MiniProgram 微信小程序相关API
 type MiniProgram struct {
-	*context.Context
+	ctx *context.Context
 }
 
-// NewMiniProgram 实例化小程序接口
-func NewMiniProgram(context *context.Context) *MiniProgram {
-	miniProgram := new(MiniProgram)
-	miniProgram.Context = context
-	return miniProgram
+// NewMiniProgram 实例化小程序API
+func NewMiniProgram(cfg *config.Config) *MiniProgram {
+	defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyMiniProgramPrefix, cfg.Cache)
+	ctx := &context.Context{
+		Config:            cfg,
+		AccessTokenHandle: defaultAkHandle,
+	}
+	return &MiniProgram{ctx}
+}
+
+// SetAccessTokenHandle 自定义access_token获取方式
+func (miniProgram *MiniProgram) SetAccessTokenHandle(accessTokenHandle credential.AccessTokenHandle) {
+	miniProgram.ctx.AccessTokenHandle = accessTokenHandle
+}
+
+// GetContext get Context
+func (miniProgram *MiniProgram) GetContext() *context.Context {
+	return miniProgram.ctx
+}
+
+// GetEncryptor  小程序加解密
+func (miniProgram *MiniProgram) GetEncryptor() *encryptor.Encryptor {
+	return encryptor.NewEncryptor(miniProgram.ctx)
+}
+
+// GetAuth 登录/用户信息相关接口
+func (miniProgram *MiniProgram) GetAuth() *auth.Auth {
+	return auth.NewAuth(miniProgram.ctx)
+}
+
+// GetAnalysis 数据分析
+func (miniProgram *MiniProgram) GetAnalysis() *analysis.Analysis {
+	return analysis.NewAnalysis(miniProgram.ctx)
+}
+
+// GetBusiness 业务接口
+func (miniProgram *MiniProgram) GetBusiness() *business.Business {
+	return business.NewBusiness(miniProgram.ctx)
+}
+
+// GetPrivacy 小程序隐私协议相关API
+func (miniProgram *MiniProgram) GetPrivacy() *privacy.Privacy {
+	return privacy.NewPrivacy(miniProgram.ctx)
+}
+
+// GetQRCode 小程序码相关API
+func (miniProgram *MiniProgram) GetQRCode() *qrcode.QRCode {
+	return qrcode.NewQRCode(miniProgram.ctx)
+}
+
+// GetTcb 小程序云开发API
+func (miniProgram *MiniProgram) GetTcb() *tcb.Tcb {
+	return tcb.NewTcb(miniProgram.ctx)
+}
+
+// GetSubscribe 小程序订阅消息
+func (miniProgram *MiniProgram) GetSubscribe() *subscribe.Subscribe {
+	return subscribe.NewSubscribe(miniProgram.ctx)
+}
+
+// GetCustomerMessage 客服消息接口
+func (miniProgram *MiniProgram) GetCustomerMessage() *message.Manager {
+	return message.NewCustomerMessageManager(miniProgram.ctx)
+}
+
+// GetWeRun 微信运动接口
+func (miniProgram *MiniProgram) GetWeRun() *werun.WeRun {
+	return werun.NewWeRun(miniProgram.ctx)
+}
+
+// GetContentSecurity 内容安全接口
+func (miniProgram *MiniProgram) GetContentSecurity() *content.Content {
+	return content.NewContent(miniProgram.ctx)
+}
+
+// GetURLLink 小程序URL Link接口
+func (miniProgram *MiniProgram) GetURLLink() *urllink.URLLink {
+	return urllink.NewURLLink(miniProgram.ctx)
+}
+
+// GetRiskControl 安全风控接口
+func (miniProgram *MiniProgram) GetRiskControl() *riskcontrol.RiskControl {
+	return riskcontrol.NewRiskControl(miniProgram.ctx)
+}
+
+// GetSecurity 内容安全接口
+func (miniProgram *MiniProgram) GetSecurity() *security.Security {
+	return security.NewSecurity(miniProgram.ctx)
+}
+
+// GetShortLink 小程序短链接口
+func (miniProgram *MiniProgram) GetShortLink() *shortlink.ShortLink {
+	return shortlink.NewShortLink(miniProgram.ctx)
+}
+
+// GetSURLScheme 小程序URL Scheme接口
+func (miniProgram *MiniProgram) GetSURLScheme() *urlscheme.URLScheme {
+	return urlscheme.NewURLScheme(miniProgram.ctx)
 }

miniprogram/privacy/privacy.go

@@ -0,0 +1,167 @@
+package privacy
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// Privacy 小程序授权隐私设置
+type Privacy struct {
+	*context.Context
+}
+
+// NewPrivacy 实例化小程序隐私接口
+// 文档地址 https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/2.0/api/privacy_config/set_privacy_setting.html
+func NewPrivacy(context *context.Context) *Privacy {
+	if context == nil {
+		panic("NewPrivacy got a nil context")
+	}
+	return &Privacy{
+		context,
+	}
+}
+
+// OwnerSetting 收集方（开发者）信息配置
+type OwnerSetting struct {
+	ContactEmail         string `json:"contact_email"`
+	ContactPhone         string `json:"contact_phone"`
+	ContactQQ            string `json:"contact_qq"`
+	ContactWeixin        string `json:"contact_weixin"`
+	ExtFileMediaID       string `json:"ext_file_media_id"`
+	NoticeMethod         string `json:"notice_method"`
+	StoreExpireTimestamp string `json:"store_expire_timestamp"`
+}
+
+// SettingItem 收集权限的配置
+type SettingItem struct {
+	PrivacyKey  string `json:"privacy_key"`
+	PrivacyText string `json:"privacy_text"`
+}
+
+// SetPrivacySettingRequest 设置权限的请求参数
+type SetPrivacySettingRequest struct {
+	PrivacyVer   int           `json:"privacy_ver"`
+	OwnerSetting OwnerSetting  `json:"owner_setting"`
+	SettingList  []SettingItem `json:"setting_list"`
+}
+
+const (
+	setPrivacySettingURL    = "https://api.weixin.qq.com/cgi-bin/component/setprivacysetting"
+	getPrivacySettingURL    = "https://api.weixin.qq.com/cgi-bin/component/getprivacysetting"
+	uploadPrivacyExtFileURL = "https://api.weixin.qq.com/cgi-bin/component/uploadprivacyextfile"
+
+	// PrivacyV1 用户隐私保护指引的版本，1表示现网版本。
+	PrivacyV1 = 1
+	// PrivacyV2 2表示开发版。默认是2开发版。
+	PrivacyV2 = 2
+)
+
+// GetPrivacySettingResponse 获取权限配置的响应结果
+type GetPrivacySettingResponse struct {
+	util.CommonError
+	CodeExist    int                   `json:"code_exist"`
+	PrivacyList  []string              `json:"privacy_list"`
+	SettingList  []SettingResponseItem `json:"setting_list"`
+	UpdateTime   int64                 `json:"update_time"`
+	OwnerSetting OwnerSetting          `json:"owner_setting"`
+	PrivacyDesc  DescList              `json:"privacy_desc"`
+}
+
+// SettingResponseItem 获取权限设置的响应明细
+type SettingResponseItem struct {
+	PrivacyKey   string `json:"privacy_key"`
+	PrivacyText  string `json:"privacy_text"`
+	PrivacyLabel string `json:"privacy_label"`
+}
+
+// DescList 权限列表(保持与官方一致)
+type DescList struct {
+	PrivacyDescList []Desc `json:"privacy_desc_list"`
+}
+
+// Desc 权限列表明细(保持与官方一致)
+type Desc struct {
+	PrivacyDesc string `json:"privacy_desc"`
+	PrivacyKey  string `json:"privacy_key"`
+}
+
+// GetPrivacySetting 获取小程序权限配置
+func (s *Privacy) GetPrivacySetting(privacyVer int) (GetPrivacySettingResponse, error) {
+	accessToken, err := s.GetAccessToken()
+	if err != nil {
+		return GetPrivacySettingResponse{}, err
+	}
+
+	response, err := util.PostJSON(fmt.Sprintf("%s?access_token=%s", getPrivacySettingURL, accessToken), map[string]int{
+		"privacy_ver": privacyVer,
+	})
+	if err != nil {
+		return GetPrivacySettingResponse{}, err
+	}
+	// 返回错误信息
+	var result GetPrivacySettingResponse
+	if err = util.DecodeWithError(response, &result, "getprivacysetting"); err != nil {
+		return GetPrivacySettingResponse{}, err
+	}
+
+	return result, nil
+}
+
+// SetPrivacySetting 更新小程序权限配置
+func (s *Privacy) SetPrivacySetting(privacyVer int, ownerSetting OwnerSetting, settingList []SettingItem) error {
+	if privacyVer == PrivacyV1 && len(settingList) > 0 {
+		return errors.New("当privacy_ver传2或者不传时，setting_list是必填；当privacy_ver传1时，该参数不可传")
+	}
+	accessToken, err := s.GetAccessToken()
+	if err != nil {
+		return err
+	}
+
+	response, err := util.PostJSON(fmt.Sprintf("%s?access_token=%s", setPrivacySettingURL, accessToken), SetPrivacySettingRequest{
+		PrivacyVer:   privacyVer,
+		OwnerSetting: ownerSetting,
+		SettingList:  settingList,
+	})
+	if err != nil {
+		return err
+	}
+
+	// 返回错误信息
+	if err = util.DecodeWithCommonError(response, "setprivacysetting"); err != nil {
+		return err
+	}
+
+	return err
+}
+
+// UploadPrivacyExtFileResponse 上传权限定义模板响应参数
+type UploadPrivacyExtFileResponse struct {
+	util.CommonError
+	ExtFileMediaID string `json:"ext_file_media_id"`
+}
+
+// UploadPrivacyExtFile 上传权限定义模板
+func (s *Privacy) UploadPrivacyExtFile(fileData []byte) (UploadPrivacyExtFileResponse, error) {
+	accessToken, err := s.GetAccessToken()
+	if err != nil {
+		return UploadPrivacyExtFileResponse{}, err
+	}
+
+	response, err := util.PostJSON(fmt.Sprintf("%s?access_token=%s", uploadPrivacyExtFileURL, accessToken), map[string][]byte{
+		"file": fileData,
+	})
+	if err != nil {
+		return UploadPrivacyExtFileResponse{}, err
+	}
+
+	// 返回错误信息
+	var result UploadPrivacyExtFileResponse
+	if err = util.DecodeWithError(response, &result, "setprivacysetting"); err != nil {
+		return UploadPrivacyExtFileResponse{}, err
+	}
+
+	return result, err
+}

miniprogram/qrcode/qrcode.go

@@ -1,11 +1,12 @@
-package miniprogram
+package qrcode
 
 import (
 	"encoding/json"
 	"fmt"
 	"strings"
 
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (
@@ -14,22 +15,16 @@ const (
 	getWXACodeUnlimitURL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=%s"
 )
 
-// QRCoder 小程序码参数
-type QRCoder struct {
-	// page 必须是已经发布的小程序存在的页面,根路径前不要填加 /,不能携带参数（参数请放在scene字段里），如果不填写这个字段，默认跳主页面
-	Page string `json:"page,omitempty"`
-	// path 扫码进入的小程序页面路径
-	Path string `json:"path,omitempty"`
-	// width 图片宽度
-	Width int `json:"width,omitempty"`
-	// scene 最大32个可见字符，只支持数字，大小写英文以及部分特殊字符：!#$&'()*+,/:;=?@-._~，其它字符请自行编码为合法字符（因不支持%，中文无法使用 urlencode 处理，请使用其他编码方式）
-	Scene string `json:"scene,omitempty"`
-	// autoColor 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
-	AutoColor bool `json:"auto_color,omitempty"`
-	// lineColor AutoColor 为 false 时生效，使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"},十进制表示
-	LineColor Color `json:"line_color,omitempty"`
-	// isHyaline 是否需要透明底色
-	IsHyaline bool `json:"is_hyaline,omitempty"`
+// QRCode struct
+type QRCode struct {
+	*context.Context
+}
+
+// NewQRCode 实例
+func NewQRCode(context *context.Context) *QRCode {
+	qrCode := new(QRCode)
+	qrCode.Context = context
+	return qrCode
 }
 
 // Color QRCode color
@@ -39,10 +34,32 @@ type Color struct {
 	B string `json:"b"`
 }
 
+// QRCoder 小程序码参数
+type QRCoder struct {
+	// page 必须是已经发布的小程序存在的页面,根路径前不要填加 /,不能携带参数（参数请放在scene字段里），如果不填写这个字段，默认跳主页面
+	Page string `json:"page,omitempty"`
+	// path 扫码进入的小程序页面路径
+	Path string `json:"path,omitempty"`
+	// checkPath 检查page 是否存在，为 true 时 page 必须是已经发布的小程序存在的页面（否则报错）；为 false 时允许小程序未发布或者 page 不存在， 但page 有数量上限（60000个）请勿滥用，默认true
+	CheckPath *bool `json:"check_path,omitempty"`
+	// width 图片宽度
+	Width int `json:"width,omitempty"`
+	// scene 最大32个可见字符，只支持数字，大小写英文以及部分特殊字符：!#$&'()*+,/:;=?@-._~，其它字符请自行编码为合法字符（因不支持%，中文无法使用 urlencode 处理，请使用其他编码方式）
+	Scene string `json:"scene,omitempty"`
+	// autoColor 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调，默认false
+	AutoColor bool `json:"auto_color,omitempty"`
+	// lineColor AutoColor 为 false 时生效，使用 rgb 设置颜色 例如 {"r":"xxx","g":"xxx","b":"xxx"},十进制表示
+	LineColor *Color `json:"line_color,omitempty"`
+	// isHyaline 是否需要透明底色，默认false
+	IsHyaline bool `json:"is_hyaline,omitempty"`
+	// envVersion 要打开的小程序版本。正式版为 "release"，体验版为 "trial"，开发版为 "develop"
+	EnvVersion string `json:"env_version,omitempty"`
+}
+
 // fetchCode 请求并返回二维码二进制数据
-func (wxa *MiniProgram) fetchCode(urlStr string, body interface{}) (response []byte, err error) {
+func (qrCode *QRCode) fetchCode(urlStr string, body interface{}) (response []byte, err error) {
 	var accessToken string
-	accessToken, err = wxa.GetAccessToken()
+	accessToken, err = qrCode.GetAccessToken()
 	if err != nil {
 		return
 	}
@@ -61,31 +78,29 @@ func (wxa *MiniProgram) fetchCode(urlStr string, body interface{}) (response []b
 			err = fmt.Errorf("fetchCode error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
 			return nil, err
 		}
-	} else if contentType == "image/jpeg" {
+	}
+	if contentType == "image/jpeg" {
 		// 返回文件
 		return response, nil
-	} else {
-		err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
-		return nil, err
 	}
-
-	return
+	err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
+	return nil, err
 }
 
 // CreateWXAQRCode 获取小程序二维码，适用于需要的码数量较少的业务场景
 // 文档地址： https://developers.weixin.qq.com/miniprogram/dev/api/createWXAQRCode.html
-func (wxa *MiniProgram) CreateWXAQRCode(coderParams QRCoder) (response []byte, err error) {
-	return wxa.fetchCode(createWXAQRCodeURL, coderParams)
+func (qrCode *QRCode) CreateWXAQRCode(coderParams QRCoder) (response []byte, err error) {
+	return qrCode.fetchCode(createWXAQRCodeURL, coderParams)
 }
 
 // GetWXACode 获取小程序码，适用于需要的码数量较少的业务场景
 // 文档地址： https://developers.weixin.qq.com/miniprogram/dev/api/getWXACode.html
-func (wxa *MiniProgram) GetWXACode(coderParams QRCoder) (response []byte, err error) {
-	return wxa.fetchCode(getWXACodeURL, coderParams)
+func (qrCode *QRCode) GetWXACode(coderParams QRCoder) (response []byte, err error) {
+	return qrCode.fetchCode(getWXACodeURL, coderParams)
 }
 
 // GetWXACodeUnlimit 获取小程序码，适用于需要的码数量极多的业务场景
 // 文档地址： https://developers.weixin.qq.com/miniprogram/dev/api/getWXACodeUnlimit.html
-func (wxa *MiniProgram) GetWXACodeUnlimit(coderParams QRCoder) (response []byte, err error) {
-	return wxa.fetchCode(getWXACodeUnlimitURL, coderParams)
+func (qrCode *QRCode) GetWXACodeUnlimit(coderParams QRCoder) (response []byte, err error) {
+	return qrCode.fetchCode(getWXACodeUnlimitURL, coderParams)
 }

miniprogram/riskcontrol/riskcontrol.go

@@ -0,0 +1,60 @@
+package riskcontrol
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	getUserRiskRankURL = "https://api.weixin.qq.com/wxa/getuserriskrank?access_token=%s"
+)
+
+// RiskControl 安全风控
+type RiskControl struct {
+	*context.Context
+}
+
+// NewRiskControl init
+func NewRiskControl(ctx *context.Context) *RiskControl {
+	return &RiskControl{ctx}
+}
+
+// UserRiskRankRequest 获取用户安全等级请求
+type UserRiskRankRequest struct {
+	AppID    string `json:"appid"`     // 小程序 app id
+	OpenID   string `json:"openid"`    // 用户的 openid
+	Scene    uint8  `json:"scene"`     // 场景值，0:注册，1:营销作弊
+	ClientIP string `json:"client_ip"` // 用户访问源ip
+
+	Mobile       string `json:"mobile_no"`     // 用户手机号
+	Email        string `json:"email_address"` // 用户邮箱地址
+	ExtendedInfo string `json:"extended_info"` // 额外补充信息
+	IsTest       bool   `json:"is_test"`       // false：正式调用，true：测试调用
+}
+
+// UserRiskRank 用户安全等级
+type UserRiskRank struct {
+	util.CommonError
+	UnionID  int64 `json:"union_id"`  // 唯一请求标识
+	RiskRank uint8 `json:"risk_rank"` // 用户风险等级
+}
+
+// GetUserRiskRank 根据提交的用户信息数据获取用户的安全等级 risk_rank，无需用户授权。
+func (riskControl *RiskControl) GetUserRiskRank(in *UserRiskRankRequest) (res UserRiskRank, err error) {
+	accessToken, err := riskControl.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf(getUserRiskRankURL, accessToken)
+	response, err := util.PostJSON(uri, in)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	err = util.DecodeWithError(response, &res, "GetUserRiskRank")
+	return
+}

miniprogram/security/security.go

@@ -0,0 +1,256 @@
+package security
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	mediaCheckAsyncURL = "https://api.weixin.qq.com/wxa/media_check_async?access_token=%s"
+	imageCheckURL      = "https://api.weixin.qq.com/wxa/img_sec_check?access_token=%s"
+	msgCheckURL        = "https://api.weixin.qq.com/wxa/msg_sec_check?access_token=%s"
+)
+
+// Security 内容安全
+type Security struct {
+	*context.Context
+}
+
+// NewSecurity init
+func NewSecurity(ctx *context.Context) *Security {
+	return &Security{ctx}
+}
+
+// MediaCheckAsyncV1Request 图片/音频异步校验请求参数
+type MediaCheckAsyncV1Request struct {
+	MediaURL  string `json:"media_url"`  // 要检测的图片或音频的url，支持图片格式包括jpg, jepg, png, bmp, gif（取首帧），支持的音频格式包括mp3, aac, ac3, wma, flac, vorbis, opus, wav
+	MediaType uint8  `json:"media_type"` // 1:音频;2:图片
+}
+
+// MediaCheckAsyncV1 异步校验图片/音频是否含有违法违规内容
+// Deprecated
+// 在2021年9月1日停止更新，请尽快更新至 2.0 接口。建议使用 MediaCheckAsync
+func (security *Security) MediaCheckAsyncV1(in *MediaCheckAsyncV1Request) (traceID string, err error) {
+	accessToken, err := security.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf(mediaCheckAsyncURL, accessToken)
+	response, err := util.PostJSON(uri, in)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	var res struct {
+		util.CommonError
+		TraceID string `json:"trace_id"`
+	}
+	err = util.DecodeWithError(response, &res, "MediaCheckAsyncV1")
+	if err != nil {
+		return
+	}
+
+	traceID = res.TraceID
+	return
+}
+
+// MediaCheckAsyncRequest 图片/音频异步校验请求参数
+type MediaCheckAsyncRequest struct {
+	MediaURL  string `json:"media_url"`  // 要检测的图片或音频的url，支持图片格式包括jpg, jepg, png, bmp, gif（取首帧），支持的音频格式包括mp3, aac, ac3, wma, flac, vorbis, opus, wav
+	MediaType uint8  `json:"media_type"` // 1:音频;2:图片
+	OpenID    string `json:"openid"`     // 用户的openid（用户需在近两小时访问过小程序）
+	Scene     uint8  `json:"scene"`      // 场景枚举值（1 资料；2 评论；3 论坛；4 社交日志）
+}
+
+// MediaCheckAsync 异步校验图片/音频是否含有违法违规内容
+func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID string, err error) {
+	accessToken, err := security.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		MediaCheckAsyncRequest
+		Version uint `json:"version"` // 接口版本号，2.0版本为固定值2
+	}
+	req.MediaCheckAsyncRequest = *in
+	req.Version = 2
+
+	uri := fmt.Sprintf(mediaCheckAsyncURL, accessToken)
+	response, err := util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	var res struct {
+		util.CommonError
+		TraceID string `json:"trace_id"`
+	}
+	err = util.DecodeWithError(response, &res, "MediaCheckAsync")
+	if err != nil {
+		return
+	}
+
+	traceID = res.TraceID
+	return
+}
+
+// ImageCheckV1 校验一张图片是否含有违法违规内容（同步）
+// https://developers.weixin.qq.com/miniprogram/dev/framework/security.imgSecCheck.html
+// Deprecated
+// 在2021年9月1日停止更新。建议使用 MediaCheckAsync
+func (security *Security) ImageCheckV1(filename string) (err error) {
+	accessToken, err := security.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf(imageCheckURL, accessToken)
+	response, err := util.PostFile("media", filename, uri)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	return util.DecodeWithCommonError(response, "ImageCheckV1")
+}
+
+// CheckSuggest 检查建议
+type CheckSuggest string
+
+const (
+	// CheckSuggestRisky 违规风险建议
+	CheckSuggestRisky CheckSuggest = "risky"
+	// CheckSuggestPass 安全
+	CheckSuggestPass CheckSuggest = "pass"
+	// CheckSuggestReview 需要审查
+	CheckSuggestReview CheckSuggest = "review"
+)
+
+// MsgScene 文本场景
+type MsgScene uint8
+
+const (
+	// MsgSceneMaterial 资料文件检查场景
+	MsgSceneMaterial MsgScene = iota + 1
+	// MsgSceneComment 评论
+	MsgSceneComment
+	// MsgSceneForum 论坛
+	MsgSceneForum
+	// MsgSceneSocialLog 社交日志
+	MsgSceneSocialLog
+)
+
+// CheckLabel 检查命中标签
+type CheckLabel int
+
+func (cl CheckLabel) String() string {
+	switch cl {
+	case 100:
+		return "正常"
+	case 10001:
+		return "广告"
+	case 20001:
+		return "时政"
+	case 20002:
+		return "色情"
+	case 20003:
+		return "辱骂"
+	case 20006:
+		return "违法犯罪"
+	case 20008:
+		return "欺诈"
+	case 20012:
+		return "低俗"
+	case 20013:
+		return "版权"
+	case 21000:
+		return "其他"
+	default:
+		return strconv.Itoa(int(cl))
+	}
+}
+
+// MsgCheckRequest 文本检查请求
+type MsgCheckRequest struct {
+	OpenID    string   `json:"openid"`    // 用户的openid（用户需在近两小时访问过小程序）
+	Scene     MsgScene `json:"scene"`     // 场景枚举值（1 资料；2 评论；3 论坛；4 社交日志）
+	Content   string   `json:"content"`   // 需检测的文本内容，文本字数的上限为 2500 字，需使用 UTF-8 编码
+	Nickname  string   `json:"nickname"`  // （非必填）用户昵称，需使用UTF-8编码
+	Title     string   `json:"title"`     // （非必填）文本标题，需使用UTF-8编码
+	Signature string   `json:"signature"` // （非必填）个性签名，该参数仅在资料类场景有效(scene=1)，需使用UTF-8编码
+}
+
+// MsgCheckResponse 文本检查响应
+type MsgCheckResponse struct {
+	util.CommonError
+	TraceID string `json:"trace_id"` // 唯一请求标识
+	Result  struct {
+		Suggest CheckSuggest `json:"suggest"` // 建议
+		Label   CheckLabel   `json:"label"`   // 命中标签
+	} `json:"result"` // 综合结果
+	Detail []struct {
+		ErrCode  int64      `json:"errcode"`  // 错误码，仅当该值为0时，该项结果有效
+		Strategy string     `json:"strategy"` // 策略类型
+		Suggest  string     `json:"suggest"`  // 建议
+		Label    CheckLabel `json:"label"`    // 命中标签
+		Prob     uint       `json:"prob"`     // 置信度。0-100，越高代表越有可能属于当前返回的标签（label）
+		Keyword  string     `json:"keyword"`  // 命中的自定义关键词
+	} `json:"detail"` // 详细检测结果
+}
+
+// MsgCheckV1 检查一段文本是否含有违法违规内容
+// Deprecated
+// 在2021年9月1日停止更新，请尽快更新至 2.0 接口。建议使用 MsgCheck
+func (security *Security) MsgCheckV1(content string) (res MsgCheckResponse, err error) {
+	accessToken, err := security.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		Content string `json:"content"`
+	}
+	req.Content = content
+
+	uri := fmt.Sprintf(msgCheckURL, accessToken)
+	response, err := util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	err = util.DecodeWithError(response, &res, "security.MsgCheckV1")
+	return
+}
+
+// MsgCheck 检查一段文本是否含有违法违规内容
+func (security *Security) MsgCheck(in *MsgCheckRequest) (res MsgCheckResponse, err error) {
+	accessToken, err := security.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		MsgCheckRequest
+		Version uint `json:"version"`
+	}
+	req.MsgCheckRequest = *in
+	req.Version = 2
+
+	uri := fmt.Sprintf(msgCheckURL, accessToken)
+	response, err := util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	err = util.DecodeWithError(response, &res, "security.MsgCheck")
+	return
+}

miniprogram/shortlink/shortlink.go

@@ -0,0 +1,86 @@
+package shortlink
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	generateShortLinkURL = "https://api.weixin.qq.com/wxa/genwxashortlink?access_token=%s"
+)
+
+// ShortLink 短链接
+type ShortLink struct {
+	*context.Context
+}
+
+// NewShortLink 实例
+func NewShortLink(ctx *context.Context) *ShortLink {
+	return &ShortLink{ctx}
+}
+
+// ShortLinker 请求结构体
+type ShortLinker struct {
+
+	// pageUrl 通过 Short Link 进入的小程序页面路径，必须是已经发布的小程序存在的页面，可携带 query，最大1024个字符
+	PageURL string `json:"page_url"`
+
+	// pageTitle 页面标题，不能包含违法信息，超过20字符会用... 截断代替
+	PageTitle string `json:"page_title"`
+
+	// isPermanent 生成的 Short Link 类型，短期有效：false，永久有效：true
+	IsPermanent bool `json:"is_permanent,omitempty"`
+}
+
+// resShortLinker 返回结构体
+type resShortLinker struct {
+	// 通用错误
+	util.CommonError
+
+	// 返回的 shortLink
+	Link string `json:"link"`
+}
+
+// Generate 生成 shortLink
+func (shortLink *ShortLink) generate(shortLinkParams ShortLinker) (string, error) {
+	var accessToken string
+	accessToken, err := shortLink.GetAccessToken()
+	if err != nil {
+		return "", err
+	}
+
+	urlStr := fmt.Sprintf(generateShortLinkURL, accessToken)
+	response, err := util.PostJSON(urlStr, shortLinkParams)
+	if err != nil {
+		return "", err
+	}
+
+	// 使用通用方法返回错误
+	var res resShortLinker
+	err = util.DecodeWithError(response, &res, "GenerateShortLink")
+	if err != nil {
+		return "", err
+	}
+
+	return res.Link, nil
+}
+
+// GenerateShortLinkPermanent 生成永久shortLink
+func (shortLink *ShortLink) GenerateShortLinkPermanent(PageURL, pageTitle string) (string, error) {
+	return shortLink.generate(ShortLinker{
+		PageURL:     PageURL,
+		PageTitle:   pageTitle,
+		IsPermanent: true,
+	})
+}
+
+// GenerateShortLinkTemp 生成临时shortLink
+func (shortLink *ShortLink) GenerateShortLinkTemp(PageURL, pageTitle string) (string, error) {
+	return shortLink.generate(ShortLinker{
+		PageURL:     PageURL,
+		PageTitle:   pageTitle,
+		IsPermanent: false,
+	})
+}

miniprogram/sns.go

@@ -1,40 +0,0 @@
-package miniprogram
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/silenceper/wechat/util"
-)
-
-const (
-	code2SessionURL = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code"
-)
-
-// ResCode2Session 登录凭证校验的返回结果
-type ResCode2Session struct {
-	util.CommonError
-
-	OpenID     string `json:"openid"`      // 用户唯一标识
-	SessionKey string `json:"session_key"` // 会话密钥
-	UnionID    string `json:"unionid"`     // 用户在开放平台的唯一标识符，在满足UnionID下发条件的情况下会返回
-}
-
-// Code2Session 登录凭证校验
-func (wxa *MiniProgram) Code2Session(jsCode string) (result ResCode2Session, err error) {
-	urlStr := fmt.Sprintf(code2SessionURL, wxa.AppID, wxa.AppSecret, jsCode)
-	var response []byte
-	response, err = util.HTTPGet(urlStr)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("Code2Session error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	return
-}

miniprogram/subscribe/subscribe.go

@@ -0,0 +1,195 @@
+package subscribe
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// 发送订阅消息
+	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.send.html
+	subscribeSendURL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send"
+
+	// 获取当前帐号下的个人模板列表
+	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
+	getTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate"
+
+	// 添加订阅模板
+	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.addTemplate.html
+	addTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate"
+
+	// 删除私有模板
+	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.deleteTemplate.html
+	delTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate"
+
+	// 统一服务消息
+	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/uniform-message/uniformMessage.send.html
+	uniformMessageSend = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send"
+)
+
+// Subscribe 订阅消息
+type Subscribe struct {
+	*context.Context
+}
+
+// NewSubscribe 实例化
+func NewSubscribe(ctx *context.Context) *Subscribe {
+	return &Subscribe{Context: ctx}
+}
+
+// Message 订阅消息请求参数
+type Message struct {
+	ToUser           string               `json:"touser"`            // 必选，接收者（用户）的 openid
+	TemplateID       string               `json:"template_id"`       // 必选，所需下发的订阅模板id
+	Page             string               `json:"page"`              // 可选，点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。
+	Data             map[string]*DataItem `json:"data"`              // 必选, 模板内容
+	MiniprogramState string               `json:"miniprogram_state"` // 可选，跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+	Lang             string               `json:"lang"`              // 入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN
+}
+
+// DataItem 模版内某个 .DATA 的值
+type DataItem struct {
+	Value interface{} `json:"value"`
+	Color string      `json:"color"`
+}
+
+// TemplateItem template item
+type TemplateItem struct {
+	PriTmplID string `json:"priTmplId"`
+	Title     string `json:"title"`
+	Content   string `json:"content"`
+	Example   string `json:"example"`
+	Type      int64  `json:"type"`
+}
+
+// TemplateList template list
+type TemplateList struct {
+	util.CommonError
+	Data []TemplateItem `json:"data"`
+}
+
+// Send 发送订阅消息
+func (s *Subscribe) Send(msg *Message) (err error) {
+	var accessToken string
+	accessToken, err = s.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", subscribeSendURL, accessToken)
+	response, err := util.PostJSON(uri, msg)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(response, "Send")
+}
+
+// ListTemplates 获取当前帐号下的个人模板列表
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
+func (s *Subscribe) ListTemplates() (*TemplateList, error) {
+	accessToken, err := s.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", getTemplateURL, accessToken)
+	response, err := util.HTTPGet(uri)
+	if err != nil {
+		return nil, err
+	}
+	templateList := TemplateList{}
+	err = util.DecodeWithError(response, &templateList, "ListTemplates")
+	if err != nil {
+		return nil, err
+	}
+	return &templateList, nil
+}
+
+// UniformMessage 统一服务消息
+type UniformMessage struct {
+	ToUser           string `json:"touser"`
+	WeappTemplateMsg struct {
+		TemplateID      string               `json:"template_id"`
+		Page            string               `json:"page"`
+		FormID          string               `json:"form_id"`
+		Data            map[string]*DataItem `json:"data"`
+		EmphasisKeyword string               `json:"emphasis_keyword"`
+	} `json:"weapp_template_msg"`
+	MpTemplateMsg struct {
+		Appid       string `json:"appid"`
+		TemplateID  string `json:"template_id"`
+		URL         string `json:"url"`
+		Miniprogram struct {
+			Appid    string `json:"appid"`
+			Pagepath string `json:"pagepath"`
+		} `json:"miniprogram"`
+		Data map[string]*DataItem `json:"data"`
+	} `json:"mp_template_msg"`
+}
+
+// UniformSend 发送统一服务消息
+func (s *Subscribe) UniformSend(msg *UniformMessage) (err error) {
+	var accessToken string
+	accessToken, err = s.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", uniformMessageSend, accessToken)
+	response, err := util.PostJSON(uri, msg)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(response, "UniformSend")
+}
+
+type resSubscribeAdd struct {
+	util.CommonError
+
+	TemplateID string `json:"priTmplId"`
+}
+
+// Add 添加订阅消息模板
+func (s *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (templateID string, err error) {
+	var accessToken string
+	accessToken, err = s.GetAccessToken()
+	if err != nil {
+		return
+	}
+	var msg = struct {
+		TemplateIDShort string `json:"tid"`
+		SceneDesc       string `json:"sceneDesc"`
+		KidList         []int  `json:"kidList"`
+	}{TemplateIDShort: ShortID, SceneDesc: sceneDesc, KidList: kidList}
+	uri := fmt.Sprintf("%s?access_token=%s", addTemplateURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
+		return
+	}
+	var result resSubscribeAdd
+	err = util.DecodeWithError(response, &result, "AddSubscribe")
+	if err != nil {
+		return
+	}
+	templateID = result.TemplateID
+	return
+}
+
+// Delete 删除私有模板
+func (s *Subscribe) Delete(templateID string) (err error) {
+	var accessToken string
+	accessToken, err = s.GetAccessToken()
+	if err != nil {
+		return
+	}
+	var msg = struct {
+		TemplateID string `json:"priTmplId"`
+	}{TemplateID: templateID}
+	uri := fmt.Sprintf("%s?access_token=%s", delTemplateURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(response, "DeleteSubscribe")
+}

miniprogram/tcb/README.md

@@ -21,7 +21,9 @@ wcTcb := wc.GetTcb()
 ```
 
 ### 举例
+
 #### 触发云函数
+
 ```golang
 res, err := wcTcb.InvokeCloudFunction("test-xxxx", "add", `{"a":1,"b":2}`)
 if err != nil {
@@ -29,4 +31,4 @@ if err != nil {
 }
 ```
 
-更多使用方法参考[GODOC](https://godoc.org/github.com/silenceper/wechat/tcb)
+更多使用方法参考[PKG.DEV](https://pkg.go.dev/github.com/silenceper/wechat/v2/miniprogram/tcb)

miniprogram/tcb/cloudfunction.go

@@ -3,21 +3,22 @@ package tcb
 import (
 	"fmt"
 
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (
-	//触发云函数
+	// 触发云函数
 	invokeCloudFunctionURL = "https://api.weixin.qq.com/tcb/invokecloudfunction"
 )
 
-//InvokeCloudFunctionRes 云函数调用返回结果
+// InvokeCloudFunctionRes 云函数调用返回结果
 type InvokeCloudFunctionRes struct {
 	util.CommonError
-	RespData string `json:"resp_data"` //云函数返回的buffer
+	RespData string `json:"resp_data"` // 云函数返回的buffer
 }
 
-//InvokeCloudFunction 云函数调用
+// InvokeCloudFunction 云函数调用
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/functions/invokeCloudFunction.html
 func (tcb *Tcb) InvokeCloudFunction(env, name, args string) (*InvokeCloudFunctionRes, error) {
 	accessToken, err := tcb.GetAccessToken()

miniprogram/tcb/database.go

@@ -3,195 +3,196 @@ package tcb
 import (
 	"fmt"
 
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (
-	//数据库导入
+	// 数据库导入
 	databaseMigrateImportURL = "https://api.weixin.qq.com/tcb/databasemigrateimport"
-	//数据库导出
+	// 数据库导出
 	databaseMigrateExportURL = "https://api.weixin.qq.com/tcb/databasemigrateexport"
-	//数据库迁移状态查询
+	// 数据库迁移状态查询
 	databaseMigrateQueryInfoURL = "https://api.weixin.qq.com/tcb/databasemigratequeryinfo"
-	//变更数据库索引
+	// 变更数据库索引
 	updateIndexURL = "https://api.weixin.qq.com/tcb/updateindex"
-	//新增集合
+	// 新增集合
 	databaseCollectionAddURL = "https://api.weixin.qq.com/tcb/databasecollectionadd"
-	//删除集合
+	// 删除集合
 	databaseCollectionDeleteURL = "https://api.weixin.qq.com/tcb/databasecollectiondelete"
-	//获取特定云环境下集合信息
+	// 获取特定云环境下集合信息
 	databaseCollectionGetURL = "https://api.weixin.qq.com/tcb/databasecollectionget"
-	//数据库插入记录
+	// 数据库插入记录
 	databaseAddURL = "https://api.weixin.qq.com/tcb/databaseadd"
-	//数据库删除记录
+	// 数据库删除记录
 	databaseDeleteURL = "https://api.weixin.qq.com/tcb/databasedelete"
-	//数据库更新记录
+	// 数据库更新记录
 	databaseUpdateURL = "https://api.weixin.qq.com/tcb/databaseupdate"
-	//数据库查询记录
+	// 数据库查询记录
 	databaseQueryURL = "https://api.weixin.qq.com/tcb/databasequery"
-	//统计集合记录数或统计查询语句对应的结果记录数
+	// 统计集合记录数或统计查询语句对应的结果记录数
 	databaseCountURL = "https://api.weixin.qq.com/tcb/databasecount"
 
-	//ConflictModeInster 冲突处理模式 插入
+	// ConflictModeInster 冲突处理模式 插入
 	ConflictModeInster ConflictMode = 1
-	//ConflictModeUpsert 冲突处理模式 更新
+	// ConflictModeUpsert 冲突处理模式 更新
 	ConflictModeUpsert ConflictMode = 2
 
-	//FileTypeJSON 的合法值 json
+	// FileTypeJSON 的合法值 json
 	FileTypeJSON FileType = 1
-	//FileTypeCsv 的合法值 csv
+	// FileTypeCsv 的合法值 csv
 	FileTypeCsv FileType = 2
 )
 
-//ConflictMode 冲突处理模式
+// ConflictMode 冲突处理模式
 type ConflictMode int
 
-//FileType 文件上传和导出的允许文件类型
+// FileType 文件上传和导出的允许文件类型
 type FileType int
 
-//ValidDirections 合法的direction值
+// ValidDirections 合法的direction值
 var ValidDirections = []string{"1", "-1", "2dsphere"}
 
-//DatabaseMigrateExportReq 数据库出 请求参数
+// DatabaseMigrateExportReq 数据库出 请求参数
 type DatabaseMigrateExportReq struct {
-	Env      string   `json:"env,omitempty"`       //云环境ID
-	FilePath string   `json:"file_path,omitempty"` //导出文件路径(导入文件需先上传到同环境的存储中，可使用开发者工具或 HTTP API的上传文件 API上传）
-	FileType FileType `json:"file_type,omitempty"` //导出文件类型，文件格式参考数据库导入指引中的文件格式部分  1:json 2:csv
-	Query    string   `json:"query,omitempty"`     //导出条件
+	Env      string   `json:"env,omitempty"`       // 云环境ID
+	FilePath string   `json:"file_path,omitempty"` // 导出文件路径(导入文件需先上传到同环境的存储中，可使用开发者工具或 HTTP API的上传文件 API上传）
+	FileType FileType `json:"file_type,omitempty"` // 导出文件类型，文件格式参考数据库导入指引中的文件格式部分  1:json 2:csv
+	Query    string   `json:"query,omitempty"`     // 导出条件
 }
 
-//DatabaseMigrateExportRes 数据库导出 返回结果
+// DatabaseMigrateExportRes 数据库导出 返回结果
 type DatabaseMigrateExportRes struct {
 	util.CommonError
-	JobID int64 `json:"job_id"` //导出任务ID，可使用数据库迁移进度查询 API 查询导入进度及结果
+	JobID int64 `json:"job_id"` // 导出任务ID，可使用数据库迁移进度查询 API 查询导入进度及结果
 }
 
-//DatabaseMigrateImportReq 数据库导入 请求参数
+// DatabaseMigrateImportReq 数据库导入 请求参数
 type DatabaseMigrateImportReq struct {
-	Env            string       `json:"env,omitempty"`             //云环境ID
-	CollectionName string       `json:"collection_name,omitempty"` //集合名称
-	FilePath       string       `json:"file_path,omitempty"`       //导出文件路径（文件会导出到同环境的云存储中，可使用获取下载链接 API 获取下载链接）
-	FileType       FileType     `json:"file_type,omitempty"`       //导入文件类型，文件格式参考数据库导入指引中的文件格式部分  1:json 2:csv
-	StopOnError    bool         `json:"stop_on_error,omitempty"`   //是否在遇到错误时停止导入
-	ConflictMode   ConflictMode `json:"conflict_mode,omitempty"`   //冲突处理模式  1:inster 2:UPSERT
+	Env            string       `json:"env,omitempty"`             // 云环境ID
+	CollectionName string       `json:"collection_name,omitempty"` // 集合名称
+	FilePath       string       `json:"file_path,omitempty"`       // 导出文件路径（文件会导出到同环境的云存储中，可使用获取下载链接 API 获取下载链接）
+	FileType       FileType     `json:"file_type,omitempty"`       // 导入文件类型，文件格式参考数据库导入指引中的文件格式部分  1:json 2:csv
+	StopOnError    bool         `json:"stop_on_error,omitempty"`   // 是否在遇到错误时停止导入
+	ConflictMode   ConflictMode `json:"conflict_mode,omitempty"`   // 冲突处理模式  1:inster 2:UPSERT
 }
 
-//DatabaseMigrateImportRes 数据库导入 返回结果
+// DatabaseMigrateImportRes 数据库导入 返回结果
 type DatabaseMigrateImportRes struct {
 	util.CommonError
-	JobID int64 `json:"job_id"` //导入任务ID，可使用数据库迁移进度查询 API 查询导入进度及结果
+	JobID int64 `json:"job_id"` // 导入任务ID，可使用数据库迁移进度查询 API 查询导入进度及结果
 }
 
-//DatabaseMigrateQueryInfoRes 数据库迁移状态查询
+// DatabaseMigrateQueryInfoRes 数据库迁移状态查询
 type DatabaseMigrateQueryInfoRes struct {
 	util.CommonError
-	Status        string `json:"status"`         //导出状态
-	RecordSuccess int64  `json:"record_success"` //导出成功记录数
-	RecordFail    int64  `json:"record_fail"`    //导出失败记录数
-	ErrMsg        string `json:"err_msg"`        //导出错误信息
-	FileURL       string `json:"file_url"`       //导出文件下载地址
+	Status        string `json:"status"`         // 导出状态
+	RecordSuccess int64  `json:"record_success"` // 导出成功记录数
+	RecordFail    int64  `json:"record_fail"`    // 导出失败记录数
+	ErrMsg        string `json:"err_msg"`        // 导出错误信息
+	FileURL       string `json:"file_url"`       // 导出文件下载地址
 }
 
-//UpdateIndexReq 变更数据库索引 请求参数
+// UpdateIndexReq 变更数据库索引 请求参数
 type UpdateIndexReq struct {
-	Env            string        `json:"env,omitempty"`             //云环境ID
-	CollectionName string        `json:"collection_name,omitempty"` //集合名称
-	CreateIndexes  []CreateIndex `json:"create_indexes,omitempty"`  //新增索引
-	DropIndexes    []DropIndex   `json:"drop_indexes,omitempty"`    //删除索引
+	Env            string        `json:"env,omitempty"`             // 云环境ID
+	CollectionName string        `json:"collection_name,omitempty"` // 集合名称
+	CreateIndexes  []CreateIndex `json:"create_indexes,omitempty"`  // 新增索引
+	DropIndexes    []DropIndex   `json:"drop_indexes,omitempty"`    // 删除索引
 }
 
-//CreateIndex 新增索引
+// CreateIndex 新增索引
 type CreateIndex struct {
-	Name   string           `json:"name,omitempty"`   //索引名
-	Unique bool             `json:"unique,omitempty"` //是否唯一
-	Keys   []CreateIndexKey `json:"keys,omitempty"`   //索引字段
+	Name   string           `json:"name,omitempty"`   // 索引名
+	Unique bool             `json:"unique,omitempty"` // 是否唯一
+	Keys   []CreateIndexKey `json:"keys,omitempty"`   // 索引字段
 }
 
-//CreateIndexKey create index key
+// CreateIndexKey create index key
 type CreateIndexKey struct {
-	Name      string `json:"name,omitempty"`      //字段名
-	Direction string `json:"direction,omitempty"` //字段排序
+	Name      string `json:"name,omitempty"`      // 字段名
+	Direction string `json:"direction,omitempty"` // 字段排序
 }
 
-//DropIndex 删除索引
+// DropIndex 删除索引
 type DropIndex struct {
 	Name string `json:"name,omitempty"`
 }
 
-//DatabaseCollectionReq 新增/删除集合请求参数
+// DatabaseCollectionReq 新增/删除集合请求参数
 type DatabaseCollectionReq struct {
-	Env            string `json:"env,omitempty"`             //云环境ID
-	CollectionName string `json:"collection_name,omitempty"` //集合名称
+	Env            string `json:"env,omitempty"`             // 云环境ID
+	CollectionName string `json:"collection_name,omitempty"` // 集合名称
 }
 
-//DatabaseCollectionGetReq 获取特定云环境下集合信息请求
+// DatabaseCollectionGetReq 获取特定云环境下集合信息请求
 type DatabaseCollectionGetReq struct {
-	Env    string `json:"env,omitempty"`    //云环境ID
-	Limit  int64  `json:"limit,omitempty"`  //获取数量限制
-	Offset int64  `json:"offset,omitempty"` //偏移量
+	Env    string `json:"env,omitempty"`    // 云环境ID
+	Limit  int64  `json:"limit,omitempty"`  // 获取数量限制
+	Offset int64  `json:"offset,omitempty"` // 偏移量
 }
 
-//DatabaseCollectionGetRes 获取特定云环境下集合信息结果
+// DatabaseCollectionGetRes 获取特定云环境下集合信息结果
 type DatabaseCollectionGetRes struct {
 	util.CommonError
 	Pager struct {
-		Limit  int64 `json:"limit"`  //单次查询限制
-		Offset int64 `json:"offset"` //偏移量
-		Total  int64 `json:"total"`  //符合查询条件的记录总数
+		Limit  int64 `json:"limit"`  // 单次查询限制
+		Offset int64 `json:"offset"` // 偏移量
+		Total  int64 `json:"total"`  // 符合查询条件的记录总数
 	} `json:"pager"`
 	Collections []struct {
-		Name       string `json:"name"`        //集合名
-		Count      int64  `json:"count"`       //表中文档数量
-		Size       int64  `json:"size"`        //表的大小（即表中文档总大小），单位：字节
-		IndexCount int64  `json:"index_count"` //索引数量
-		IndexSize  int64  `json:"index_size"`  //索引占用大小，单位：字节
+		Name       string `json:"name"`        // 集合名
+		Count      int64  `json:"count"`       // 表中文档数量
+		Size       int64  `json:"size"`        // 表的大小（即表中文档总大小），单位：字节
+		IndexCount int64  `json:"index_count"` // 索引数量
+		IndexSize  int64  `json:"index_size"`  // 索引占用大小，单位：字节
 	} `json:"collections"`
 }
 
-//DatabaseReq 数据库插入/删除/更新/查询/统计记录请求参数
+// DatabaseReq 数据库插入/删除/更新/查询/统计记录请求参数
 type DatabaseReq struct {
-	Env   string `json:"env,omitempty"`   //云环境ID
-	Query string `json:"query,omitempty"` //数据库操作语句
+	Env   string `json:"env,omitempty"`   // 云环境ID
+	Query string `json:"query,omitempty"` // 数据库操作语句
 }
 
-//DatabaseAddRes 数据库插入记录返回结果
+// DatabaseAddRes 数据库插入记录返回结果
 type DatabaseAddRes struct {
 	util.CommonError
-	IDList []string `json:"id_list"` //插入成功的数据集合主键_id。
+	IDList []string `json:"id_list"` // 插入成功的数据集合主键_id。
 }
 
-//DatabaseDeleteRes 数据库删除记录返回结果
+// DatabaseDeleteRes 数据库删除记录返回结果
 type DatabaseDeleteRes struct {
 	util.CommonError
-	Deleted int64 `json:"deleted"` //删除记录数量
+	Deleted int64 `json:"deleted"` // 删除记录数量
 }
 
-//DatabaseUpdateRes 数据库更新记录返回结果
+// DatabaseUpdateRes 数据库更新记录返回结果
 type DatabaseUpdateRes struct {
 	util.CommonError
-	Matched  int64  `json:"matched"`  //更新条件匹配到的结果数
-	Modified int64  `json:"modified"` //修改的记录数，注意：使用set操作新插入的数据不计入修改数目
+	Matched  int64  `json:"matched"`  // 更新条件匹配到的结果数
+	Modified int64  `json:"modified"` // 修改的记录数，注意：使用set操作新插入的数据不计入修改数目
 	ID       string `json:"id"`
 }
 
-//DatabaseQueryRes 数据库查询记录 返回结果
+// DatabaseQueryRes 数据库查询记录 返回结果
 type DatabaseQueryRes struct {
 	util.CommonError
 	Pager struct {
-		Limit  int64 `json:"limit"`  //单次查询限制
-		Offset int64 `json:"offset"` //偏移量
-		Total  int64 `json:"total"`  //符合查询条件的记录总数
+		Limit  int64 `json:"limit"`  // 单次查询限制
+		Offset int64 `json:"offset"` // 偏移量
+		Total  int64 `json:"total"`  // 符合查询条件的记录总数
 	} `json:"pager"`
 	Data []string `json:"data"`
 }
 
-//DatabaseCountRes 统计集合记录数或统计查询语句对应的结果记录数 返回结果
+// DatabaseCountRes 统计集合记录数或统计查询语句对应的结果记录数 返回结果
 type DatabaseCountRes struct {
 	util.CommonError
-	Count int64 `json:"count"` //记录数量
+	Count int64 `json:"count"` // 记录数量
 }
 
-//DatabaseMigrateImport 数据库导入
+// DatabaseMigrateImport 数据库导入
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateImport.html
 func (tcb *Tcb) DatabaseMigrateImport(req *DatabaseMigrateImportReq) (*DatabaseMigrateImportRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -208,7 +209,8 @@ func (tcb *Tcb) DatabaseMigrateImport(req *DatabaseMigrateImportReq) (*DatabaseM
 	return databaseMigrateImportRes, err
 }
 
-//DatabaseMigrateExport 数据库导出
+// DatabaseMigrateExport 数据库导出
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateExport.html
 func (tcb *Tcb) DatabaseMigrateExport(req *DatabaseMigrateExportReq) (*DatabaseMigrateExportRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -225,7 +227,8 @@ func (tcb *Tcb) DatabaseMigrateExport(req *DatabaseMigrateExportReq) (*DatabaseM
 	return databaseMigrateExportRes, err
 }
 
-//DatabaseMigrateQueryInfo 数据库迁移状态查询
+// DatabaseMigrateQueryInfo 数据库迁移状态查询
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateQueryInfo.html
 func (tcb *Tcb) DatabaseMigrateQueryInfo(env string, jobID int64) (*DatabaseMigrateQueryInfoRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -245,8 +248,8 @@ func (tcb *Tcb) DatabaseMigrateQueryInfo(env string, jobID int64) (*DatabaseMigr
 	return databaseMigrateQueryInfoRes, err
 }
 
-//UpdateIndex 变更数据库索引
-//https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/updateIndex.html
+// UpdateIndex 变更数据库索引
+// https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/updateIndex.html
 func (tcb *Tcb) UpdateIndex(req *UpdateIndexReq) error {
 	accessToken, err := tcb.GetAccessToken()
 	if err != nil {
@@ -260,7 +263,8 @@ func (tcb *Tcb) UpdateIndex(req *UpdateIndexReq) error {
 	return util.DecodeWithCommonError(response, "UpdateIndex")
 }
 
-//DatabaseCollectionAdd 新增集合
+// DatabaseCollectionAdd 新增集合
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionAdd.html
 func (tcb *Tcb) DatabaseCollectionAdd(env, collectionName string) error {
 	accessToken, err := tcb.GetAccessToken()
@@ -278,7 +282,8 @@ func (tcb *Tcb) DatabaseCollectionAdd(env, collectionName string) error {
 	return util.DecodeWithCommonError(response, "DatabaseCollectionAdd")
 }
 
-//DatabaseCollectionDelete 删除集合
+// DatabaseCollectionDelete 删除集合
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionDelete.html
 func (tcb *Tcb) DatabaseCollectionDelete(env, collectionName string) error {
 	accessToken, err := tcb.GetAccessToken()
@@ -296,7 +301,8 @@ func (tcb *Tcb) DatabaseCollectionDelete(env, collectionName string) error {
 	return util.DecodeWithCommonError(response, "DatabaseCollectionDelete")
 }
 
-//DatabaseCollectionGet 获取特定云环境下集合信息
+// DatabaseCollectionGet 获取特定云环境下集合信息
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionGet.html
 func (tcb *Tcb) DatabaseCollectionGet(env string, limit, offset int64) (*DatabaseCollectionGetRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -317,7 +323,8 @@ func (tcb *Tcb) DatabaseCollectionGet(env string, limit, offset int64) (*Databas
 	return databaseCollectionGetRes, err
 }
 
-//DatabaseAdd 数据库插入记录
+// DatabaseAdd 数据库插入记录
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseAdd.html
 func (tcb *Tcb) DatabaseAdd(env, query string) (*DatabaseAddRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -337,7 +344,8 @@ func (tcb *Tcb) DatabaseAdd(env, query string) (*DatabaseAddRes, error) {
 	return databaseAddRes, err
 }
 
-//DatabaseDelete 数据库插入记录
+// DatabaseDelete 数据库插入记录
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseDelete.html
 func (tcb *Tcb) DatabaseDelete(env, query string) (*DatabaseDeleteRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -357,7 +365,8 @@ func (tcb *Tcb) DatabaseDelete(env, query string) (*DatabaseDeleteRes, error) {
 	return databaseDeleteRes, err
 }
 
-//DatabaseUpdate 数据库插入记录
+// DatabaseUpdate 数据库插入记录
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseUpdate.html
 func (tcb *Tcb) DatabaseUpdate(env, query string) (*DatabaseUpdateRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -377,7 +386,8 @@ func (tcb *Tcb) DatabaseUpdate(env, query string) (*DatabaseUpdateRes, error) {
 	return databaseUpdateRes, err
 }
 
-//DatabaseQuery 数据库查询记录
+// DatabaseQuery 数据库查询记录
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseQuery.html
 func (tcb *Tcb) DatabaseQuery(env, query string) (*DatabaseQueryRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -397,7 +407,8 @@ func (tcb *Tcb) DatabaseQuery(env, query string) (*DatabaseQueryRes, error) {
 	return databaseQueryRes, err
 }
 
-//DatabaseCount 统计集合记录数或统计查询语句对应的结果记录数
+// DatabaseCount 统计集合记录数或统计查询语句对应的结果记录数
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCount.html
 func (tcb *Tcb) DatabaseCount(env, query string) (*DatabaseCountRes, error) {
 	accessToken, err := tcb.GetAccessToken()

miniprogram/tcb/file.go

@@ -3,64 +3,64 @@ package tcb
 import (
 	"fmt"
 
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (
-	//获取文件上传链接
+	// 获取文件上传链接
 	uploadFilePathURL = "https://api.weixin.qq.com/tcb/uploadfile"
-	//获取文件下载链接
+	// 获取文件下载链接
 	batchDownloadFileURL = "https://api.weixin.qq.com/tcb/batchdownloadfile"
-	//删除文件链接
+	// 删除文件链接
 	batchDeleteFileURL = "https://api.weixin.qq.com/tcb/batchdeletefile"
 )
 
-//UploadFileReq 上传文件请求值
+// UploadFileReq 上传文件请求值
 type UploadFileReq struct {
 	Env  string `json:"env,omitempty"`
 	Path string `json:"path,omitempty"`
 }
 
-//UploadFileRes 上传文件返回结果
+// UploadFileRes 上传文件返回结果
 type UploadFileRes struct {
 	util.CommonError
-	URL           string `json:"url"`           //上传url
-	Token         string `json:"token"`         //token
-	Authorization string `json:"authorization"` //authorization
-	FileID        string `json:"file_id"`       //文件ID
-	CosFileID     string `json:"cos_file_id"`   //cos文件ID
+	URL           string `json:"url"`           // 上传url
+	Token         string `json:"token"`         // token
+	Authorization string `json:"authorization"` // authorization
+	FileID        string `json:"file_id"`       // 文件ID
+	CosFileID     string `json:"cos_file_id"`   // cos文件ID
 }
 
-//BatchDownloadFileReq 上传文件请求值
+// BatchDownloadFileReq 上传文件请求值
 type BatchDownloadFileReq struct {
 	Env      string          `json:"env,omitempty"`
 	FileList []*DownloadFile `json:"file_list,omitempty"`
 }
 
-//DownloadFile 文件信息
+// DownloadFile 文件信息
 type DownloadFile struct {
-	FileID string `json:"fileid"`  //文件ID
-	MaxAge int64  `json:"max_age"` //下载链接有效期
+	FileID string `json:"fileid"`  // 文件ID
+	MaxAge int64  `json:"max_age"` // 下载链接有效期
 }
 
-//BatchDownloadFileRes 上传文件返回结果
+// BatchDownloadFileRes 上传文件返回结果
 type BatchDownloadFileRes struct {
 	util.CommonError
 	FileList []struct {
-		FileID      string `json:"file_id"`      //文件ID
-		DownloadURL string `json:"download_url"` //下载链接
-		Status      int64  `json:"status"`       //状态码
-		ErrMsg      string `json:"errmsg"`       //该文件错误信息
+		FileID      string `json:"file_id"`      // 文件ID
+		DownloadURL string `json:"download_url"` // 下载链接
+		Status      int64  `json:"status"`       // 状态码
+		ErrMsg      string `json:"errmsg"`       // 该文件错误信息
 	} `json:"file_list"`
 }
 
-//BatchDeleteFileReq 批量删除文件请求参数
+// BatchDeleteFileReq 批量删除文件请求参数
 type BatchDeleteFileReq struct {
 	Env        string   `json:"env,omitempty"`
 	FileIDList []string `json:"fileid_list,omitempty"`
 }
 
-//BatchDeleteFileRes 批量删除文件返回结果
+// BatchDeleteFileRes 批量删除文件返回结果
 type BatchDeleteFileRes struct {
 	util.CommonError
 	DeleteList []struct {
@@ -70,7 +70,8 @@ type BatchDeleteFileRes struct {
 	} `json:"delete_list"`
 }
 
-//UploadFile 上传文件
+// UploadFile 上传文件
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/storage/uploadFile.html
 func (tcb *Tcb) UploadFile(env, path string) (*UploadFileRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -91,7 +92,8 @@ func (tcb *Tcb) UploadFile(env, path string) (*UploadFileRes, error) {
 	return uploadFileRes, err
 }
 
-//BatchDownloadFile 获取文件下载链接
+// BatchDownloadFile 获取文件下载链接
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/storage/batchDownloadFile.html
 func (tcb *Tcb) BatchDownloadFile(env string, fileList []*DownloadFile) (*BatchDownloadFileRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -112,7 +114,8 @@ func (tcb *Tcb) BatchDownloadFile(env string, fileList []*DownloadFile) (*BatchD
 	return batchDownloadFileRes, err
 }
 
-//BatchDeleteFile 批量删除文件
+// BatchDeleteFile 批量删除文件
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/storage/batchDeleteFile.html
 func (tcb *Tcb) BatchDeleteFile(env string, fileIDList []string) (*BatchDeleteFileRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -130,5 +133,5 @@ func (tcb *Tcb) BatchDeleteFile(env string, fileIDList []string) (*BatchDeleteFi
 	}
 	batchDeleteFileRes := &BatchDeleteFileRes{}
 	err = util.DecodeWithError(response, batchDeleteFileRes, "BatchDeleteFile")
-	return batchDeleteFileRes, nil
+	return batchDeleteFileRes, err
 }

miniprogram/tcb/tcb.go

@@ -0,0 +1,15 @@
+package tcb
+
+import "github.com/silenceper/wechat/v2/miniprogram/context"
+
+// Tcb Tencent Cloud Base
+type Tcb struct {
+	*context.Context
+}
+
+// NewTcb new Tencent Cloud Base
+func NewTcb(context *context.Context) *Tcb {
+	return &Tcb{
+		context,
+	}
+}

miniprogram/urllink/query.go

@@ -0,0 +1,52 @@
+package urllink
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const queryURL = "https://api.weixin.qq.com/wxa/query_urllink"
+
+// ULQueryResult 返回的结果
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-link/urllink.query.html 返回值
+type ULQueryResult struct {
+	util.CommonError
+
+	URLLinkInfo struct {
+		Appid      string `json:"appid"`
+		Path       string `json:"path"`
+		Query      string `json:"query"`
+		CreateTime int64  `json:"create_time"`
+		ExpireTime int64  `json:"expire_time"`
+		EnvVersion string `json:"env_version"`
+		CloudBase  struct {
+			Env           string `json:"env"`
+			Domain        string `json:"domain"`
+			Path          string `json:"path"`
+			Query         string `json:"query"`
+			ResourceAppid string `json:"resource_appid"`
+		} `json:"cloud_base"`
+	} `json:"url_link_info"`
+	VisitOpenid string `json:"visit_openid"`
+}
+
+// Query 查询小程序 url_link 配置。
+func (u *URLLink) Query(urlLink string) (*ULQueryResult, error) {
+	accessToken, err := u.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", queryURL, accessToken)
+	response, err := util.PostJSON(uri, map[string]string{"url_link": urlLink})
+	if err != nil {
+		return nil, err
+	}
+	var resp ULQueryResult
+	err = util.DecodeWithError(response, &resp, "URLLink.Query")
+	if err != nil {
+		return nil, err
+	}
+	return &resp, nil
+}

miniprogram/urllink/urllink.go

@@ -0,0 +1,72 @@
+package urllink
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// URLLink 小程序 URL Link
+type URLLink struct {
+	*context.Context
+}
+
+// NewURLLink 实例化
+func NewURLLink(ctx *context.Context) *URLLink {
+	return &URLLink{Context: ctx}
+}
+
+const generateURL = "https://api.weixin.qq.com/wxa/generate_urllink"
+
+// TExpireType 失效类型 (指定时间戳/指定间隔)
+type TExpireType int
+
+const (
+	// ExpireTypeTime 指定时间戳后失效
+	ExpireTypeTime TExpireType = 0
+
+	// ExpireTypeInterval 间隔指定天数后失效
+	ExpireTypeInterval TExpireType = 1
+)
+
+// ULParams 请求参数
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-link/urllink.generate.html#请求参数
+type ULParams struct {
+	Path  string `json:"path"`
+	Query string `json:"query"`
+	// envVersion 要打开的小程序版本。正式版为 "release"，体验版为 "trial"，开发版为 "develop"
+	EnvVersion     string      `json:"env_version,omitempty"`
+	IsExpire       bool        `json:"is_expire"`
+	ExpireType     TExpireType `json:"expire_type"`
+	ExpireTime     int64       `json:"expire_time"`
+	ExpireInterval int         `json:"expire_interval"`
+}
+
+// ULResult 返回的结果
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-link/urllink.generate.html#返回值
+type ULResult struct {
+	util.CommonError
+
+	URLLink string `json:"url_link"`
+}
+
+// Generate 生成url link
+func (u *URLLink) Generate(params *ULParams) (string, error) {
+	accessToken, err := u.GetAccessToken()
+	if err != nil {
+		return "", err
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", generateURL, accessToken)
+	response, err := util.PostJSON(uri, params)
+	if err != nil {
+		return "", err
+	}
+	var resp ULResult
+	err = util.DecodeWithError(response, &resp, "URLLink.Generate")
+	if err != nil {
+		return "", err
+	}
+	return resp.URLLink, nil
+}

miniprogram/urlscheme/query.go

@@ -0,0 +1,70 @@
+package urlscheme
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	querySchemeURL = "https://api.weixin.qq.com/wxa/queryscheme?access_token=%s"
+)
+
+// QueryScheme 获取小程序访问scheme
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
+type QueryScheme struct {
+	// 小程序 scheme 码
+	Scheme string `json:"scheme"`
+}
+
+// SchemeInfo scheme 配置
+type SchemeInfo struct {
+	// 小程序 appid。
+	AppID string `json:"appid"`
+	// 小程序页面路径。
+	Path string `json:"path"`
+	// 小程序页面query。
+	Query string `json:"query"`
+	// 创建时间，为 Unix 时间戳。
+	CreateTime int64 `json:"create_time"`
+	// 到期失效时间，为 Unix 时间戳，0 表示永久生效
+	ExpireTime int64 `json:"expire_time"`
+	// 要打开的小程序版本。正式版为"release"，体验版为"trial"，开发版为"develop"。
+	EnvVersion EnvVersion `json:"env_version"`
+}
+
+// resQueryScheme 返回结构体
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
+type resQueryScheme struct {
+	// 通用错误
+	*util.CommonError
+	// scheme 配置
+	SchemeInfo SchemeInfo `json:"scheme_info"`
+	// 访问该链接的openid，没有用户访问过则为空字符串
+	VisitOpenid string `json:"visit_openid"`
+}
+
+// QueryScheme 查询小程序 scheme 码
+func (u *URLScheme) QueryScheme(querySchemeParams QueryScheme) (schemeInfo SchemeInfo, visitOpenid string, err error) {
+	var accessToken string
+	accessToken, err = u.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	urlStr := fmt.Sprintf(querySchemeURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(urlStr, querySchemeParams)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	var res resQueryScheme
+	err = util.DecodeWithError(response, &res, "QueryScheme")
+	if err != nil {
+		return
+	}
+
+	return res.SchemeInfo, res.VisitOpenid, nil
+}

miniprogram/urlscheme/urlscheme.go

@@ -0,0 +1,85 @@
+package urlscheme
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// URLScheme 小程序 URL Scheme
+type URLScheme struct {
+	*context.Context
+}
+
+// NewURLScheme 实例化
+func NewURLScheme(ctx *context.Context) *URLScheme {
+	return &URLScheme{Context: ctx}
+}
+
+const generateURL = "https://api.weixin.qq.com/wxa/generatescheme"
+
+// TExpireType 失效类型 (指定时间戳/指定间隔)
+type TExpireType int
+
+// EnvVersion 要打开的小程序版本
+type EnvVersion string
+
+const (
+	// ExpireTypeTime 指定时间戳后失效
+	ExpireTypeTime TExpireType = 0
+	// ExpireTypeInterval 间隔指定天数后失效
+	ExpireTypeInterval TExpireType = 1
+
+	// EnvVersionRelease 正式版为"release"
+	EnvVersionRelease EnvVersion = "release"
+	// EnvVersionTrial 体验版为"trial"
+	EnvVersionTrial EnvVersion = "trial"
+	// EnvVersionDevelop 开发版为"develop"
+	EnvVersionDevelop EnvVersion = "develop"
+)
+
+// JumpWxa 跳转到的目标小程序信息
+type JumpWxa struct {
+	Path  string `json:"path"`
+	Query string `json:"query"`
+	// envVersion 要打开的小程序版本。正式版为 "release"，体验版为 "trial"，开发版为 "develop"
+	EnvVersion EnvVersion `json:"env_version,omitempty"`
+}
+
+// USParams 请求参数
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.generate.html#请求参数
+type USParams struct {
+	JumpWxa        *JumpWxa    `json:"jump_wxa"`
+	ExpireType     TExpireType `json:"expire_type"`
+	ExpireTime     int64       `json:"expire_time"`
+	ExpireInterval int         `json:"expire_interval"`
+}
+
+// USResult 返回的结果
+// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.generate.html#返回值
+type USResult struct {
+	util.CommonError
+
+	OpenLink string `json:"openlink"`
+}
+
+// Generate 生成url link
+func (u *URLScheme) Generate(params *USParams) (string, error) {
+	accessToken, err := u.GetAccessToken()
+	if err != nil {
+		return "", err
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", generateURL, accessToken)
+	response, err := util.PostJSON(uri, params)
+	if err != nil {
+		return "", err
+	}
+	var resp USResult
+	err = util.DecodeWithError(response, &resp, "URLScheme.Generate")
+	if err != nil {
+		return "", err
+	}
+	return resp.OpenLink, nil
+}

miniprogram/werun/werun.go

@@ -0,0 +1,40 @@
+package werun
+
+import (
+	"encoding/json"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/miniprogram/encryptor"
+)
+
+// WeRun 微信运动
+type WeRun struct {
+	*context.Context
+}
+
+// Data 微信运动数据
+type Data struct {
+	StepInfoList []struct {
+		Timestamp int `json:"timestamp"`
+		Step      int `json:"step"`
+	} `json:"stepInfoList"`
+}
+
+// NewWeRun 实例化
+func NewWeRun(ctx *context.Context) *WeRun {
+	return &WeRun{Context: ctx}
+}
+
+// GetWeRunData 解密数据
+func (werun *WeRun) GetWeRunData(sessionKey, encryptedData, iv string) (*Data, error) {
+	cipherText, err := encryptor.GetCipherText(sessionKey, encryptedData, iv)
+	if err != nil {
+		return nil, err
+	}
+	var weRunData Data
+	err = json.Unmarshal(cipherText, &weRunData)
+	if err != nil {
+		return nil, err
+	}
+	return &weRunData, nil
+}

oauth/qy_oauth.go

@@ -1,95 +0,0 @@
-package oauth
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-
-	"github.com/silenceper/wechat/util"
-)
-
-var (
-	qyRedirectOauthURL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&agentid=%s&state=%s#wechat_redirect"
-	qyUserInfoURL      = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?access_token=%s&code=%s"
-	qyUserDetailURL    = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserdetail"
-)
-
-//GetQyRedirectURL 获取企业微信跳转的url地址
-func (oauth *Oauth) GetQyRedirectURL(redirectURI, agentid, scope, state string) (string, error) {
-	//url encode
-	urlStr := url.QueryEscape(redirectURI)
-	return fmt.Sprintf(qyRedirectOauthURL, oauth.AppID, urlStr, scope, agentid, state), nil
-}
-
-//QyUserInfo 用户授权获取到用户信息
-type QyUserInfo struct {
-	util.CommonError
-
-	UserID     string `json:"UserId"`
-	DeviceID   string `json:"DeviceId"`
-	UserTicket string `json:"user_ticket"`
-	ExpiresIn  int64  `json:"expires_in"`
-}
-
-//GetQyUserInfoByCode 根据code获取企业user_info
-func (oauth *Oauth) GetQyUserInfoByCode(code string) (result QyUserInfo, err error) {
-	qyAccessToken, e := oauth.GetQyAccessToken()
-	if e != nil {
-		err = e
-		return
-	}
-	urlStr := fmt.Sprintf(qyUserInfoURL, qyAccessToken, code)
-	var response []byte
-	response, err = util.HTTPGet(urlStr)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("GetQyUserInfoByCode error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-	return
-}
-
-//QyUserDetail 到用户详情
-type QyUserDetail struct {
-	util.CommonError
-
-	UserID string `json:"UserId"`
-	Name   string `json:"name"`
-	Mobile string `json:"mobile"`
-	Gender string `json:"gender"`
-	Email  string `json:"email"`
-	Avatar string `json:"avatar"`
-	QrCode string `json:"qr_code"`
-}
-
-//GetQyUserDetailUserTicket 根据user_ticket获取到用户详情
-func (oauth *Oauth) GetQyUserDetailUserTicket(userTicket string) (result QyUserDetail, err error) {
-	var qyAccessToken string
-	qyAccessToken, err = oauth.GetQyAccessToken()
-	if err != nil {
-		return
-	}
-	uri := fmt.Sprintf("%s?access_token=%s", qyUserDetailURL, qyAccessToken)
-	var response []byte
-	response, err = util.PostJSON(uri, map[string]string{
-		"user_ticket": userTicket,
-	})
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(response, &result)
-	if err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("GetQyUserDetailUserTicket Error , errcode=%d , errmsg=%s", result.ErrCode, result.ErrMsg)
-		return
-	}
-	return
-}

officialaccount/README.md

@@ -0,0 +1,5 @@
+# 微信公众号
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Getting_Started/Overview.html)
+
+## 快速入门

officialaccount/basic/basic.go

@@ -0,0 +1,84 @@
+package basic
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+var (
+	// 获取微信服务器IP地址
+	// 文档：https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Get_the_WeChat_server_IP_address.html
+	getCallbackIPURL  = "https://api.weixin.qq.com/cgi-bin/getcallbackip"
+	getAPIDomainIPURL = "https://api.weixin.qq.com/cgi-bin/get_api_domain_ip"
+
+	// 清理接口调用次数
+	clearQuotaURL = "https://api.weixin.qq.com/cgi-bin/clear_quota"
+)
+
+// Basic struct
+type Basic struct {
+	*context.Context
+}
+
+// NewBasic 实例
+func NewBasic(context *context.Context) *Basic {
+	basic := new(Basic)
+	basic.Context = context
+	return basic
+}
+
+// IPListRes 获取微信服务器IP地址 返回结果
+type IPListRes struct {
+	util.CommonError
+	IPList []string `json:"ip_list"`
+}
+
+// GetCallbackIP 获取微信callback IP地址
+func (basic *Basic) GetCallbackIP() ([]string, error) {
+	ak, err := basic.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", getCallbackIPURL, ak)
+	data, err := util.HTTPGet(url)
+	if err != nil {
+		return nil, err
+	}
+	ipListRes := &IPListRes{}
+	err = util.DecodeWithError(data, ipListRes, "GetCallbackIP")
+	return ipListRes.IPList, err
+}
+
+// GetAPIDomainIP 获取微信API接口 IP地址
+func (basic *Basic) GetAPIDomainIP() ([]string, error) {
+	ak, err := basic.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", getAPIDomainIPURL, ak)
+	data, err := util.HTTPGet(url)
+	if err != nil {
+		return nil, err
+	}
+	ipListRes := &IPListRes{}
+	err = util.DecodeWithError(data, ipListRes, "GetAPIDomainIP")
+	return ipListRes.IPList, err
+}
+
+// ClearQuota 清理接口调用次数
+func (basic *Basic) ClearQuota() error {
+	ak, err := basic.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", clearQuotaURL, ak)
+	data, err := util.PostJSON(url, map[string]string{
+		"appid": basic.AppID,
+	})
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(data, "ClearQuota")
+}

officialaccount/basic/qr.go

@@ -1,4 +1,4 @@
-package qr
+package basic
 
 import (
 	"encoding/json"
@@ -6,8 +6,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/silenceper/wechat/context"
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (
@@ -23,18 +22,6 @@ const (
 	actionLimitStr = "QR_LIMIT_STR_SCENE"
 )
 
-// QR 二维码
-type QR struct {
-	*context.Context
-}
-
-//NewQR 二维码实例
-func NewQR(context *context.Context) *QR {
-	q := new(QR)
-	q.Context = context
-	return q
-}
-
 // Request 临时二维码
 type Request struct {
 	ExpireSeconds int64  `json:"expire_seconds,omitempty"`
@@ -56,8 +43,8 @@ type Ticket struct {
 }
 
 // GetQRTicket 获取二维码 Ticket
-func (q *QR) GetQRTicket(tq *Request) (t *Ticket, err error) {
-	accessToken, err := q.GetAccessToken()
+func (basic *Basic) GetQRTicket(tq *Request) (t *Ticket, err error) {
+	accessToken, err := basic.GetAccessToken()
 	if err != nil {
 		return
 	}
@@ -75,6 +62,11 @@ func (q *QR) GetQRTicket(tq *Request) (t *Ticket, err error) {
 		return
 	}
 
+	if t.ErrMsg != "" {
+		err = fmt.Errorf("get qr_ticket error : errcode=%v , errormsg=%v", t.ErrCode, t.ErrMsg)
+		return
+	}
+
 	return
 }
 

officialaccount/basic/short_url.go

@@ -0,0 +1,52 @@
+package basic
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// 将一条长链接转成短链接
+	// https://developers.weixin.qq.com/doc/offiaccount/Account_Management/URL_Shortener.html
+	long2shortURL    = "https://api.weixin.qq.com/cgi-bin/shorturl?access_token=%s"
+	long2shortAction = "long2short"
+)
+
+type (
+	reqLong2ShortURL struct {
+		Action  string `json:"action"`
+		LongURL string `json:"long_url"`
+	}
+	resplong2ShortURL struct {
+		ShortURL string `json:"short_url"`
+		util.CommonError
+	}
+)
+
+// Long2ShortURL 将一条长链接转成短链接
+func (basic *Basic) Long2ShortURL(longURL string) (shortURL string, err error) {
+	var (
+		req = &reqLong2ShortURL{
+			Action:  long2shortAction,
+			LongURL: longURL,
+		}
+		resp          = new(resplong2ShortURL)
+		ac, uri       string
+		responseBytes []byte
+	)
+	ac, err = basic.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri = fmt.Sprintf(long2shortURL, ac)
+	responseBytes, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+	if err = util.DecodeWithError(responseBytes, resp, long2shortAction); err != nil {
+		return
+	}
+	shortURL = resp.ShortURL
+	return
+}

officialaccount/broadcast/broadcast.go

@@ -0,0 +1,356 @@
+package broadcast
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	sendURLByTag      = "https://api.weixin.qq.com/cgi-bin/message/mass/sendall"
+	sendURLByOpenID   = "https://api.weixin.qq.com/cgi-bin/message/mass/send"
+	deleteSendURL     = "https://api.weixin.qq.com/cgi-bin/message/mass/delete"
+	previewSendURL    = "https://api.weixin.qq.com/cgi-bin/message/mass/preview"
+	massStatusSendURL = "https://api.weixin.qq.com/cgi-bin/message/mass/get"
+	getSpeedSendURL   = "https://api.weixin.qq.com/cgi-bin/message/mass/speed/get"
+	setSpeedSendURL   = "https://api.weixin.qq.com/cgi-bin/message/mass/speed/set"
+)
+
+// MsgType 发送消息类型
+type MsgType string
+
+const (
+	// MsgTypeNews 图文消息
+	MsgTypeNews MsgType = "mpnews"
+	// MsgTypeText 文本
+	MsgTypeText MsgType = "text"
+	// MsgTypeVoice 语音/音频
+	MsgTypeVoice MsgType = "voice"
+	// MsgTypeImage 图片
+	MsgTypeImage MsgType = "image"
+	// MsgTypeVideo 视频
+	MsgTypeVideo MsgType = "mpvideo"
+	// MsgTypeWxCard 卡券
+	MsgTypeWxCard MsgType = "wxcard"
+)
+
+// Broadcast 群发消息
+type Broadcast struct {
+	*context.Context
+	preview bool
+}
+
+// NewBroadcast new
+func NewBroadcast(ctx *context.Context) *Broadcast {
+	return &Broadcast{ctx, false}
+}
+
+// User 发送的用户
+type User struct {
+	TagID  int64
+	OpenID []string
+}
+
+// Result 群发返回结果
+type Result struct {
+	util.CommonError
+	MsgID     int64  `json:"msg_id"`
+	MsgDataID int64  `json:"msg_data_id"`
+	MsgStatus string `json:"msg_status"`
+}
+
+// SpeedResult 群发速度返回结果
+type SpeedResult struct {
+	util.CommonError
+	Speed     int64 `json:"speed"`
+	RealSpeed int64 `json:"realspeed"`
+}
+
+// sendRequest 发送请求的数据
+type sendRequest struct {
+	// 根据tag获全部发送
+	Filter map[string]interface{} `json:"filter,omitempty"`
+	// 根据OpenID发送
+	ToUser interface{} `json:"touser,omitempty"`
+	// 发送文本
+	Text map[string]interface{} `json:"text,omitempty"`
+	// 发送图文消息
+	Mpnews map[string]interface{} `json:"mpnews,omitempty"`
+	// 发送语音
+	Voice map[string]interface{} `json:"voice,omitempty"`
+	// 发送图片
+	Images *Image `json:"images,omitempty"`
+	// 发送卡券
+	WxCard            map[string]interface{} `json:"wxcard,omitempty"`
+	MsgType           MsgType                `json:"msgtype"`
+	SendIgnoreReprint int32                  `json:"send_ignore_reprint,omitempty"`
+}
+
+// Image 发送图片
+type Image struct {
+	MediaIDs           []string `json:"media_ids"`
+	Recommend          string   `json:"recommend"`
+	NeedOpenComment    int32    `json:"need_open_comment"`
+	OnlyFansCanComment int32    `json:"only_fans_can_comment"`
+}
+
+// SendText 群发文本
+// user 为nil，表示全员发送
+// &User{TagID:2} 根据tag发送
+// &User{OpenID:[]string("xxx","xxx")} 根据openid发送
+func (broadcast *Broadcast) SendText(user *User, content string) (*Result, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := &sendRequest{
+		ToUser:  nil,
+		MsgType: MsgTypeText,
+	}
+	req.Text = map[string]interface{}{
+		"content": content,
+	}
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
+	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &Result{}
+	err = util.DecodeWithError(data, res, "SendText")
+	return res, err
+}
+
+// SendNews 发送图文
+func (broadcast *Broadcast) SendNews(user *User, mediaID string, ignoreReprint bool) (*Result, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := &sendRequest{
+		ToUser:  nil,
+		MsgType: MsgTypeNews,
+	}
+	if ignoreReprint {
+		req.SendIgnoreReprint = 1
+	}
+	req.Mpnews = map[string]interface{}{
+		"media_id": mediaID,
+	}
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
+	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &Result{}
+	err = util.DecodeWithError(data, res, "SendNews")
+	return res, err
+}
+
+// SendVoice 发送语音
+func (broadcast *Broadcast) SendVoice(user *User, mediaID string) (*Result, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := &sendRequest{
+		ToUser:  nil,
+		MsgType: MsgTypeVoice,
+	}
+	req.Voice = map[string]interface{}{
+		"media_id": mediaID,
+	}
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
+	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &Result{}
+	err = util.DecodeWithError(data, res, "SendVoice")
+	return res, err
+}
+
+// SendImage 发送图片
+func (broadcast *Broadcast) SendImage(user *User, images *Image) (*Result, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := &sendRequest{
+		ToUser:  nil,
+		MsgType: MsgTypeImage,
+	}
+	req.Images = images
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
+	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &Result{}
+	err = util.DecodeWithError(data, res, "SendImage")
+	return res, err
+}
+
+// SendVideo 发送视频
+func (broadcast *Broadcast) SendVideo(user *User, mediaID string, title, description string) (*Result, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := &sendRequest{
+		ToUser:  nil,
+		MsgType: MsgTypeVideo,
+	}
+	req.Voice = map[string]interface{}{
+		"media_id":    mediaID,
+		"title":       title,
+		"description": description,
+	}
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
+	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &Result{}
+	err = util.DecodeWithError(data, res, "SendVideo")
+	return res, err
+}
+
+// SendWxCard 发送卡券
+func (broadcast *Broadcast) SendWxCard(user *User, cardID string) (*Result, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := &sendRequest{
+		ToUser:  nil,
+		MsgType: MsgTypeWxCard,
+	}
+	req.WxCard = map[string]interface{}{
+		"card_id": cardID,
+	}
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
+	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &Result{}
+	err = util.DecodeWithError(data, res, "SendWxCard")
+	return res, err
+}
+
+// Delete 删除群发消息
+func (broadcast *Broadcast) Delete(msgID int64, articleIDx int64) error {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	req := map[string]interface{}{
+		"msg_id":      msgID,
+		"article_idx": articleIDx,
+	}
+	url := fmt.Sprintf("%s?access_token=%s", deleteSendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(data, "Delete")
+}
+
+// Preview 预览
+func (broadcast *Broadcast) Preview() *Broadcast {
+	broadcast.preview = true
+	return broadcast
+}
+
+// GetMassStatus 获取群发状态
+func (broadcast *Broadcast) GetMassStatus(msgID string) (*Result, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := map[string]interface{}{
+		"msg_id": msgID,
+	}
+	url := fmt.Sprintf("%s?access_token=%s", massStatusSendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &Result{}
+	err = util.DecodeWithError(data, res, "GetMassStatus")
+	return res, err
+}
+
+// GetSpeed 获取群发速度
+func (broadcast *Broadcast) GetSpeed() (*SpeedResult, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := map[string]interface{}{}
+	url := fmt.Sprintf("%s?access_token=%s", getSpeedSendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &SpeedResult{}
+	err = util.DecodeWithError(data, res, "GetSpeed")
+	return res, err
+}
+
+// SetSpeed 设置群发速度
+func (broadcast *Broadcast) SetSpeed(speed int) (*SpeedResult, error) {
+	ak, err := broadcast.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	req := map[string]interface{}{
+		"speed": speed,
+	}
+	url := fmt.Sprintf("%s?access_token=%s", setSpeedSendURL, ak)
+	data, err := util.PostJSON(url, req)
+	if err != nil {
+		return nil, err
+	}
+	res := &SpeedResult{}
+	err = util.DecodeWithError(data, res, "SetSpeed")
+	return res, err
+}
+
+func (broadcast *Broadcast) chooseTagOrOpenID(user *User, req *sendRequest) (ret *sendRequest, url string) {
+	sendURL := ""
+	if user == nil {
+		req.Filter = map[string]interface{}{
+			"is_to_all": true,
+		}
+		sendURL = sendURLByTag
+	} else {
+		if broadcast.preview {
+			// 预览 默认发给第一个用户
+			if len(user.OpenID) != 0 {
+				req.ToUser = user.OpenID[0]
+				sendURL = previewSendURL
+			}
+		} else {
+			if user.TagID != 0 {
+				req.Filter = map[string]interface{}{
+					"is_to_all": false,
+					"tag_id":    user.TagID,
+				}
+				sendURL = sendURLByTag
+			}
+			if len(user.OpenID) != 0 {
+				req.ToUser = user.OpenID
+				sendURL = sendURLByOpenID
+			}
+		}
+	}
+	return req, sendURL
+}

officialaccount/config/config.go

@@ -0,0 +1,14 @@
+package config
+
+import (
+	"github.com/silenceper/wechat/v2/cache"
+)
+
+// Config .config for 微信公众号
+type Config struct {
+	AppID          string `json:"app_id"`           // appid
+	AppSecret      string `json:"app_secret"`       // appsecret
+	Token          string `json:"token"`            // token
+	EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
+	Cache          cache.Cache
+}

officialaccount/context/context.go

@@ -0,0 +1,12 @@
+package context
+
+import (
+	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/officialaccount/config"
+)
+
+// Context struct
+type Context struct {
+	*config.Config
+	credential.AccessTokenHandle
+}

officialaccount/customerservice/manager.go

@@ -0,0 +1,253 @@
+package customerservice
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// TypingStatus 输入状态类型
+type TypingStatus string
+
+const (
+	customerServiceListURL       = "https://api.weixin.qq.com/cgi-bin/customservice/getkflist"
+	customerServiceOnlineListURL = "https://api.weixin.qq.com/cgi-bin/customservice/getonlinekflist"
+	customerServiceAddURL        = "https://api.weixin.qq.com/customservice/kfaccount/add"
+	customerServiceUpdateURL     = "https://api.weixin.qq.com/customservice/kfaccount/update"
+	customerServiceDeleteURL     = "https://api.weixin.qq.com/customservice/kfaccount/del"
+	customerServiceInviteURL     = "https://api.weixin.qq.com/customservice/kfaccount/inviteworker"
+	customerServiceUploadHeadImg = "https://api.weixin.qq.com/customservice/kfaccount/uploadheadimg"
+	customerServiceTypingURL     = "https://api.weixin.qq.com/cgi-bin/message/custom/typing"
+)
+
+const (
+	// Typing 表示正在输入状态
+	Typing TypingStatus = "Typing"
+	// CancelTyping 表示取消正在输入状态
+	CancelTyping TypingStatus = "CancelTyping"
+)
+
+// Manager 客服管理者，可以管理客服
+type Manager struct {
+	*context.Context
+}
+
+// NewCustomerServiceManager 实例化客服管理
+func NewCustomerServiceManager(ctx *context.Context) *Manager {
+	csm := new(Manager)
+	csm.Context = ctx
+	return csm
+}
+
+// KeFuInfo 客服基本信息
+type KeFuInfo struct {
+	KfAccount     string `json:"kf_account"`         // 完整客服帐号，格式为：帐号前缀@公众号微信号
+	KfNick        string `json:"kf_nick"`            // 客服昵称
+	KfID          int    `json:"kf_id"`              // 客服编号
+	KfHeadImgURL  string `json:"kf_headimgurl"`      // 客服头像
+	KfWX          string `json:"kf_wx"`              // 如果客服帐号已绑定了客服人员微信号， 则此处显示微信号
+	InviteWX      string `json:"invite_wx"`          // 如果客服帐号尚未绑定微信号，但是已经发起了一个绑定邀请， 则此处显示绑定邀请的微信号
+	InviteExpTime int    `json:"invite_expire_time"` // 如果客服帐号尚未绑定微信号，但是已经发起过一个绑定邀请， 邀请的过期时间，为unix 时间戳
+	InviteStatus  string `json:"invite_status"`      // 邀请的状态，有等待确认“waiting”，被拒绝“rejected”， 过期“expired”
+}
+
+type resKeFuList struct {
+	util.CommonError
+	KfList []*KeFuInfo `json:"kf_list"`
+}
+
+// List 获取所有客服基本信息
+func (csm *Manager) List() (customerServiceList []*KeFuInfo, err error) {
+	var accessToken string
+	accessToken, err = csm.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", customerServiceListURL, accessToken)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	var res resKeFuList
+	err = util.DecodeWithError(response, &res, "ListCustomerService")
+	if err != nil {
+		return
+	}
+	customerServiceList = res.KfList
+	return
+}
+
+// KeFuOnlineInfo 客服在线信息
+type KeFuOnlineInfo struct {
+	KfAccount    string `json:"kf_account"`
+	Status       int    `json:"status"`
+	KfID         int    `json:"kf_id"`
+	AcceptedCase int    `json:"accepted_case"`
+}
+
+type resKeFuOnlineList struct {
+	util.CommonError
+	KfOnlineList []*KeFuOnlineInfo `json:"kf_online_list"`
+}
+
+// OnlineList 获取在线客服列表
+func (csm *Manager) OnlineList() (customerServiceOnlineList []*KeFuOnlineInfo, err error) {
+	var accessToken string
+	accessToken, err = csm.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", customerServiceOnlineListURL, accessToken)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	var res resKeFuOnlineList
+	err = util.DecodeWithError(response, &res, "ListOnlineCustomerService")
+	if err != nil {
+		return
+	}
+	customerServiceOnlineList = res.KfOnlineList
+	return
+}
+
+// Add 添加客服账号
+func (csm *Manager) Add(kfAccount, nickName string) (err error) {
+	// kfAccount：完整客服帐号，格式为：帐号前缀@公众号微信号，帐号前缀最多10个字符，必须是英文、数字字符或者下划线，后缀为公众号微信号，长度不超过30个字符
+	// nickName：客服昵称，最长16个字
+	// 参数此处均不做校验
+	var accessToken string
+	accessToken, err = csm.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", customerServiceAddURL, accessToken)
+	data := struct {
+		KfAccount string `json:"kf_account"`
+		NickName  string `json:"nickname"`
+	}{
+		KfAccount: kfAccount,
+		NickName:  nickName,
+	}
+	var response []byte
+	response, err = util.PostJSON(uri, data)
+	if err != nil {
+		return
+	}
+	err = util.DecodeWithCommonError(response, "AddCustomerService")
+	return
+}
+
+// Update 修改客服账号
+func (csm *Manager) Update(kfAccount, nickName string) (err error) {
+	var accessToken string
+	accessToken, err = csm.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", customerServiceUpdateURL, accessToken)
+	data := struct {
+		KfAccount string `json:"kf_account"`
+		NickName  string `json:"nickname"`
+	}{
+		KfAccount: kfAccount,
+		NickName:  nickName,
+	}
+	var response []byte
+	response, err = util.PostJSON(uri, data)
+	if err != nil {
+		return
+	}
+	err = util.DecodeWithCommonError(response, "UpdateCustomerService")
+	return
+}
+
+// Delete 删除客服帐号
+func (csm *Manager) Delete(kfAccount string) (err error) {
+	var accessToken string
+	accessToken, err = csm.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", customerServiceDeleteURL, accessToken)
+	data := struct {
+		KfAccount string `json:"kf_account"`
+	}{
+		KfAccount: kfAccount,
+	}
+	var response []byte
+	response, err = util.PostJSON(uri, data)
+	if err != nil {
+		return
+	}
+	err = util.DecodeWithCommonError(response, "DeleteCustomerService")
+	return
+}
+
+// InviteBind 邀请绑定客服帐号和微信号
+func (csm *Manager) InviteBind(kfAccount, inviteWX string) (err error) {
+	var accessToken string
+	accessToken, err = csm.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", customerServiceInviteURL, accessToken)
+	data := struct {
+		KfAccount string `json:"kf_account"`
+		InviteWX  string `json:"invite_wx"`
+	}{
+		KfAccount: kfAccount,
+		InviteWX:  inviteWX,
+	}
+	var response []byte
+	response, err = util.PostJSON(uri, data)
+	if err != nil {
+		return
+	}
+	err = util.DecodeWithCommonError(response, "InviteBindCustomerService")
+	return
+}
+
+// UploadHeadImg 上传客服头像
+func (csm *Manager) UploadHeadImg(kfAccount, fileName string) (err error) {
+	var accessToken string
+	accessToken, err = csm.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s&kf_account=%s", customerServiceUploadHeadImg, accessToken, kfAccount)
+	var response []byte
+	response, err = util.PostFile("media", fileName, uri)
+	if err != nil {
+		return
+	}
+	err = util.DecodeWithCommonError(response, "UploadCustomerServiceHeadImg")
+	return
+}
+
+// SendTypingStatus 下发客服输入状态给用户
+func (csm *Manager) SendTypingStatus(openid string, cmd TypingStatus) (err error) {
+	var accessToken string
+	accessToken, err = csm.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", customerServiceTypingURL, accessToken)
+	data := struct {
+		ToUser  string `json:"touser"`
+		Command string `json:"command"`
+	}{
+		ToUser:  openid,
+		Command: string(cmd),
+	}
+	var response []byte
+	response, err = util.PostJSON(uri, data)
+	if err != nil {
+		return
+	}
+	err = util.DecodeWithCommonError(response, "SendTypingStatus")
+	return
+}

officialaccount/datacube/broadcast.go

@@ -0,0 +1,271 @@
+package datacube
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	getArticleSummary = "https://api.weixin.qq.com/datacube/getarticlesummary"
+	getArticleTotal   = "https://api.weixin.qq.com/datacube/getarticletotal"
+	getUserRead       = "https://api.weixin.qq.com/datacube/getuserread"
+	getUserReadHour   = "https://api.weixin.qq.com/datacube/getuserreadhour"
+	getUserShare      = "https://api.weixin.qq.com/datacube/getusershare"
+	getUserShareHour  = "https://api.weixin.qq.com/datacube/getusersharehour"
+)
+
+// ResArticleSummary 获取图文群发每日数据响应
+type ResArticleSummary struct {
+	util.CommonError
+
+	List []struct {
+		RefDate          string `json:"ref_date"`
+		MsgID            string `json:"msgid"`
+		Title            string `json:"title"`
+		IntPageReadUser  int    `json:"int_page_read_user"`
+		IntPageReadCount int    `json:"int_page_read_count"`
+		OriPageReadUser  int    `json:"ori_page_read_user"`
+		OriPageReadCount int    `json:"ori_page_read_count"`
+		ShareUser        int    `json:"share_user"`
+		ShareCount       int    `json:"share_count"`
+		AddToFavUser     int    `json:"add_to_fav_user"`
+		AddToFavCount    int    `json:"add_to_fav_count"`
+	} `json:"list"`
+}
+
+// ResArticleTotal 获取图文群发总数据响应
+type ResArticleTotal struct {
+	util.CommonError
+
+	List []struct {
+		RefDate string                `json:"ref_date"`
+		MsgID   string                `json:"msgid"`
+		Title   string                `json:"title"`
+		Details []ArticleTotalDetails `json:"details"`
+	} `json:"list"`
+}
+
+// ArticleTotalDetails 获取图文群发总数据响应文字详情
+type ArticleTotalDetails struct {
+	StatDate                    string `json:"stat_date"`
+	TargetUser                  int    `json:"target_user"`
+	IntPageReadUser             int    `json:"int_page_read_user"`
+	IntPageReadCount            int    `json:"int_page_read_count"`
+	OriPageReadUser             int    `json:"ori_page_read_user"`
+	OriPageReadCount            int    `json:"ori_page_read_count"`
+	ShareUser                   int    `json:"share_user"`
+	ShareCount                  int    `json:"share_count"`
+	AddToFavUser                int    `json:"add_to_fav_user"`
+	AddToFavCount               int    `json:"add_to_fav_count"`
+	IntPageFromSessionReadUser  int    `json:"int_page_from_session_read_user"`
+	IntPageFromSessionReadCount int    `json:"int_page_from_session_read_count"`
+	IntPageFromHistMsgReadUser  int    `json:"int_page_from_hist_msg_read_user"`
+	IntPageFromHistMsgReadCount int    `json:"int_page_from_hist_msg_read_count"`
+	IntPageFromFeedReadUser     int    `json:"int_page_from_feed_read_user"`
+	IntPageFromFeedReadCount    int    `json:"int_page_from_feed_read_count"`
+	IntPageFromFriendsReadUser  int    `json:"int_page_from_friends_read_user"`
+	IntPageFromFriendsReadCount int    `json:"int_page_from_friends_read_count"`
+	IntPageFromOtherReadUser    int    `json:"int_page_from_other_read_user"`
+	IntPageFromOtherReadCount   int    `json:"int_page_from_other_read_count"`
+	FeedShareFromSessionUser    int    `json:"feed_share_from_session_user"`
+	FeedShareFromSessionCnt     int    `json:"feed_share_from_session_cnt"`
+	FeedShareFromFeedUser       int    `json:"feed_share_from_feed_user"`
+	FeedShareFromFeedCnt        int    `json:"feed_share_from_feed_cnt"`
+	FeedShareFromOtherUser      int    `json:"feed_share_from_other_user"`
+	FeedShareFromOtherCnt       int    `json:"feed_share_from_other_cnt"`
+}
+
+// ResUserRead 获取图文统计数据响应
+type ResUserRead struct {
+	util.CommonError
+
+	List []struct {
+		RefDate          string `json:"ref_date"`
+		UserSource       int    `json:"user_source"`
+		IntPageReadUser  int    `json:"int_page_read_user"`
+		IntPageReadCount int    `json:"int_page_read_count"`
+		OriPageReadUser  int    `json:"ori_page_read_user"`
+		OriPageReadCount int    `json:"ori_page_read_count"`
+		ShareUser        int    `json:"share_user"`
+		ShareCount       int    `json:"share_count"`
+		AddToFavUser     int    `json:"add_to_fav_user"`
+		AddToFavCount    int    `json:"add_to_fav_count"`
+	} `json:"list"`
+}
+
+// ResUserReadHour 获取图文统计分时数据
+type ResUserReadHour struct {
+	util.CommonError
+
+	List []struct {
+		RefDate          string `json:"ref_date"`
+		RefHour          int    `json:"ref_hour"`
+		UserSource       int    `json:"user_source"`
+		IntPageReadUser  int    `json:"int_page_read_user"`
+		IntPageReadCount int    `json:"int_page_read_count"`
+		OriPageReadUser  int    `json:"ori_page_read_user"`
+		OriPageReadCount int    `json:"ori_page_read_count"`
+		ShareUser        int    `json:"share_user"`
+		ShareCount       int    `json:"share_count"`
+		AddToFavUser     int    `json:"add_to_fav_user"`
+		AddToFavCount    int    `json:"add_to_fav_count"`
+	} `json:"list"`
+}
+
+// ResUserShare 获取图文分享转发数据
+type ResUserShare struct {
+	util.CommonError
+
+	List []struct {
+		RefDate    string `json:"ref_date"`
+		ShareScene int    `json:"share_scene"`
+		ShareCount int    `json:"share_count"`
+		ShareUser  int    `json:"share_user"`
+	} `json:"list"`
+}
+
+// ResUserShareHour  获取图文分享转发分时数据
+type ResUserShareHour struct {
+	util.CommonError
+
+	List []struct {
+		RefDate    string `json:"ref_date"`
+		RefHour    int    `json:"ref_hour"`
+		ShareScene int    `json:"share_scene"`
+		ShareCount int    `json:"share_count"`
+		ShareUser  int    `json:"share_user"`
+	} `json:"list"`
+}
+
+// GetArticleSummary 获取图文群发每日数据
+func (cube *DataCube) GetArticleSummary(s string, e string) (resArticleSummary ResArticleSummary, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getArticleSummary, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resArticleSummary, "GetArticleSummary")
+	return
+}
+
+// GetArticleTotal 获取图文群发总数据
+func (cube *DataCube) GetArticleTotal(s string, e string) (resArticleTotal ResArticleTotal, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getArticleTotal, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resArticleTotal, "GetArticleTotal")
+	return
+}
+
+// GetUserRead 获取图文统计数据
+func (cube *DataCube) GetUserRead(s string, e string) (resUserRead ResUserRead, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUserRead, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUserRead, "GetUserRead")
+	return
+}
+
+// GetUserReadHour 获取图文统计分时数据
+func (cube *DataCube) GetUserReadHour(s string, e string) (resUserReadHour ResUserReadHour, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUserReadHour, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUserReadHour, "GetUserReadHour")
+	return
+}
+
+// GetUserShare 获取图文分享转发数据
+func (cube *DataCube) GetUserShare(s string, e string) (resUserShare ResUserShare, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUserShare, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUserShare, "GetUserShare")
+	return
+}
+
+// GetUserShareHour 获取图文分享转发分时数据
+func (cube *DataCube) GetUserShareHour(s string, e string) (resUserShareHour ResUserShareHour, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUserShareHour, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUserShareHour, "GetUserShareHour")
+	return
+}

officialaccount/datacube/datacube.go

@@ -0,0 +1,22 @@
+package datacube
+
+import (
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+)
+
+type reqDate struct {
+	BeginDate string `json:"begin_date"`
+	EndDate   string `json:"end_date"`
+}
+
+// DataCube 数据统计
+type DataCube struct {
+	*context.Context
+}
+
+// NewCube 数据统计
+func NewCube(context *context.Context) *DataCube {
+	dataCube := new(DataCube)
+	dataCube.Context = context
+	return dataCube
+}

officialaccount/datacube/interface.go

@@ -0,0 +1,83 @@
+package datacube
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	getInterfaceSummary     = "https://api.weixin.qq.com/datacube/getinterfacesummary"
+	getInterfaceSummaryHour = "https://api.weixin.qq.com/datacube/getinterfacesummaryhour"
+)
+
+// ResInterfaceSummary 接口分析数据响应
+type ResInterfaceSummary struct {
+	util.CommonError
+
+	List []struct {
+		RefDate       string `json:"ref_date"`
+		CallbackCount int    `json:"callback_count"`
+		FailCount     int    `json:"fail_count"`
+		TotalTimeCost int    `json:"total_time_cost"`
+		MaxTimeCost   int    `json:"max_time_cost"`
+	} `json:"list"`
+}
+
+// ResInterfaceSummaryHour 接口分析分时数据响应
+type ResInterfaceSummaryHour struct {
+	util.CommonError
+
+	List []struct {
+		RefDate       string `json:"ref_date"`
+		RefHour       int    `json:"ref_hour"`
+		CallbackCount int    `json:"callback_count"`
+		FailCount     int    `json:"fail_count"`
+		TotalTimeCost int    `json:"total_time_cost"`
+		MaxTimeCost   int    `json:"max_time_cost"`
+	} `json:"list"`
+}
+
+// GetInterfaceSummary 获取接口分析数据
+func (cube *DataCube) GetInterfaceSummary(s string, e string) (resInterfaceSummary ResInterfaceSummary, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getInterfaceSummary, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resInterfaceSummary, "GetInterfaceSummary")
+	return
+}
+
+// GetInterfaceSummaryHour 获取接口分析分时数据
+func (cube *DataCube) GetInterfaceSummaryHour(s string, e string) (resInterfaceSummaryHour ResInterfaceSummaryHour, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getInterfaceSummaryHour, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resInterfaceSummaryHour, "GetInterfaceSummaryHour")
+	return
+}

officialaccount/datacube/message.go

@@ -0,0 +1,253 @@
+package datacube
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	getUpstreamMsg          = "https://api.weixin.qq.com/datacube/getupstreammsg"
+	getUpstreamMsgHour      = "https://api.weixin.qq.com/datacube/getupstreammsghour"
+	getUpstreamMsgWeek      = "https://api.weixin.qq.com/datacube/getupstreammsgweek"
+	getUpstreamMsgMonth     = "https://api.weixin.qq.com/datacube/getupstreammsgmonth"
+	getUpstreamMsgDist      = "https://api.weixin.qq.com/datacube/getupstreammsgdist"
+	getUpstreamMsgDistWeek  = "https://api.weixin.qq.com/datacube/getupstreammsgdistweek"
+	getUpstreamMsgDistMonth = "https://api.weixin.qq.com/datacube/getupstreammsgdistmonth"
+)
+
+// ResUpstreamMsg 获取消息发送概况数据响应
+type ResUpstreamMsg struct {
+	util.CommonError
+
+	List []struct {
+		RefDate  string `json:"ref_date"`
+		MsgType  int    `json:"msg_type"`
+		MsgUser  int    `json:"msg_user"`
+		MsgCount int    `json:"msg_count"`
+	} `json:"list"`
+}
+
+// ResUpstreamMsgHour 获取消息分送分时数据响应
+type ResUpstreamMsgHour struct {
+	util.CommonError
+
+	List []struct {
+		RefDate  string `json:"ref_date"`
+		RefHour  int    `json:"ref_hour"`
+		MsgType  int    `json:"msg_type"`
+		MsgUser  int    `json:"msg_user"`
+		MsgCount int    `json:"msg_count"`
+	} `json:"list"`
+}
+
+// ResUpstreamMsgWeek 获取消息发送周数据响应
+type ResUpstreamMsgWeek struct {
+	util.CommonError
+
+	List []struct {
+		RefDate  string `json:"ref_date"`
+		MsgType  int    `json:"msg_type"`
+		MsgUser  int    `json:"msg_user"`
+		MsgCount int    `json:"msg_count"`
+	} `json:"list"`
+}
+
+// ResUpstreamMsgMonth 获取消息发送月数据响应
+type ResUpstreamMsgMonth struct {
+	util.CommonError
+
+	List []struct {
+		RefDate  string `json:"ref_date"`
+		MsgType  int    `json:"msg_type"`
+		MsgUser  int    `json:"msg_user"`
+		MsgCount int    `json:"msg_count"`
+	} `json:"list"`
+}
+
+// ResUpstreamMsgDist 获取消息发送分布数据响应
+type ResUpstreamMsgDist struct {
+	util.CommonError
+
+	List []struct {
+		RefDate       string `json:"ref_date"`
+		CountInterval int    `json:"count_interval"`
+		MsgUser       int    `json:"msg_user"`
+	} `json:"list"`
+}
+
+// ResUpstreamMsgDistWeek 获取消息发送分布周数据响应
+type ResUpstreamMsgDistWeek struct {
+	util.CommonError
+
+	List []struct {
+		RefDate       string `json:"ref_date"`
+		CountInterval int    `json:"count_interval"`
+		MsgUser       int    `json:"msg_user"`
+	} `json:"list"`
+}
+
+// ResUpstreamMsgDistMonth 获取消息发送分布月数据响应
+type ResUpstreamMsgDistMonth struct {
+	util.CommonError
+
+	List []struct {
+		RefDate       string `json:"ref_date"`
+		CountInterval int    `json:"count_interval"`
+		MsgUser       int    `json:"msg_user"`
+	} `json:"list"`
+}
+
+// GetUpstreamMsg 获取消息发送概况数据
+func (cube *DataCube) GetUpstreamMsg(s string, e string) (resUpstreamMsg ResUpstreamMsg, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUpstreamMsg, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUpstreamMsg, "GetUpstreamMsg")
+	return
+}
+
+// GetUpstreamMsgHour 获取消息分送分时数据
+func (cube *DataCube) GetUpstreamMsgHour(s string, e string) (resUpstreamMsgHour ResUpstreamMsgHour, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUpstreamMsgHour, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUpstreamMsgHour, "GetUpstreamMsgHour")
+	return
+}
+
+// GetUpstreamMsgWeek 获取消息发送周数据
+func (cube *DataCube) GetUpstreamMsgWeek(s string, e string) (resUpstreamMsgWeek ResUpstreamMsgWeek, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUpstreamMsgWeek, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUpstreamMsgWeek, "GetUpstreamMsgWeek")
+	return
+}
+
+// GetUpstreamMsgMonth 获取消息发送月数据
+func (cube *DataCube) GetUpstreamMsgMonth(s string, e string) (resUpstreamMsgMonth ResUpstreamMsgMonth, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUpstreamMsgMonth, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUpstreamMsgMonth, "GetUpstreamMsgMonth")
+	return
+}
+
+// GetUpstreamMsgDist 获取消息发送分布数据
+func (cube *DataCube) GetUpstreamMsgDist(s string, e string) (resUpstreamMsgDist ResUpstreamMsgDist, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUpstreamMsgDist, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUpstreamMsgDist, "GetUpstreamMsgDist")
+	return
+}
+
+// GetUpstreamMsgDistWeek 获取消息发送分布周数据
+func (cube *DataCube) GetUpstreamMsgDistWeek(s string, e string) (resUpstreamMsgDistWeek ResUpstreamMsgDistWeek, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUpstreamMsgDistWeek, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUpstreamMsgDistWeek, "GetUpstreamMsgDistWeek")
+	return
+}
+
+// GetUpstreamMsgDistMonth 获取消息发送分布月数据
+func (cube *DataCube) GetUpstreamMsgDistMonth(s string, e string) (resUpstreamMsgDistMonth ResUpstreamMsgDistMonth, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUpstreamMsgDistMonth, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUpstreamMsgDistMonth, "GetUpstreamMsgDistMonth")
+	return
+}

officialaccount/datacube/publisher.go

@@ -0,0 +1,272 @@
+package datacube
+
+import (
+	"fmt"
+	"net/url"
+	"strconv"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// AdSlot 广告位类型
+type AdSlot string
+
+const (
+	// SlotIDBizBottom 公众号底部广告
+	SlotIDBizBottom AdSlot = "SLOT_ID_BIZ_BOTTOM"
+	// SlotIDBizMidContext 公众号文中广告
+	SlotIDBizMidContext AdSlot = "SLOT_ID_BIZ_MID_CONTEXT"
+	// SlotIDBizVideoEnd 公众号视频后贴
+	SlotIDBizVideoEnd AdSlot = "SLOT_ID_BIZ_VIDEO_END"
+	// SlotIDBizSponsor 公众号互选广告
+	SlotIDBizSponsor AdSlot = "SLOT_ID_BIZ_SPONSOR"
+	// SlotIDBizCps 公众号返佣商品
+	SlotIDBizCps AdSlot = "SLOT_ID_BIZ_CPS"
+	// SlotIDWeappBanner 小程序banner
+	SlotIDWeappBanner AdSlot = "SLOT_ID_WEAPP_BANNER"
+	// SlotIDWeappRewardVideo 小程序激励视频
+	SlotIDWeappRewardVideo AdSlot = "SLOT_ID_WEAPP_REWARD_VIDEO"
+	// SlotIDWeappInterstitial 小程序插屏广告
+	SlotIDWeappInterstitial AdSlot = "SLOT_ID_WEAPP_INTERSTITIAL"
+	// SlotIDWeappVideoFeeds 小程序视频广告
+	SlotIDWeappVideoFeeds AdSlot = "SLOT_ID_WEAPP_VIDEO_FEEDS"
+	// SlotIDWeappVideoBegin 小程序视频前贴
+	SlotIDWeappVideoBegin AdSlot = "SLOT_ID_WEAPP_VIDEO_BEGIN"
+	// SlotIDWeappBox 小程序格子广告
+	SlotIDWeappBox AdSlot = "SLOT_ID_WEAPP_BOX"
+)
+
+const (
+	publisherURL = "https://api.weixin.qq.com/publisher/stat"
+)
+
+const (
+	actionPublisherAdPosGeneral = "publisher_adpos_general"
+	actionPublisherCpsGeneral   = "publisher_cps_general"
+	actionPublisherSettlement   = "publisher_settlement"
+)
+
+// BaseResp 错误信息
+type BaseResp struct {
+	ErrMsg string `json:"err_msg"`
+	Ret    int    `json:"ret"`
+}
+
+// ResPublisherAdPos 公众号分广告位数据响应
+type ResPublisherAdPos struct {
+	util.CommonError
+
+	BaseResp BaseResp        `json:"base_resp"`
+	List     []ResAdPosList  `json:"list"`
+	Summary  ResAdPosSummary `json:"summary"`
+	TotalNum int             `json:"total_num"`
+}
+
+// ResAdPosList 公众号分广告位列表
+type ResAdPosList struct {
+	SlotID        int64   `json:"slot_id"`
+	AdSlot        string  `json:"ad_slot"`
+	Date          string  `json:"date"`
+	ReqSuccCount  int     `json:"req_succ_count"`
+	ExposureCount int     `json:"exposure_count"`
+	ExposureRate  float64 `json:"exposure_rate"`
+	ClickCount    int     `json:"click_count"`
+	ClickRate     float64 `json:"click_rate"`
+	Income        int     `json:"income"`
+	Ecpm          float64 `json:"ecpm"`
+}
+
+// ResAdPosSummary 公众号分广告位概览
+type ResAdPosSummary struct {
+	ReqSuccCount  int     `json:"req_succ_count"`
+	ExposureCount int     `json:"exposure_count"`
+	ExposureRate  float64 `json:"exposure_rate"`
+	ClickCount    int     `json:"click_count"`
+	ClickRate     float64 `json:"click_rate"`
+	Income        int     `json:"income"`
+	Ecpm          float64 `json:"ecpm"`
+}
+
+// ResPublisherCps 公众号返佣商品数据响应
+type ResPublisherCps struct {
+	util.CommonError
+
+	BaseResp BaseResp      `json:"base_resp"`
+	List     []ResCpsList  `json:"list"`
+	Summary  ResCpsSummary `json:"summary"`
+	TotalNum int           `json:"total_num"`
+}
+
+// ResCpsList 公众号返佣商品列表
+type ResCpsList struct {
+	Date            string  `json:"date"`
+	ExposureCount   int     `json:"exposure_count"`
+	ClickCount      int     `json:"click_count"`
+	ClickRate       float64 `json:"click_rate"`
+	OrderCount      int     `json:"order_count"`
+	OrderRate       float64 `json:"order_rate"`
+	TotalFee        int     `json:"total_fee"`
+	TotalCommission int     `json:"total_commission"`
+}
+
+// ResCpsSummary 公众号返佣概览
+type ResCpsSummary struct {
+	ExposureCount   int     `json:"exposure_count"`
+	ClickCount      int     `json:"click_count"`
+	ClickRate       float64 `json:"click_rate"`
+	OrderCount      int     `json:"order_count"`
+	OrderRate       float64 `json:"order_rate"`
+	TotalFee        int     `json:"total_fee"`
+	TotalCommission int     `json:"total_commission"`
+}
+
+// ResPublisherSettlement 公众号结算收入数据及结算主体信息响应
+type ResPublisherSettlement struct {
+	util.CommonError
+
+	BaseResp          BaseResp         `json:"base_resp"`
+	Body              string           `json:"body"`
+	PenaltyAll        int              `json:"penalty_all"`
+	RevenueAll        int64            `json:"revenue_all"`
+	SettledRevenueAll int64            `json:"settled_revenue_all"`
+	SettlementList    []SettlementList `json:"settlement_list"`
+	TotalNum          int              `json:"total_num"`
+}
+
+// SettlementList 结算单列表
+type SettlementList struct {
+	Date           string        `json:"date"`
+	Zone           string        `json:"zone"`
+	Month          string        `json:"month"`
+	Order          int           `json:"order"`
+	SettStatus     int           `json:"sett_status"`
+	SettledRevenue int           `json:"settled_revenue"`
+	SettNo         string        `json:"sett_no"`
+	MailSendCnt    string        `json:"mail_send_cnt"`
+	SlotRevenue    []SlotRevenue `json:"slot_revenue"`
+}
+
+// SlotRevenue 产生收入的广告
+type SlotRevenue struct {
+	SlotID             string `json:"slot_id"`
+	SlotSettledRevenue int    `json:"slot_settled_revenue"`
+}
+
+// ParamsPublisher 拉取数据参数
+type ParamsPublisher struct {
+	Action    string `json:"action"`
+	StartDate string `json:"start_date"`
+	EndDate   string `json:"end_date"`
+	Page      int    `json:"page"`
+	PageSize  int    `json:"page_size"`
+	AdSlot    AdSlot `json:"ad_slot"`
+}
+
+// fetchData 拉取统计数据
+func (cube *DataCube) fetchData(params ParamsPublisher) (response []byte, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	v := url.Values{}
+	v.Add("action", params.Action)
+	v.Add("access_token", accessToken)
+	v.Add("page", strconv.Itoa(params.Page))
+	v.Add("page_size", strconv.Itoa(params.PageSize))
+	v.Add("start_date", params.StartDate)
+	v.Add("end_date", params.EndDate)
+	if params.AdSlot != "" {
+		v.Add("ad_slot", string(params.AdSlot))
+	}
+
+	uri := fmt.Sprintf("%s?%s", publisherURL, v.Encode())
+
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// GetPublisherAdPosGeneral 获取公众号分广告位数据
+func (cube *DataCube) GetPublisherAdPosGeneral(startDate, endDate string, page, pageSize int, adSlot AdSlot) (resPublisherAdPos ResPublisherAdPos, err error) {
+	params := ParamsPublisher{
+		Action:    actionPublisherAdPosGeneral,
+		StartDate: startDate,
+		EndDate:   endDate,
+		Page:      page,
+		PageSize:  pageSize,
+		AdSlot:    adSlot,
+	}
+
+	response, err := cube.fetchData(params)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resPublisherAdPos, "GetPublisherAdPosGeneral")
+	if err != nil {
+		return
+	}
+
+	if resPublisherAdPos.BaseResp.Ret != 0 {
+		err = fmt.Errorf("GetPublisherAdPosGeneral Error , errcode=%d , errmsg=%s", resPublisherAdPos.BaseResp.Ret, resPublisherAdPos.BaseResp.ErrMsg)
+		return
+	}
+	return
+}
+
+// GetPublisherCpsGeneral 获取公众号返佣商品数据
+func (cube *DataCube) GetPublisherCpsGeneral(startDate, endDate string, page, pageSize int) (resPublisherCps ResPublisherCps, err error) {
+	params := ParamsPublisher{
+		Action:    actionPublisherCpsGeneral,
+		StartDate: startDate,
+		EndDate:   endDate,
+		Page:      page,
+		PageSize:  pageSize,
+	}
+
+	response, err := cube.fetchData(params)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resPublisherCps, "GetPublisherCpsGeneral")
+	if err != nil {
+		return
+	}
+
+	if resPublisherCps.BaseResp.Ret != 0 {
+		err = fmt.Errorf("GetPublisherCpsGeneral Error , errcode=%d , errmsg=%s", resPublisherCps.BaseResp.Ret, resPublisherCps.BaseResp.ErrMsg)
+		return
+	}
+	return
+}
+
+// GetPublisherSettlement 获取公众号结算收入数据及结算主体信息
+func (cube *DataCube) GetPublisherSettlement(startDate, endDate string, page, pageSize int) (resPublisherSettlement ResPublisherSettlement, err error) {
+	params := ParamsPublisher{
+		Action:    actionPublisherSettlement,
+		StartDate: startDate,
+		EndDate:   endDate,
+		Page:      page,
+		PageSize:  pageSize,
+	}
+
+	response, err := cube.fetchData(params)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resPublisherSettlement, "GetPublisherSettlement")
+	if err != nil {
+		return
+	}
+
+	if resPublisherSettlement.BaseResp.Ret != 0 {
+		err = fmt.Errorf("GetPublisherSettlement Error , errcode=%d , errmsg=%s", resPublisherSettlement.BaseResp.Ret, resPublisherSettlement.BaseResp.ErrMsg)
+		return
+	}
+	return
+}

officialaccount/datacube/user.go

@@ -0,0 +1,78 @@
+package datacube
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	getUserSummary    = "https://api.weixin.qq.com/datacube/getusersummary"
+	getUserAccumulate = "https://api.weixin.qq.com/datacube/getusercumulate"
+)
+
+// ResUserSummary 获取用户增减数据响应
+type ResUserSummary struct {
+	util.CommonError
+
+	List []struct {
+		RefDate    string `json:"ref_date"`
+		UserSource int    `json:"user_source"`
+		NewUser    int    `json:"new_user"`
+		CancelUser int    `json:"cancel_user"`
+	} `json:"list"`
+}
+
+// ResUserAccumulate 获取累计用户数据响应
+type ResUserAccumulate struct {
+	util.CommonError
+
+	List []struct {
+		RefDate      string `json:"ref_date"`
+		CumulateUser int    `json:"cumulate_user"`
+	} `json:"list"`
+}
+
+// GetUserSummary 获取用户增减数据
+func (cube *DataCube) GetUserSummary(s string, e string) (resUserSummary ResUserSummary, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUserSummary, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUserSummary, "GetUserSummary")
+	return
+}
+
+// GetUserAccumulate 获取累计用户数据
+func (cube *DataCube) GetUserAccumulate(s string, e string) (resUserAccumulate ResUserAccumulate, err error) {
+	accessToken, err := cube.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", getUserAccumulate, accessToken)
+	reqDate := &reqDate{
+		BeginDate: s,
+		EndDate:   e,
+	}
+
+	response, err := util.PostJSON(uri, reqDate)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &resUserAccumulate, "GetUserAccumulate")
+	return
+}

officialaccount/device/authorize.go

@@ -1,10 +1,11 @@
+// Package device 设备相关接口
 package device
 
 import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (
@@ -22,13 +23,13 @@ type reqDeviceAuthorize struct {
 	// 请求操作的类型，限定取值为：0：设备授权（缺省值为0） 1：设备更新（更新已授权设备的各属性值）
 	OpType string `json:"op_type,omitempty"`
 	// 设备的产品编号（由微信硬件平台分配）。可在公众号设备功能管理页面查询。
-	//当 op_type 为‘0’，product_id 为‘1’时，不要填写 product_id 字段（会引起不必要错误）；
-	//当 op_typy 为‘0’，product_id 不为‘1’时，必须填写 product_id 字段；
-	//当 op_type 为 1 时，不要填写 product_id 字段。
+	// 当 op_type 为‘0’，product_id 为‘1’时，不要填写 product_id 字段（会引起不必要错误）；
+	// 当 op_typy 为‘0’，product_id 不为‘1’时，必须填写 product_id 字段；
+	// 当 op_type 为 1 时，不要填写 product_id 字段。
 	ProductID string `json:"product_id,omitempty"`
 }
 
-//ReqDevice 设备授权实体
+// ReqDevice 设备授权实体
 type ReqDevice struct {
 	// 设备的 device id
 	ID string `json:"id"`
@@ -41,22 +42,22 @@ type ReqDevice struct {
 	//	ble – 3
 	//	wifi -- 4
 	//	一个设备可以支持多种连接类型，用符号"|"做分割，客户端优先选择靠前的连接方式（优先级按|关系的排序依次降低），举例：
-	//	1：表示设备仅支持andiod classic bluetooth 1|2：表示设备支持andiod 和ios 两种classic bluetooth，但是客户端优先选择andriod classic bluetooth 协议，如果andriod classic bluetooth协议连接失败，再选择ios classic bluetooth协议进行连接
+	//	1：表示设备仅支持andiod classic bluetooth 1|2：表示设备支持android 和ios 两种classic bluetooth，但是客户端优先选择android classic bluetooth 协议，如果android classic bluetooth协议连接失败，再选择ios classic bluetooth协议进行连接
 	//	（注：安卓平台不同时支持BLE和classic类型）
 	ConnectProtocol string `json:"connect_protocol"`
-	//auth及通信的加密key，第三方需要将key烧制在设备上（128bit），格式采用16进制串的方式（长度为32字节），不需要0X前缀，如： 1234567890ABCDEF1234567890ABCDEF
+	// auth及通信的加密key，第三方需要将key烧制在设备上（128bit），格式采用16进制串的方式（长度为32字节），不需要0X前缀，如： 1234567890ABCDEF1234567890ABCDEF
 	AuthKey string `json:"auth_key"`
 	// 断开策略，目前支持： 1：退出公众号页面时即断开连接 2：退出公众号之后保持连接不断开
 	CloseStrategy string `json:"close_strategy"`
-	//连接策略，32位整型，按bit位置位，目前仅第1bit和第3bit位有效（bit置0为无效，1为有效；第2bit已被废弃），且bit位可以按或置位（如1|4=5），各bit置位含义说明如下：
-	//1：（第1bit置位）在公众号对话页面，不停的尝试连接设备
-	//4：（第3bit置位）处于非公众号页面（如主界面等），微信自动连接。当用户切换微信到前台时，可能尝试去连接设备，连上后一定时间会断开
+	// 连接策略，32位整型，按bit位置位，目前仅第1bit和第3bit位有效（bit置0为无效，1为有效；第2bit已被废弃），且bit位可以按或置位（如1|4=5），各bit置位含义说明如下：
+	// 1：（第1bit置位）在公众号对话页面，不停的尝试连接设备
+	// 4：（第3bit置位）处于非公众号页面（如主界面等），微信自动连接。当用户切换微信到前台时，可能尝试去连接设备，连上后一定时间会断开
 	ConnStrategy string `json:"conn_strategy"`
 	// auth version，设备和微信进行auth时，会根据该版本号来确认auth buf和auth key的格式（各version对应的auth buf及key的具体格式可以参看“客户端蓝牙外设协议”），该字段目前支持取值：
 	// 0：不加密的version
 	// 1：version 1
 	AuthVer string `json:"auth_ver"`
-	// 表示mac地址在厂商广播manufature data里含有mac地址的偏移，取值如下：
+	// 表示mac地址在厂商广播manufacture data里含有mac地址的偏移，取值如下：
 	// -1：在尾部、
 	// -2：表示不包含mac地址 其他：非法偏移
 	ManuMacPos string `json:"manu_mac_pos"`
@@ -68,7 +69,7 @@ type ReqDevice struct {
 	BleSimpleProtocol string `json:"ble_simple_protocol,omitempty"`
 }
 
-//ResBaseInfo 授权回调实体
+// ResBaseInfo 授权回调实体
 type ResBaseInfo struct {
 	BaseInfo struct {
 		DeviceType string `json:"device_type"`

officialaccount/device/bind.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 // ReqBind 设备绑定解绑共通实体

officialaccount/device/device.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/silenceper/wechat/context"
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
 )
 
 const (
@@ -19,12 +19,12 @@ const (
 	uriState        = "https://api.weixin.qq.com/device/get_stat"
 )
 
-//Device struct
+// Device struct
 type Device struct {
 	*context.Context
 }
 
-//NewDevice 实例
+// NewDevice 实例
 func NewDevice(context *context.Context) *Device {
 	device := new(Device)
 	device.Context = context

officialaccount/device/message.go

@@ -1,6 +1,6 @@
 package device
 
-//MsgDevice 设备消息响应
+// MsgDevice 设备消息响应
 type MsgDevice struct {
 	DeviceType string
 	DeviceID   string

officialaccount/device/qrcode.go

@@ -4,10 +4,10 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/silenceper/wechat/util"
+	"github.com/silenceper/wechat/v2/util"
 )
 
-//ResCreateQRCode 获取二维码的返回实体
+// ResCreateQRCode 获取二维码的返回实体
 type ResCreateQRCode struct {
 	util.CommonError
 	DeviceNum int `json:"device_num"`
@@ -42,7 +42,7 @@ func (d *Device) CreateQRCode(devices []string) (res ResCreateQRCode, err error)
 	return
 }
 
-//ResVerifyQRCode 验证授权结果实体
+// ResVerifyQRCode 验证授权结果实体
 type ResVerifyQRCode struct {
 	util.CommonError
 	DeviceType string `json:"device_type"`
@@ -60,7 +60,7 @@ func (d *Device) VerifyQRCode(ticket string) (res ResVerifyQRCode, err error) {
 	req := map[string]interface{}{
 		"ticket": ticket,
 	}
-	fmt.Println(req)
+
 	var response []byte
 	if response, err = util.PostJSON(uri, req); err != nil {
 		return