企业微信 OAuth2：支持获取 ExternalUserID (#565)

* [feature] Format the code and improve Mini Program authorization to obtain openid（miniprogram/auth/auth.go Code2Session）

* [feature] CheckEncryptedData (https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/user-info/auth.checkEncryptedData.html)

* upgrade json error

* upgrade json error

* [feature] Wallet Transfer returns the pointer object

* feat:Adaptation of new go-redis components

* improve code

* feat:upgrade golangci-lint-action version

* fix

* test ci

* fix

* test ci

* fix

* test

* improve code

* feat:GetPhoneNumber return ptr

* fix: ptr Elem() error

* improve code

Co-authored-by: houseme <houseme@outlook.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

@@ -2,13 +2,27 @@ name: Go
 
 on:
   push:
-    branches: [ master,release-* ]
+    branches: [ master,release-*,v2 ]
   pull_request:
-    branches: [ master,release-* ]
+    branches: [ master,release-*,v2 ]
 
 jobs:
+  golangci:
+    strategy:
+      matrix:
+        go-version: [1.15.x,1.16.x]
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3.1.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: v1.31
   build:
-    name: Build
+    name: Test
     runs-on: ubuntu-latest
     services:
       redis:
@@ -20,21 +34,18 @@ jobs:
         image: memcached
         ports:
           - 11211:11211
-    steps:
 
+    # strategy set
+    strategy:
+      matrix:
+        go: ["1.14","1.15", "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: ^1.13
+          go-version: ${{ matrix.go }}
         id: go
-
-      - uses: actions/checkout@v2
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v1
-        with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.26
-
-
       - 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

@@ -27,3 +27,4 @@ _testmain.go
 vendor
 .idea/
 example/*
+/test

.golangci.yml

@@ -11,7 +11,7 @@ linters:
     - errcheck
     - funlen
     - goconst
-    - gocritic
+      # - gocritic
     - gocyclo
     - gofmt
     - goimports

.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:'

README.md

@@ -1,20 +1,25 @@
 # WeChat SDK for Go
+
 ![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)
 [![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版本
-
+> 注意：当前版本为v2版本，v1版本已废弃
 
 ## 文档 && 例子
-[Wechat SDK 2.0 文档](http://silenceper.com/wechat)
+
+[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
+import "github.com/silenceper/wechat/v2"
 ```
 
 以下是一个微信公众号处理消息接收以及回复的例子：
@@ -35,7 +40,7 @@ officialAccount := wc.GetOfficialAccount(cfg)
 // 传入request和responseWriter
 server := officialAccount.GetServer(req, rw)
 //设置接收消息的处理方法
-server.SetMessageHandler(func(msg message.MixMessage) *message.Reply {
+server.SetMessageHandler(func(msg *message.MixMessage) *message.Reply {
 
     //回复消息：演示回复用户发送的消息
     text := message.NewText(msg.Content)
@@ -54,19 +59,24 @@ server.Send()
 ```
 
 ## 目录说明
+
 - officialaccount: 微信公众号API
 - miniprogram: 小程序API
 - minigame:小游戏API
 - pay:微信支付API
-- opernplatform:开放平台API
+- openplatform:开放平台API
 - work:企业微信
 - aispeech:智能对话
+- doc: api文档
 
 ## 贡献
+
+- 在[API列表](https://github.com/silenceper/wechat/tree/v2/doc/api)中查看哪些API未实现
 - 提交issue，描述需要贡献的内容
 - 完成更改后，提交PR
 
 ## 公众号
+
 ![img](https://silenceper.oss-cn-beijing.aliyuncs.com/qrcode/search_study_program.png)
 
 ## License

cache/redis.go

@@ -1,15 +1,16 @@
 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 连接属性
@@ -23,89 +24,49 @@ type RedisOpts struct {
 }
 
 // NewRedis 实例化
-func NewRedis(opts *RedisOpts) *Redis {
-	pool := &redis.Pool{
-		MaxActive:   opts.MaxActive,
-		MaxIdle:     opts.MaxIdle,
+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),
-		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}
-}
-
-//SetRedisPool 设置redis连接池
-func (r *Redis) SetRedisPool(pool *redis.Pool) {
-	r.conn = pool
+		MinIdleConns: opts.MaxIdle,
+	})
+	return &Redis{ctx: ctx, conn: conn}
 }
 
 // SetConn 设置conn
-func (r *Redis) SetConn(conn *redis.Pool) {
+func (r *Redis) SetConn(conn redis.UniversalClient) {
 	r.conn = conn
 }
 
+// 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 {
+	result, err := r.conn.Do(r.ctx, "GET", key).Result()
+	if err != nil {
 		return nil
 	}
-	var reply interface{}
-	if err = json.Unmarshal(data, &reply); err != nil {
-		return nil
-	}
-
-	return reply
+	return result
 }
 
 // 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
-	}
-
-	_, err = conn.Do("SETEX", key, int64(timeout/time.Second), data)
-
-	return
+func (r *Redis) Set(key string, val interface{}, timeout time.Duration) error {
+	return r.conn.SetEX(r.ctx, key, val, timeout).Err()
 }
 
 // IsExist 判断key是否存在
 func (r *Redis) IsExist(key string) bool {
-	conn := r.conn.Get()
-	defer conn.Close()
+	result, _ := r.conn.Exists(r.ctx, key).Result()
 
-	a, _ := conn.Do("EXISTS", key)
-	i := a.(int64)
-	return i > 0
+	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.conn.Del(r.ctx, key).Err()
 }

cache/redis_test.go

@@ -1,33 +1,40 @@
 package cache
 
 import (
+	"context"
 	"testing"
 	"time"
 )
 
 func TestRedis(t *testing.T) {
-	opts := &RedisOpts{
+	var (
+		timeoutDuration = time.Second
+		ctx             = context.Background()
+		opts            = &RedisOpts{
 			Host: "127.0.0.1:6379",
 		}
-	redis := NewRedis(opts)
+		redis = NewRedis(ctx, opts)
+		err   error
+		val   = "silenceper"
+		key   = "username"
+	)
 	redis.SetConn(redis.conn)
-	var err error
-	timeoutDuration := 1 * time.Second
+	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)
 	}
 }

credential/default_access_token.go

@@ -12,11 +12,15 @@ import (
 
 const (
 	// AccessTokenURL 获取access_token的接口
-	accessTokenURL = "https://api.weixin.qq.com/cgi-bin/token"
+	accessTokenURL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"
+	// AccessTokenURL 企业微信获取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 获取
@@ -52,11 +56,66 @@ type ResAccessToken struct {
 
 // GetAccessToken 获取access_token,先从cache中获取，没有则从服务端获取
 func (ak *DefaultAccessToken) GetAccessToken() (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()
 
-	accessTokenCacheKey := fmt.Sprintf("%s_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 = GetTokenFromServer(fmt.Sprintf(accessTokenURL, ak.appID, ak.appSecret))
+	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
+}
+
+// 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) AccessTokenHandle {
+	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) {
+	// 加上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)
@@ -65,7 +124,7 @@ func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
 
 	// cache失效，从微信服务器获取
 	var resAccessToken ResAccessToken
-	resAccessToken, err = GetTokenFromServer(ak.appID, ak.appSecret)
+	resAccessToken, err = GetTokenFromServer(fmt.Sprintf(workAccessTokenURL, ak.CorpID, ak.CorpSecret))
 	if err != nil {
 		return
 	}
@@ -80,8 +139,7 @@ func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
 }
 
 // GetTokenFromServer 强制从微信服务器获取token
-func GetTokenFromServer(appID, appSecret string) (resAccessToken ResAccessToken, err error) {
-	url := fmt.Sprintf("%s?grant_type=client_credential&appid=%s&secret=%s", accessTokenURL, appID, appSecret)
+func GetTokenFromServer(url string) (resAccessToken ResAccessToken, err error) {
 	var body []byte
 	body, err = util.HTTPGet(url)
 	if err != nil {
@@ -91,7 +149,7 @@ func GetTokenFromServer(appID, appSecret string) (resAccessToken ResAccessToken,
 	if err != nil {
 		return
 	}
-	if resAccessToken.ErrMsg != "" {
+	if resAccessToken.ErrCode != 0 {
 		err = fmt.Errorf("get access_token error : errcode=%v , errormsg=%v", resAccessToken.ErrCode, resAccessToken.ErrMsg)
 		return
 	}

credential/default_access_token_test.go

@@ -7,6 +7,7 @@ import (
 	"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})

credential/default_js_ticket.go

@@ -10,7 +10,7 @@ import (
 	"github.com/silenceper/wechat/v2/util"
 )
 
-//获取ticket的url
+// getTicketURL 获取ticket的url
 const getTicketURL = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi"
 
 // DefaultJsTicket 默认获取js ticket方法
@@ -42,16 +42,20 @@ type ResTicket struct {
 
 // 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()
 
-	//先从cache中取
-	jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", js.cacheKeyPrefix, js.appID)
-	val := js.cache.Get(jsAPITicketCacheKey)
-	if val != nil {
-		ticketStr = val.(string)
-		return
+	// 双检，防止重复从微信服务器获取
+	if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
+		return val.(string), nil
 	}
+
 	var ticket ResTicket
 	ticket, err = GetTicketFromServer(accessToken)
 	if err != nil {

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,219 @@
+# 微信公众号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            | NO         |                         |
+| 获取模板中的关键词   | GET      | /wxaapi/newtmpl/getpubtemplatekeywords | NO         |                         |
+| 获取类目下的公共模板 | GET      | /wxaapi/newtmpl/getpubtemplatetitles   | NO         |                         |
+| 获取私有模板列表     | 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       | NO         |          |
+| 添加客服帐号     | POST      | /customservice/kfaccount/add           | NO         |          |
+| 邀请绑定客服帐号 | POST      | /customservice/kfaccount/inviteworker  | NO         |          |
+| 设置客服信息     | POST      | /customservice/kfaccount/update        | NO         |          |
+| 上传客服头像     | POST/FORM | /customservice/kfaccount/uploadheadimg | NO         |          |
+| 删除客服帐号     | GET       | /customservice/kfaccount/del           | NO         |          |
+
+#### 会话控制
+
+[官方文档](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     |
+
+
+## 图文消息留言管理
+
+## 用户管理
+
+## 账号管理
+
+## 数据统计
+
+## 微信卡券
+
+## 微信门店
+
+## 智能接口
+
+## 微信设备功能
+
+## 微信“一物一码”
+
+## 微信发票
+
+## 微信非税缴费 
+

doc/api/oplatform.md

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

doc/api/work.md

@@ -0,0 +1,65 @@
+# 企业微信
+
+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    |
+
+## 应用管理
+
+TODO
+

doc/api/wxpay.md

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

go.mod

@@ -3,12 +3,13 @@ module github.com/silenceper/wechat/v2
 go 1.14
 
 require (
-	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
+	github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
 	github.com/fatih/structs v1.1.0
-	github.com/gomodule/redigo v1.8.1
-	github.com/sirupsen/logrus v1.6.0
-	github.com/spf13/cast v1.3.1
-	github.com/stretchr/testify v1.5.1
-	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
-	gopkg.in/h2non/gock.v1 v1.0.15
+	github.com/go-redis/redis/v8 v8.11.6-0.20220405070650-99c79f7041fc
+	github.com/sirupsen/logrus v1.8.1
+	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-20220411220226-7b82a4e95df4
+	gopkg.in/h2non/gock.v1 v1.1.2
 )

go.sum

@@ -1,43 +1,147 @@
-github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
-github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+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/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/gomodule/redigo v1.8.1 h1:Abmo0bI7Xf0IhdIPc7HZQzZcShdnmxeoVuDDtIQp8N8=
-github.com/gomodule/redigo v1.8.1/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
+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.6-0.20220405070650-99c79f7041fc h1:jZY+lpZB92nvBo2f31oPC/ivGll6NcsnEOORm8Fkr4M=
+github.com/go-redis/redis/v8 v8.11.6-0.20220405070650-99c79f7041fc/go.mod h1:25mL1NKxbJhB63ihiK8MnNeTRd+xAizd6bOdydrTLUQ=
+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 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+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 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+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/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+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.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc=
+github.com/onsi/ginkgo/v2 v2.1.3/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.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
+github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
 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.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
-github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+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.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+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=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
+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-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/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/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+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-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-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+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-20191026070338-33540a1f6037/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 h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+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 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+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 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+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/h2non/gock.v1 v1.0.15 h1:SzLqcIlb/fDfg7UvukMpNcWsu7sI5tWwL+KCATZqks0=
-gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
-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=

minigame/README.md

@@ -3,6 +3,7 @@
 [官方文档](https://developers.weixin.qq.com/minigame/dev/api-backend/)
 
 ## 快速入门
+
 ```go
 
 ```

miniprogram/README.md

@@ -2,11 +2,12 @@
 
 [官方文档](https://developers.weixin.qq.com/miniprogram/dev/framework/)
 
-
 ## 包说明
+
 - analysis 数据分析相关API
 
 ## 快速入门
+
 ```go
 wc := wechat.NewWechat()
 memory := cache.NewMemory()

miniprogram/auth/auth.go

@@ -1,6 +1,7 @@
 package auth
 
 import (
+	context2 "context"
 	"encoding/json"
 	"fmt"
 
@@ -10,6 +11,10 @@ import (
 
 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 登录/用户信息
@@ -31,16 +36,26 @@ type ResCode2Session struct {
 	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) {
-	urlStr := fmt.Sprintf(code2SessionURL, auth.AppID, auth.AppSecret, jsCode)
+	return auth.Code2SessionContext(context2.Background(), jsCode)
+}
+
+// Code2SessionContext 登录凭证校验。
+func (auth *Auth) Code2SessionContext(ctx context2.Context, jsCode string) (result ResCode2Session, err error) {
 	var response []byte
-	response, err = util.HTTPGet(urlStr)
-	if err != nil {
+	if response, err = util.HTTPGetContext(ctx, fmt.Sprintf(code2SessionURL, auth.AppID, auth.AppSecret, jsCode)); err != nil {
 		return
 	}
-	err = json.Unmarshal(response, &result)
-	if err != nil {
+	if err = json.Unmarshal(response, &result); err != nil {
 		return
 	}
 	if result.ErrCode != 0 {
@@ -54,3 +69,67 @@ func (auth *Auth) Code2Session(jsCode string) (result ResCode2Session, err error
 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
+	}
+	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), "encrypted_msg_hash="+encryptedMsgHash); 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"` // 数据水印
+}
+
+// GetPhoneNumber 小程序通过code获取用户手机号
+func (auth *Auth) GetPhoneNumber(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,
+	}
+	if response, err = util.PostJSON(fmt.Sprintf(getPhoneNumber, at), body); err != nil {
+		return nil, err
+	}
+	var result GetPhoneNumberResponse
+	if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}

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

@@ -5,7 +5,7 @@ import (
 	"github.com/silenceper/wechat/v2/cache"
 )
 
-//Config config for 小程序
+// Config .config for 小程序
 type Config struct {
 	AppID     string `json:"app_id"`     // appid
 	AppSecret string `json:"app_secret"` // appsecret

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/encryptor/encryptor.go

@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
+	"fmt"
 
 	"github.com/silenceper/wechat/v2/miniprogram/context"
 )
@@ -45,6 +46,8 @@ type PlainData struct {
 	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 {
@@ -74,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
@@ -88,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
@@ -103,7 +109,7 @@ func getCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
 
 // Decrypt 解密数据
 func (encryptor *Encryptor) Decrypt(sessionKey, encryptedData, iv string) (*PlainData, error) {
-	cipherText, err := getCipherText(sessionKey, encryptedData, iv)
+	cipherText, err := GetCipherText(sessionKey, encryptedData, iv)
 	if err != nil {
 		return nil, err
 	}

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/miniprogram.go

@@ -4,13 +4,22 @@ import (
 	"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 微信小程序相关API
@@ -53,6 +62,16 @@ 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)
@@ -72,3 +91,38 @@ func (miniProgram *MiniProgram) GetSubscribe() *subscribe.Subscribe {
 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

@@ -40,16 +40,20 @@ type QRCoder struct {
 	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 自动配置线条颜色，如果颜色依然是黑色，则说明不建议配置主色调
+	// 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 是否需要透明底色
+	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 请求并返回二维码二进制数据

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/subscribe/subscribe.go

@@ -15,6 +15,18 @@ const (
 	// 获取当前帐号下的个人模板列表
 	// 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 订阅消息
@@ -39,7 +51,8 @@ type Message struct {
 
 // DataItem 模版内某个 .DATA 的值
 type DataItem struct {
-	Value string `json:"value"`
+	Value interface{} `json:"value"`
+	Color string      `json:"color"`
 }
 
 // TemplateItem template item
@@ -91,3 +104,92 @@ func (s *Subscribe) ListTemplates() (*TemplateList, error) {
 	}
 	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:"page"`
+		} `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 {

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
+}

officialaccount/basic/qr.go

@@ -62,6 +62,11 @@ func (basic *Basic) 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

@@ -11,6 +11,10 @@ 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 发送消息类型
@@ -34,11 +38,12 @@ const (
 // Broadcast 群发消息
 type Broadcast struct {
 	*context.Context
+	preview bool
 }
 
 // NewBroadcast new
 func NewBroadcast(ctx *context.Context) *Broadcast {
-	return &Broadcast{ctx}
+	return &Broadcast{ctx, false}
 }
 
 // User 发送的用户
@@ -52,6 +57,14 @@ 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 发送请求的数据
@@ -250,7 +263,66 @@ func (broadcast *Broadcast) Delete(msgID int64, articleIDx int64) error {
 	return util.DecodeWithCommonError(data, "Delete")
 }
 
-//TODO 发送预览，群发消息状态，发送速度
+// 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 := ""
@@ -259,6 +331,13 @@ func (broadcast *Broadcast) chooseTagOrOpenID(user *User, req *sendRequest) (ret
 			"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{}{
@@ -272,5 +351,6 @@ func (broadcast *Broadcast) chooseTagOrOpenID(user *User, req *sendRequest) (ret
 				sendURL = sendURLByOpenID
 			}
 		}
+	}
 	return req, sendURL
 }

officialaccount/config/config.go

@@ -4,7 +4,7 @@ import (
 	"github.com/silenceper/wechat/v2/cache"
 )
 
-//Config config for 微信公众号
+// Config .config for 微信公众号
 type Config struct {
 	AppID          string `json:"app_id"`           // appid
 	AppSecret      string `json:"app_secret"`       // appsecret

officialaccount/draft/draft.go

@@ -0,0 +1,228 @@
+package draft
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	addURL      = "https://api.weixin.qq.com/cgi-bin/draft/add"      // 新建草稿
+	getURL      = "https://api.weixin.qq.com/cgi-bin/draft/get"      // 获取草稿
+	deleteURL   = "https://api.weixin.qq.com/cgi-bin/draft/delete"   // 删除草稿
+	updateURL   = "https://api.weixin.qq.com/cgi-bin/draft/update"   // 修改草稿
+	countURL    = "https://api.weixin.qq.com/cgi-bin/draft/count"    // 获取草稿总数
+	paginateURL = "https://api.weixin.qq.com/cgi-bin/draft/batchget" // 获取草稿列表
+)
+
+// Draft 草稿箱
+type Draft struct {
+	*context.Context
+}
+
+// NewDraft init
+func NewDraft(ctx *context.Context) *Draft {
+	return &Draft{
+		Context: ctx,
+	}
+}
+
+// Article 草稿
+type Article struct {
+	Title              string `json:"title"`                 // 标题
+	Author             string `json:"author"`                // 作者
+	Digest             string `json:"digest"`                // 图文消息的摘要，仅有单图文消息才有摘要，多图文此处为空。
+	Content            string `json:"content"`               // 图文消息的具体内容，支持HTML标签，必须少于2万字符，小于1M，且去除JS
+	ContentSourceURL   string `json:"content_source_url"`    // 图文消息的原文地址，即点击“阅读原文”后的URL
+	ThumbMediaID       string `json:"thumb_media_id"`        // 图文消息的封面图片素材id（必须是永久MediaID）
+	ShowCoverPic       uint   `json:"show_cover_pic"`        // 是否显示封面，0为false，即不显示，1为true，即显示(默认)
+	NeedOpenComment    uint   `json:"need_open_comment"`     // 是否打开评论，0不打开(默认)，1打开
+	OnlyFansCanComment uint   `json:"only_fans_can_comment"` // 是否粉丝才可评论，0所有人可评论(默认)，1粉丝才可评论
+}
+
+// AddDraft 新建草稿
+func (draft *Draft) AddDraft(articles []*Article) (mediaID string, err error) {
+	accessToken, err := draft.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		Articles []*Article `json:"articles"`
+	}
+	req.Articles = articles
+
+	uri := fmt.Sprintf("%s?access_token=%s", addURL, accessToken)
+	response, err := util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	var res struct {
+		util.CommonError
+		MediaID string `json:"media_id"`
+	}
+	err = util.DecodeWithError(response, &res, "AddDraft")
+	if err != nil {
+		return
+	}
+	mediaID = res.MediaID
+	return
+}
+
+// GetDraft 获取草稿
+func (draft *Draft) GetDraft(mediaID string) (articles []*Article, err error) {
+	accessToken, err := draft.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		MediaID string `json:"media_id"`
+	}
+	req.MediaID = mediaID
+
+	uri := fmt.Sprintf("%s?access_token=%s", getURL, accessToken)
+	response, err := util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	var res struct {
+		util.CommonError
+		NewsItem []*Article `json:"news_item"`
+	}
+	err = util.DecodeWithError(response, &res, "GetDraft")
+	if err != nil {
+		return
+	}
+
+	articles = res.NewsItem
+	return
+}
+
+// DeleteDraft 删除草稿
+func (draft *Draft) DeleteDraft(mediaID string) (err error) {
+	accessToken, err := draft.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		MediaID string `json:"media_id"`
+	}
+	req.MediaID = mediaID
+
+	var response []byte
+	uri := fmt.Sprintf("%s?access_token=%s", deleteURL, accessToken)
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithCommonError(response, "DeleteDraft")
+	return
+}
+
+// UpdateDraft 修改草稿
+// index 要更新的文章在图文消息中的位置（多图文消息时，此字段才有意义），第一篇为0
+func (draft *Draft) UpdateDraft(article *Article, mediaID string, index uint) (err error) {
+	accessToken, err := draft.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		MediaID string   `json:"media_id"`
+		Index   uint     `json:"index"`
+		Article *Article `json:"articles"`
+	}
+	req.MediaID = mediaID
+	req.Index = index
+	req.Article = article
+
+	uri := fmt.Sprintf("%s?access_token=%s", updateURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithCommonError(response, "UpdateDraft")
+	return
+}
+
+// CountDraft 获取草稿总数
+func (draft *Draft) CountDraft() (total uint, err error) {
+	accessToken, err := draft.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var response []byte
+	uri := fmt.Sprintf("%s?access_token=%s", countURL, accessToken)
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+
+	var res struct {
+		util.CommonError
+		Total uint `json:"total_count"`
+	}
+	err = util.DecodeWithError(response, &res, "CountDraft")
+	if nil != err {
+		return
+	}
+
+	total = res.Total
+	return
+}
+
+// ArticleList 草稿列表
+type ArticleList struct {
+	util.CommonError
+	TotalCount int64             `json:"total_count"` // 草稿素材的总数
+	ItemCount  int64             `json:"item_count"`  // 本次调用获取的素材的数量
+	Item       []ArticleListItem `json:"item"`
+}
+
+// ArticleListItem 用于 ArticleList 的 item 节点
+type ArticleListItem struct {
+	MediaID    string             `json:"media_id"`    // 图文消息的id
+	Content    ArticleListContent `json:"content"`     // 内容
+	UpdateTime int64              `json:"update_time"` // 这篇图文消息素材的最后更新时间
+}
+
+// ArticleListContent 用于 ArticleListItem 的 content 节点
+type ArticleListContent struct {
+	NewsItem []Article `json:"news_item"` // 这篇图文消息素材的内容
+}
+
+// PaginateDraft 获取草稿列表
+func (draft *Draft) PaginateDraft(offset, count int64, noReturnContent bool) (list ArticleList, err error) {
+	accessToken, err := draft.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		Count           int64 `json:"count"`
+		Offset          int64 `json:"offset"`
+		NoReturnContent bool  `json:"no_content"`
+	}
+	req.Count = count
+	req.Offset = offset
+	req.NoReturnContent = noReturnContent
+
+	var response []byte
+	uri := fmt.Sprintf("%s?access_token=%s", paginateURL, accessToken)
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &list, "PaginateDraft")
+	return
+}

officialaccount/freepublish/freepublish.go

@@ -0,0 +1,248 @@
+package freepublish
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	publishURL      = "https://api.weixin.qq.com/cgi-bin/freepublish/submit"     // 发布接口
+	selectStateURL  = "https://api.weixin.qq.com/cgi-bin/freepublish/get"        // 发布状态轮询接口
+	deleteURL       = "https://api.weixin.qq.com/cgi-bin/freepublish/delete"     // 删除发布
+	firstArticleURL = "https://api.weixin.qq.com/cgi-bin/freepublish/getarticle" // 通过 article_id 获取已发布文章
+	paginateURL     = "https://api.weixin.qq.com/cgi-bin/freepublish/batchget"   // 获取成功发布列表
+)
+
+// PublishStatus 发布状态
+type PublishStatus uint
+
+const (
+	// PublishStatusSuccess 0:成功
+	PublishStatusSuccess PublishStatus = iota
+	// PublishStatusPublishing 1:发布中
+	PublishStatusPublishing
+	// PublishStatusOriginalFail 2:原创失败
+	PublishStatusOriginalFail
+	// PublishStatusFail 3:常规失败
+	PublishStatusFail
+	// PublishStatusAuditRefused 4:平台审核不通过
+	PublishStatusAuditRefused
+	// PublishStatusUserDeleted 5:成功后用户删除所有文章
+	PublishStatusUserDeleted
+	// PublishStatusSystemBanned 6:成功后系统封禁所有文章
+	PublishStatusSystemBanned
+)
+
+// FreePublish 发布能力
+type FreePublish struct {
+	*context.Context
+}
+
+// NewFreePublish init
+func NewFreePublish(ctx *context.Context) *FreePublish {
+	return &FreePublish{
+		Context: ctx,
+	}
+}
+
+// Publish 发布接口。需要先将图文素材以草稿的形式保存（见“草稿箱/新建草稿”，
+// 如需从已保存的草稿中选择，见“草稿箱/获取草稿列表”），选择要发布的草稿 media_id 进行发布
+func (freePublish *FreePublish) Publish(mediaID string) (publishID int64, err error) {
+	var accessToken string
+	accessToken, err = freePublish.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		MediaID string `json:"media_id"`
+	}
+	req.MediaID = mediaID
+
+	var response []byte
+	uri := fmt.Sprintf("%s?access_token=%s", publishURL, accessToken)
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	var res struct {
+		util.CommonError
+		PublishID int64 `json:"publish_id"`
+	}
+	err = util.DecodeWithError(response, &res, "SubmitFreePublish")
+	if err != nil {
+		return
+	}
+
+	publishID = res.PublishID
+	return
+}
+
+// PublishStatusList 发布任务状态列表
+type PublishStatusList struct {
+	util.CommonError
+	PublishID     int64                `json:"publish_id"`     // 发布任务id
+	PublishStatus PublishStatus        `json:"publish_status"` // 发布状态
+	ArticleID     string               `json:"article_id"`     // 当发布状态为0时（即成功）时，返回图文的 article_id，可用于“客服消息”场景
+	ArticleDetail PublishArticleDetail `json:"article_detail"` // 发布任务文章成功状态详情
+	FailIndex     []uint               `json:"fail_idx"`       // 当发布状态为2或4时，返回不通过的文章编号，第一篇为 1；其他发布状态则为空
+}
+
+// PublishArticleDetail 发布任务成功详情
+type PublishArticleDetail struct {
+	Count uint                 `json:"count"` // 当发布状态为0时（即成功）时，返回文章数量
+	Items []PublishArticleItem `json:"item"`
+}
+
+// PublishArticleItem 发布任务成功的文章内容
+type PublishArticleItem struct {
+	Index      uint   `json:"idx"`         // 当发布状态为0时（即成功）时，返回文章对应的编号
+	ArticleURL string `json:"article_url"` // 当发布状态为0时（即成功）时，返回图文的永久链接
+}
+
+// SelectStatus 发布状态轮询接口
+func (freePublish *FreePublish) SelectStatus(publishID int64) (list PublishStatusList, err error) {
+	accessToken, err := freePublish.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		PublishID int64 `json:"publish_id"`
+	}
+	req.PublishID = publishID
+
+	var response []byte
+	uri := fmt.Sprintf("%s?access_token=%s", selectStateURL, accessToken)
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &list, "SelectStatusFreePublish")
+	return
+}
+
+// Delete 删除发布。
+// index 要删除的文章在图文消息中的位置，第一篇编号为1，该字段不填或填0会删除全部文章
+// !!!此操作不可逆，请谨慎操作!!!删除后微信公众号后台仍然会有记录!!!
+func (freePublish *FreePublish) Delete(articleID string, index uint) (err error) {
+	accessToken, err := freePublish.GetAccessToken()
+	if err != nil {
+		return err
+	}
+
+	var req struct {
+		ArticleID string `json:"article_id"`
+		Index     uint   `json:"index"`
+	}
+	req.ArticleID = articleID
+	req.Index = index
+
+	var response []byte
+	uri := fmt.Sprintf("%s?access_token=%s", deleteURL, accessToken)
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return err
+	}
+
+	return util.DecodeWithCommonError(response, "DeleteFreePublish")
+}
+
+// Article 图文信息内容
+type Article struct {
+	Title              string `json:"title"`                 // 标题
+	Author             string `json:"author"`                // 作者
+	Digest             string `json:"digest"`                // 图文消息的摘要，仅有单图文消息才有摘要，多图文此处为空
+	Content            string `json:"content"`               // 图文消息的具体内容，支持HTML标签，必须少于2万字符，小于1M，且此处会去除JS
+	ContentSourceURL   string `json:"content_source_url"`    // 图文消息的原文地址，即点击“阅读原文”后的URL
+	ThumbMediaID       string `json:"thumb_media_id"`        // 图文消息的封面图片素材id（一定是永久MediaID）
+	ShowCoverPic       uint   `json:"show_cover_pic"`        // 是否显示封面，0为false，即不显示，1为true，即显示(默认)
+	NeedOpenComment    uint   `json:"need_open_comment"`     // 是否打开评论，0不打开(默认)，1打开
+	OnlyFansCanComment uint   `json:"only_fans_can_comment"` // 是否粉丝才可评论，0所有人可评论(默认)，1粉丝才可评论
+	URL                string `json:"url"`                   // 图文消息的URL
+	IsDeleted          bool   `json:"is_deleted"`            // 该图文是否被删除
+}
+
+// First 通过 article_id 获取已发布文章
+func (freePublish *FreePublish) First(articleID string) (list []Article, err error) {
+	accessToken, err := freePublish.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		ArticleID string `json:"article_id"`
+	}
+	req.ArticleID = articleID
+
+	var response []byte
+	uri := fmt.Sprintf("%s?access_token=%s", firstArticleURL, accessToken)
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	var res struct {
+		util.CommonError
+		NewsItem []Article `json:"news_item"`
+	}
+	err = util.DecodeWithError(response, &res, "FirstFreePublish")
+	if err != nil {
+		return
+	}
+
+	list = res.NewsItem
+	return
+}
+
+// ArticleList 发布列表
+type ArticleList struct {
+	util.CommonError
+	TotalCount int64             `json:"total_count"` // 成功发布素材的总数
+	ItemCount  int64             `json:"item_count"`  // 本次调用获取的素材的数量
+	Item       []ArticleListItem `json:"item"`
+}
+
+// ArticleListItem 用于 ArticleList 的 item 节点
+type ArticleListItem struct {
+	ArticleID  string             `json:"article_id"`  // 成功发布的图文消息id
+	Content    ArticleListContent `json:"content"`     // 内容
+	UpdateTime int64              `json:"update_time"` // 这篇图文消息素材的最后更新时间
+}
+
+// ArticleListContent 用于 ArticleListItem 的 content 节点
+type ArticleListContent struct {
+	NewsItem []Article `json:"news_item"` // 这篇图文消息素材的内容
+}
+
+// Paginate 获取成功发布列表
+func (freePublish *FreePublish) Paginate(offset, count int64, noReturnContent bool) (list ArticleList, err error) {
+	var accessToken string
+	accessToken, err = freePublish.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	var req struct {
+		Count           int64 `json:"count"`
+		Offset          int64 `json:"offset"`
+		NoReturnContent bool  `json:"no_content"`
+	}
+	req.Count = count
+	req.Offset = offset
+	req.NoReturnContent = noReturnContent
+
+	var response []byte
+	uri := fmt.Sprintf("%s?access_token=%s", paginateURL, accessToken)
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &list, "PaginateFreePublish")
+	return
+}

officialaccount/material/material.go

@@ -119,6 +119,9 @@ func (material *Material) AddNews(articles []*Article) (mediaID string, err erro
 	if err != nil {
 		return
 	}
+	if res.ErrCode != 0 {
+		return "", fmt.Errorf("errcode=%d,errmsg=%s", res.ErrCode, res.ErrMsg)
+	}
 	mediaID = res.MediaID
 	return
 }

officialaccount/menu/button.go

@@ -13,47 +13,51 @@ type Button struct {
 }
 
 // SetSubButton 设置二级菜单
-func (btn *Button) SetSubButton(name string, subButtons []*Button) {
+func (btn *Button) SetSubButton(name string, subButtons []*Button) *Button {
 	btn.Name = name
 	btn.SubButtons = subButtons
 	btn.Type = ""
 	btn.Key = ""
 	btn.URL = ""
 	btn.MediaID = ""
+	return btn
 }
 
 // SetClickButton btn 为click类型
-func (btn *Button) SetClickButton(name, key string) {
+func (btn *Button) SetClickButton(name, key string) *Button {
 	btn.Type = "click"
 	btn.Name = name
 	btn.Key = key
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetViewButton view类型
-func (btn *Button) SetViewButton(name, url string) {
+func (btn *Button) SetViewButton(name, url string) *Button {
 	btn.Type = "view"
 	btn.Name = name
 	btn.URL = url
 	btn.Key = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetScanCodePushButton 扫码推事件
-func (btn *Button) SetScanCodePushButton(name, key string) {
+func (btn *Button) SetScanCodePushButton(name, key string) *Button {
 	btn.Type = "scancode_push"
 	btn.Name = name
 	btn.Key = key
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetScanCodeWaitMsgButton 设置 扫码推事件且弹出"消息接收中"提示框
-func (btn *Button) SetScanCodeWaitMsgButton(name, key string) {
+func (btn *Button) SetScanCodeWaitMsgButton(name, key string) *Button {
 	btn.Type = "scancode_waitmsg"
 	btn.Name = name
 	btn.Key = key
@@ -61,10 +65,11 @@ func (btn *Button) SetScanCodeWaitMsgButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetPicSysPhotoButton 设置弹出系统拍照发图按钮
-func (btn *Button) SetPicSysPhotoButton(name, key string) {
+func (btn *Button) SetPicSysPhotoButton(name, key string) *Button {
 	btn.Type = "pic_sysphoto"
 	btn.Name = name
 	btn.Key = key
@@ -72,10 +77,11 @@ func (btn *Button) SetPicSysPhotoButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetPicPhotoOrAlbumButton 设置弹出拍照或者相册发图类型按钮
-func (btn *Button) SetPicPhotoOrAlbumButton(name, key string) {
+func (btn *Button) SetPicPhotoOrAlbumButton(name, key string) *Button {
 	btn.Type = "pic_photo_or_album"
 	btn.Name = name
 	btn.Key = key
@@ -83,10 +89,11 @@ func (btn *Button) SetPicPhotoOrAlbumButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetPicWeixinButton 设置弹出微信相册发图器类型按钮
-func (btn *Button) SetPicWeixinButton(name, key string) {
+func (btn *Button) SetPicWeixinButton(name, key string) *Button {
 	btn.Type = "pic_weixin"
 	btn.Name = name
 	btn.Key = key
@@ -94,10 +101,11 @@ func (btn *Button) SetPicWeixinButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetLocationSelectButton 设置 弹出地理位置选择器 类型按钮
-func (btn *Button) SetLocationSelectButton(name, key string) {
+func (btn *Button) SetLocationSelectButton(name, key string) *Button {
 	btn.Type = "location_select"
 	btn.Name = name
 	btn.Key = key
@@ -105,10 +113,11 @@ func (btn *Button) SetLocationSelectButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetMediaIDButton  设置 下发消息(除文本消息) 类型按钮
-func (btn *Button) SetMediaIDButton(name, mediaID string) {
+func (btn *Button) SetMediaIDButton(name, mediaID string) *Button {
 	btn.Type = "media_id"
 	btn.Name = name
 	btn.MediaID = mediaID
@@ -116,10 +125,11 @@ func (btn *Button) SetMediaIDButton(name, mediaID string) {
 	btn.Key = ""
 	btn.URL = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetViewLimitedButton  设置 跳转图文消息URL 类型按钮
-func (btn *Button) SetViewLimitedButton(name, mediaID string) {
+func (btn *Button) SetViewLimitedButton(name, mediaID string) *Button {
 	btn.Type = "view_limited"
 	btn.Name = name
 	btn.MediaID = mediaID
@@ -127,10 +137,11 @@ func (btn *Button) SetViewLimitedButton(name, mediaID string) {
 	btn.Key = ""
 	btn.URL = ""
 	btn.SubButtons = nil
+	return btn
 }
 
 // SetMiniprogramButton  设置 跳转小程序 类型按钮 (公众号后台必须已经关联小程序)
-func (btn *Button) SetMiniprogramButton(name, url, appID, pagePath string) {
+func (btn *Button) SetMiniprogramButton(name, url, appID, pagePath string) *Button {
 	btn.Type = "miniprogram"
 	btn.Name = name
 	btn.URL = url
@@ -140,4 +151,65 @@ func (btn *Button) SetMiniprogramButton(name, url, appID, pagePath string) {
 	btn.Key = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
+}
+
+// NewSubButton 二级菜单
+func NewSubButton(name string, subButtons []*Button) *Button {
+	return (&Button{}).SetSubButton(name, subButtons)
+}
+
+// NewClickButton btn 为click类型
+func NewClickButton(name, key string) *Button {
+	return (&Button{}).SetClickButton(name, key)
+}
+
+// NewViewButton view类型
+func NewViewButton(name, url string) *Button {
+	return (&Button{}).SetViewButton(name, url)
+}
+
+// NewScanCodePushButton 扫码推事件
+func NewScanCodePushButton(name, key string) *Button {
+	return (&Button{}).SetScanCodePushButton(name, key)
+}
+
+// NewScanCodeWaitMsgButton 扫码推事件且弹出"消息接收中"提示框
+func NewScanCodeWaitMsgButton(name, key string) *Button {
+	return (&Button{}).SetScanCodeWaitMsgButton(name, key)
+}
+
+// NewPicSysPhotoButton 弹出系统拍照发图按钮
+func NewPicSysPhotoButton(name, key string) *Button {
+	return (&Button{}).SetPicSysPhotoButton(name, key)
+}
+
+// NewPicPhotoOrAlbumButton 弹出拍照或者相册发图类型按钮
+func NewPicPhotoOrAlbumButton(name, key string) *Button {
+	return (&Button{}).SetPicPhotoOrAlbumButton(name, key)
+}
+
+// NewPicWeixinButton 弹出微信相册发图器类型按钮
+func NewPicWeixinButton(name, key string) *Button {
+	return (&Button{}).SetPicWeixinButton(name, key)
+}
+
+// NewLocationSelectButton  弹出地理位置选择器 类型按钮
+func NewLocationSelectButton(name, key string) *Button {
+	return (&Button{}).SetLocationSelectButton(name, key)
+}
+
+// NewMediaIDButton  下发消息(除文本消息) 类型按钮
+func NewMediaIDButton(name, mediaID string) *Button {
+	return (&Button{}).SetMediaIDButton(name, mediaID)
+}
+
+// NewViewLimitedButton  跳转图文消息URL 类型按钮
+func NewViewLimitedButton(name, mediaID string) *Button {
+	return (&Button{}).SetViewLimitedButton(name, mediaID)
+}
+
+// NewMiniprogramButton  跳转小程序 类型按钮 (公众号后台必须已经关联小程序)
+func NewMiniprogramButton(name, url, appID, pagePath string) *Button {
+	return (&Button{}).SetMiniprogramButton(name, url, appID, pagePath)
 }

officialaccount/menu/button_test.go

@@ -0,0 +1,28 @@
+package menu
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewButtonFun(t *testing.T) {
+	buttons := []*Button{
+		NewSubButton("1", []*Button{
+			NewViewButton("1.1", "https://baidu.com"),
+			NewViewButton("1.2", "https://baidu.com"),
+			NewViewButton("1.3", "https://baidu.com"),
+		}),
+		NewSubButton("2", []*Button{
+			NewViewButton("2.1", "https://baidu.com"),
+			NewViewButton("2.2", "https://baidu.com"),
+			NewViewButton("2.3", "https://baidu.com"),
+		}),
+		NewViewButton("3", "https://baidu.com"),
+	}
+
+	data, err := json.Marshal(buttons)
+	assert.Nil(t, err)
+	assert.Equal(t, `[{"name":"1","sub_button":[{"type":"view","name":"1.1","url":"https://baidu.com"},{"type":"view","name":"1.2","url":"https://baidu.com"},{"type":"view","name":"1.3","url":"https://baidu.com"}]},{"name":"2","sub_button":[{"type":"view","name":"2.1","url":"https://baidu.com"},{"type":"view","name":"2.2","url":"https://baidu.com"},{"type":"view","name":"2.3","url":"https://baidu.com"}]},{"type":"view","name":"3","url":"https://baidu.com"}]`, string(data))
+}

officialaccount/menu/menu.go

@@ -147,12 +147,12 @@ func (menu *Menu) SetMenuByJSON(jsonInfo string) error {
 
 	uri := fmt.Sprintf("%s?access_token=%s", menuCreateURL, accessToken)
 
-	response, err := util.PostJSON(uri, jsonInfo)
+	response, err := util.HTTPPost(uri, jsonInfo)
 	if err != nil {
 		return err
 	}
 
-	return util.DecodeWithCommonError(response, "SetMenu")
+	return util.DecodeWithCommonError(response, "SetMenuByJSON")
 }
 
 // GetMenu 获取菜单配置
@@ -223,7 +223,7 @@ func (menu *Menu) AddConditionalByJSON(jsonInfo string) error {
 	}
 
 	uri := fmt.Sprintf("%s?access_token=%s", menuAddConditionalURL, accessToken)
-	response, err := util.PostJSON(uri, jsonInfo)
+	response, err := util.HTTPPost(uri, jsonInfo)
 	if err != nil {
 		return err
 	}

officialaccount/message/message.go

@@ -4,6 +4,7 @@ import (
 	"encoding/xml"
 
 	"github.com/silenceper/wechat/v2/officialaccount/device"
+	"github.com/silenceper/wechat/v2/officialaccount/freepublish"
 )
 
 // MsgType 基本消息类型
@@ -19,58 +20,64 @@ const (
 	// MsgTypeText 表示文本消息
 	MsgTypeText MsgType = "text"
 	// MsgTypeImage 表示图片消息
-	MsgTypeImage = "image"
+	MsgTypeImage MsgType = "image"
 	// MsgTypeVoice 表示语音消息
-	MsgTypeVoice = "voice"
+	MsgTypeVoice MsgType = "voice"
 	// MsgTypeVideo 表示视频消息
-	MsgTypeVideo = "video"
+	MsgTypeVideo MsgType = "video"
 	// MsgTypeMiniprogrampage 表示小程序卡片消息
-	MsgTypeMiniprogrampage = "miniprogrampage"
+	MsgTypeMiniprogrampage MsgType = "miniprogrampage"
 	// MsgTypeShortVideo 表示短视频消息[限接收]
-	MsgTypeShortVideo = "shortvideo"
+	MsgTypeShortVideo MsgType = "shortvideo"
 	// MsgTypeLocation 表示坐标消息[限接收]
-	MsgTypeLocation = "location"
+	MsgTypeLocation MsgType = "location"
 	// MsgTypeLink 表示链接消息[限接收]
-	MsgTypeLink = "link"
+	MsgTypeLink MsgType = "link"
 	// MsgTypeMusic 表示音乐消息[限回复]
-	MsgTypeMusic = "music"
+	MsgTypeMusic MsgType = "music"
 	// MsgTypeNews 表示图文消息[限回复]
-	MsgTypeNews = "news"
+	MsgTypeNews MsgType = "news"
 	// MsgTypeTransfer 表示消息消息转发到客服
-	MsgTypeTransfer = "transfer_customer_service"
+	MsgTypeTransfer MsgType = "transfer_customer_service"
 	// MsgTypeEvent 表示事件推送消息
-	MsgTypeEvent = "event"
+	MsgTypeEvent MsgType = "event"
 )
 
 const (
 	// EventSubscribe 订阅
 	EventSubscribe EventType = "subscribe"
 	// EventUnsubscribe 取消订阅
-	EventUnsubscribe = "unsubscribe"
+	EventUnsubscribe EventType = "unsubscribe"
 	// EventScan 用户已经关注公众号，则微信会将带场景值扫描事件推送给开发者
-	EventScan = "SCAN"
+	EventScan EventType = "SCAN"
 	// EventLocation 上报地理位置事件
-	EventLocation = "LOCATION"
+	EventLocation EventType = "LOCATION"
 	// EventClick 点击菜单拉取消息时的事件推送
-	EventClick = "CLICK"
+	EventClick EventType = "CLICK"
 	// EventView 点击菜单跳转链接时的事件推送
-	EventView = "VIEW"
+	EventView EventType = "VIEW"
 	// EventScancodePush 扫码推事件的事件推送
-	EventScancodePush = "scancode_push"
+	EventScancodePush EventType = "scancode_push"
 	// EventScancodeWaitmsg 扫码推事件且弹出“消息接收中”提示框的事件推送
-	EventScancodeWaitmsg = "scancode_waitmsg"
+	EventScancodeWaitmsg EventType = "scancode_waitmsg"
 	// EventPicSysphoto 弹出系统拍照发图的事件推送
-	EventPicSysphoto = "pic_sysphoto"
+	EventPicSysphoto EventType = "pic_sysphoto"
 	// EventPicPhotoOrAlbum 弹出拍照或者相册发图的事件推送
-	EventPicPhotoOrAlbum = "pic_photo_or_album"
+	EventPicPhotoOrAlbum EventType = "pic_photo_or_album"
 	// EventPicWeixin 弹出微信相册发图器的事件推送
-	EventPicWeixin = "pic_weixin"
+	EventPicWeixin EventType = "pic_weixin"
 	// EventLocationSelect 弹出地理位置选择器的事件推送
-	EventLocationSelect = "location_select"
+	EventLocationSelect EventType = "location_select"
 	// EventTemplateSendJobFinish 发送模板消息推送通知
-	EventTemplateSendJobFinish = "TEMPLATESENDJOBFINISH"
+	EventTemplateSendJobFinish EventType = "TEMPLATESENDJOBFINISH"
+	// EventMassSendJobFinish 群发消息推送通知
+	EventMassSendJobFinish EventType = "MASSSENDJOBFINISH"
 	// EventWxaMediaCheck 异步校验图片/音频是否含有违法违规内容推送事件
-	EventWxaMediaCheck = "wxa_media_check"
+	EventWxaMediaCheck EventType = "wxa_media_check"
+	// EventSubscribeMsgPopupEvent 订阅通知事件推送
+	EventSubscribeMsgPopupEvent EventType = "subscribe_msg_popup_event"
+	// EventPublishJobFinish 发布任务完成
+	EventPublishJobFinish EventType = "PUBLISHJOBFINISH"
 )
 
 const (
@@ -79,11 +86,13 @@ const (
 	// InfoTypeVerifyTicket 返回ticket
 	InfoTypeVerifyTicket InfoType = "component_verify_ticket"
 	// InfoTypeAuthorized 授权
-	InfoTypeAuthorized = "authorized"
+	InfoTypeAuthorized InfoType = "authorized"
 	// InfoTypeUnauthorized 取消授权
-	InfoTypeUnauthorized = "unauthorized"
+	InfoTypeUnauthorized InfoType = "unauthorized"
 	// InfoTypeUpdateAuthorized 更新授权
-	InfoTypeUpdateAuthorized = "updateauthorized"
+	InfoTypeUpdateAuthorized InfoType = "updateauthorized"
+	// InfoTypeNotifyThirdFasterRegister 注册审核事件推送
+	InfoTypeNotifyThirdFasterRegister InfoType = "notify_third_fasteregister"
 )
 
 // MixMessage 存放所有微信发送过来的消息和事件
@@ -108,7 +117,7 @@ type MixMessage struct {
 	URL           string  `xml:"Url"`
 
 	// 事件相关
-	Event       EventType `xml:"Event"`
+	Event       EventType `xml:"Event" json:"Event"`
 	EventKey    string    `xml:"EventKey"`
 	Ticket      string    `xml:"Ticket"`
 	Latitude    string    `xml:"Latitude"`
@@ -117,6 +126,10 @@ type MixMessage struct {
 	MenuID      string    `xml:"MenuId"`
 	Status      string    `xml:"Status"`
 	SessionFrom string    `xml:"SessionFrom"`
+	TotalCount  int64     `xml:"TotalCount"`
+	FilterCount int64     `xml:"FilterCount"`
+	SentCount   int64     `xml:"SentCount"`
+	ErrorCount  int64     `xml:"ErrorCount"`
 
 	ScanCodeInfo struct {
 		ScanType   string `xml:"ScanType"`
@@ -136,6 +149,27 @@ type MixMessage struct {
 		Poiname   string  `xml:"Poiname"`
 	}
 
+	subscribeMsgPopupEventList []SubscribeMsgPopupEvent `json:"-"`
+
+	SubscribeMsgPopupEvent []struct {
+		List SubscribeMsgPopupEvent `xml:"List"`
+	} `xml:"SubscribeMsgPopupEvent"`
+
+	// 事件相关：发布能力
+	PublishEventInfo struct {
+		PublishID     int64                     `xml:"publish_id"`     // 发布任务id
+		PublishStatus freepublish.PublishStatus `xml:"publish_status"` // 发布状态
+		ArticleID     string                    `xml:"article_id"`     // 当发布状态为0时（即成功）时，返回图文的 article_id，可用于“客服消息”场景
+		ArticleDetail struct {
+			Count uint `xml:"count"` // 文章数量
+			Item  []struct {
+				Index      uint   `xml:"idx"`         // 文章对应的编号
+				ArticleURL string `xml:"article_url"` // 图文的永久链接
+			} `xml:"item"`
+		} `xml:"article_detail"` // 当发布状态为0时（即成功）时，返回内容
+		FailIndex []uint `xml:"fail_idx"` // 当发布状态为2或4时，返回不通过的文章编号，第一篇为 1；其他发布状态则为空
+	} `xml:"PublishEventInfo"`
+
 	// 第三方平台相关
 	InfoType                     InfoType `xml:"InfoType"`
 	AppID                        string   `xml:"AppId"`
@@ -144,6 +178,15 @@ type MixMessage struct {
 	AuthorizationCode            string   `xml:"AuthorizationCode"`
 	AuthorizationCodeExpiredTime int64    `xml:"AuthorizationCodeExpiredTime"`
 	PreAuthCode                  string   `xml:"PreAuthCode"`
+	AuthCode                     string   `xml:"auth_code"`
+	Info                         struct {
+		Name               string `xml:"name"`
+		Code               string `xml:"code"`
+		CodeType           int    `xml:"code_type"`
+		LegalPersonaWechat string `xml:"legal_persona_wechat"`
+		LegalPersonaName   string `xml:"legal_persona_name"`
+		ComponentPhone     string `xml:"component_phone"`
+	} `xml:"info"`
 
 	// 卡券相关
 	CardID              string `xml:"CardId"`
@@ -166,6 +209,30 @@ type MixMessage struct {
 	device.MsgDevice
 }
 
+// SubscribeMsgPopupEvent 订阅通知事件推送的消息体
+type SubscribeMsgPopupEvent struct {
+	TemplateID            string `xml:"TemplateId" json:"TemplateId"`
+	SubscribeStatusString string `xml:"SubscribeStatusString" json:"SubscribeStatusString"`
+	PopupScene            int    `xml:"PopupScene" json:"PopupScene,string"`
+}
+
+// SetSubscribeMsgPopupEvents 设置订阅消息事件
+func (s *MixMessage) SetSubscribeMsgPopupEvents(list []SubscribeMsgPopupEvent) {
+	s.subscribeMsgPopupEventList = list
+}
+
+// GetSubscribeMsgPopupEvents 获取订阅消息事件数据
+func (s *MixMessage) GetSubscribeMsgPopupEvents() []SubscribeMsgPopupEvent {
+	if s.subscribeMsgPopupEventList != nil {
+		return s.subscribeMsgPopupEventList
+	}
+	list := make([]SubscribeMsgPopupEvent, len(s.SubscribeMsgPopupEvent))
+	for i, item := range s.SubscribeMsgPopupEvent {
+		list[i] = item.List
+	}
+	return list
+}
+
 // EventPic 发图事件推送
 type EventPic struct {
 	PicMd5Sum string `xml:"PicMd5Sum"`
@@ -200,10 +267,10 @@ func (c CDATA) MarshalXML(e *xml.Encoder, start xml.StartElement) error {
 // 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"`
+	ToUserName   CDATA    `xml:"ToUserName" json:"ToUserName"`
+	FromUserName CDATA    `xml:"FromUserName" json:"FromUserName"`
+	CreateTime   int64    `xml:"CreateTime" json:"CreateTime"`
+	MsgType      MsgType  `xml:"MsgType" json:"MsgType"`
 }
 
 // SetToUserName set ToUserName
@@ -225,3 +292,8 @@ func (msg *CommonToken) SetCreateTime(createTime int64) {
 func (msg *CommonToken) SetMsgType(msgType MsgType) {
 	msg.MsgType = msgType
 }
+
+// GetOpenID get the FromUserName value
+func (msg *CommonToken) GetOpenID() string {
+	return string(msg.FromUserName)
+}

officialaccount/message/subscribe.go

@@ -0,0 +1,147 @@
+package message
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	subscribeSendURL         = "https://api.weixin.qq.com/cgi-bin/message/subscribe/bizsend"
+	subscribeTemplateListURL = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate"
+	subscribeTemplateAddURL  = "https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate"
+	subscribeTemplateDelURL  = "https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate"
+)
+
+// Subscribe 订阅消息
+type Subscribe struct {
+	*context.Context
+}
+
+// NewSubscribe 实例化
+func NewSubscribe(context *context.Context) *Subscribe {
+	tpl := new(Subscribe)
+	tpl.Context = context
+	return tpl
+}
+
+// SubscribeMessage 发送的订阅消息内容
+type SubscribeMessage struct {
+	ToUser      string                        `json:"touser"`         // 必须, 接受者OpenID
+	TemplateID  string                        `json:"template_id"`    // 必须, 模版ID
+	Page        string                        `json:"page,omitempty"` // 可选, 跳转网页时填写
+	Data        map[string]*SubscribeDataItem `json:"data"`           // 必须, 模板数据
+	MiniProgram struct {
+		AppID    string `json:"appid"`    // 所需跳转到的小程序appid（该小程序appid必须与发模板消息的公众号是绑定关联关系）
+		PagePath string `json:"pagepath"` // 所需跳转到小程序的具体页面路径，支持带参数,（示例index?foo=bar）
+	} `json:"miniprogram"` // 可选,跳转至小程序地址
+}
+
+// SubscribeDataItem 模版内某个 .DATA 的值
+type SubscribeDataItem struct {
+	Value string `json:"value"`
+}
+
+// Send 发送订阅消息
+func (tpl *Subscribe) Send(msg *SubscribeMessage) (err error) {
+	var accessToken string
+	accessToken, err = tpl.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, "SendSubscribeMessage")
+}
+
+// PrivateSubscribeItem 私有订阅消息模板
+type PrivateSubscribeItem struct {
+	PriTmplID string `json:"priTmplId"` //	添加至帐号下的模板 id，发送订阅通知时所需
+	Title     string `json:"title"`     // 模版标题
+	Content   string `json:"content"`   // 模版内容
+	Example   string `json:"example"`   // 模板内容示例
+	SubType   int    `json:"type"`      // 模版类型，2 为一次性订阅，3 为长期订阅
+}
+
+type resPrivateSubscribeList struct {
+	util.CommonError
+	SubscriptionList []*PrivateSubscribeItem `json:"data"`
+}
+
+// List 获取私有订阅消息模板列表
+func (tpl *Subscribe) List() (templateList []*PrivateSubscribeItem, err error) {
+	var accessToken string
+	accessToken, err = tpl.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", subscribeTemplateListURL, accessToken)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	var res resPrivateSubscribeList
+	err = util.DecodeWithError(response, &res, "ListSubscribe")
+	if err != nil {
+		return
+	}
+	templateList = res.SubscriptionList
+	return
+}
+
+type resSubscribeAdd struct {
+	util.CommonError
+
+	TemplateID string `json:"priTmplId"`
+}
+
+// Add 添加订阅消息模板
+func (tpl *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (templateID string, err error) {
+	var accessToken string
+	accessToken, err = tpl.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", subscribeTemplateAddURL, 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 (tpl *Subscribe) Delete(templateID string) (err error) {
+	var accessToken string
+	accessToken, err = tpl.GetAccessToken()
+	if err != nil {
+		return
+	}
+	var msg = struct {
+		TemplateID string `json:"priTmplId"`
+	}{TemplateID: templateID}
+	uri := fmt.Sprintf("%s?access_token=%s", subscribeTemplateDelURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(response, "DeleteSubscribe")
+}

officialaccount/message/template.go

@@ -11,6 +11,8 @@ import (
 const (
 	templateSendURL = "https://api.weixin.qq.com/cgi-bin/message/template/send"
 	templateListURL = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template"
+	templateAddURL  = "https://api.weixin.qq.com/cgi-bin/template/api_add_template"
+	templateDelURL  = "https://api.weixin.qq.com/cgi-bin/template/del_private_template"
 )
 
 // Template 模板消息
@@ -59,7 +61,8 @@ func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) {
 		return
 	}
 	uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
-	response, err := util.PostJSON(uri, msg)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
 	if err != nil {
 		return
 	}
@@ -113,3 +116,55 @@ func (tpl *Template) List() (templateList []*TemplateItem, err error) {
 	templateList = res.TemplateList
 	return
 }
+
+type resTemplateAdd struct {
+	util.CommonError
+
+	TemplateID string `json:"template_id"`
+}
+
+// Add 添加模板.
+func (tpl *Template) Add(shortID string) (templateID string, err error) {
+	var accessToken string
+	accessToken, err = tpl.GetAccessToken()
+	if err != nil {
+		return
+	}
+	var msg = struct {
+		ShortID string `json:"template_id_short"`
+	}{ShortID: shortID}
+	uri := fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
+		return
+	}
+
+	var result resTemplateAdd
+	err = util.DecodeWithError(response, &result, "AddTemplate")
+	if err != nil {
+		return
+	}
+	templateID = result.TemplateID
+	return
+}
+
+// Delete 删除私有模板.
+func (tpl *Template) Delete(templateID string) (err error) {
+	var accessToken string
+	accessToken, err = tpl.GetAccessToken()
+	if err != nil {
+		return
+	}
+	var msg = struct {
+		TemplateID string `json:"template_id"`
+	}{TemplateID: templateID}
+
+	uri := fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(response, "DeleteTemplate")
+}

officialaccount/oauth/oauth.go

@@ -15,7 +15,7 @@ const (
 	webAppRedirectOauthURL = "https://open.weixin.qq.com/connect/qrconnect?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=%s#wechat_redirect"
 	accessTokenURL         = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code"
 	refreshAccessTokenURL  = "https://api.weixin.qq.com/sns/oauth2/refresh_token?appid=%s&grant_type=refresh_token&refresh_token=%s"
-	userInfoURL            = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN"
+	userInfoURL            = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=%s"
 	checkAccessTokenURL    = "https://api.weixin.qq.com/sns/auth?access_token=%s&openid=%s"
 )
 
@@ -144,8 +144,11 @@ type UserInfo struct {
 }
 
 // GetUserInfo 如果scope为 snsapi_userinfo 则可以通过此方法获取到用户基本信息
-func (oauth *Oauth) GetUserInfo(accessToken, openID string) (result UserInfo, err error) {
-	urlStr := fmt.Sprintf(userInfoURL, accessToken, openID)
+func (oauth *Oauth) GetUserInfo(accessToken, openID, lang string) (result UserInfo, err error) {
+	if lang == "" {
+		lang = "zh_CN"
+	}
+	urlStr := fmt.Sprintf(userInfoURL, accessToken, openID, lang)
 	var response []byte
 	response, err = util.HTTPGet(urlStr)
 	if err != nil {

officialaccount/ocr/ocr.go

@@ -0,0 +1,287 @@
+package ocr
+
+import (
+	"fmt"
+	"net/url"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	ocrIDCardURL         = "https://api.weixin.qq.com/cv/ocr/idcard"
+	ocrBankCardURL       = "https://api.weixin.qq.com/cv/ocr/bankcard"
+	ocrDrivingURL        = "https://api.weixin.qq.com/cv/ocr/driving"
+	ocrDrivingLicenseURL = "https://api.weixin.qq.com/cv/ocr/drivinglicense"
+	ocrBizLicenseURL     = "https://api.weixin.qq.com/cv/ocr/bizlicense"
+	ocrCommonURL         = "https://api.weixin.qq.com/cv/ocr/comm"
+	ocrPlateNumberURL    = "https://api.weixin.qq.com/cv/ocr/platenum"
+)
+
+// OCR struct
+type OCR struct {
+	*context.Context
+}
+
+// coordinate 坐标
+type coordinate struct {
+	X int64 `json:"x,omitempty"`
+	Y int64 `json:"y,omitempty"`
+}
+
+// position 位置
+type position struct {
+	LeftTop     coordinate `json:"left_top"`
+	RightTop    coordinate `json:"right_top"`
+	RightBottom coordinate `json:"right_bottom"`
+	LeftBottom  coordinate `json:"left_bottom"`
+}
+
+// imageSize 图片尺寸
+type imageSize struct {
+	Width  int64 `json:"w,omitempty"`
+	Height int64 `json:"h,omitempty"`
+}
+
+// ResDriving 行驶证返回结果
+type ResDriving struct {
+	util.CommonError
+
+	PlateNumber       string              `json:"plate_num,omitempty"`
+	VehicleType       string              `json:"vehicle_type,omitempty"`
+	Owner             string              `json:"owner,omitempty"`
+	Address           string              `json:"addr,omitempty"`
+	UseCharacter      string              `json:"use_character,omitempty"`
+	Model             string              `json:"model,omitempty"`
+	Vin               string              `json:"vin,omitempty"`
+	EngineNumber      string              `json:"engine_num,omitempty"`
+	RegisterDate      string              `json:"register_date,omitempty"`
+	IssueDate         string              `json:"issue_date,omitempty"`
+	PlateNumberB      string              `json:"plate_num_b,omitempty"`
+	Record            string              `json:"record,omitempty"`
+	PassengersNumber  string              `json:"passengers_num,omitempty"`
+	TotalQuality      string              `json:"total_quality,omitempty"`
+	PrepareQuality    string              `json:"prepare_quality,omitempty"`
+	OverallSize       string              `json:"overall_size,omitempty"`
+	CardPositionFront map[string]position `json:"card_position_front,omitempty"`
+	CardPositionBack  map[string]position `json:"card_position_back,omitempty"`
+	ImageSize         imageSize           `json:"img_size,omitempty"`
+}
+
+// ResIDCard 身份证返回结果
+type ResIDCard struct {
+	util.CommonError
+
+	Type        string `json:"type,omitempty"`
+	Name        string `json:"name,omitempty"`
+	ID          string `json:"id,omitempty"`
+	Address     string `json:"addr,omitempty"`
+	Gender      string `json:"gender,omitempty"`
+	Nationality string `json:"nationality,omitempty"`
+	ValidDate   string `json:"valid_date,omitempty"`
+}
+
+// ResBankCard 银行卡返回结果
+type ResBankCard struct {
+	util.CommonError
+
+	Number string `json:"number,omitempty"`
+}
+
+// ResDrivingLicense 驾驶证返回结果
+type ResDrivingLicense struct {
+	util.CommonError
+
+	IDNumber     string `json:"id_num,omitempty"`
+	Name         string `json:"name,omitempty"`
+	Sex          string `json:"sex,omitempty"`
+	Nationality  string `json:"nationality,omitempty"`
+	Address      string `json:"address,omitempty"`
+	Birthday     string `json:"birth_date,omitempty"`
+	IssueDate    string `json:"issue_date,omitempty"`
+	CarClass     string `json:"car_class,omitempty"`
+	ValidFrom    string `json:"valid_from,omitempty"`
+	ValidTo      string `json:"valid_to,omitempty"`
+	OfficialSeal string `json:"official_seal,omitempty"`
+}
+
+// ResBizLicense 营业执照返回结果
+type ResBizLicense struct {
+	util.CommonError
+
+	RegisterNumber      string              `json:"reg_num,omitempty"`
+	Serial              string              `json:"serial,omitempty"`
+	LegalRepresentative string              `json:"legal_representative,omitempty"`
+	EnterpriseName      string              `json:"enterprise_name,omitempty"`
+	TypeOfOrganization  string              `json:"type_of_organization,omitempty"`
+	Address             string              `json:"address,omitempty"`
+	TypeOfEnterprise    string              `json:"type_of_enterprise,omitempty"`
+	BusinessScope       string              `json:"business_scope,omitempty"`
+	RegisteredCapital   string              `json:"registered_capital,omitempty"`
+	PaidInCapital       string              `json:"paid_in_capital,omitempty"`
+	ValidPeriod         string              `json:"valid_period,omitempty"`
+	RegisterDate        string              `json:"registered_date,omitempty"`
+	CertPosition        map[string]position `json:"cert_position,omitempty"`
+	ImageSize           imageSize           `json:"img_size,omitempty"`
+}
+
+// ResCommon 公共印刷品返回结果
+type ResCommon struct {
+	util.CommonError
+
+	Items     []commonItem `json:"items,omitempty"`
+	ImageSize imageSize    `json:"img_size,omitempty"`
+}
+
+// commonItem 公共元素
+type commonItem struct {
+	Position position `json:"pos"`
+	Text     string   `json:"text"`
+}
+
+// ResPlateNumber 车牌号返回结果
+type ResPlateNumber struct {
+	util.CommonError
+
+	Number string `json:"number"`
+}
+
+// NewOCR 实例
+func NewOCR(c *context.Context) *OCR {
+	ocr := new(OCR)
+	ocr.Context = c
+	return ocr
+}
+
+// IDCard 身份证OCR识别接口
+func (ocr *OCR) IDCard(path string) (ResIDCard ResIDCard, err error) {
+	accessToken, err := ocr.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrIDCardURL, url.QueryEscape(path), accessToken)
+
+	response, err := util.HTTPPost(uri, "")
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &ResIDCard, "OCRIDCard")
+
+	return
+}
+
+// BankCard 银行卡OCR识别接口
+func (ocr *OCR) BankCard(path string) (ResBankCard ResBankCard, err error) {
+	accessToken, err := ocr.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrBankCardURL, url.QueryEscape(path), accessToken)
+
+	response, err := util.HTTPPost(uri, "")
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &ResBankCard, "OCRBankCard")
+
+	return
+}
+
+// Driving 行驶证OCR识别接口
+func (ocr *OCR) Driving(path string) (ResDriving ResDriving, err error) {
+	accessToken, err := ocr.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrDrivingURL, url.QueryEscape(path), accessToken)
+
+	response, err := util.HTTPPost(uri, "")
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &ResDriving, "OCRDriving")
+
+	return
+}
+
+// DrivingLicense 驾驶证OCR识别接口
+func (ocr *OCR) DrivingLicense(path string) (ResDrivingLicense ResDrivingLicense, err error) {
+	accessToken, err := ocr.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrDrivingLicenseURL, url.QueryEscape(path), accessToken)
+
+	response, err := util.HTTPPost(uri, "")
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &ResDrivingLicense, "OCRDrivingLicense")
+
+	return
+}
+
+// BizLicense 营业执照OCR识别接口
+func (ocr *OCR) BizLicense(path string) (ResBizLicense ResBizLicense, err error) {
+	accessToken, err := ocr.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrBizLicenseURL, url.QueryEscape(path), accessToken)
+
+	response, err := util.HTTPPost(uri, "")
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &ResBizLicense, "OCRBizLicense")
+
+	return
+}
+
+// Common 通用印刷体OCR识别接口
+func (ocr *OCR) Common(path string) (ResCommon ResCommon, err error) {
+	accessToken, err := ocr.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrCommonURL, url.QueryEscape(path), accessToken)
+
+	response, err := util.HTTPPost(uri, "")
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &ResCommon, "OCRCommon")
+
+	return
+}
+
+// PlateNumber 车牌OCR识别接口
+func (ocr *OCR) PlateNumber(path string) (ResPlateNumber ResPlateNumber, err error) {
+	accessToken, err := ocr.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?img_url=%s&access_token=%s", ocrPlateNumberURL, url.QueryEscape(path), accessToken)
+
+	response, err := util.HTTPPost(uri, "")
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &ResPlateNumber, "OCRPlateNumber")
+
+	return
+}

officialaccount/officialaccount.go

@@ -3,6 +3,10 @@ package officialaccount
 import (
 	"net/http"
 
+	"github.com/silenceper/wechat/v2/officialaccount/draft"
+	"github.com/silenceper/wechat/v2/officialaccount/freepublish"
+	"github.com/silenceper/wechat/v2/officialaccount/ocr"
+
 	"github.com/silenceper/wechat/v2/officialaccount/datacube"
 
 	"github.com/silenceper/wechat/v2/credential"
@@ -78,6 +82,16 @@ func (officialAccount *OfficialAccount) GetMaterial() *material.Material {
 	return material.NewMaterial(officialAccount.ctx)
 }
 
+// GetDraft 草稿箱
+func (officialAccount *OfficialAccount) GetDraft() *draft.Draft {
+	return draft.NewDraft(officialAccount.ctx)
+}
+
+// GetFreePublish 发布能力
+func (officialAccount *OfficialAccount) GetFreePublish() *freepublish.FreePublish {
+	return freepublish.NewFreePublish(officialAccount.ctx)
+}
+
 // GetJs js-sdk配置
 func (officialAccount *OfficialAccount) GetJs() *js.Js {
 	return js.NewJs(officialAccount.ctx)
@@ -113,3 +127,13 @@ func (officialAccount *OfficialAccount) GetBroadcast() *broadcast.Broadcast {
 func (officialAccount *OfficialAccount) GetDataCube() *datacube.DataCube {
 	return datacube.NewCube(officialAccount.ctx)
 }
+
+// GetOCR OCR接口
+func (officialAccount *OfficialAccount) GetOCR() *ocr.OCR {
+	return ocr.NewOCR(officialAccount.ctx)
+}
+
+// GetSubscribe 公众号订阅消息
+func (officialAccount *OfficialAccount) GetSubscribe() *message.Subscribe {
+	return message.NewSubscribe(officialAccount.ctx)
+}

officialaccount/server/server.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"encoding/json"
 	"encoding/xml"
 	"errors"
 	"fmt"
@@ -9,12 +10,14 @@ import (
 	"reflect"
 	"runtime/debug"
 	"strconv"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
 
 	"github.com/silenceper/wechat/v2/officialaccount/context"
 	"github.com/silenceper/wechat/v2/officialaccount/message"
-	log "github.com/sirupsen/logrus"
-
 	"github.com/silenceper/wechat/v2/util"
+	"github.com/tidwall/gjson"
 )
 
 // Server struct
@@ -27,14 +30,15 @@ type Server struct {
 
 	openID string
 
-	messageHandler func(message.MixMessage) *message.Reply
+	messageHandler func(*message.MixMessage) *message.Reply
 
 	RequestRawXMLMsg  []byte
-	RequestMsg        message.MixMessage
+	RequestMsg        *message.MixMessage
 	ResponseRawXMLMsg []byte
 	ResponseMsg       interface{}
 
 	isSafeMode    bool
+	isJSONContent bool
 	random        []byte
 	nonce         string
 	timestamp     int64
@@ -97,6 +101,10 @@ func (srv *Server) handleRequest() (reply *message.Reply, err error) {
 		srv.isSafeMode = true
 	}
 
+	//set request contentType
+	contentType := srv.Request.Header.Get("Content-Type")
+	srv.isJSONContent = strings.Contains(contentType, "application/json")
+
 	// set openID
 	srv.openID = srv.Query("openid")
 
@@ -105,7 +113,7 @@ func (srv *Server) handleRequest() (reply *message.Reply, err error) {
 	if err != nil {
 		return
 	}
-	mixMessage, success := msg.(message.MixMessage)
+	mixMessage, success := msg.(*message.MixMessage)
 	if !success {
 		err = errors.New("消息类型转换失败")
 	}
@@ -124,9 +132,9 @@ func (srv *Server) getMessage() (interface{}, error) {
 	var rawXMLMsgBytes []byte
 	var err error
 	if srv.isSafeMode {
-		var encryptedXMLMsg message.EncryptedXMLMsg
-		if err := xml.NewDecoder(srv.Request.Body).Decode(&encryptedXMLMsg); err != nil {
-			return nil, fmt.Errorf("从body中解析xml失败,err=%v", err)
+		encryptedXMLMsg, dataErr := srv.getEncryptBody()
+		if dataErr != nil {
+			return nil, dataErr
 		}
 
 		// 验证消息签名
@@ -160,14 +168,53 @@ func (srv *Server) getMessage() (interface{}, error) {
 	return srv.parseRequestMessage(rawXMLMsgBytes)
 }
 
-func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg message.MixMessage, err error) {
-	msg = message.MixMessage{}
-	err = xml.Unmarshal(rawXMLMsgBytes, &msg)
+func (srv *Server) getEncryptBody() (*message.EncryptedXMLMsg, error) {
+	var encryptedXMLMsg = &message.EncryptedXMLMsg{}
+	if srv.isJSONContent {
+		if err := json.NewDecoder(srv.Request.Body).Decode(encryptedXMLMsg); err != nil {
+			return nil, fmt.Errorf("从body中解析json失败,err=%v", err)
+		}
+	} else {
+		if err := xml.NewDecoder(srv.Request.Body).Decode(encryptedXMLMsg); err != nil {
+			return nil, fmt.Errorf("从body中解析xml失败,err=%v", err)
+		}
+	}
+	return encryptedXMLMsg, nil
+}
+
+func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg *message.MixMessage, err error) {
+	msg = &message.MixMessage{}
+	if !srv.isJSONContent {
+		err = xml.Unmarshal(rawXMLMsgBytes, msg)
+		return
+	}
+	//parse json
+	err = json.Unmarshal(rawXMLMsgBytes, msg)
+	if err != nil {
+		return
+	}
+	// nonstandard json, 目前小程序订阅消息返回数据格式不标准，订阅消息模板单个List返回是对象，多个List返回是数组。
+	if msg.MsgType == message.MsgTypeEvent {
+		listData := gjson.Get(string(rawXMLMsgBytes), "List")
+		if listData.IsObject() {
+			listItem := message.SubscribeMsgPopupEvent{}
+			if parseErr := json.Unmarshal([]byte(listData.Raw), &listItem); parseErr != nil {
+				return msg, parseErr
+			}
+			msg.SetSubscribeMsgPopupEvents([]message.SubscribeMsgPopupEvent{listItem})
+		} else if listData.IsArray() {
+			listItems := make([]message.SubscribeMsgPopupEvent, 0)
+			if parseErr := json.Unmarshal([]byte(listData.Raw), &listItems); parseErr != nil {
+				return msg, parseErr
+			}
+			msg.SetSubscribeMsgPopupEvents(listItems)
+		}
+	}
 	return
 }
 
 // SetMessageHandler 设置用户自定义的回调方法
-func (srv *Server) SetMessageHandler(handler func(message.MixMessage) *message.Reply) {
+func (srv *Server) SetMessageHandler(handler func(*message.MixMessage) *message.Reply) {
 	srv.messageHandler = handler
 }
 

officialaccount/user/migrate.go

@@ -0,0 +1,87 @@
+// Package user migrate 用于微信公众号账号迁移，获取openID变化
+// 参考文档：https://kf.qq.com/faq/1901177NrqMr190117nqYJze.html
+package user
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	changeOpenIDURL = "https://api.weixin.qq.com/cgi-bin/changeopenid"
+)
+
+// ChangeOpenIDResult OpenID迁移变化
+type ChangeOpenIDResult struct {
+	OriOpenID string `json:"ori_openid"`
+	NewOpenID string `json:"new_openid"`
+	ErrMsg    string `json:"err_msg,omitempty"`
+}
+
+// ChangeOpenIDResultList OpenID迁移变化列表
+type ChangeOpenIDResultList struct {
+	util.CommonError
+	List []ChangeOpenIDResult `json:"result_list"`
+}
+
+// ListChangeOpenIDs 返回指定OpenID变化列表
+// fromAppID 为老账号AppID
+// openIDs 为老账号的openID，openIDs限100个以内
+// AccessToken 为新账号的AccessToken
+func (user *User) ListChangeOpenIDs(fromAppID string, openIDs ...string) (list *ChangeOpenIDResultList, err error) {
+	list = &ChangeOpenIDResultList{}
+	// list.List = make([]ChangeOpenIDResult, 0)
+	if len(openIDs) > 100 {
+		err = errors.New("openIDs length must be lt 100")
+		return
+	}
+
+	if fromAppID == "" {
+		err = errors.New("fromAppID is required")
+		return
+	}
+
+	accessToken, err := user.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", changeOpenIDURL, accessToken)
+	var resp []byte
+	var req struct {
+		FromAppID  string   `json:"from_appid"`
+		OpenidList []string `json:"openid_list"`
+	}
+	req.FromAppID = fromAppID
+	req.OpenidList = append(req.OpenidList, openIDs...)
+	resp, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(resp, list, "ListChangeOpenIDs")
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+// ListAllChangeOpenIDs  返回所有用户OpenID列表
+// fromAppID 为老账号AppID
+// openIDs 为老账号的openID
+// AccessToken 为新账号的AccessToken
+func (user *User) ListAllChangeOpenIDs(fromAppID string, openIDs ...string) (list []ChangeOpenIDResult, err error) {
+	list = make([]ChangeOpenIDResult, 0)
+	chunks := util.SliceChunk(openIDs, 100)
+	for _, chunk := range chunks {
+		result, err := user.ListChangeOpenIDs(fromAppID, chunk...)
+		if err != nil {
+			return list, err
+		}
+		list = append(list, result.List...)
+	}
+	return
+}

officialaccount/user/user.go

@@ -139,7 +139,7 @@ func (user *User) ListUserOpenIDs(nextOpenid ...string) (*OpenidList, error) {
 // ListAllUserOpenIDs 返回所有用户OpenID列表
 func (user *User) ListAllUserOpenIDs() ([]string, error) {
 	nextOpenid := ""
-	openids := []string{}
+	openids := make([]string, 0)
 	count := 0
 	for {
 		ul, err := user.ListUserOpenIDs(nextOpenid)

openplatform/README.md

@@ -1,11 +1,11 @@
 # 微信开放平台
 
-
 [官方文档](https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/Third_party_platform_appid.html)
 
 ## 快速入门
 
 ### 服务端处理
+
 ```go
 wc := wechat.NewWechat()
 memory := cache.NewMemory()
@@ -22,7 +22,7 @@ openPlatform := wc.GetOpenPlatform(cfg)
 // 传入request和responseWriter
 server := openPlatform.GetServer(req, rw)
 //设置接收消息的处理方法
-server.SetMessageHandler(func(msg message.MixMessage) *message.Reply {
+server.SetMessageHandler(func(msg *message.MixMessage) *message.Reply {
     if msg.InfoType == message.InfoTypeVerifyTicket {
         componentVerifyTicket, err := openPlatform.SetComponentAccessToken(msg.ComponentVerifyTicket)
         if err != nil {
@@ -52,7 +52,9 @@ server.Send()
 
 
 ```
+
 ### 待授权处理消息
+
 ```go
 
 //授权的第三方公众号的appID

openplatform/config/config.go

@@ -4,7 +4,7 @@ import (
 	"github.com/silenceper/wechat/v2/cache"
 )
 
-//Config config for 微信开放平台
+// Config .config for 微信开放平台
 type Config struct {
 	AppID          string `json:"app_id"`           // appid
 	AppSecret      string `json:"app_secret"`       // appsecret

openplatform/context/accessToken.go

@@ -26,6 +26,7 @@ const (
 
 // ComponentAccessToken 第三方平台
 type ComponentAccessToken struct {
+	util.CommonError
 	AccessToken string `json:"component_access_token"`
 	ExpiresIn   int64  `json:"expires_in"`
 }
@@ -57,6 +58,10 @@ func (ctx *Context) SetComponentAccessToken(verifyTicket string) (*ComponentAcce
 		return nil, err
 	}
 
+	if at.ErrCode != 0 {
+		return nil, fmt.Errorf("SetComponentAccessToken Error , errcode=%d , errmsg=%s", at.ErrCode, at.ErrMsg)
+	}
+
 	accessTokenCacheKey := fmt.Sprintf("component_access_token_%s", ctx.AppID)
 	expires := at.ExpiresIn - 1500
 	if err := ctx.Cache.Set(accessTokenCacheKey, at.AccessToken, time.Duration(expires)*time.Second); err != nil {

openplatform/officialaccount/js/js.go

@@ -16,10 +16,10 @@ type Js struct {
 }
 
 // NewJs init
-func NewJs(context *context.Context) *Js {
+func NewJs(context *context.Context, appID string) *Js {
 	js := new(Js)
 	js.Context = context
-	jsTicketHandle := credential.NewDefaultJsTicket(context.AppID, credential.CacheKeyOfficialAccountPrefix, context.Cache)
+	jsTicketHandle := credential.NewDefaultJsTicket(appID, credential.CacheKeyOfficialAccountPrefix, context.Cache)
 	js.SetJsTicketHandle(jsTicketHandle)
 	return js
 }

openplatform/officialaccount/officialaccount.go

@@ -37,7 +37,7 @@ func (officialAccount *OfficialAccount) PlatformOauth() *oauth.Oauth {
 
 // PlatformJs 平台代获取js-sdk配置
 func (officialAccount *OfficialAccount) PlatformJs() *js.Js {
-	return js.NewJs(officialAccount.GetContext())
+	return js.NewJs(officialAccount.GetContext(), officialAccount.appID)
 }
 
 // DefaultAuthrAccessToken 默认获取授权ak的方法

pay/config/config.go

@@ -1,6 +1,6 @@
 package config
 
-//Config config for pay
+// Config .config for pay
 type Config struct {
 	AppID     string `json:"app_id"`
 	MchID     string `json:"mch_id"`

pay/notify/paid.go

@@ -7,8 +7,9 @@ import (
 	"strings"
 
 	"github.com/fatih/structs"
-	"github.com/silenceper/wechat/v2/util"
 	"github.com/spf13/cast"
+
+	"github.com/silenceper/wechat/v2/util"
 )
 
 // doc: https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7&index=8
@@ -30,6 +31,7 @@ type PaidResult struct {
 	OpenID             *string `xml:"openid"`
 	IsSubscribe        *string `xml:"is_subscribe"`
 	TradeType          *string `xml:"trade_type"`
+	TradeState         *string `xml:"trade_state"`
 	BankType           *string `xml:"bank_type"`
 	TotalFee           *int    `xml:"total_fee"`
 	SettlementTotalFee *int    `xml:"settlement_total_fee"`
@@ -46,9 +48,9 @@ type PaidResult struct {
 	CouponID0   *string `xml:"coupon_id_0"`
 	CouponID1   *string `xml:"coupon_id_1"`
 	CouponID2   *string `xml:"coupon_id_2"`
-	CouponFeed0 *string `xml:"coupon_fee_0"`
-	CouponFeed1 *string `xml:"coupon_fee_1"`
-	CouponFeed2 *string `xml:"coupon_fee_2"`
+	CouponFee0  *string `xml:"coupon_fee_0"`
+	CouponFee1  *string `xml:"coupon_fee_1"`
+	CouponFee2  *string `xml:"coupon_fee_2"`
 
 	TransactionID *string `xml:"transaction_id"`
 	OutTradeNo    *string `xml:"out_trade_no"`

pay/notify/refund.go

@@ -0,0 +1,77 @@
+package notify
+
+import (
+	"crypto/md5"
+	"encoding/base64"
+	"encoding/hex"
+	"encoding/xml"
+	"errors"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// reference: https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_16&index=10
+
+// RefundedResult 退款回调
+type RefundedResult struct {
+	ReturnCode *string `xml:"return_code"`
+	ReturnMsg  *string `xml:"return_msg"`
+
+	AppID    *string `xml:"appid"`
+	MchID    *string `xml:"mch_id"`
+	NonceStr *string `xml:"nonce_str"`
+	ReqInfo  *string `xml:"req_info"`
+}
+
+// RefundedReqInfo 退款结果（明文）
+type RefundedReqInfo struct {
+	TransactionID       *string `xml:"transaction_id"`
+	OutTradeNO          *string `xml:"out_trade_no"`
+	RefundID            *string `xml:"refund_id"`
+	OutRefundNO         *string `xml:"out_refund_no"`
+	TotalFee            *int    `xml:"total_fee"`
+	SettlementTotalFee  *int    `xml:"settlement_total_fee"`
+	RefundFee           *int    `xml:"refund_fee"`
+	SettlementRefundFee *int    `xml:"settlement_refund_fee"`
+	RefundStatus        *string `xml:"refund_status"`
+	SuccessTime         *string `xml:"success_time"`
+	RefundRecvAccount   *string `xml:"refund_recv_accout"`
+	RefundAccount       *string `xml:"refund_account"`
+	RefundRequestSource *string `xml:"refund_request_source"`
+}
+
+// RefundedResp 消息通知返回
+type RefundedResp struct {
+	ReturnCode string `xml:"return_code"`
+	ReturnMsg  string `xml:"return_msg"`
+}
+
+// DecryptReqInfo 对退款结果进行解密
+func (notify *Notify) DecryptReqInfo(result *RefundedResult) (*RefundedReqInfo, error) {
+	var err error
+	if result == nil || result.ReqInfo == nil {
+		return nil, errors.New("empty refunded_result or req_info")
+	}
+
+	base64Decode, err := base64.StdEncoding.DecodeString(*result.ReqInfo)
+	if err != nil {
+		return nil, err
+	}
+
+	hash := md5.New()
+	if _, err = hash.Write([]byte(notify.Key)); err != nil {
+		return nil, err
+	}
+	md5APIKey := hex.EncodeToString(hash.Sum(nil))
+
+	data, err := util.AesECBDecrypt(base64Decode, []byte(md5APIKey))
+	if err != nil {
+		return nil, err
+	}
+
+	res := &RefundedReqInfo{}
+	if err = xml.Unmarshal(data, res); err != nil {
+		return nil, err
+	}
+	return res, nil
+}

pay/notify/refund_test.go

@@ -0,0 +1,26 @@
+package notify
+
+import (
+	"encoding/xml"
+	"testing"
+
+	"github.com/silenceper/wechat/v2/pay/config"
+)
+
+func TestNotify_DecryptReqInfo(t *testing.T) {
+	// data_source: https://studygolang.com/articles/11811
+	notify := &Notify{Config: &config.Config{Key: "ziR0QKsTUfMOuochC9RfCdmfHECorQAP"}}
+	info := "YYwp8C48th0wnQzTqeI+41pflB26v+smFj9z6h9RPBgxTyZyxc+4YNEz7QEgZNWj/6rIb2MfyWMZmCc41CfjKSssoSZPXxOhUayb6KvNSZ1p6frOX1PDWzhyruXK7ouNND+gDsG4yZ0XXzsL4/pYNwLLba/71QrnkJ/BHcByk4EXnglju5DLup9pJQSnTxjomI9Rxu57m9jg5lLQFxMWXyeASZJNvof0ulnHlWJswS4OxKOkmW7VEyKyLGV6npoOm03Qsx2wkRxLsSa9gPpg4hdaReeUqh1FMbm7aWjyrVYT/MEZWg98p4GomEIYvz34XfDncTezX4bf/ZiSLXt79aE1/YTZrYfymXeCrGjlbe0rg/T2ezJHAC870u2vsVbY1/KcE2A443N+DEnAziXlBQ1AeWq3Rqk/O6/TMM0lomzgctAOiAMg+bh5+Gu1ubA9O3E+vehULydD5qx2o6i3+qA9ORbH415NyRrQdeFq5vmCiRikp5xYptWiGZA0tkoaLKMPQ4ndE5gWHqiBbGPfULZWokI+QjjhhBmwgbd6J0VqpRorwOuzC/BHdkP72DCdNcm7IDUpggnzBIy0+seWIkcHEryKjge3YDHpJeQCqrAH0CgxXHDt1xtbQbST1VqFyuhPhUjDXMXrknrGPN/oE1t0rLRq+78cI+k8xe5E6seeUXQsEe8r3358mpcDYSmXWSXVZxK6er9EF98APqHwcndyEJD2YyCh/mMVhERuX+7kjlRXSiNUWa/Cv/XAKFQuvUYA5ea2eYWtPRHa4DpyuF1SNsaqVKfgqKXZrJHfAgslVpSVqUpX4zkKszHF4kwMZO3M7J1P94Mxa7Tm9mTOJePOoHPXeEB+m9rX6pSfoi3mJDQ5inJ+Vc4gOkg/Wd/lqiy6TTyP/dHDN6/v+AuJx5AXBo/2NDD3fWhHjkqEKIuARr2ClZt9ZRQO4HkXdZo7CN06sGCHk48Tg8PmxnxKcMZm7Aoquv5yMIM2gWSWIRJhwJ8cUpafIHc+GesDlbF6Zbt+/KXkafJAQq2RklEN+WvZ/zFz113EPgWPjp16TwBoziq96MMekvWKY/vdhjol8VFtGH9F61Oy1Xwf6DJtPw=="
+	res, err := notify.DecryptReqInfo(&RefundedResult{ReqInfo: &info})
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	bytes, err := xml.Marshal(res)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	t.Log(string(bytes))
+}

pay/order/close.go

@@ -0,0 +1,98 @@
+package order
+
+import (
+	"encoding/xml"
+	"errors"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_3
+var closeGateway = "https://api.mch.weixin.qq.com/pay/closeorder"
+
+// CloseParams 传入的参数
+type CloseParams struct {
+	OutTradeNo string // 商户订单号
+	SignType   string // 签名类型
+}
+
+// closeRequest 接口请求参数
+type closeRequest struct {
+	AppID      string `xml:"appid"`               // 公众账号ID
+	MchID      string `xml:"mch_id"`              // 商户号
+	NonceStr   string `xml:"nonce_str"`           // 随机字符串
+	Sign       string `xml:"sign"`                // 签名
+	SignType   string `xml:"sign_type,omitempty"` // 签名类型
+	OutTradeNo string `xml:"out_trade_no"`        // 商户订单号
+}
+
+// CloseResult 关闭订单返回结果
+type CloseResult struct {
+	ReturnCode *string `xml:"return_code"`
+	ReturnMsg  *string `xml:"return_msg"`
+
+	AppID      *string `xml:"appid" json:"appid"`
+	MchID      *string `xml:"mch_id"`
+	NonceStr   *string `xml:"nonce_str"`
+	Sign       *string `xml:"sign"`
+	ResultCode *string `xml:"result_code"`
+	ResultMsg  *string `xml:"result_msg"`
+	ErrCode    *string `xml:"err_code"`
+	ErrCodeDes *string `xml:"err_code_des"`
+}
+
+// CloseOrder 关闭订单
+func (o *Order) CloseOrder(p *CloseParams) (closeResult CloseResult, err error) {
+	nonceStr := util.RandomStr(32)
+	// 签名类型
+	if p.SignType == "" {
+		p.SignType = "MD5"
+	}
+
+	params := make(map[string]string)
+	params["appid"] = o.AppID
+	params["mch_id"] = o.MchID
+	params["nonce_str"] = nonceStr
+	params["out_trade_no"] = p.OutTradeNo
+	params["sign_type"] = p.SignType
+
+	var (
+		sign   string
+		rawRet []byte
+	)
+
+	sign, err = util.ParamSign(params, o.Key)
+	if err != nil {
+		return
+	}
+	request := closeRequest{
+		AppID:      o.AppID,
+		MchID:      o.MchID,
+		NonceStr:   nonceStr,
+		Sign:       sign,
+		OutTradeNo: p.OutTradeNo,
+		SignType:   p.SignType,
+	}
+
+	rawRet, err = util.PostXML(closeGateway, request)
+	if err != nil {
+		return
+	}
+
+	err = xml.Unmarshal(rawRet, &closeResult)
+	if err != nil {
+		return
+	}
+
+	if *closeResult.ReturnCode == SUCCESS {
+		// close success
+		if *closeResult.ResultCode == SUCCESS {
+			err = nil
+			return
+		}
+		err = errors.New(*closeResult.ErrCode + *closeResult.ErrCodeDes)
+		return
+	}
+	err = errors.New("[msg : xmlUnmarshalError] [rawReturn : " + string(rawRet) + "] [sign : " + sign + "]")
+	return
+}

pay/order/pay.go

@@ -14,6 +14,9 @@ import (
 // https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
 var payGateway = "https://api.mch.weixin.qq.com/pay/unifiedorder"
 
+// SUCCESS 表示支付成功
+const SUCCESS = "SUCCESS"
+
 // Order struct extends context
 type Order struct {
 	*config.Config
@@ -25,13 +28,14 @@ func NewOrder(cfg *config.Config) *Order {
 	return &order
 }
 
-// Params was NEEDED when request unifiedorder
+// Params was NEEDED when request Unified order
 // 传入的参数，用于生成 prepay_id 的必需参数
 type Params struct {
 	TotalFee   string
 	CreateIP   string
 	Body       string
 	OutTradeNo string
+	TimeExpire string // 订单失效时间，格式为yyyyMMddHHmmss，如2009年12月27日9点10分10秒表示为20091227091010。
 	OpenID     string
 	TradeType  string
 	SignType   string
@@ -51,7 +55,18 @@ type Config struct {
 	PaySign   string `json:"paySign"`
 }
 
-// PreOrder 是 unifie order 接口的返回
+// ConfigForApp 是传出用于 app sdk 用的参数
+type ConfigForApp struct {
+	AppID     string `json:"appid"`
+	MchID     string `json:"partnerid"` // 微信支付分配的商户号
+	PrePayID  string `json:"prepayid"`
+	Package   string `json:"package"`
+	NonceStr  string `json:"nonceStr"`
+	Timestamp string `json:"timestamp"`
+	Sign      string `json:"sign"`
+}
+
+// PreOrder 是 Unified order 接口的返回
 type PreOrder struct {
 	ReturnCode string `xml:"return_code"`
 	ReturnMsg  string `xml:"return_msg"`
@@ -63,20 +78,21 @@ type PreOrder struct {
 	TradeType  string `xml:"trade_type,omitempty"`
 	PrePayID   string `xml:"prepay_id,omitempty"`
 	CodeURL    string `xml:"code_url,omitempty"`
+	MWebURL    string `xml:"mweb_url,omitempty"`
 	ErrCode    string `xml:"err_code,omitempty"`
 	ErrCodeDes string `xml:"err_code_des,omitempty"`
 }
 
 // payRequest 接口请求参数
 type payRequest struct {
-	AppID          string `xml:"appid"`
-	MchID          string `xml:"mch_id"`
-	DeviceInfo     string `xml:"device_info,omitempty"`
-	NonceStr       string `xml:"nonce_str"`
-	Sign           string `xml:"sign"`
-	SignType       string `xml:"sign_type,omitempty"`
-	Body           string `xml:"body"`
-	Detail         string `xml:"detail,omitempty"`
+	AppID          string `xml:"appid"`                 // 公众账号ID
+	MchID          string `xml:"mch_id"`                // 商户号
+	DeviceInfo     string `xml:"device_info,omitempty"` // 设备号
+	NonceStr       string `xml:"nonce_str"`             // 随机字符串
+	Sign           string `xml:"sign"`                  // 签名
+	SignType       string `xml:"sign_type,omitempty"`   // 签名类型
+	Body           string `xml:"body"`                  // 商品描述
+	Detail         string `xml:"detail,omitempty"`      // 商品详情
 	Attach         string `xml:"attach,omitempty"`      // 附加数据
 	OutTradeNo     string `xml:"out_trade_no"`          // 商户订单号
 	FeeType        string `xml:"fee_type,omitempty"`    // 标价币种
@@ -88,13 +104,34 @@ type payRequest struct {
 	NotifyURL      string `xml:"notify_url"`            // 通知地址
 	TradeType      string `xml:"trade_type"`            // 交易类型
 	ProductID      string `xml:"product_id,omitempty"`  // 商品ID
-	LimitPay       string `xml:"limit_pay,omitempty"`   //
+	LimitPay       string `xml:"limit_pay,omitempty"`   // 指定支付方式
 	OpenID         string `xml:"openid,omitempty"`      // 用户标识
 	SceneInfo      string `xml:"scene_info,omitempty"`  // 场景信息
 
 	XMLName struct{} `xml:"xml"`
 }
 
+func (req *payRequest) BridgePayRequest(p *Params, AppID, MchID, nonceStr, sign string) *payRequest {
+	request := payRequest{
+		AppID:          AppID,
+		MchID:          MchID,
+		NonceStr:       nonceStr,
+		Sign:           sign,
+		Body:           p.Body,
+		OutTradeNo:     p.OutTradeNo,
+		TotalFee:       p.TotalFee,
+		SpbillCreateIP: p.CreateIP,
+		NotifyURL:      p.NotifyURL,
+		TradeType:      p.TradeType,
+		OpenID:         p.OpenID,
+		SignType:       p.SignType,
+		Detail:         p.Detail,
+		Attach:         p.Attach,
+		GoodsTag:       p.GoodsTag,
+	}
+	return &request
+}
+
 // BridgeConfig get js bridge config
 func (o *Order) BridgeConfig(p *Params) (cfg Config, err error) {
 	var (
@@ -132,54 +169,88 @@ func (o *Order) BridgeConfig(p *Params) (cfg Config, err error) {
 	return
 }
 
+// BridgeAppConfig get app bridge config
+func (o *Order) BridgeAppConfig(p *Params) (cfg ConfigForApp, err error) {
+	var (
+		timestamp = strconv.FormatInt(time.Now().Unix(), 10)
+		noncestr  = util.RandomStr(32)
+		_package  = "Sign=WXPay"
+	)
+	order, err := o.PrePayOrder(p)
+	if err != nil {
+		return
+	}
+
+	result := map[string]string{
+		"appid":     order.AppID,
+		"partnerid": order.MchID,
+		"prepayid":  order.PrePayID,
+		"package":   _package,
+		"noncestr":  noncestr,
+		"timestamp": timestamp,
+	}
+	// 签名
+	sign, err := util.ParamSign(result, o.Key)
+	if err != nil {
+		return
+	}
+	result["sign"] = sign
+	cfg = ConfigForApp{
+		AppID:     result["appid"],
+		MchID:     result["partnerid"],
+		PrePayID:  result["prepayid"],
+		Package:   result["package"],
+		NonceStr:  result["noncestr"],
+		Timestamp: result["timestamp"],
+		Sign:      result["sign"],
+	}
+	return
+}
+
 // PrePayOrder return data for invoke wechat payment
 func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 	nonceStr := util.RandomStr(32)
-	notifyURL := o.NotifyURL
+
+	// 通知地址
+	if len(p.NotifyURL) == 0 {
+		p.NotifyURL = o.NotifyURL // 默认使用order.NotifyURL
+	}
+
 	// 签名类型
 	if p.SignType == "" {
 		p.SignType = util.SignTypeMD5
 	}
-	// 通知地址
-	if p.NotifyURL != "" {
-		notifyURL = p.NotifyURL
+
+	param := map[string]string{
+		"appid":            o.AppID,
+		"body":             p.Body,
+		"mch_id":           o.MchID,
+		"nonce_str":        nonceStr,
+		"out_trade_no":     p.OutTradeNo,
+		"spbill_create_ip": p.CreateIP,
+		"total_fee":        p.TotalFee,
+		"trade_type":       p.TradeType,
+		"openid":           p.OpenID,
+		"sign_type":        p.SignType,
+		"detail":           p.Detail,
+		"attach":           p.Attach,
+		"goods_tag":        p.GoodsTag,
+		"notify_url":       p.NotifyURL,
+	}
+
+	if p.TimeExpire != "" {
+		// 如果有传入交易结束时间
+		param["time_expire"] = p.TimeExpire
 	}
-	param := make(map[string]string)
-	param["appid"] = o.AppID
-	param["body"] = p.Body
-	param["mch_id"] = o.MchID
-	param["nonce_str"] = nonceStr
-	param["out_trade_no"] = p.OutTradeNo
-	param["spbill_create_ip"] = p.CreateIP
-	param["total_fee"] = p.TotalFee
-	param["trade_type"] = p.TradeType
-	param["openid"] = p.OpenID
-	param["sign_type"] = p.SignType
-	param["detail"] = p.Detail
-	param["attach"] = p.Attach
-	param["goods_tag"] = p.GoodsTag
-	param["notify_url"] = notifyURL
 
 	sign, err := util.ParamSign(param, o.Key)
 	if err != nil {
 		return
 	}
-	request := payRequest{
-		AppID:          o.AppID,
-		MchID:          o.MchID,
-		NonceStr:       nonceStr,
-		Sign:           sign,
-		Body:           p.Body,
-		OutTradeNo:     p.OutTradeNo,
-		TotalFee:       p.TotalFee,
-		SpbillCreateIP: p.CreateIP,
-		NotifyURL:      notifyURL,
-		TradeType:      p.TradeType,
-		OpenID:         p.OpenID,
-		SignType:       p.SignType,
-		Detail:         p.Detail,
-		Attach:         p.Attach,
-		GoodsTag:       p.GoodsTag,
+	request := new(payRequest).BridgePayRequest(p, o.AppID, o.MchID, nonceStr, sign)
+	if len(p.TimeExpire) > 0 {
+		// 如果有传入交易结束时间
+		request.TimeExpire = p.TimeExpire
 	}
 	rawRet, err := util.PostXML(payGateway, request)
 	if err != nil {
@@ -189,9 +260,9 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 	if err != nil {
 		return
 	}
-	if payOrder.ReturnCode == "SUCCESS" {
+	if payOrder.ReturnCode == SUCCESS {
 		// pay success
-		if payOrder.ResultCode == "SUCCESS" {
+		if payOrder.ResultCode == SUCCESS {
 			err = nil
 			return
 		}

pay/order/query.go

@@ -0,0 +1,82 @@
+package order
+
+import (
+	"encoding/xml"
+	"errors"
+
+	"github.com/silenceper/wechat/v2/pay/notify"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+var queryGateway = "https://api.mch.weixin.qq.com/pay/orderquery"
+
+// QueryParams 传入的参数
+type QueryParams struct {
+	OutTradeNo    string // 商户订单号
+	SignType      string // 签名类型
+	TransactionID string // 微信订单号
+}
+
+// queryRequest 接口请求参数
+type queryRequest struct {
+	AppID         string `xml:"appid"`               // 公众账号ID
+	MchID         string `xml:"mch_id"`              // 商户号
+	NonceStr      string `xml:"nonce_str"`           // 随机字符串
+	Sign          string `xml:"sign"`                // 签名
+	SignType      string `xml:"sign_type,omitempty"` // 签名类型
+	TransactionID string `xml:"transaction_id"`      // 微信订单号
+	OutTradeNo    string `xml:"out_trade_no"`        // 商户订单号
+}
+
+// QueryOrder 查询订单
+func (o *Order) QueryOrder(p *QueryParams) (paidResult notify.PaidResult, err error) {
+	nonceStr := util.RandomStr(32)
+	// 签名类型
+	if p.SignType == "" {
+		p.SignType = "MD5"
+	}
+
+	params := make(map[string]string)
+	params["appid"] = o.AppID
+	params["mch_id"] = o.MchID
+	params["nonce_str"] = nonceStr
+	params["out_trade_no"] = p.OutTradeNo
+	params["sign_type"] = p.SignType
+	params["transaction_id"] = p.TransactionID
+
+	sign, err := util.ParamSign(params, o.Key)
+	if err != nil {
+		return
+	}
+	request := queryRequest{
+		AppID:         o.AppID,
+		MchID:         o.MchID,
+		NonceStr:      nonceStr,
+		Sign:          sign,
+		OutTradeNo:    p.OutTradeNo,
+		TransactionID: p.TransactionID,
+		SignType:      p.SignType,
+	}
+
+	rawRet, err := util.PostXML(queryGateway, request)
+	if err != nil {
+		return
+	}
+
+	err = xml.Unmarshal(rawRet, &paidResult)
+	if err != nil {
+		return
+	}
+
+	if *paidResult.ReturnCode == SUCCESS {
+		// query success
+		if *paidResult.ResultCode == SUCCESS {
+			err = nil
+			return
+		}
+		err = errors.New(*paidResult.ErrCode + *paidResult.ErrCodeDes)
+		return
+	}
+	err = errors.New("[msg : xmlUnmarshalError] [rawReturn : " + string(rawRet) + "] [sign : " + sign + "]")
+	return
+}

pay/pay.go

@@ -5,6 +5,7 @@ import (
 	"github.com/silenceper/wechat/v2/pay/notify"
 	"github.com/silenceper/wechat/v2/pay/order"
 	"github.com/silenceper/wechat/v2/pay/refund"
+	"github.com/silenceper/wechat/v2/pay/transfer"
 )
 
 // Pay 微信支付相关API
@@ -31,3 +32,8 @@ func (pay *Pay) GetNotify() *notify.Notify {
 func (pay *Pay) GetRefund() *refund.Refund {
 	return refund.NewRefund(pay.cfg)
 }
+
+// GetTransfer 付款
+func (pay *Pay) GetTransfer() *transfer.Transfer {
+	return transfer.NewTransfer(pay.cfg)
+}

pay/refund/refund.go

@@ -25,10 +25,13 @@ func NewRefund(cfg *config.Config) *Refund {
 type Params struct {
 	TransactionID string
 	OutRefundNo   string
+	OutTradeNo    string
 	TotalFee      string
 	RefundFee     string
 	RefundDesc    string
 	RootCa        string // ca证书
+	NotifyURL     string
+	SignType      string
 }
 
 // request 接口请求参数
@@ -38,12 +41,13 @@ type request struct {
 	NonceStr      string `xml:"nonce_str"`
 	Sign          string `xml:"sign"`
 	SignType      string `xml:"sign_type,omitempty"`
-	TransactionID string `xml:"transaction_id"`
+	TransactionID string `xml:"transaction_id,omitempty"`
+	OutTradeNo    string `xml:"out_trade_no,omitempty"`
 	OutRefundNo   string `xml:"out_refund_no"`
 	TotalFee      string `xml:"total_fee"`
 	RefundFee     string `xml:"refund_fee"`
 	RefundDesc    string `xml:"refund_desc,omitempty"`
-	//NotifyUrl     string `xml:"notify_url,omitempty"`
+	NotifyURL     string `xml:"notify_url,omitempty"`
 }
 
 // Response 接口返回
@@ -72,36 +76,33 @@ type Response struct {
 
 // Refund 退款申请
 func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
-	nonceStr := util.RandomStr(32)
-	param := make(map[string]string)
-	param["appid"] = refund.AppID
-	param["mch_id"] = refund.MchID
-	param["nonce_str"] = nonceStr
-	param["out_refund_no"] = p.OutRefundNo
-	param["refund_desc"] = p.RefundDesc
-	param["refund_fee"] = p.RefundFee
-	param["total_fee"] = p.TotalFee
-	param["sign_type"] = util.SignTypeMD5
-	param["transaction_id"] = p.TransactionID
+	param := refund.GetSignParam(p)
 
 	sign, err := util.ParamSign(param, refund.Key)
 	if err != nil {
 		return
 	}
 
-	request := request{
-		AppID:         refund.AppID,
-		MchID:         refund.MchID,
-		NonceStr:      nonceStr,
+	req := request{
+		AppID:       param["appid"],
+		MchID:       param["mch_id"],
+		NonceStr:    param["nonce_str"],
 		Sign:        sign,
-		SignType:      util.SignTypeMD5,
-		TransactionID: p.TransactionID,
-		OutRefundNo:   p.OutRefundNo,
-		TotalFee:      p.TotalFee,
-		RefundFee:     p.RefundFee,
-		RefundDesc:    p.RefundDesc,
+		SignType:    param["sign_type"],
+		OutRefundNo: param["out_refund_no"],
+		TotalFee:    param["total_fee"],
+		RefundFee:   param["refund_fee"],
+		RefundDesc:  param["refund_desc"],
+		NotifyURL:   param["notify_url"],
 	}
-	rawRet, err := util.PostXMLWithTLS(refundGateway, request, p.RootCa, refund.MchID)
+	if p.OutTradeNo != "" {
+		req.OutTradeNo = p.OutTradeNo
+	}
+	if p.TransactionID != "" {
+		req.TransactionID = p.TransactionID
+	}
+
+	rawRet, err := util.PostXMLWithTLS(refundGateway, req, p.RootCa, refund.MchID)
 	if err != nil {
 		return
 	}
@@ -120,3 +121,31 @@ func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
 	err = fmt.Errorf("[msg : xmlUnmarshalError] [rawReturn : %s] [sign : %s]", string(rawRet), sign)
 	return
 }
+
+// GetSignParam 获取签名的参数
+func (refund *Refund) GetSignParam(p *Params) (param map[string]string) {
+	nonceStr := util.RandomStr(32)
+	param = make(map[string]string)
+	param["appid"] = refund.AppID
+	param["mch_id"] = refund.MchID
+	param["nonce_str"] = nonceStr
+	param["out_refund_no"] = p.OutRefundNo
+	param["refund_desc"] = p.RefundDesc
+	param["refund_fee"] = p.RefundFee
+	param["total_fee"] = p.TotalFee
+
+	if p.SignType == "" {
+		param["sign_type"] = util.SignTypeMD5
+	}
+	if p.OutTradeNo != "" {
+		param["out_trade_no"] = p.OutTradeNo
+	}
+	if p.TransactionID != "" {
+		param["transaction_id"] = p.TransactionID
+	}
+	if p.NotifyURL != "" {
+		param["notify_url"] = p.NotifyURL
+	}
+
+	return param
+}

pay/transfer/transfer_wallet.go

@@ -0,0 +1,135 @@
+package transfer
+
+import (
+	"encoding/xml"
+	"fmt"
+	"strconv"
+
+	"github.com/silenceper/wechat/v2/pay/config"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// 付款到零钱
+// https://pay.weixin.qq.com/wiki/doc/api/tools/mch_pay.php?chapter=14_2
+var walletTransferGateway = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers"
+
+// Transfer struct extends context
+type Transfer struct {
+	*config.Config
+}
+
+// NewTransfer return an instance of Transfer package
+func NewTransfer(cfg *config.Config) *Transfer {
+	transfer := Transfer{cfg}
+	return &transfer
+}
+
+// Params 调用参数
+type Params struct {
+	DeviceInfo     string
+	PartnerTradeNo string
+	OpenID         string
+	CheckName      bool
+	ReUserName     string
+	Amount         int
+	Desc           string
+	SpbillCreateIP string
+	RootCa         string // ca证书
+}
+
+// request 接口请求参数
+type request struct {
+	AppID          string `xml:"mch_appid"`
+	MchID          string `xml:"mchid"`
+	NonceStr       string `xml:"nonce_str"`
+	Sign           string `xml:"sign"`
+	DeviceInfo     string `xml:"device_info,omitempty"`
+	PartnerTradeNo string `xml:"partner_trade_no"`
+	OpenID         string `xml:"openid"`
+	CheckName      string `xml:"check_name"`
+	ReUserName     string `xml:"re_user_name,omitempty"`
+	Amount         int    `xml:"amount"`
+	Desc           string `xml:"desc"`
+	SpbillCreateIP string `xml:"spbill_create_ip,omitempty"`
+}
+
+// Response 接口返回
+type Response struct {
+	ReturnCode     string `xml:"return_code"`
+	ReturnMsg      string `xml:"return_msg"`
+	AppID          string `xml:"appid,omitempty"`
+	MchID          string `xml:"mch_id,omitempty"`
+	DeviceInfo     string `xml:"device_info,omitempty"`
+	NonceStr       string `xml:"nonce_str,omitempty"`
+	ResultCode     string `xml:"result_code,omitempty"`
+	ErrCode        string `xml:"err_code,omitempty"`
+	ErrCodeDes     string `xml:"err_code_des,omitempty"`
+	PartnerTradeNo string `xml:"partner_trade_no"`
+	PaymentNo      string `xml:"payment_no"`
+	PaymentTime    string `xml:"payment_time"`
+}
+
+// WalletTransfer 付款到零钱
+func (transfer *Transfer) WalletTransfer(p *Params) (rsp *Response, err error) {
+	nonceStr := util.RandomStr(32)
+	param := make(map[string]string)
+	param["mch_appid"] = transfer.AppID
+	param["mchid"] = transfer.MchID
+	param["nonce_str"] = nonceStr
+	param["partner_trade_no"] = p.PartnerTradeNo
+	param["openid"] = p.OpenID
+	param["amount"] = strconv.Itoa(p.Amount)
+	param["desc"] = p.Desc
+	if p.DeviceInfo != "" {
+		param["device_info"] = p.DeviceInfo
+	}
+	param["check_name"] = "NO_CHECK"
+	if p.CheckName {
+		param["check_name"] = "FORCE_CHECK"
+		param["re_user_name"] = p.ReUserName
+	}
+	if p.SpbillCreateIP != "" {
+		param["spbill_create_ip"] = p.SpbillCreateIP
+	}
+
+	sign, err := util.ParamSign(param, transfer.Key)
+	if err != nil {
+		return
+	}
+
+	req := request{
+		AppID:          transfer.AppID,
+		MchID:          transfer.MchID,
+		NonceStr:       nonceStr,
+		Sign:           sign,
+		DeviceInfo:     p.DeviceInfo,
+		PartnerTradeNo: p.PartnerTradeNo,
+		OpenID:         p.OpenID,
+		Amount:         p.Amount,
+		Desc:           p.Desc,
+		SpbillCreateIP: p.SpbillCreateIP,
+	}
+	req.CheckName = "NO_CHECK"
+	if p.CheckName {
+		req.CheckName = "FORCE_CHECK"
+		req.ReUserName = p.ReUserName
+	}
+	rawRet, err := util.PostXMLWithTLS(walletTransferGateway, req, p.RootCa, transfer.MchID)
+	if err != nil {
+		return
+	}
+	err = xml.Unmarshal(rawRet, &rsp)
+	if err != nil {
+		return
+	}
+	if rsp.ReturnCode == "SUCCESS" {
+		if rsp.ResultCode == "SUCCESS" {
+			err = nil
+			return
+		}
+		err = fmt.Errorf("transfer error, errcode=%s,errmsg=%s", rsp.ErrCode, rsp.ErrCodeDes)
+		return
+	}
+	err = fmt.Errorf("[msg : xmlUnmarshalError] [rawReturn : %s] [sign : %s]", string(rawRet), sign)
+	return
+}

util/crypto.go

@@ -1,6 +1,7 @@
 package util
 
 import (
+	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/hmac"
@@ -227,3 +228,105 @@ func ParamSign(p map[string]string, key string) (string, error) {
 
 	return CalculateSign(str, signType, key)
 }
+
+// ECB provides confidentiality by assigning a fixed ciphertext block to each plaintext block.
+// See NIST SP 800-38A, pp 08-09
+// reference: https://codereview.appspot.com/7860047/patch/23001/24001
+type ecb struct {
+	b         cipher.Block
+	blockSize int
+}
+
+func newECB(b cipher.Block) *ecb {
+	return &ecb{
+		b:         b,
+		blockSize: b.BlockSize(),
+	}
+}
+
+// ECBEncryptor -
+type ECBEncryptor ecb
+
+// NewECBEncryptor returns a BlockMode which encrypts in electronic code book mode, using the given Block.
+func NewECBEncryptor(b cipher.Block) cipher.BlockMode {
+	return (*ECBEncryptor)(newECB(b))
+}
+
+// BlockSize implement BlockMode.BlockSize
+func (x *ECBEncryptor) BlockSize() int {
+	return x.blockSize
+}
+
+// CryptBlocks implement BlockMode.CryptBlocks
+func (x *ECBEncryptor) CryptBlocks(dst, src []byte) {
+	if len(src)%x.blockSize != 0 {
+		panic("crypto/cipher: input not full blocks")
+	}
+	if len(dst) < len(src) {
+		panic("crypto/cipher: output smaller than input")
+	}
+	for len(src) > 0 {
+		x.b.Encrypt(dst, src[:x.blockSize])
+		src = src[x.blockSize:]
+		dst = dst[x.blockSize:]
+	}
+}
+
+// ECBDecryptor -
+type ECBDecryptor ecb
+
+// NewECBDecryptor returns a BlockMode which decrypts in electronic code book mode, using the given Block.
+func NewECBDecryptor(b cipher.Block) cipher.BlockMode {
+	return (*ECBDecryptor)(newECB(b))
+}
+
+// BlockSize implement BlockMode.BlockSize
+func (x *ECBDecryptor) BlockSize() int {
+	return x.blockSize
+}
+
+// CryptBlocks implement BlockMode.CryptBlocks
+func (x *ECBDecryptor) CryptBlocks(dst, src []byte) {
+	if len(src)%x.blockSize != 0 {
+		panic("crypto/cipher: input not full blocks")
+	}
+	if len(dst) < len(src) {
+		panic("crypto/cipher: output smaller than input")
+	}
+	for len(src) > 0 {
+		x.b.Decrypt(dst, src[:x.blockSize])
+		src = src[x.blockSize:]
+		dst = dst[x.blockSize:]
+	}
+}
+
+// AesECBDecrypt will decrypt data with PKCS5Padding
+func AesECBDecrypt(ciphertext []byte, aesKey []byte) ([]byte, error) {
+	if len(ciphertext) < aes.BlockSize {
+		return nil, errors.New("ciphertext too short")
+	}
+	// ECB mode always works in whole blocks.
+	if len(ciphertext)%aes.BlockSize != 0 {
+		return nil, errors.New("ciphertext is not a multiple of the block size")
+	}
+	block, err := aes.NewCipher(aesKey)
+	if err != nil {
+		return nil, err
+	}
+	NewECBDecryptor(block).CryptBlocks(ciphertext, ciphertext)
+	return PKCS5UnPadding(ciphertext), nil
+}
+
+// PKCS5Padding -
+func PKCS5Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padText := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padText...)
+}
+
+// PKCS5UnPadding -
+func PKCS5UnPadding(origData []byte) []byte {
+	length := len(origData)
+	unPadding := int(origData[length-1])
+	return origData[:(length - unPadding)]
+}

util/http.go

@@ -2,6 +2,7 @@ package util
 
 import (
 	"bytes"
+	"context"
 	"crypto/tls"
 	"encoding/json"
 	"encoding/pem"
@@ -19,7 +20,16 @@ import (
 
 // HTTPGet get 请求
 func HTTPGet(uri string) ([]byte, error) {
-	response, err := http.Get(uri)
+	return HTTPGetContext(context.Background(), uri)
+}
+
+// HTTPGetContext get 请求
+func HTTPGetContext(ctx context.Context, uri string) ([]byte, error) {
+	request, err := http.NewRequestWithContext(ctx, http.MethodGet, uri, nil)
+	if err != nil {
+		return nil, err
+	}
+	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return nil, err
 	}
@@ -33,8 +43,17 @@ func HTTPGet(uri string) ([]byte, error) {
 
 // HTTPPost post 请求
 func HTTPPost(uri string, data string) ([]byte, error) {
+	return HTTPPostContext(context.Background(), uri, data)
+}
+
+// HTTPPostContext post 请求
+func HTTPPostContext(ctx context.Context, uri string, data string) ([]byte, error) {
 	body := bytes.NewBuffer([]byte(data))
-	response, err := http.Post(uri, "", body)
+	request, err := http.NewRequestWithContext(ctx, http.MethodPost, uri, body)
+	if err != nil {
+		return nil, err
+	}
+	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return nil, err
 	}
@@ -48,15 +67,14 @@ func HTTPPost(uri string, data string) ([]byte, error) {
 
 // PostJSON post json 数据请求
 func PostJSON(uri string, obj interface{}) ([]byte, error) {
-	jsonData, err := json.Marshal(obj)
+	jsonBuf := new(bytes.Buffer)
+	enc := json.NewEncoder(jsonBuf)
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(obj)
 	if err != nil {
 		return nil, err
 	}
-	jsonData = bytes.Replace(jsonData, []byte("\\u003c"), []byte("<"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u003e"), []byte(">"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u0026"), []byte("&"), -1)
-	body := bytes.NewBuffer(jsonData)
-	response, err := http.Post(uri, "application/json;charset=utf-8", body)
+	response, err := http.Post(uri, "application/json;charset=utf-8", jsonBuf)
 	if err != nil {
 		return nil, err
 	}
@@ -70,17 +88,15 @@ func PostJSON(uri string, obj interface{}) ([]byte, error) {
 
 // PostJSONWithRespContentType post json数据请求，且返回数据类型
 func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, error) {
-	jsonData, err := json.Marshal(obj)
+	jsonBuf := new(bytes.Buffer)
+	enc := json.NewEncoder(jsonBuf)
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(obj)
 	if err != nil {
 		return nil, "", err
 	}
 
-	jsonData = bytes.Replace(jsonData, []byte("\\u003c"), []byte("<"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u003e"), []byte(">"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u0026"), []byte("&"), -1)
-
-	body := bytes.NewBuffer(jsonData)
-	response, err := http.Post(uri, "application/json;charset=utf-8", body)
+	response, err := http.Post(uri, "application/json;charset=utf-8", jsonBuf)
 	if err != nil {
 		return nil, "", err
 	}

util/rsa.go

@@ -0,0 +1,43 @@
+package util
+
+import (
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/pem"
+	"errors"
+	"fmt"
+)
+
+// RSADecrypt 数据解密
+func RSADecrypt(privateKey string, ciphertext []byte) ([]byte, error) {
+	block, _ := pem.Decode([]byte(privateKey))
+	if block == nil {
+		return nil, errors.New("PrivateKey format error")
+	}
+	priv, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+	if err != nil {
+		oldErr := err
+		key, err := x509.ParsePKCS8PrivateKey(block.Bytes)
+		if err != nil {
+			return nil, fmt.Errorf("ParsePKCS1PrivateKey error: %s, ParsePKCS8PrivateKey error: %s", oldErr.Error(), err.Error())
+		}
+		switch t := key.(type) {
+		case *rsa.PrivateKey:
+			priv = key.(*rsa.PrivateKey)
+		default:
+			return nil, fmt.Errorf("ParsePKCS1PrivateKey error: %s, ParsePKCS8PrivateKey error: Not supported privatekey format, should be *rsa.PrivateKey, got %T", oldErr.Error(), t)
+		}
+	}
+	return rsa.DecryptPKCS1v15(rand.Reader, priv, ciphertext)
+}
+
+// RSADecryptBase64 Base64解码后再次进行RSA解密
+func RSADecryptBase64(privateKey string, cryptoText string) ([]byte, error) {
+	encryptedData, err := base64.StdEncoding.DecodeString(cryptoText)
+	if err != nil {
+		return nil, err
+	}
+	return RSADecrypt(privateKey, encryptedData)
+}

util/util.go

@@ -0,0 +1,41 @@
+package util
+
+// SliceChunk 用于将字符串切片分块
+func SliceChunk(src []string, chunkSize int) (chunks [][]string) {
+	total := len(src)
+	chunks = make([][]string, 0)
+	if chunkSize < 1 {
+		chunkSize = 1
+	}
+	if total == 0 {
+		return
+	}
+
+	chunkNum := total / chunkSize
+	if total%chunkSize != 0 {
+		chunkNum++
+	}
+
+	chunks = make([][]string, chunkNum)
+
+	for i := 0; i < chunkNum; i++ {
+		for j := 0; j < chunkSize; j++ {
+			offset := i*chunkSize + j
+			if offset >= total {
+				return
+			}
+
+			if chunks[i] == nil {
+				actualChunkSize := chunkSize
+				if i == chunkNum-1 && total%chunkSize != 0 {
+					actualChunkSize = total % chunkSize
+				}
+				chunks[i] = make([]string, actualChunkSize)
+			}
+
+			chunks[i][j] = src[offset]
+		}
+	}
+
+	return
+}

util/util_test.go

@@ -0,0 +1,18 @@
+package util
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSliceChunk(t *testing.T) {
+	src1 := []string{"1", "2", "3", "4", "5"}
+	assert.Equal(t, [][]string{{"1", "2"}, {"3", "4"}, {"5"}}, SliceChunk(src1, 2))
+	assert.Equal(t, [][]string{{"1", "2", "3", "4", "5"}}, SliceChunk(src1, 5))
+	assert.Equal(t, [][]string{{"1", "2", "3", "4", "5"}}, SliceChunk(src1, 6))
+	assert.Equal(t, [][]string{{"1"}, {"2"}, {"3"}, {"4"}, {"5"}}, SliceChunk(src1, 1))
+	assert.Equal(t, [][]string{{"1"}, {"2"}, {"3"}, {"4"}, {"5"}}, SliceChunk(src1, 0))
+	assert.Equal(t, [][]string{{"1"}, {"2"}, {"3"}, {"4"}, {"5"}}, SliceChunk(src1, -100))
+	assert.Equal(t, [][]string{}, SliceChunk(nil, 5))
+}

wechat.go

@@ -3,6 +3,8 @@ package wechat
 import (
 	"os"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/silenceper/wechat/v2/cache"
 	"github.com/silenceper/wechat/v2/miniprogram"
 	miniConfig "github.com/silenceper/wechat/v2/miniprogram/config"
@@ -12,7 +14,8 @@ import (
 	openConfig "github.com/silenceper/wechat/v2/openplatform/config"
 	"github.com/silenceper/wechat/v2/pay"
 	payConfig "github.com/silenceper/wechat/v2/pay/config"
-	log "github.com/sirupsen/logrus"
+	"github.com/silenceper/wechat/v2/work"
+	workConfig "github.com/silenceper/wechat/v2/work/config"
 )
 
 func init() {
@@ -67,3 +70,8 @@ func (wc *Wechat) GetPay(cfg *payConfig.Config) *pay.Pay {
 func (wc *Wechat) GetOpenPlatform(cfg *openConfig.Config) *openplatform.OpenPlatform {
 	return openplatform.NewOpenPlatform(cfg)
 }
+
+// GetWork 获取企业微信的实例
+func (wc *Wechat) GetWork(cfg *workConfig.Config) *work.Work {
+	return work.NewWork(cfg)
+}

work/config/config.go

@@ -0,0 +1,18 @@
+// Package config 企业微信config配置
+package config
+
+import (
+	"github.com/silenceper/wechat/v2/cache"
+)
+
+// Config for 企业微信
+type Config struct {
+	CorpID        string `json:"corp_id"`     // corp_id
+	CorpSecret    string `json:"corp_secret"` // corp_secret,如果需要获取会话存档实例，当前参数请填写聊天内容存档的Secret，可以在企业微信管理端--管理工具--聊天内容存档查看
+	AgentID       string `json:"agent_id"`    // agent_id
+	Cache         cache.Cache
+	RasPrivateKey string // 消息加密私钥，可以在企业微信管理端--管理工具--消息加密公钥查看对用公钥，私钥一般由自己保存
+
+	Token          string `json:"token"`            // 微信客服回调配置，用于生成签名校验回调请求的合法性
+	EncodingAESKey string `json:"encoding_aes_key"` // 微信客服回调p配置，用于解密回调消息内容对应的密文
+}

work/context/context.go

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

work/externalcontact/README.md

@@ -0,0 +1,3 @@
+### 企业微信 客户联系部分
+
+相关文档正在梳理中...

work/externalcontact/client.go

@@ -0,0 +1,17 @@
+package externalcontact
+
+import (
+	"github.com/silenceper/wechat/v2/work/context"
+)
+
+// Client 外部联系接口实例
+type Client struct {
+	*context.Context
+}
+
+// NewClient 初始化实例
+func NewClient(ctx *context.Context) *Client {
+	return &Client{
+		ctx,
+	}
+}

work/externalcontact/external_user.go

@@ -0,0 +1,177 @@
+package externalcontact
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// FetchExternalContactUserListURL 获取客户列表
+	FetchExternalContactUserListURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/list"
+	// FetchExternalContactUserDetailURL 获取客户详情
+	FetchExternalContactUserDetailURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get"
+	// FetchBatchExternalContactUserDetailURL 批量获取客户详情
+	FetchBatchExternalContactUserDetailURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/batch/get_by_user"
+	// UpdateUserRemarkURL 更新客户备注信息
+	UpdateUserRemarkURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/remark"
+)
+
+// ExternalUserListResponse 外部联系人列表响应
+type ExternalUserListResponse struct {
+	util.CommonError
+	ExternalUserID []string `json:"external_userid"`
+}
+
+// GetExternalUserList 获取客户列表
+// @see https://developer.work.weixin.qq.com/document/path/92113
+func (r *Client) GetExternalUserList(userID string) ([]string, error) {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	response, err = util.HTTPGet(fmt.Sprintf("%s?access_token=%v&userid=%v", FetchExternalContactUserListURL, accessToken, userID))
+	if err != nil {
+		return nil, err
+	}
+	var result ExternalUserListResponse
+	err = util.DecodeWithError(response, &result, "GetExternalUserList")
+	if err != nil {
+		return nil, err
+	}
+	return result.ExternalUserID, nil
+}
+
+// ExternalUserDetailResponse 外部联系人详情响应
+type ExternalUserDetailResponse struct {
+	util.CommonError
+	ExternalUser
+}
+
+// ExternalUser 外部联系人
+type ExternalUser struct {
+	ExternalUserID  string       `json:"external_userid"`
+	Name            string       `json:"name"`
+	Avatar          string       `json:"avatar"`
+	Type            int64        `json:"type"`
+	Gender          int64        `json:"gender"`
+	UnionID         string       `json:"unionid"`
+	Position        string       `json:"position"`
+	CorpName        string       `json:"corp_name"`
+	CorpFullName    string       `json:"corp_full_name"`
+	ExternalProfile string       `json:"external_profile"`
+	FollowUser      []FollowUser `json:"follow_user"`
+	NextCursor      string       `json:"next_cursor"`
+}
+
+// FollowUser 跟进用户（指企业内部用户）
+type FollowUser struct {
+	UserID         string        `json:"userid"`
+	Remark         string        `json:"remark"`
+	Description    string        `json:"description"`
+	CreateTime     string        `json:"create_time"`
+	Tags           []Tag         `json:"tags"`
+	RemarkCorpName string        `json:"remark_corp_name"`
+	RemarkMobiles  []string      `json:"remark_mobiles"`
+	OperUserID     string        `json:"oper_userid"`
+	AddWay         int64         `json:"add_way"`
+	WeChatChannels WechatChannel `json:"wechat_channels"`
+	State          string        `json:"state"`
+}
+
+// Tag 已绑定在外部联系人的标签
+type Tag struct {
+	GroupName string `json:"group_name"`
+	TagName   string `json:"tag_name"`
+	Type      int64  `json:"type"`
+	TagID     string `json:"tag_id"`
+}
+
+// WechatChannel 视频号添加的场景
+type WechatChannel struct {
+	NickName string `json:"nickname"`
+	Source   string `json:"source"`
+}
+
+// GetExternalUserDetail 获取外部联系人详情
+func (r *Client) GetExternalUserDetail(externalUserID string, nextCursor ...string) (*ExternalUser, error) {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	response, err = util.HTTPGet(fmt.Sprintf("%s?access_token=%v&external_userid=%v&cursor=%v", FetchExternalContactUserDetailURL, accessToken, externalUserID, nextCursor))
+	if err != nil {
+		return nil, err
+	}
+	var result ExternalUserDetailResponse
+	err = util.DecodeWithError(response, &result, "get_external_user_detail")
+	if err != nil {
+		return nil, err
+	}
+	return &result.ExternalUser, nil
+}
+
+// BatchGetExternalUserDetailsRequest 批量获取外部联系人详情请求
+type BatchGetExternalUserDetailsRequest struct {
+	UserIDList []string `json:"userid_list"`
+	Cursor     string   `json:"cursor"`
+}
+
+// ExternalUserDetailListResponse 批量获取外部联系人详情响应
+type ExternalUserDetailListResponse struct {
+	util.CommonError
+	ExternalContactList []ExternalUser `json:"external_contact_list"`
+}
+
+// BatchGetExternalUserDetails 批量获取外部联系人详情
+func (r *Client) BatchGetExternalUserDetails(request BatchGetExternalUserDetailsRequest) ([]ExternalUser, error) {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	jsonData, _ := json.Marshal(request)
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", FetchBatchExternalContactUserDetailURL, accessToken), string(jsonData))
+	if err != nil {
+		return nil, err
+	}
+	var result ExternalUserDetailListResponse
+	err = util.DecodeWithError(response, &result, "BatchGetExternalUserDetails")
+	if err != nil {
+		return nil, err
+	}
+	return result.ExternalContactList, nil
+}
+
+// UpdateUserRemarkRequest 修改客户备注信息请求体
+type UpdateUserRemarkRequest struct {
+	UserID           string   `json:"userid"`
+	ExternalUserID   string   `json:"external_userid"`
+	Remark           string   `json:"remark"`
+	Description      string   `json:"description"`
+	RemarkCompany    string   `json:"remark_company"`
+	RemarkMobiles    []string `json:"remark_mobiles"`
+	RemarkPicMediaid string   `json:"remark_pic_mediaid"`
+}
+
+// UpdateUserRemark 修改客户备注信息
+func (r *Client) UpdateUserRemark(request UpdateUserRemarkRequest) error {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	var response []byte
+	jsonData, _ := json.Marshal(request)
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", UpdateUserRemarkURL, accessToken), string(jsonData))
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "UpdateUserRemark")
+}

work/externalcontact/follow_user.go

@@ -0,0 +1,39 @@
+package externalcontact
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// FetchFollowUserListURL 获取配置了客户联系功能的成员列表
+	FetchFollowUserListURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_follow_user_list"
+)
+
+// followerUserResponse 客户联系功能的成员列表响应
+type followerUserResponse struct {
+	util.CommonError
+	FollowUser []string `json:"follow_user"`
+}
+
+//GetFollowUserList 获取配置了客户联系功能的成员列表
+//@see https://developer.work.weixin.qq.com/document/path/92571
+func (r *Client) GetFollowUserList() ([]string, error) {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	response, err = util.HTTPGet(fmt.Sprintf("%s?access_token=%s", FetchFollowUserListURL, accessToken))
+	if err != nil {
+		return nil, err
+	}
+	var result followerUserResponse
+	err = util.DecodeWithError(response, &result, "GetFollowUserList")
+	if err != nil {
+		return nil, err
+	}
+	return result.FollowUser, nil
+}

work/externalcontact/tag.go

@@ -0,0 +1,191 @@
+package externalcontact
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// GetCropTagURL 获取标签列表
+	GetCropTagURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_corp_tag_list"
+	// AddCropTagURL 添加标签
+	AddCropTagURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/add_corp_tag"
+	// EditCropTagURL 修改标签
+	EditCropTagURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/edit_corp_tag"
+	// DelCropTagURL 删除标签
+	DelCropTagURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/del_corp_tag"
+	// MarkCropTagURL 为客户打上、删除标签
+	MarkCropTagURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/mark_tag"
+)
+
+// GetCropTagRequest 获取企业标签请求
+type GetCropTagRequest struct {
+	TagID   []string `json:"tag_id"`
+	GroupID []string `json:"group_id"`
+}
+
+// GetCropTagListResponse 获取企业标签列表响应
+type GetCropTagListResponse struct {
+	util.CommonError
+	TagGroup []TagGroup `json:"tag_group"`
+}
+
+// TagGroup 企业标签组
+type TagGroup struct {
+	GroupID    string            `json:"group_id"`
+	GroupName  string            `json:"group_name"`
+	CreateTime string            `json:"create_time"`
+	GroupOrder int               `json:"group_order"`
+	Deleted    bool              `json:"deleted"`
+	Tag        []TagGroupTagItem `json:"tag"`
+}
+
+// TagGroupTagItem 企业标签内的子项
+type TagGroupTagItem struct {
+	ID         string `json:"id"`
+	Name       string `json:"name"`
+	CreateTime int    `json:"create_time"`
+	Order      int    `json:"order"`
+	Deleted    bool   `json:"deleted"`
+}
+
+// GetCropTagList 获取企业标签库
+// @see https://developer.work.weixin.qq.com/document/path/92117
+func (r *Client) GetCropTagList(req GetCropTagRequest) ([]TagGroup, error) {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	jsonData, _ := json.Marshal(req)
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", GetCropTagURL, accessToken), string(jsonData))
+	if err != nil {
+		return nil, err
+	}
+	var result GetCropTagListResponse
+	err = util.DecodeWithError(response, &result, "GetCropTagList")
+	if err != nil {
+		return nil, err
+	}
+	return result.TagGroup, nil
+}
+
+// AddCropTagRequest 添加企业标签请求
+type AddCropTagRequest struct {
+	GroupID   string           `json:"group_id"`
+	GroupName string           `json:"group_name"`
+	Order     int              `json:"order"`
+	Tag       []AddCropTagItem `json:"tag"`
+	AgentID   int              `json:"agentid"`
+}
+
+// AddCropTagItem 添加企业标签子项
+type AddCropTagItem struct {
+	Name  string `json:"name"`
+	Order int    `json:"order"`
+}
+
+// AddCropTagResponse 添加企业标签响应
+type AddCropTagResponse struct {
+	util.CommonError
+	TagGroup TagGroup `json:"tag_group"`
+}
+
+// AddCropTag 添加企业客户标签
+// @see https://developer.work.weixin.qq.com/document/path/92117
+func (r *Client) AddCropTag(req AddCropTagRequest) (*TagGroup, error) {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	jsonData, _ := json.Marshal(req)
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", AddCropTagURL, accessToken), string(jsonData))
+	if err != nil {
+		return nil, err
+	}
+	var result AddCropTagResponse
+	err = util.DecodeWithError(response, &result, "AddCropTag")
+	if err != nil {
+		return nil, err
+	}
+	return &result.TagGroup, nil
+}
+
+// EditCropTagRequest 编辑客户企业标签请求
+type EditCropTagRequest struct {
+	ID      string `json:"id"`
+	Name    string `json:"name"`
+	Order   int    `json:"order"`
+	AgentID string `json:"agent_id"`
+}
+
+// EditCropTag 修改企业客户标签
+// @see https://developer.work.weixin.qq.com/document/path/92117
+func (r *Client) EditCropTag(req EditCropTagRequest) error {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	var response []byte
+	jsonData, _ := json.Marshal(req)
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", EditCropTagURL, accessToken), string(jsonData))
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "EditCropTag")
+}
+
+// DeleteCropTagRequest 删除企业标签请求
+type DeleteCropTagRequest struct {
+	TagID   []string `json:"tag_id"`
+	GroupID []string `json:"group_id"`
+	AgentID string   `json:"agent_id"`
+}
+
+// DeleteCropTag 删除企业客户标签
+// @see https://developer.work.weixin.qq.com/document/path/92117
+func (r *Client) DeleteCropTag(req DeleteCropTagRequest) error {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	var response []byte
+	jsonData, _ := json.Marshal(req)
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", DelCropTagURL, accessToken), string(jsonData))
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "DeleteCropTag")
+}
+
+// MarkTagRequest 给客户打标签请求
+type MarkTagRequest struct {
+	UserID         string   `json:"user_id"`
+	ExternalUserID string   `json:"external_userid"`
+	AddTag         []string `json:"add_tag"`
+	RemoveTag      []string `json:"remove_tag"`
+}
+
+// MarkTag 为客户打上标签
+// @see https://developer.work.weixin.qq.com/document/path/92118
+func (r *Client) MarkTag(request MarkTagRequest) error {
+	var accessToken string
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	var response []byte
+	jsonData, _ := json.Marshal(request)
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", MarkCropTagURL, accessToken), string(jsonData))
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "MarkTag")
+}

work/kf/README.md

@@ -0,0 +1,3 @@
+### 微信客服SDK
+
+相关文档正在梳理中...

work/kf/account.go

@@ -0,0 +1,189 @@
+package kf
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// 添加客服账号
+	accountAddAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/account/add?access_token=%s"
+	// 删除客服账号
+	accountDelAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/account/del?access_token=%s"
+	// 修改客服账号
+	accountUpdateAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/account/update?access_token=%s"
+	// 获取客服账号列表
+	accountListAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/account/list?access_token=%s"
+	// 获取客服账号链接
+	addContactWayAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/add_contact_way?access_token=%s"
+)
+
+// AccountAddOptions 添加客服账号请求参数
+type AccountAddOptions struct {
+	Name    string `json:"name"`     // 客服帐号名称, 不多于16个字符
+	MediaID string `json:"media_id"` // 客服头像临时素材。可以调用上传临时素材接口获取, 不多于128个字节
+}
+
+// AccountAddSchema 添加客服账号响应内容
+type AccountAddSchema struct {
+	util.CommonError
+	OpenKFID string `json:"open_kfid"` // 新创建的客服张号ID
+}
+
+// AccountAdd 添加客服账号
+func (r *Client) AccountAdd(options AccountAddOptions) (info AccountAddSchema, err error) {
+	var (
+		accessToken string
+		data        []byte
+	)
+	accessToken, err = r.ctx.GetAccessToken()
+	if err != nil {
+		return
+	}
+	data, err = util.PostJSON(fmt.Sprintf(accountAddAddr, accessToken), options)
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &info); err != nil {
+		return
+	}
+	if info.ErrCode != 0 {
+		return info, NewSDKErr(info.ErrCode, info.ErrMsg)
+	}
+	return info, nil
+}
+
+// AccountDelOptions 删除客服账号请求参数
+type AccountDelOptions struct {
+	OpenKFID string `json:"open_kfid"` // 客服帐号ID, 不多于64字节
+}
+
+// AccountDel 删除客服账号
+func (r *Client) AccountDel(options AccountDelOptions) (info util.CommonError, err error) {
+	var (
+		accessToken string
+		data        []byte
+	)
+	accessToken, err = r.ctx.GetAccessToken()
+	if err != nil {
+		return
+	}
+	data, err = util.PostJSON(fmt.Sprintf(accountDelAddr, accessToken), options)
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &info); err != nil {
+		return
+	}
+	if info.ErrCode != 0 {
+		return info, NewSDKErr(info.ErrCode, info.ErrMsg)
+	}
+	return info, nil
+}
+
+// AccountUpdateOptions 修改客服账号请求参数
+type AccountUpdateOptions struct {
+	OpenKFID string `json:"open_kfid"` // 客服帐号ID, 不多于64字节
+	Name     string `json:"name"`      // 客服帐号名称, 不多于16个字符
+	MediaID  string `json:"media_id"`  // 客服头像临时素材。可以调用上传临时素材接口获取, 不多于128个字节
+}
+
+// AccountUpdate 修复客服账号
+func (r *Client) AccountUpdate(options AccountUpdateOptions) (info util.CommonError, err error) {
+	var (
+		accessToken string
+		data        []byte
+	)
+	accessToken, err = r.ctx.GetAccessToken()
+	if err != nil {
+		return
+	}
+	data, err = util.PostJSON(fmt.Sprintf(accountUpdateAddr, accessToken), options)
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &info); err != nil {
+		return
+	}
+	if info.ErrCode != 0 {
+		return info, NewSDKErr(info.ErrCode, info.ErrMsg)
+	}
+	return info, nil
+}
+
+// AccountInfoSchema 客服详情
+type AccountInfoSchema struct {
+	OpenKFID string `json:"open_kfid"` // 客服帐号ID
+	Name     string `json:"name"`      // 客服帐号名称
+	Avatar   string `json:"avatar"`    // 客服头像URL
+}
+
+// AccountListSchema 获取客服账号列表响应内容
+type AccountListSchema struct {
+	util.CommonError
+	AccountList []AccountInfoSchema `json:"account_list"` // 客服账号列表
+}
+
+// AccountList 获取客服账号列表
+func (r *Client) AccountList() (info AccountListSchema, err error) {
+	var (
+		accessToken string
+		data        []byte
+	)
+	accessToken, err = r.ctx.GetAccessToken()
+	if err != nil {
+		return
+	}
+	data, err = util.HTTPGet(fmt.Sprintf(accountListAddr, accessToken))
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &info); err != nil {
+		return
+	}
+	if info.ErrCode != 0 {
+		return info, NewSDKErr(info.ErrCode, info.ErrMsg)
+	}
+	return info, nil
+}
+
+// AddContactWayOptions 获取客服账号链接
+// 1.若scene非空，返回的客服链接开发者可拼接scene_param=SCENE_PARAM参数使用，用户进入会话事件会将SCENE_PARAM原样返回。其中SCENE_PARAM需要urlencode，且长度不能超过128字节。
+// 如 https://work.weixin.qq.com/kf/kfcbf8f8d07ac7215f?enc_scene=ENCGFSDF567DF&scene_param=a%3D1%26b%3D2
+// 2.历史调用接口返回的客服链接（包含encScene=XXX参数），不支持scene_param参数。
+// 3.返回的客服链接，不能修改或复制参数到其他链接使用。否则进入会话事件参数校验不通过，导致无法回调。
+type AddContactWayOptions struct {
+	OpenKFID string `json:"open_kfid"` // 客服帐号ID, 不多于64字节
+	Scene    string `json:"scene"`     // 场景值，字符串类型，由开发者自定义, 不多于32字节, 字符串取值范围(正则表达式)：[0-9a-zA-Z_-]*
+}
+
+// AddContactWaySchema 获取客服账号链接响应内容
+type AddContactWaySchema struct {
+	util.CommonError
+	URL string `json:"url"` // 客服链接，开发者可将该链接嵌入到H5页面中，用户点击链接即可向对应的微信客服帐号发起咨询。开发者也可根据该url自行生成需要的二维码图片
+}
+
+// AddContactWay 获取客服账号链接
+func (r *Client) AddContactWay(options AddContactWayOptions) (info AddContactWaySchema, err error) {
+	var (
+		accessToken string
+		data        []byte
+	)
+	accessToken, err = r.ctx.GetAccessToken()
+	if err != nil {
+		return
+	}
+	data, err = util.PostJSON(fmt.Sprintf(addContactWayAddr, accessToken), options)
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &info); err != nil {
+		return
+	}
+	if info.ErrCode != 0 {
+		return info, NewSDKErr(info.ErrCode, info.ErrMsg)
+	}
+	return info, nil
+}

work/kf/callback.go

@@ -0,0 +1,96 @@
+package kf
+
+import (
+	"encoding/xml"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// SignatureOptions 微信服务器验证参数
+type SignatureOptions struct {
+	Signature string `form:"msg_signature"`
+	TimeStamp string `form:"timestamp"`
+	Nonce     string `form:"nonce"`
+	EchoStr   string `form:"echostr"`
+}
+
+// VerifyURL 验证请求参数是否合法并返回解密后的消息内容
+//  //Gin框架的使用示例
+//	r.GET("/v1/event/callback", func(c *gin.Context) {
+//		options := kf.SignatureOptions{}
+//		//获取回调的的校验参数
+//		if = c.ShouldBindQuery(&options); err != nil {
+//			c.String(http.StatusUnauthorized, "参数解析失败")
+//		}
+//		// 调用VerifyURL方法校验当前请求，如果合法则把解密后的内容作为响应返回给微信服务器
+//		echo, err := kfClient.VerifyURL(options)
+//		if err == nil {
+//			c.String(http.StatusOK, echo)
+//		} else {
+//			c.String(http.StatusUnauthorized, "非法请求来源")
+//		}
+//	})
+func (r *Client) VerifyURL(options SignatureOptions) (string, error) {
+	if options.Signature != util.Signature(r.ctx.Token, options.TimeStamp, options.Nonce, options.EchoStr) {
+		return "", NewSDKErr(40015)
+	}
+	_, bData, err := util.DecryptMsg(r.corpID, options.EchoStr, r.encodingAESKey)
+	if err != nil {
+		return "", NewSDKErr(40016)
+	}
+
+	return string(bData), nil
+}
+
+// 原始回调消息内容
+type callbackOriginMessage struct {
+	ToUserName string // 企业微信的CorpID，当为第三方套件回调事件时，CorpID的内容为suiteid
+	AgentID    string // 接收的应用id，可在应用的设置页面获取
+	Encrypt    string // 消息结构体加密后的字符串
+}
+
+// CallbackMessage 微信客服回调消息
+type CallbackMessage struct {
+	ToUserName string `json:"to_user_name"` // 微信客服组件ID
+	CreateTime int    `json:"create_time"`  // 消息创建时间，unix时间戳
+	MsgType    string `json:"msgtype"`      // 消息的类型，此时固定为 event
+	Event      string `json:"event"`        // 事件的类型，此时固定为 kf_msg_or_event
+	Token      string `json:"token"`        // 调用拉取消息接口时，需要传此token，用于校验请求的合法性
+}
+
+// GetCallbackMessage 获取回调事件中的消息内容
+//  //Gin框架的使用示例
+//	r.POST("/v1/event/callback", func(c *gin.Context) {
+//		var (
+//			message kf.CallbackMessage
+//			body []byte
+//		)
+//		// 读取原始消息内容
+//		body, err = c.GetRawData()
+//		if err != nil {
+//			c.String(http.StatusInternalServerError, err.Error())
+//			return
+//		}
+//		// 解析原始数据
+//		message, err = kfClient.GetCallbackMessage(body)
+//		if err != nil {
+//			c.String(http.StatusInternalServerError, "消息获取失败")
+//			return
+//		}
+//		fmt.Println(message)
+//		c.String(200, "ok")
+//	})
+func (r *Client) GetCallbackMessage(encryptedMsg []byte) (msg CallbackMessage, err error) {
+	var origin callbackOriginMessage
+	if err = xml.Unmarshal(encryptedMsg, &origin); err != nil {
+		return msg, err
+	}
+	_, bData, err := util.DecryptMsg(r.corpID, origin.Encrypt, r.encodingAESKey)
+	if err != nil {
+		return msg, NewSDKErr(40016)
+	}
+	if err = xml.Unmarshal(bData, &msg); err != nil {
+		return msg, err
+	}
+	return msg, err
+}

work/kf/client.go

@@ -0,0 +1,43 @@
+package kf
+
+import (
+	"github.com/silenceper/wechat/v2/cache"
+	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/work/config"
+	"github.com/silenceper/wechat/v2/work/context"
+)
+
+// Client 微信客服实例
+type Client struct {
+	corpID         string // 企业ID：企业开通的每个微信客服，都对应唯一的企业ID，企业可在微信客服管理后台的企业信息处查看
+	secret         string // Secret是微信客服用于校验开发者身份的访问密钥，企业成功注册微信客服后，可在「微信客服管理后台-开发配置」处获取
+	token          string // 用于生成签名校验回调请求的合法性
+	encodingAESKey string // 回调消息加解密参数是AES密钥的Base64编码，用于解密回调消息内容对应的密文
+	cache          cache.Cache
+	ctx            *context.Context
+}
+
+// NewClient 初始化微信客服实例
+func NewClient(cfg *config.Config) (client *Client, err error) {
+	if cfg.Cache == nil {
+		return nil, NewSDKErr(50001)
+	}
+
+	// 初始化 AccessToken Handle
+	defaultAkHandle := credential.NewWorkAccessToken(cfg.CorpID, cfg.CorpSecret, credential.CacheKeyWorkPrefix, cfg.Cache)
+	ctx := &context.Context{
+		Config:            cfg,
+		AccessTokenHandle: defaultAkHandle,
+	}
+
+	client = &Client{
+		corpID:         cfg.CorpID,
+		secret:         cfg.CorpSecret,
+		token:          cfg.Token,
+		encodingAESKey: cfg.EncodingAESKey,
+		cache:          cfg.Cache,
+		ctx:            ctx,
+	}
+
+	return client, nil
+}

work/kf/customer.go

@@ -0,0 +1,56 @@
+package kf
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	customerBatchGetAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/customer/batchget?access_token=%s"
+)
+
+// CustomerBatchGetOptions 客户基本信息获取请求参数
+type CustomerBatchGetOptions struct {
+	ExternalUserIDList []string `json:"external_userid_list"` // external_userid列表
+}
+
+// CustomerSchema 微信客户基本资料
+type CustomerSchema struct {
+	ExternalUserID string `json:"external_userid"` // 微信客户的external_userid
+	NickName       string `json:"nickname"`        // 微信昵称
+	Avatar         string `json:"avatar"`          // 微信头像。第三方不可获取
+	Gender         int    `json:"gender"`          // 性别
+	UnionID        string `json:"unionid"`         // unionid，需要绑定微信开发者帐号才能获取到，查看绑定方法: https://open.work.weixin.qq.com/kf/doc/92512/93143/94769#%E5%A6%82%E4%BD%95%E8%8E%B7%E5%8F%96%E5%BE%AE%E4%BF%A1%E5%AE%A2%E6%88%B7%E7%9A%84unionid
+}
+
+// CustomerBatchGetSchema 获取客户基本信息响应内容
+type CustomerBatchGetSchema struct {
+	util.CommonError
+	CustomerList          []CustomerSchema `json:"customer_list"`           // 微信客户信息列表
+	InvalidExternalUserID []string         `json:"invalid_external_userid"` // 无效的微信客户ID
+}
+
+// CustomerBatchGet 客户基本信息获取
+func (r *Client) CustomerBatchGet(options CustomerBatchGetOptions) (info CustomerBatchGetSchema, err error) {
+	var (
+		accessToken string
+		data        []byte
+	)
+	accessToken, err = r.ctx.GetAccessToken()
+	if err != nil {
+		return
+	}
+	data, err = util.PostJSON(fmt.Sprintf(customerBatchGetAddr, accessToken), options)
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &info); err != nil {
+		return
+	}
+	if info.ErrCode != 0 {
+		return info, NewSDKErr(info.ErrCode, info.ErrMsg)
+	}
+	return info, nil
+}

work/kf/error.go

@@ -0,0 +1,93 @@
+package kf
+
+import (
+	"reflect"
+	"strings"
+)
+
+// Error 错误
+type Error string
+
+const (
+	// SDKInitFailed 错误码：50001
+	SDKInitFailed Error = "SDK初始化失败"
+	// SDKCacheUnavailable 错误码：50002
+	SDKCacheUnavailable Error = "缓存无效"
+	// SDKUnknownError 错误码：50003
+	SDKUnknownError Error = "未知错误"
+	// SDKInvalidCredential 错误码：40001
+	SDKInvalidCredential Error = "不合法的secret参数"
+	// SDKInvalidImageSize 错误码：40009
+	SDKInvalidImageSize Error = "无效的图片大小"
+	// SDKInvalidCorpID 错误码：40013
+	SDKInvalidCorpID Error = "无效的 CorpID"
+	// SDKAccessTokenInvalid 错误码：40014
+	SDKAccessTokenInvalid Error = "AccessToken 无效"
+	// SDKValidateSignatureFailed 错误码：40015
+	SDKValidateSignatureFailed Error = "校验签名错误"
+	// SDKDecryptMSGFailed 错误码：40016
+	SDKDecryptMSGFailed Error = "消息解密失败"
+	// SDKMediaIDExceedMinLength 错误码：40058
+	SDKMediaIDExceedMinLength Error = "不合法的参数, 请参照具体 API 接口说明进行传参"
+	// SDKContentContainsSensitiveInformation 错误码：40201
+	SDKContentContainsSensitiveInformation Error = "当前客服账号由于涉及敏感信息，已被封禁，请联系企业微信客服处理"
+	// SDKAccessTokenMissing 错误码：41001
+	SDKAccessTokenMissing Error = "缺少AccessToken参数"
+	// SDKAccessTokenExpired 错误码：42001
+	SDKAccessTokenExpired Error = "AccessToken 已过期"
+	// SDKApiFreqOutOfLimit 错误码：45009
+	SDKApiFreqOutOfLimit Error = "接口请求次数超频"
+	// SDKApiForbidden 错误码：48002
+	SDKApiForbidden Error = "API 禁止调用"
+	// SDKInvalidOpenKFID 错误码：95000
+	SDKInvalidOpenKFID Error = "无效的 open_kfid"
+	// SDKOpenKFIDNotExist 错误码：95004
+	SDKOpenKFIDNotExist Error = "open_kfid 不存在"
+	// SDKWeWorkAlready 错误码：95011
+	SDKWeWorkAlready Error = "已在企业微信使用微信客服"
+	// SDKNotUseInWeCom 错误码：95012
+	SDKNotUseInWeCom Error = "未在企业微信使用微信客服"
+	// SDKApiNotOpen 错误码：95017
+	SDKApiNotOpen Error = "API 功能没有被开启"
+)
+
+// Error 输出错误信息
+func (r Error) Error() string {
+	return reflect.ValueOf(r).String()
+}
+
+var codeDic = map[int64]error{
+	50001: SDKInitFailed,
+	50002: SDKCacheUnavailable,
+	50003: SDKUnknownError,
+	40001: SDKInvalidCredential,
+	40009: SDKInvalidImageSize,
+	40013: SDKInvalidCorpID,
+	40014: SDKAccessTokenInvalid,
+	40015: SDKValidateSignatureFailed,
+	40016: SDKDecryptMSGFailed,
+	40058: SDKMediaIDExceedMinLength,
+	40201: SDKContentContainsSensitiveInformation,
+	41001: SDKAccessTokenMissing,
+	42001: SDKAccessTokenExpired,
+	45009: SDKApiFreqOutOfLimit,
+	48002: SDKApiForbidden,
+	95000: SDKInvalidOpenKFID,
+	95004: SDKOpenKFIDNotExist,
+	95011: SDKWeWorkAlready,
+	95012: SDKNotUseInWeCom,
+	95017: SDKApiNotOpen,
+}
+
+// NewSDKErr 初始化SDK实例错误信息
+func NewSDKErr(code int64, msgList ...string) error {
+	if err := codeDic[code]; err != nil {
+		return err
+	}
+
+	// 返回未知的自定义错误
+	if len(msgList) > 0 {
+		return Error(strings.Join(msgList, ","))
+	}
+	return SDKUnknownError
+}

work/kf/other.go

@@ -0,0 +1,49 @@
+package kf
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// 获取视频号绑定状态
+	corpQualification = "https://qyapi.weixin.qq.com/cgi-bin/kf/get_corp_qualification?access_token=%s"
+)
+
+// CorpQualificationSchema 获取视频号绑定状态响应内容
+type CorpQualificationSchema struct {
+	util.CommonError
+	WechatChannelsBinding bool `json:"wechat_channels_binding"` // 	当企业具有绑定成功的视频号时，返回true，否则返回false。 1. 企业申请绑定视频号且由视频号管理员确认后，才为绑定成功状态 2. 至少有一个绑定成功的视频号就会返回true
+}
+
+// GetCorpQualification 获取视频号绑定状态
+// 微信客服可接待的客户数，和企业是否已完成主体验证、是否绑定视频号相关。
+//
+// 企业未完成主体验证时，微信客服仅可累计接待100位客户
+// 企业已验证但未绑定视频号时，微信客服仅可累计接待10000位客户
+// 企业已验证且已绑定视频号时，微信客服可接待的客户数不受限制
+//
+// 开发者可获取状态后，在应用等地方提示企业去完成主体验证或绑定视频号。
+func (r *Client) GetCorpQualification() (info CorpQualificationSchema, err error) {
+	var (
+		accessToken string
+		data        []byte
+	)
+	accessToken, err = r.ctx.GetAccessToken()
+	if err != nil {
+		return
+	}
+	data, err = util.HTTPGet(fmt.Sprintf(corpQualification, accessToken))
+	if err != nil {
+		return info, err
+	}
+	if err = json.Unmarshal(data, &info); err != nil {
+		return
+	}
+	if info.ErrCode != 0 {
+		return info, NewSDKErr(info.ErrCode, info.ErrMsg)
+	}
+	return info, nil
+}