企业微信客户群进群方式配置(#631) (#632)

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

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

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

* debug

* rollback

* debug

* debug

* 获取用户信息

* token

* json.Marshal错误输出

* debug

* bugfix

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

* 企业微信-通讯录管理

* 企业微信-通讯录管理

* 企业微信-通讯录管理

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

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

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

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

* json.Marshal错误输出

* 已实现接口bug修改

* 历史接口bugfix

* 历史接口bugfix

* comment

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

* fix

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

* 历史接口bugfix

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

* golangci-lint

* gofmt

* 方法访问命名

Co-authored-by: wang.yu <wangyu@uniondrug.com>

.github/ISSUE_TEMPLATE.md

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

.github/workflows/go.yml

@@ -10,16 +10,17 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [1.15.x]
+        go-version: [1.16.x,1.17.x,1.18.x]
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.2.0
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.31
+          version: latest
   build:
     name: Test
     runs-on: ubuntu-latest
@@ -33,12 +34,18 @@ jobs:
         image: memcached
         ports:
           - 11211:11211
+
+    # strategy set
+    strategy:
+      matrix:
+        go: ["1.16", "1.17", "1.18"]
+
     steps:
       - uses: actions/checkout@v2
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: ^1.13
+          go-version: ${{ matrix.go }}
         id: go
       - name: Test
         run: go test -v -race ./...

.golangci.yml

@@ -36,8 +36,13 @@ linters:
     - whitespace
 
 issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
+  include:
+    - EXC0002 # disable excluding of issues about comments from golint
   exclude-rules:
+    - linters:
+        - stylecheck
+      text: "ST1000:"
+  # Excluding configuration per-path, per-linter, per-text and per-source
     - path: _test\.go
       linters:
         - gomnd
@@ -52,10 +57,10 @@ linters-settings:
     lines: 66
     statements: 40
 
-issues:
-  include:
-  - EXC0002 # disable excluding of issues about comments from golint
-  exclude-rules:
-    - linters:
-       - stylecheck
-      text: "ST1000:"
+#issues:
+#  include:
+#  - EXC0002 # disable excluding of issues about comments from golint
+#  exclude-rules:
+#    - linters:
+#       - stylecheck
+#      text: "ST1000:"

README.md

@@ -1,22 +1,23 @@
 # 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版本，v1版本已废弃
-
+> 注意：当前版本为v2版本，v1版本已废弃
 
 ## 文档 && 例子
+
 [API列表](https://github.com/silenceper/wechat/tree/v2/doc/api)
 
 [Wechat SDK 2.0 文档](https://silenceper.com/wechat)
 
 [Wechat SDK 2.0 例子](https://github.com/gowechat/example)
 
-
 ## 快速开始
+
 ```
 import "github.com/silenceper/wechat/v2"
 ```
@@ -24,40 +25,41 @@ import "github.com/silenceper/wechat/v2"
 以下是一个微信公众号处理消息接收以及回复的例子：
 
 ```go
-//使用memcache保存access_token，也可选择redis或自定义cache
+// 使用memcache保存access_token，也可选择redis或自定义cache
 wc := wechat.NewWechat()
 memory := cache.NewMemory()
 cfg := &offConfig.Config{
     AppID:     "xxx",
     AppSecret: "xxx",
     Token:     "xxx",
-    //EncodingAESKey: "xxxx",
+    // EncodingAESKey: "xxxx",
     Cache: memory,
 }
 officialAccount := wc.GetOfficialAccount(cfg)
 
 // 传入request和responseWriter
 server := officialAccount.GetServer(req, rw)
-//设置接收消息的处理方法
+// 设置接收消息的处理方法
 server.SetMessageHandler(func(msg *message.MixMessage) *message.Reply {
 
-    //回复消息：演示回复用户发送的消息
+    // 回复消息：演示回复用户发送的消息
     text := message.NewText(msg.Content)
     return &message.Reply{MsgType: message.MsgTypeText, MsgData: text}
 })
 
-//处理消息接收以及回复
+// 处理消息接收以及回复
 err := server.Serve()
 if err != nil {
     fmt.Println(err)
     return
 }
-//发送回复的消息
+// 发送回复的消息
 server.Send()
 
 ```
 
 ## 目录说明
+
 - officialaccount: 微信公众号API
 - miniprogram: 小程序API
 - minigame:小游戏API
@@ -68,11 +70,13 @@ server.Send()
 - 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
 type Redis struct {
-	conn *redis.Pool
+	ctx  context.Context
+	conn redis.UniversalClient
 }
 
 // RedisOpts redis 连接属性
@@ -23,90 +24,49 @@ type RedisOpts struct {
 }
 
 // NewRedis 实例化
-func NewRedis(opts *RedisOpts, dialOpts ...redis.DialOption) *Redis {
-	pool := &redis.Pool{
-		MaxActive:   opts.MaxActive,
-		MaxIdle:     opts.MaxIdle,
-		IdleTimeout: time.Second * time.Duration(opts.IdleTimeout),
-		Dial: func() (redis.Conn, error) {
-			dialOpts = append(dialOpts, []redis.DialOption{
-				redis.DialDatabase(opts.Database),
-				redis.DialPassword(opts.Password),
-			}...)
-			return redis.Dial("tcp", opts.Host, dialOpts...)
-		},
-		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
+func NewRedis(ctx context.Context, opts *RedisOpts) *Redis {
+	conn := redis.NewUniversalClient(&redis.UniversalOptions{
+		Addrs:        []string{opts.Host},
+		DB:           opts.Database,
+		Password:     opts.Password,
+		IdleTimeout:  time.Second * time.Duration(opts.IdleTimeout),
+		MinIdleConns: opts.MaxIdle,
+	})
+	return &Redis{ctx: ctx, conn: conn}
 }
 
 // SetConn 设置conn
-func (r *Redis) SetConn(conn *redis.Pool) {
+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{
-		Host: "127.0.0.1:6379",
-	}
-	redis := NewRedis(opts)
+	var (
+		timeoutDuration = time.Second
+		ctx             = context.Background()
+		opts            = &RedisOpts{
+			Host: "127.0.0.1:6379",
+		}
+		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/access_token.go

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

credential/default_access_token.go

@@ -1,6 +1,7 @@
 package credential
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"sync"
@@ -33,7 +34,7 @@ type DefaultAccessToken struct {
 }
 
 // NewDefaultAccessToken new DefaultAccessToken
-func NewDefaultAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenHandle {
+func NewDefaultAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
 	if cache == nil {
 		panic("cache is ineed")
 	}
@@ -56,6 +57,11 @@ type ResAccessToken struct {
 
 // GetAccessToken 获取access_token,先从cache中获取，没有则从服务端获取
 func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
+	return ak.GetAccessTokenContext(context.Background())
+}
+
+// GetAccessTokenContext 获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
 	// 先从cache中取
 	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.appID)
 	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
@@ -73,7 +79,7 @@ func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
 
 	// cache失效，从微信服务器获取
 	var resAccessToken ResAccessToken
-	resAccessToken, err = GetTokenFromServer(fmt.Sprintf(accessTokenURL, ak.appID, ak.appSecret))
+	resAccessToken, err = GetTokenFromServerContext(ctx, fmt.Sprintf(accessTokenURL, ak.appID, ak.appSecret))
 	if err != nil {
 		return
 	}
@@ -97,7 +103,7 @@ type WorkAccessToken struct {
 }
 
 // NewWorkAccessToken new WorkAccessToken
-func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenHandle {
+func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
 	if cache == nil {
 		panic("cache the not exist")
 	}
@@ -112,6 +118,11 @@ func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.C
 
 // GetAccessToken 企业微信获取access_token,先从cache中获取，没有则从服务端获取
 func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
+	return ak.GetAccessTokenContext(context.Background())
+}
+
+// GetAccessTokenContext 企业微信获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
 	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
 	ak.accessTokenLock.Lock()
 	defer ak.accessTokenLock.Unlock()
@@ -124,7 +135,7 @@ func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
 
 	// cache失效，从微信服务器获取
 	var resAccessToken ResAccessToken
-	resAccessToken, err = GetTokenFromServer(fmt.Sprintf(workAccessTokenURL, ak.CorpID, ak.CorpSecret))
+	resAccessToken, err = GetTokenFromServerContext(ctx, fmt.Sprintf(workAccessTokenURL, ak.CorpID, ak.CorpSecret))
 	if err != nil {
 		return
 	}
@@ -140,8 +151,13 @@ func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
 
 // GetTokenFromServer 强制从微信服务器获取token
 func GetTokenFromServer(url string) (resAccessToken ResAccessToken, err error) {
+	return GetTokenFromServerContext(context.Background(), url)
+}
+
+// GetTokenFromServerContext 强制从微信服务器获取token
+func GetTokenFromServerContext(ctx context.Context, url string) (resAccessToken ResAccessToken, err error) {
 	var body []byte
-	body, err = util.HTTPGet(url)
+	body, err = util.HTTPGetContext(ctx, url)
 	if err != nil {
 		return
 	}

doc.go

@@ -7,4 +7,6 @@ Package wechat provide wechat sdk for go
 更多信息：https://github.com/silenceper/wechat
 
 */
+
+// Package wechat provide wechat sdk for go
 package wechat

doc/api/README.md

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

doc/api/aispeech.md

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

doc/api/minigame.md

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

doc/api/miniprogram.md

@@ -1,2 +1,50 @@
 # 小程序
-TODO
+
+## 基础接口
+
+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

@@ -1,29 +1,29 @@
-# 微信公众号API列表
+# 微信公众号 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        |          |
+|           名称            | 请求方式 | 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   |
+| 名称                 | 请求方式 | URL                                    | 是否已实现 | 使用方法                                     |
+| -------------------- | -------- | -------------------------------------- | ---------- | -------------------------------------------- |
+| 选用模板             | POST     | /wxaapi/newtmpl/addtemplate            | YES        | (tpl \*Subscribe) Add                        |
+| 删除模板             | POST     | /wxaapi/newtmpl/deltemplate            | YES        | (tpl \*Subscribe) Delete                     |
+| 获取公众号类目       | GET      | /wxaapi/newtmpl/getcategory            | YES        | (tpl \*Subscribe) GetCategory                |
+| 获取模板中的关键词   | GET      | /wxaapi/newtmpl/getpubtemplatekeywords | YES        | (tpl \*Subscribe) GetPubTplKeyWordsByID      |
+| 获取类目下的公共模板 | GET      | /wxaapi/newtmpl/getpubtemplatetitles   | YES        | (tpl \*Subscribe) GetPublicTemplateTitleList |
+| 获取私有模板列表     | GET      | /wxaapi/newtmpl/gettemplate            | YES        | (tpl \*Subscribe) List()                     |
+| 发送订阅通知         | POST     | /cgi-bin/message/subscribe/bizsend     | YES        | (tpl \*Subscribe) Send                       |
 
 ## 客服消息
 
@@ -33,14 +33,16 @@
 
 [官方文档](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         |          |
+| 名称             | 请求方式  | URL                                    | 是否已实现 | 使用方法                         |
+| ---------------- | --------- | -------------------------------------- | ---------- | -------------------------------- |
+| 获取客服基本信息 | GET       | /cgi-bin/customservice/getkflist       | YES        | (csm \*Manager) List             |
+| 添加客服帐号     | POST      | /customservice/kfaccount/add           | YES        | (csm \*Manager) Add              |
+| 邀请绑定客服帐号 | POST      | /customservice/kfaccount/inviteworker  | YES        | (csm \*Manager) InviteBind       |
+| 设置客服信息     | POST      | /customservice/kfaccount/update        | YES        | (csm \*Manager) Update           |
+| 上传客服头像     | POST/FORM | /customservice/kfaccount/uploadheadimg | YES        | (csm \*Manager) UploadHeadImg    |
+| 删除客服帐号     | POST      | /customservice/kfaccount/del           | YES        | (csm \*Manager) Delete           |
+| 获取在线客服     | POST      | /cgi-bin/customservice/getonlinekflist | YES        | (csm \*Manager) OnlineList       |
+| 下发客服输入状态 | POST      | /cgi-bin/message/custom/typing         | YES        | (csm \*Manager) SendTypingStatus |
 
 #### 会话控制
 
@@ -132,6 +134,8 @@
 
 #### 群发任务管理
 
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Shopping_Guide/task-account/shopping-guide.addGuideMassendJob.html)
+
 | 名称                 | 请求方式 | URL                                   | 是否已实现 | 使用方法 |
 | -------------------- | -------- | ------------------------------------- | ---------- | -------- |
 | 添加群发任务         | POST     | /cgi-bin/guide/addguidemassendjob     | NO         |          |
@@ -144,22 +148,77 @@
 
 [官方文档](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                  |
+| 名称                                                                    | 请求方式 | URL                                                 | 是否已实现 | 使用方法                             |
+| ----------------------------------------------------------------------- | -------- | --------------------------------------------------- | ---------- | ------------------------------------ |
+| 获取跳转的 url 地址                                                     | GET      | https://open.weixin.qq.com/connect/oauth2/authorize | YES        | (oauth \*Oauth) GetRedirectURL       |
+| 获取网页应用跳转的 url 地址                                             | GET      | https://open.weixin.qq.com/connect/qrconnect        | YES        | (oauth \*Oauth) GetWebAppRedirectURL |
+| 通过网页授权的 code 换取 access_token(区别于 context 中的 access_token) | GET      | /sns/oauth2/access_token                            | YES        | (oauth \*Oauth) GetUserAccessToken   |
+| 刷新 access_token                                                       | GET      | /sns/oauth2/refresh_token?                          | YES        | (oauth \*Oauth) RefreshAccessToken   |
+| 检验 access_token 是否有效                                              | GET      | /sns/auth                                           | YES        | (oauth \*Oauth) CheckAccessToken(    |
+| 拉取用户信息(需 scope 为 snsapi_userinfo)                               | GET      | /sns/userinfo                                       | YES        | (oauth \*Oauth) GetUserInfo          |
+| 获取 jssdk 需要的配置参数                                               | GET      | /cgi-bin/ticket/getticket                           | YES        | (js \*Js) GetConfig                  |
 
 ## 素材管理
 
+## 草稿箱
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Draft_Box/Add_draft.html)
+
+| 名称                        | 请求方式 | URL                                                          | 是否已实现 | 使用方法                      |
+| --------------------------- | -------- | ------------------------------------------------------------ | ---------- | ----------------------------- |
+| 新建草稿                    | POST     | /cgi-bin/draft/add                                           | YES        | (draft \*Draft) AddDraft      |
+| 获取草稿                    | POST     | /cgi-bin/draft/get                                           | YES        | (draft \*Draft) GetDraft      |
+| 删除草稿                    | POST     | /cgi-bin/draft/delete                                        | YES        | (draft \*Draft) DeleteDraft   |
+| 修改草稿                    | POST     | /cgi-bin/draft/update                                        | YES        | (draft \*Draft) UpdateDraft   |
+| 获取草稿总数                | GET      | /cgi-bin/draft/count                                         | YES        | (draft \*Draft) CountDraft    |
+| 获取草稿列表                | POST     | /cgi-bin/draft/batchget                                      | YES        | (draft \*Draft) PaginateDraft |
+| MP 端开关（仅内测期间使用） | POST     | /cgi-bin/draft/switch<br />/cgi-bin/draft/switch?checkonly=1 | NO         |                               |
+
+## 发布能力
+
+[官方文档](https://developers.weixin.qq.com/doc/offiaccount/Publish/Publish.html)
+
+说明：「发表记录」包括群发和发布。
+
+注意：该接口，只能处理 "发布" 相关的信息，无法操作和获取 "群发" 相关内容！！[官方回复](https://developers.weixin.qq.com/community/develop/doc/0002a4fb2109d8f7a91d421c556c00)
+
+- 群发：主动推送给粉丝，历史消息可看，被搜一搜收录，可以限定部分的粉丝接收到。
+- 发布：不会主动推给粉丝，历史消息列表看不到，但是是公开给所有人的文章。也不会占用群发的次数。每天可以发布多篇内容。可以用于自动回复、自定义菜单、页面模板和话题中，发布成功时会生成一个永久链接。
+
+| 名称                           | 请求方式 | URL                             | 是否已实现 | 使用方法                                 |
+| ------------------------------ | -------- | ------------------------------- | ---------- | ---------------------------------------- |
+| 发布接口                       | POST     | /cgi-bin/freepublish/submit     | YES        | (freePublish \*FreePublish) Publish      |
+| 发布状态轮询接口               | POST     | /cgi-bin/freepublish/get        | YES        | (freePublish \*FreePublish) SelectStatus |
+| 事件推送发布结果               |          |                                 | YES        | EventPublishJobFinish                    |
+| 删除发布                       | POST     | /cgi-bin/freepublish/delete     | YES        | (freePublish \*FreePublish) Delete       |
+| 通过 article_id 获取已发布文章 | POST     | /cgi-bin/freepublish/getarticle | YES        | (freePublish \*FreePublish) First        |
+| 获取成功发布列表               | POST     | /cgi-bin/freepublish/batchget   | YES        | (freePublish \*FreePublish) Paginate     |
+
 ## 图文消息留言管理
 
 ## 用户管理
 
+| 名称                                       | 请求方式 | URL                                    | 是否已实现 | 使用方法                           |
+| ------------------------------------------ | -------- | -------------------------------------- | ---------- | ---------------------------------- |
+| 获取指定 OpenID 变化列表（公众号账号迁移） | POST     | /cgi-bin/changeopenid                  | YES        | (user \*User) ListChangeOpenIDs    |
+| 获取所有用户 OpenID 列表（公众号账号迁移） |          |                                        | YES        | (user \*User) ListAllChangeOpenIDs |
+| 获取用户基本信息                           | GET      | /cgi-bin/user/info                     | YES        | (user \*User) GetUserInfo          |
+| 设置用户备注名                             | POST     | /cgi-bin/user/info/updateremark        | YES        | (user \*User) UpdateRemark         |
+| 获取用户列表                               | GET      | /cgi-bin/user/get                      | YES        | (user \*User) ListUserOpenIDs      |
+| 获取所有用户 OpenID 列表                   |          |                                        | YES        | (user \*User) ListAllUserOpenIDs   |
+| 获取公众号的黑名单列表                     | POST     | /cgi-bin/tags/members/getblacklist     | YES        | (user \*User) GetBlackList         |
+| 获取公众号的所有黑名单列表                 |          |                                        | YES        | (user \*User) GetAllBlackList      |
+| 拉黑用户                                   | POST     | /cgi-bin/tags/members/batchblacklist   | YES        | (user \*User) BatchBlackList       |
+| 取消拉黑用户                               | POST     | /cgi-bin/tags/members/batchunblacklist | YES        | (user \*User) BatchUnBlackList     |
+| 创建标签                                   | POST     | /cgi-bin/tags/create                   | YES        | (user \*User) CreateTag            |
+| 删除标签                                   | POST     | /cgi-bin/tags/delete                   | YES        | (user \*User) DeleteTag            |
+| 编辑标签                                   | POST     | /cgi-bin/tags/update                   | YES        | (user \*User) UpdateTag            |
+| 获取公众号已创建的标签                     | GET      | /cgi-bin/tags/get                      | YES        | (user \*User) GetTag               |
+| 获取标签下粉丝列表                         | POST     | /cgi-bin/user/tag/get                  | YES        | (user \*User) OpenIDListByTag      |
+| 批量为用户打标签                           | POST     | /cgi-bin/tags/members/batchtagging     | YES        | (user \*User) BatchTag             |
+| 批量为用户取消标签                         | POST     | /cgi-bin/tags/members/batchuntagging   | YES        | (user \*User) BatchUntag           |
+| 获取用户身上的标签列表                     | POST     | /cgi-bin/tags/getidlist                | YES        | (user \*User) UserTidList          |
+
 ## 账号管理
 
 ## 数据统计
@@ -176,5 +235,4 @@
 
 ## 微信发票
 
-## 微信非税缴费 
-
+## 微信非税缴费

doc/api/work.md

@@ -59,7 +59,62 @@ host: https://qyapi.weixin.qq.com/
 | 获取客户基础信息        | POST     | /cgi-bin/kf/customer/batchget           | YES        | (r *Client) CustomerBatchGet      | NICEXAI    |
 | 获取视频号绑定状态      | GET      |  /cgi-bin/kf/get_corp_qualification      | YES        | (r *Client) GetCorpQualification  | NICEXAI    |
 
+### 客户联系
+[官方文档](https://developer.work.weixin.qq.com/document/path/92132/92133/92228)
+
+|            名称            | 请求方式  | URL                                                          | 是否已实现   | 使用方法                            | 贡献者      |
+|:------------------------:| -------- |:-------------------------------------------------------------| ---------- | -------------------------------   |----------|
+|       获取「联系客户统计」数据       | POST     | /cgi-bin/externalcontact/get_user_behavior_data              | YES        | (r *Client) GetUserBehaviorData      | MARKWANG |
+| 获取「群聊数据统计」数据 (按群主聚合的方式)  | POST      | /cgi-bin/externalcontact/groupchat/statistic                 | YES        | (r *Client) GetGroupChatStat  | MARKWANG  |
+| 获取「群聊数据统计」数据 (按自然日聚合的方式) | POST      | /cgi-bin/externalcontact/groupchat/statistic_group_by_day    | YES        | (r *Client) GetGroupChatStatByDay  | MARKWANG  |
+|      配置客户联系「联系我」方式       | POST      | /cgi-bin/externalcontact/add_contact_way                     | YES        | (r *Client) AddContactWay  | MARKWANG  |
+|     获取企业已配置的「联系我」方式      | POST      | /cgi-bin/externalcontact/get_contact_way                     | YES        | (r *Client) GetContactWay  | MARKWANG  |
+|     更新企业已配置的「联系我」方式      | POST      | /cgi-bin/externalcontact/update_contact_way                  | YES        | (r *Client) UpdateContactWay  | MARKWANG  |
+|     获取企业已配置的「联系我」列表      | POST      | /cgi-bin/externalcontact/list_contact_way                    | YES        | (r *Client) ListContactWay  | MARKWANG  |
+|     删除企业已配置的「联系我」方式      | POST      | /cgi-bin/externalcontact/del_contact_way                     | YES        | (r *Client) DelContactWay  | MARKWANG  |
+|          创建企业群发          | POST      | /cgi-bin/externalcontact/add_msg_template                    | YES        | (r *Client) AddMsgTemplate  | MARKWANG  |
+|          获取群发记录列表          | POST      | /cgi-bin/externalcontact/get_groupmsg_list_v2                | YES        | (r *Client) GetGroupMsgListV2  | MARKWANG  |
+|          获取群发成员发送任务列表          | POST      | /cgi-bin/externalcontact/get_groupmsg_task                   | YES        | (r *Client) GetGroupMsgTask  | MARKWANG  |
+|          获取企业群发成员执行结果          | POST      | /cgi-bin/externalcontact/get_groupmsg_send_result            | YES        | (r *Client) GetGroupMsgSendResult  | MARKWANG  |
+|          发送新客户欢迎语          | POST      | /cgi-bin/externalcontact/send_welcome_msg                    | YES        | (r *Client) SendWelcomeMsg  | MARKWANG  |
+|          添加入群欢迎语素材          | POST      | /cgi-bin/externalcontact/group_welcome_template/add          | YES        | (r *Client) AddGroupWelcomeTemplate  | MARKWANG  |
+|          编辑入群欢迎语素材          | POST      | /cgi-bin/externalcontact/group_welcome_template/edit         | YES        | (r *Client) EditGroupWelcomeTemplate  | MARKWANG  |
+|          获取入群欢迎语素材          | POST      | /cgi-bin/externalcontact/group_welcome_template/get          | YES        | (r *Client) GetGroupWelcomeTemplate  | MARKWANG  |
+|          删除入群欢迎语素材          | POST      | /cgi-bin/externalcontact/group_welcome_template/del          | YES        | (r *Client) DelGroupWelcomeTemplate  | MARKWANG  |
+
+## 通讯录管理
+[官方文档](https://developer.work.weixin.qq.com/document/path/90193)
+
+### 部门管理
+
+|    名称     | 请求方式 | URL                                     | 是否已实现   | 使用方法                            | 贡献者      |
+|:---------:|------|:----------------------------------------| ---------- | -------------------------------   |----------|
+| 获取子部门ID列表 | GET  | /cgi-bin/department/simplelist          | YES        | (r *Client) DepartmentSimpleList| MARKWANG |
+|  获取部门成员   | GET | /cgi-bin/user/simplelist                | YES        | (r *Client) UserSimpleList  | MARKWANG  |
+|  获取成员ID列表   | Post | /cgi-bin/user/list_id                | YES        | (r *Client) UserListId  | MARKWANG  |
+
+
+## 素材管理
+[官方文档](https://developer.work.weixin.qq.com/document/path/91054)
+
+|    名称     | 请求方式 | URL                                     | 是否已实现   | 使用方法                            | 贡献者      |
+|:---------:|------|:----------------------------------------| ---------- | -------------------------------   |----------|
+| 上传图片 | POST  | /cgi-bin/media/uploadimg          | YES        | (r *Client) UploadImg| MARKWANG |
+
+### 成员管理
+
+| 名称     | 请求方式 | URL               | 是否已实现 | 使用方法            | 贡献者   |
+| -------- | -------- | ----------------- | ---------- | ------------------- | -------- |
+| 读取成员 | GET      | /cgi-bin/user/get | YES        | (r *Client) UserGet | chcthink |
+
+
+## 群机器人
+
+[官方文档](https://developer.work.weixin.qq.com/document/path/91770)
+
+| 名称             | 请求方式 | URL                   | 是否已实现 | 使用方法                   | 贡献者   |
+| ---------------- | -------- | --------------------- | ---------- | -------------------------- | -------- |
+| 群机器人发送消息 | POST     | /cgi-bin/webhook/send | YES        | (r *Client) RobotBroadcast | chcthink |
+
 ## 应用管理
-
 TODO
-

doc/api/wxpay.md

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

go.mod

@@ -1,18 +1,15 @@
 module github.com/silenceper/wechat/v2
 
-go 1.14
+go 1.16
 
 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.5
-	github.com/kr/text v0.2.0 // indirect
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/cast v1.3.1
-	github.com/stretchr/testify v1.7.0
-	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
-	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/h2non/gock.v1 v1.0.15
-)
+	github.com/go-redis/redis/v8 v8.11.5
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cast v1.4.1
+	github.com/stretchr/testify v1.7.1
+	github.com/tidwall/gjson v1.14.1
+	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
+	gopkg.in/h2non/gock.v1 v1.1.2
+)

go.sum

@@ -1,49 +1,140 @@
-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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+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.5 h1:nRAxCa+SVsyjSBrtZmG/cqb6VbTmuRzpg/PoTFlpumc=
-github.com/gomodule/redigo v1.8.5/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.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
+github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-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.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
+github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
+github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
-golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
-golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/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/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/analysis/analysis.go

@@ -190,9 +190,9 @@ func (analysis *Analysis) GetAnalysisWeeklyVisitTrend(beginDate, endDate string)
 
 // UserPortraitItem 用户画像项目
 type UserPortraitItem struct {
-	ID                  int    `json:"id"`                     // 属性值id
-	Name                string `json:"name"`                   // 属性值名称
-	AccessSourceVisitUV int    `json:"access_source_visit_uv"` // 该场景访问uv
+	ID    int    `json:"id"`    // 属性值id
+	Name  string `json:"name"`  // 属性值名称
+	Value int    `json:"value"` // 该场景访问uv
 }
 
 // UserPortrait 用户画像

miniprogram/auth/auth.go

@@ -13,6 +13,8 @@ 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 登录/用户信息
@@ -82,7 +84,9 @@ func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHa
 	if at, err = auth.GetAccessToken(); err != nil {
 		return
 	}
-	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), "encrypted_msg_hash="+encryptedMsgHash); err != nil {
+
+	// 由于GetPhoneNumberContext需要传入JSON，所以HTTPPostContext入参改为[]byte
+	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), []byte("encrypted_msg_hash="+encryptedMsgHash), nil); err != nil {
 		return
 	}
 	if err = util.DecodeWithError(response, &result, "CheckEncryptedDataAuth"); err != nil {
@@ -90,3 +94,57 @@ func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHa
 	}
 	return
 }
+
+// GetPhoneNumberResponse 新版获取用户手机号响应结构体
+type GetPhoneNumberResponse struct {
+	util.CommonError
+
+	PhoneInfo PhoneInfo `json:"phone_info"`
+}
+
+// PhoneInfo 获取用户手机号内容
+type PhoneInfo struct {
+	PhoneNumber     string `json:"phoneNumber"`     // 用户绑定的手机号
+	PurePhoneNumber string `json:"purePhoneNumber"` // 没有区号的手机号
+	CountryCode     string `json:"countryCode"`     // 区号
+	WaterMark       struct {
+		Timestamp int64  `json:"timestamp"`
+		AppID     string `json:"appid"`
+	} `json:"watermark"` // 数据水印
+}
+
+// GetPhoneNumberContext 小程序通过code获取用户手机号
+func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*GetPhoneNumberResponse, error) {
+	var response []byte
+	var (
+		at  string
+		err error
+	)
+	if at, err = auth.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	body := map[string]interface{}{
+		"code": code,
+	}
+
+	bodyBytes, err := json.Marshal(body)
+	if err != nil {
+		return nil, err
+	}
+
+	header := map[string]string{"Content-Type": "application/json;charset=utf-8"}
+	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, at), bodyBytes, header); err != nil {
+		return nil, err
+	}
+
+	var result GetPhoneNumberResponse
+	if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil {
+		return nil, err
+	}
+	return &result, nil
+}
+
+// GetPhoneNumber 小程序通过code获取用户手机号
+func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
+	return auth.GetPhoneNumberContext(context2.Background(), code)
+}

miniprogram/business/business.go

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

miniprogram/business/phone_number.go

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

miniprogram/config/config.go

@@ -8,6 +8,6 @@ import (
 // Config .config for 小程序
 type Config struct {
 	AppID     string `json:"app_id"`     // appid
-	AppSecret string `json:"app_secret"` // appsecret
+	AppSecret string `json:"app_secret"` // appSecret
 	Cache     cache.Cache
 }

miniprogram/content/content.go

@@ -24,6 +24,8 @@ func NewContent(ctx *context.Context) *Content {
 
 // CheckText 检测文字
 // @text 需要检测的文字
+// Deprecated
+// 采用 security.MsgCheckV1 替代，返回值更加丰富
 func (content *Content) CheckText(text string) error {
 	accessToken, err := content.GetAccessToken()
 	if err != nil {
@@ -44,6 +46,8 @@ func (content *Content) CheckText(text string) error {
 // 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 {

miniprogram/miniprogram.go

@@ -4,16 +4,21 @@ 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"
 )
 
@@ -57,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)
@@ -92,7 +107,22 @@ 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/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/tcb/cloudfunction.go

@@ -18,6 +18,7 @@ type InvokeCloudFunctionRes struct {
 }
 
 // InvokeCloudFunction 云函数调用
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/functions/invokeCloudFunction.html
 func (tcb *Tcb) InvokeCloudFunction(env, name, args string) (*InvokeCloudFunctionRes, error) {
 	accessToken, err := tcb.GetAccessToken()

miniprogram/tcb/database.go

@@ -192,6 +192,7 @@ type DatabaseCountRes struct {
 }
 
 // DatabaseMigrateImport 数据库导入
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateImport.html
 func (tcb *Tcb) DatabaseMigrateImport(req *DatabaseMigrateImportReq) (*DatabaseMigrateImportRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -209,6 +210,7 @@ func (tcb *Tcb) DatabaseMigrateImport(req *DatabaseMigrateImportReq) (*DatabaseM
 }
 
 // DatabaseMigrateExport 数据库导出
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateExport.html
 func (tcb *Tcb) DatabaseMigrateExport(req *DatabaseMigrateExportReq) (*DatabaseMigrateExportRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -226,6 +228,7 @@ func (tcb *Tcb) DatabaseMigrateExport(req *DatabaseMigrateExportReq) (*DatabaseM
 }
 
 // DatabaseMigrateQueryInfo 数据库迁移状态查询
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseMigrateQueryInfo.html
 func (tcb *Tcb) DatabaseMigrateQueryInfo(env string, jobID int64) (*DatabaseMigrateQueryInfoRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -261,6 +264,7 @@ func (tcb *Tcb) UpdateIndex(req *UpdateIndexReq) error {
 }
 
 // DatabaseCollectionAdd 新增集合
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionAdd.html
 func (tcb *Tcb) DatabaseCollectionAdd(env, collectionName string) error {
 	accessToken, err := tcb.GetAccessToken()
@@ -279,6 +283,7 @@ func (tcb *Tcb) DatabaseCollectionAdd(env, collectionName string) error {
 }
 
 // DatabaseCollectionDelete 删除集合
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionDelete.html
 func (tcb *Tcb) DatabaseCollectionDelete(env, collectionName string) error {
 	accessToken, err := tcb.GetAccessToken()
@@ -297,6 +302,7 @@ func (tcb *Tcb) DatabaseCollectionDelete(env, collectionName string) error {
 }
 
 // DatabaseCollectionGet 获取特定云环境下集合信息
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCollectionGet.html
 func (tcb *Tcb) DatabaseCollectionGet(env string, limit, offset int64) (*DatabaseCollectionGetRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -318,6 +324,7 @@ func (tcb *Tcb) DatabaseCollectionGet(env string, limit, offset int64) (*Databas
 }
 
 // DatabaseAdd 数据库插入记录
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseAdd.html
 func (tcb *Tcb) DatabaseAdd(env, query string) (*DatabaseAddRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -338,6 +345,7 @@ func (tcb *Tcb) DatabaseAdd(env, query string) (*DatabaseAddRes, error) {
 }
 
 // DatabaseDelete 数据库插入记录
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseDelete.html
 func (tcb *Tcb) DatabaseDelete(env, query string) (*DatabaseDeleteRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -358,6 +366,7 @@ func (tcb *Tcb) DatabaseDelete(env, query string) (*DatabaseDeleteRes, error) {
 }
 
 // DatabaseUpdate 数据库插入记录
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseUpdate.html
 func (tcb *Tcb) DatabaseUpdate(env, query string) (*DatabaseUpdateRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -378,6 +387,7 @@ func (tcb *Tcb) DatabaseUpdate(env, query string) (*DatabaseUpdateRes, error) {
 }
 
 // DatabaseQuery 数据库查询记录
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseQuery.html
 func (tcb *Tcb) DatabaseQuery(env, query string) (*DatabaseQueryRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -398,6 +408,7 @@ func (tcb *Tcb) DatabaseQuery(env, query string) (*DatabaseQueryRes, error) {
 }
 
 // DatabaseCount 统计集合记录数或统计查询语句对应的结果记录数
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/database/databaseCount.html
 func (tcb *Tcb) DatabaseCount(env, query string) (*DatabaseCountRes, error) {
 	accessToken, err := tcb.GetAccessToken()

miniprogram/tcb/file.go

@@ -71,6 +71,7 @@ type BatchDeleteFileRes struct {
 }
 
 // UploadFile 上传文件
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/storage/uploadFile.html
 func (tcb *Tcb) UploadFile(env, path string) (*UploadFileRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -92,6 +93,7 @@ func (tcb *Tcb) UploadFile(env, path string) (*UploadFileRes, error) {
 }
 
 // BatchDownloadFile 获取文件下载链接
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/storage/batchDownloadFile.html
 func (tcb *Tcb) BatchDownloadFile(env string, fileList []*DownloadFile) (*BatchDownloadFileRes, error) {
 	accessToken, err := tcb.GetAccessToken()
@@ -113,6 +115,7 @@ func (tcb *Tcb) BatchDownloadFile(env string, fileList []*DownloadFile) (*BatchD
 }
 
 // BatchDeleteFile 批量删除文件
+//
 //reference:https://developers.weixin.qq.com/miniprogram/dev/wxcloud/reference-http-api/storage/batchDeleteFile.html
 func (tcb *Tcb) BatchDeleteFile(env string, fileIDList []string) (*BatchDeleteFileRes, error) {
 	accessToken, err := tcb.GetAccessToken()

miniprogram/urllink/query.go

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

miniprogram/urllink/urllink.go

@@ -33,8 +33,10 @@ const (
 // 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"`
+	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"`

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

officialaccount/customerservice/manager.go

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

officialaccount/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

@@ -302,6 +302,7 @@ type reqBatchGetMaterial struct {
 }
 
 // BatchGetMaterial 批量获取永久素材
+//
 //reference:https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/Get_materials_list.html
 func (material *Material) BatchGetMaterial(permanentMaterialType PermanentMaterialType, offset, count int64) (list ArticleList, err error) {
 	var accessToken string

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 基本消息类型
@@ -67,6 +68,8 @@ const (
 	EventPicWeixin EventType = "pic_weixin"
 	// EventLocationSelect 弹出地理位置选择器的事件推送
 	EventLocationSelect EventType = "location_select"
+	// EventViewMiniprogram 点击菜单跳转小程序的事件推送
+	EventViewMiniprogram EventType = "view_miniprogram"
 	// EventTemplateSendJobFinish 发送模板消息推送通知
 	EventTemplateSendJobFinish EventType = "TEMPLATESENDJOBFINISH"
 	// EventMassSendJobFinish 群发消息推送通知
@@ -75,6 +78,14 @@ const (
 	EventWxaMediaCheck EventType = "wxa_media_check"
 	// EventSubscribeMsgPopupEvent 订阅通知事件推送
 	EventSubscribeMsgPopupEvent EventType = "subscribe_msg_popup_event"
+	// EventPublishJobFinish 发布任务完成
+	EventPublishJobFinish EventType = "PUBLISHJOBFINISH"
+	// EventWeappAuditSuccess 审核通过
+	EventWeappAuditSuccess EventType = "weapp_audit_success"
+	// EventWeappAuditFail 审核不通过
+	EventWeappAuditFail EventType = "weapp_audit_fail"
+	// EventWeappAuditDelay 审核延后
+	EventWeappAuditDelay EventType = "weapp_audit_delay"
 )
 
 const (
@@ -114,7 +125,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"`
@@ -146,10 +157,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"`
@@ -187,13 +215,37 @@ type MixMessage struct {
 
 	// 设备相关
 	device.MsgDevice
+
+	//小程序审核通知
+	SuccTime   int    `xml:"SuccTime"`   //审核成功时的时间戳
+	FailTime   int    `xml:"FailTime"`   //审核不通过的时间戳
+	DelayTime  int    `xml:"DelayTime"`  //审核延后时的时间戳
+	Reason     string `xml:"Reason"`     //审核不通过的原因
+	ScreenShot string `xml:"ScreenShot"` //审核不通过的截图示例。用 | 分隔的 media_id 的列表，可通过获取永久素材接口拉取截图内容
 }
 
 // SubscribeMsgPopupEvent 订阅通知事件推送的消息体
 type SubscribeMsgPopupEvent struct {
-	TemplateID            string `xml:"TemplateId"`
-	SubscribeStatusString string `xml:"SubscribeStatusString"`
-	PopupScene            int    `xml:"PopupScene"`
+	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 发图事件推送
@@ -230,10 +282,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

officialaccount/message/subscribe.go

@@ -8,10 +8,13 @@ import (
 )
 
 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"
+	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"
+	subscribeTemplateGetCategoryURL       = "https://api.weixin.qq.com/wxaapi/newtmpl/getcategory"
+	subscribeTemplateGetPubTplKeyWorksURL = "https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatekeywords"
+	subscribeTemplateGetPubTplTitles      = "https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatetitles"
 )
 
 // Subscribe 订阅消息
@@ -145,3 +148,108 @@ func (tpl *Subscribe) Delete(templateID string) (err error) {
 	}
 	return util.DecodeWithCommonError(response, "DeleteSubscribe")
 }
+
+// PublicTemplateCategory 公众号类目
+type PublicTemplateCategory struct {
+	ID   int    `json:"id"`   // 类目ID
+	Name string `json:"name"` // 类目的中文名
+}
+
+type resSubscribeCategoryList struct {
+	util.CommonError
+	CategoryList []*PublicTemplateCategory `json:"data"`
+}
+
+// GetCategory 获取公众号类目
+func (tpl *Subscribe) GetCategory() (categoryList []*PublicTemplateCategory, err error) {
+	var accessToken string
+	accessToken, err = tpl.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", subscribeTemplateGetCategoryURL, accessToken)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	var result resSubscribeCategoryList
+	err = util.DecodeWithError(response, &result, "GetCategory")
+	if err != nil {
+		return
+	}
+	categoryList = result.CategoryList
+	return
+}
+
+// PublicTemplateKeyWords 模板中的关键词
+type PublicTemplateKeyWords struct {
+	KeyWordsID int    `json:"kid"`     // 关键词 id
+	Name       string `json:"name"`    // 关键词内容
+	Example    string `json:"example"` // 关键词内容对应的示例
+	Rule       string `json:"rule"`    // 参数类型
+}
+
+type resPublicTemplateKeyWordsList struct {
+	util.CommonError
+	KeyWordsList []*PublicTemplateKeyWords `json:"data"` // 关键词列表
+}
+
+// GetPubTplKeyWordsByID 获取模板中的关键词
+func (tpl *Subscribe) GetPubTplKeyWordsByID(titleID string) (keyWordsList []*PublicTemplateKeyWords, err error) {
+	var accessToken string
+	accessToken, err = tpl.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s&tid=%s", subscribeTemplateGetPubTplKeyWorksURL, accessToken, titleID)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	var result resPublicTemplateKeyWordsList
+	err = util.DecodeWithError(response, &result, "GetPublicTemplateKeyWords")
+	if err != nil {
+		return
+	}
+	keyWordsList = result.KeyWordsList
+	return
+}
+
+// PublicTemplateTitle 类目下的公共模板
+type PublicTemplateTitle struct {
+	TitleID    int    `json:"tid"`        // 模版标题 id
+	Title      string `json:"title"`      // 模版标题
+	Type       int    `json:"type"`       // 模版类型，2 为一次性订阅，3 为长期订阅
+	CategoryID string `json:"categoryId"` // 模版所属类目 id
+}
+
+type resPublicTemplateTitleList struct {
+	util.CommonError
+	Count             int                    `json:"count"` // 公共模板列表总数
+	TemplateTitleList []*PublicTemplateTitle `json:"data"`  // 模板标题列表
+}
+
+// GetPublicTemplateTitleList 获取类目下的公共模板
+func (tpl *Subscribe) GetPublicTemplateTitleList(ids string, start int, limit int) (count int, templateTitleList []*PublicTemplateTitle, err error) {
+	var accessToken string
+	accessToken, err = tpl.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s&ids=%s&start=%d&limit=%d", subscribeTemplateGetPubTplTitles, accessToken, ids, start, limit)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	var result resPublicTemplateTitleList
+	err = util.DecodeWithError(response, &result, "GetPublicTemplateTitle")
+	if err != nil {
+		return
+	}
+	count = result.Count
+	templateTitleList = result.TemplateTitleList
+	return
+}

officialaccount/officialaccount.go

@@ -1,8 +1,11 @@
 package officialaccount
 
 import (
+	stdcontext "context"
 	"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"
@@ -12,6 +15,7 @@ import (
 	"github.com/silenceper/wechat/v2/officialaccount/broadcast"
 	"github.com/silenceper/wechat/v2/officialaccount/config"
 	"github.com/silenceper/wechat/v2/officialaccount/context"
+	"github.com/silenceper/wechat/v2/officialaccount/customerservice"
 	"github.com/silenceper/wechat/v2/officialaccount/device"
 	"github.com/silenceper/wechat/v2/officialaccount/js"
 	"github.com/silenceper/wechat/v2/officialaccount/material"
@@ -24,7 +28,22 @@ import (
 
 // OfficialAccount 微信公众号相关API
 type OfficialAccount struct {
-	ctx *context.Context
+	ctx          *context.Context
+	basic        *basic.Basic
+	menu         *menu.Menu
+	oauth        *oauth.Oauth
+	material     *material.Material
+	draft        *draft.Draft
+	freepublish  *freepublish.FreePublish
+	js           *js.Js
+	user         *user.User
+	templateMsg  *message.Template
+	managerMsg   *message.Manager
+	device       *device.Device
+	broadcast    *broadcast.Broadcast
+	datacube     *datacube.DataCube
+	ocr          *ocr.OCR
+	subscribeMsg *message.Subscribe
 }
 
 // NewOfficialAccount 实例化公众号API
@@ -49,12 +68,18 @@ func (officialAccount *OfficialAccount) GetContext() *context.Context {
 
 // GetBasic qr/url 相关配置
 func (officialAccount *OfficialAccount) GetBasic() *basic.Basic {
-	return basic.NewBasic(officialAccount.ctx)
+	if officialAccount.basic == nil {
+		officialAccount.basic = basic.NewBasic(officialAccount.ctx)
+	}
+	return officialAccount.basic
 }
 
 // GetMenu 菜单管理接口
 func (officialAccount *OfficialAccount) GetMenu() *menu.Menu {
-	return menu.NewMenu(officialAccount.ctx)
+	if officialAccount.menu == nil {
+		officialAccount.menu = menu.NewMenu(officialAccount.ctx)
+	}
+	return officialAccount.menu
 }
 
 // GetServer 消息管理：接收事件，被动回复消息管理
@@ -70,58 +95,120 @@ func (officialAccount *OfficialAccount) GetAccessToken() (string, error) {
 	return officialAccount.ctx.GetAccessToken()
 }
 
+// GetAccessTokenContext 获取access_token
+func (officialAccount *OfficialAccount) GetAccessTokenContext(ctx stdcontext.Context) (string, error) {
+	if c, ok := officialAccount.ctx.AccessTokenHandle.(credential.AccessTokenContextHandle); ok {
+		return c.GetAccessTokenContext(ctx)
+	}
+	return officialAccount.ctx.GetAccessToken()
+}
+
 // GetOauth oauth2网页授权
 func (officialAccount *OfficialAccount) GetOauth() *oauth.Oauth {
-	return oauth.NewOauth(officialAccount.ctx)
+	if officialAccount.oauth == nil {
+		officialAccount.oauth = oauth.NewOauth(officialAccount.ctx)
+	}
+	return officialAccount.oauth
 }
 
 // GetMaterial 素材管理
 func (officialAccount *OfficialAccount) GetMaterial() *material.Material {
-	return material.NewMaterial(officialAccount.ctx)
+	if officialAccount.material == nil {
+		officialAccount.material = material.NewMaterial(officialAccount.ctx)
+	}
+	return officialAccount.material
+}
+
+// GetDraft 草稿箱
+func (officialAccount *OfficialAccount) GetDraft() *draft.Draft {
+	if officialAccount.draft == nil {
+		officialAccount.draft = draft.NewDraft(officialAccount.ctx)
+	}
+	return officialAccount.draft
+}
+
+// GetFreePublish 发布能力
+func (officialAccount *OfficialAccount) GetFreePublish() *freepublish.FreePublish {
+	if officialAccount.freepublish == nil {
+		officialAccount.freepublish = freepublish.NewFreePublish(officialAccount.ctx)
+	}
+	return officialAccount.freepublish
 }
 
 // GetJs js-sdk配置
 func (officialAccount *OfficialAccount) GetJs() *js.Js {
-	return js.NewJs(officialAccount.ctx)
+	if officialAccount.js == nil {
+		officialAccount.js = js.NewJs(officialAccount.ctx)
+	}
+	return officialAccount.js
 }
 
 // GetUser 用户管理接口
 func (officialAccount *OfficialAccount) GetUser() *user.User {
-	return user.NewUser(officialAccount.ctx)
+	if officialAccount.user == nil {
+		officialAccount.user = user.NewUser(officialAccount.ctx)
+	}
+	return officialAccount.user
 }
 
 // GetTemplate 模板消息接口
 func (officialAccount *OfficialAccount) GetTemplate() *message.Template {
-	return message.NewTemplate(officialAccount.ctx)
+	if officialAccount.templateMsg == nil {
+		officialAccount.templateMsg = message.NewTemplate(officialAccount.ctx)
+	}
+	return officialAccount.templateMsg
 }
 
 // GetCustomerMessageManager 客服消息接口
 func (officialAccount *OfficialAccount) GetCustomerMessageManager() *message.Manager {
-	return message.NewMessageManager(officialAccount.ctx)
+	if officialAccount.managerMsg == nil {
+		officialAccount.managerMsg = message.NewMessageManager(officialAccount.ctx)
+	}
+	return officialAccount.managerMsg
 }
 
 // GetDevice 获取智能设备的实例
 func (officialAccount *OfficialAccount) GetDevice() *device.Device {
-	return device.NewDevice(officialAccount.ctx)
+	if officialAccount.device == nil {
+		officialAccount.device = device.NewDevice(officialAccount.ctx)
+	}
+	return officialAccount.device
 }
 
 // GetBroadcast 群发消息
 // TODO 待完善
 func (officialAccount *OfficialAccount) GetBroadcast() *broadcast.Broadcast {
-	return broadcast.NewBroadcast(officialAccount.ctx)
+	if officialAccount.broadcast == nil {
+		officialAccount.broadcast = broadcast.NewBroadcast(officialAccount.ctx)
+	}
+	return officialAccount.broadcast
 }
 
 // GetDataCube 数据统计
 func (officialAccount *OfficialAccount) GetDataCube() *datacube.DataCube {
-	return datacube.NewCube(officialAccount.ctx)
+	if officialAccount.datacube == nil {
+		officialAccount.datacube = datacube.NewCube(officialAccount.ctx)
+	}
+	return officialAccount.datacube
 }
 
 // GetOCR OCR接口
 func (officialAccount *OfficialAccount) GetOCR() *ocr.OCR {
-	return ocr.NewOCR(officialAccount.ctx)
+	if officialAccount.ocr == nil {
+		officialAccount.ocr = ocr.NewOCR(officialAccount.ctx)
+	}
+	return officialAccount.ocr
 }
 
 // GetSubscribe 公众号订阅消息
 func (officialAccount *OfficialAccount) GetSubscribe() *message.Subscribe {
-	return message.NewSubscribe(officialAccount.ctx)
+	if officialAccount.subscribeMsg == nil {
+		officialAccount.subscribeMsg = message.NewSubscribe(officialAccount.ctx)
+	}
+	return officialAccount.subscribeMsg
+}
+
+// GetCustomerServiceManager 客服管理
+func (officialAccount *OfficialAccount) GetCustomerServiceManager() *customerservice.Manager {
+	return customerservice.NewCustomerServiceManager(officialAccount.ctx)
 }

officialaccount/server/server.go

@@ -1,19 +1,22 @@
 package server
 
 import (
+	"encoding/json"
 	"encoding/xml"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"reflect"
 	"runtime/debug"
 	"strconv"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 
 	"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"
 )
 
@@ -34,10 +37,11 @@ type Server struct {
 	ResponseRawXMLMsg []byte
 	ResponseMsg       interface{}
 
-	isSafeMode bool
-	random     []byte
-	nonce      string
-	timestamp  int64
+	isSafeMode    bool
+	isJSONContent bool
+	random        []byte
+	nonce         string
+	timestamp     int64
 }
 
 // NewServer init
@@ -69,6 +73,11 @@ func (srv *Server) Serve() error {
 	if err != nil {
 		return err
 	}
+	// 非安全模式下，请求处理方法返回为nil则直接回复success给微信服务器
+	if response == nil && !srv.isSafeMode {
+		srv.String("success")
+		return nil
+	}
 
 	// debug print request msg
 	log.Debugf("request msg =%s", string(srv.RequestRawXMLMsg))
@@ -97,6 +106,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")
 
@@ -124,9 +137,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
 		}
 
 		// 验证消息签名
@@ -149,7 +162,7 @@ func (srv *Server) getMessage() (interface{}, error) {
 			return nil, fmt.Errorf("消息解密失败, err=%v", err)
 		}
 	} else {
-		rawXMLMsgBytes, err = ioutil.ReadAll(srv.Request.Body)
+		rawXMLMsgBytes, err = io.ReadAll(srv.Request.Body)
 		if err != nil {
 			return nil, fmt.Errorf("从body中解析xml失败, err=%v", err)
 		}
@@ -160,9 +173,48 @@ func (srv *Server) getMessage() (interface{}, error) {
 	return srv.parseRequestMessage(rawXMLMsgBytes)
 }
 
+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{}
-	err = xml.Unmarshal(rawXMLMsgBytes, msg)
+	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
 }
 

officialaccount/user/blacklist.go

@@ -0,0 +1,116 @@
+// Package user blacklist 公众号用户黑名单管理
+// 参考文档：https://developers.weixin.qq.com/doc/offiaccount/User_Management/Manage_blacklist.html
+package user
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// 获取公众号的黑名单列表
+	getblacklistURL = "https://api.weixin.qq.com/cgi-bin/tags/members/getblacklist?access_token=%s"
+	// 拉黑用户
+	batchblacklistURL = "https://api.weixin.qq.com/cgi-bin/tags/members/batchblacklist?access_token=%s"
+	// 取消拉黑用户
+	batchunblacklistURL = "https://api.weixin.qq.com/cgi-bin/tags/members/batchunblacklist?access_token=%s"
+)
+
+// GetBlackList 获取公众号的黑名单列表
+// 该接口每次调用最多可拉取 1000 个OpenID，当列表数较多时，可以通过多次拉取的方式来满足需求。
+// 参数 beginOpenid：当 begin_openid 为空时，默认从开头拉取。
+func (user *User) GetBlackList(beginOpenid ...string) (userlist *OpenidList, err error) {
+	if len(beginOpenid) > 1 {
+		return nil, errors.New("参数 beginOpenid 错误：请传递 1 个openID，若需要从头开始拉取列表请留空。")
+	}
+	// 获取 AccessToken
+	var accessToken string
+	if accessToken, err = user.GetAccessToken(); err != nil {
+		return
+	}
+
+	// 处理 request 内容
+	request := map[string]string{"begin_openid": ""}
+	if len(beginOpenid) == 1 {
+		request["begin_openid"] = beginOpenid[0]
+	}
+
+	// 调用接口
+	var resp []byte
+	url := fmt.Sprintf(getblacklistURL, accessToken)
+	if resp, err = util.PostJSON(url, &request); err != nil {
+		return nil, err
+	}
+
+	// 处理返回
+	userlist = &OpenidList{}
+	if err = util.DecodeWithError(resp, userlist, "GetBlackList"); err != nil {
+		return nil, err
+	}
+
+	return
+}
+
+// GetAllBlackList 获取公众号的所有黑名单列表
+func (user *User) GetAllBlackList() (openIDList []string, err error) {
+	var (
+		beginOpenid string
+		count       int
+		userlist    *OpenidList
+	)
+
+	for {
+		// 获取列表（每次1k条）
+		if userlist, err = user.GetBlackList(beginOpenid); err != nil {
+			return nil, err
+		}
+		openIDList = append(openIDList, userlist.Data.OpenIDs...) // 存储本次获得的OpenIDs
+		count += userlist.Count                                   // 记录获得的总数量
+		beginOpenid = userlist.NextOpenID                         // 记录下次循环的起始openID
+		if count >= userlist.Total {
+			break // 获得的数量=total，结束循环
+		}
+	}
+
+	return
+}
+
+// BatchBlackList 拉黑用户
+// 参数 openidList：需要拉入黑名单的用户的openid，每次拉黑最多允许20个
+func (user *User) BatchBlackList(openidList ...string) (err error) {
+	return user.batch(batchblacklistURL, "BatchBlackList", openidList...)
+}
+
+// BatchUnBlackList 取消拉黑用户
+// 参数 openidList：需要取消拉入黑名单的用户的openid，每次拉黑最多允许20个
+func (user *User) BatchUnBlackList(openidList ...string) (err error) {
+	return user.batch(batchunblacklistURL, "BatchUnBlackList", openidList...)
+}
+
+// batch 公共方法
+func (user *User) batch(url, apiName string, openidList ...string) (err error) {
+	// 检查参数
+	if len(openidList) == 0 || len(openidList) > 20 {
+		return errors.New("参数 openidList 错误：每次操作黑名单用户数量为1-20个。")
+	}
+
+	// 获取 AccessToken
+	var accessToken string
+	if accessToken, err = user.GetAccessToken(); err != nil {
+		return
+	}
+
+	// 处理 request 内容
+	request := map[string][]string{"openid_list": openidList}
+
+	// 调用接口
+	var resp []byte
+	url = fmt.Sprintf(url, accessToken)
+	if resp, err = util.PostJSON(url, &request); err != nil {
+		return
+	}
+
+	return util.DecodeWithCommonError(resp, apiName)
+}

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()
@@ -52,7 +52,9 @@ server.Send()
 
 
 ```
+
 ### 待授权处理消息
+
 ```go
 
 //授权的第三方公众号的appID

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 {
@@ -221,6 +226,36 @@ type AuthorizerInfo struct {
 	}
 	Alias     string `json:"alias"`
 	QrcodeURL string `json:"qrcode_url"`
+
+	MiniProgramInfo *MiniProgramInfo       `json:"MiniProgramInfo"`
+	RegisterType    int                    `json:"register_type"`
+	AccountStatus   int                    `json:"account_status"`
+	BasicConfig     *AuthorizerBasicConfig `json:"basic_config"`
+}
+
+// AuthorizerBasicConfig 授权账号的基础配置结构体
+type AuthorizerBasicConfig struct {
+	IsPhoneConfigured bool `json:"isPhoneConfigured"`
+	IsEmailConfigured bool `json:"isEmailConfigured"`
+}
+
+// MiniProgramInfo 授权账号小程序配置 授权账号为小程序时存在
+type MiniProgramInfo struct {
+	Network struct {
+		RequestDomain   []string `json:"RequestDomain"`
+		WsRequestDomain []string `json:"WsRequestDomain"`
+		UploadDomain    []string `json:"UploadDomain"`
+		DownloadDomain  []string `json:"DownloadDomain"`
+		BizDomain       []string `json:"BizDomain"`
+		UDPDomain       []string `json:"UDPDomain"`
+	} `json:"network"`
+	Categories []CategoriesInfo `json:"categories"`
+}
+
+// CategoriesInfo 授权账号小程序配置的类目信息
+type CategoriesInfo struct {
+	First  string `wx:"first"`
+	Second string `wx:"second"`
 }
 
 // GetAuthrInfo 获取授权方的帐号基本信息

openplatform/miniprogram/basic/basic.go

@@ -28,6 +28,7 @@ type AccountBasicInfo struct {
 }
 
 // GetAccountBasicInfo 获取小程序基础信息
+//
 //reference:https://developers.weixin.qq.com/doc/oplatform/Third-party_Platforms/Mini_Programs/Mini_Program_Information_Settings.html
 func (basic *Basic) GetAccountBasicInfo() (*AccountBasicInfo, error) {
 	ak, err := basic.GetAuthrAccessToken(basic.AppID)

openplatform/miniprogram/miniprogram.go

@@ -1,6 +1,13 @@
 package miniprogram
 
 import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/miniprogram"
+	miniConfig "github.com/silenceper/wechat/v2/miniprogram/config"
+	miniContext "github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/miniprogram/urllink"
 	openContext "github.com/silenceper/wechat/v2/openplatform/context"
 	"github.com/silenceper/wechat/v2/openplatform/miniprogram/basic"
 	"github.com/silenceper/wechat/v2/openplatform/miniprogram/component"
@@ -10,14 +17,41 @@ import (
 type MiniProgram struct {
 	AppID       string
 	openContext *openContext.Context
+	*miniprogram.MiniProgram
+	authorizerRefreshToken string
+}
+
+// GetAccessToken 获取ak
+func (miniProgram *MiniProgram) GetAccessToken() (string, error) {
+	ak, akErr := miniProgram.openContext.GetAuthrAccessToken(miniProgram.AppID)
+	if akErr == nil {
+		return ak, nil
+	}
+	if miniProgram.authorizerRefreshToken == "" {
+		return "", fmt.Errorf("please set the authorizer_refresh_token first")
+	}
+	akRes, akResErr := miniProgram.GetComponent().RefreshAuthrToken(miniProgram.AppID, miniProgram.authorizerRefreshToken)
+	if akResErr != nil {
+		return "", akResErr
+	}
+	return akRes.AccessToken, nil
+}
+
+// SetAuthorizerRefreshToken 设置代执操作业务授权账号authorizer_refresh_token
+func (miniProgram *MiniProgram) SetAuthorizerRefreshToken(authorizerRefreshToken string) *MiniProgram {
+	miniProgram.authorizerRefreshToken = authorizerRefreshToken
+	return miniProgram
 }
 
 // NewMiniProgram 实例化
 func NewMiniProgram(opCtx *openContext.Context, appID string) *MiniProgram {
-	return &MiniProgram{
-		openContext: opCtx,
-		AppID:       appID,
-	}
+	miniProgram := miniprogram.NewMiniProgram(&miniConfig.Config{
+		AppID: opCtx.AppID,
+		Cache: opCtx.Cache,
+	})
+	// 设置获取access_token的函数
+	miniProgram.SetAccessTokenHandle(NewDefaultAuthrAccessToken(opCtx, appID))
+	return &MiniProgram{AppID: appID, MiniProgram: miniProgram, openContext: opCtx}
 }
 
 // GetComponent get component
@@ -30,3 +64,29 @@ func (miniProgram *MiniProgram) GetComponent() *component.Component {
 func (miniProgram *MiniProgram) GetBasic() *basic.Basic {
 	return basic.NewBasic(miniProgram.openContext, miniProgram.AppID)
 }
+
+// GetURLLink 小程序URL Link接口 调用前需确认已调用 SetAuthorizerRefreshToken 避免由于缓存中 authorizer_access_token 过期执行中断
+func (miniProgram *MiniProgram) GetURLLink() *urllink.URLLink {
+	return urllink.NewURLLink(&miniContext.Context{
+		AccessTokenHandle: miniProgram,
+	})
+}
+
+// DefaultAuthrAccessToken 默认获取授权ak的方法
+type DefaultAuthrAccessToken struct {
+	opCtx *openContext.Context
+	appID string
+}
+
+// NewDefaultAuthrAccessToken 设置access_token
+func NewDefaultAuthrAccessToken(opCtx *openContext.Context, appID string) credential.AccessTokenHandle {
+	return &DefaultAuthrAccessToken{
+		opCtx: opCtx,
+		appID: appID,
+	}
+}
+
+// GetAccessToken 获取ak
+func (ak *DefaultAuthrAccessToken) GetAccessToken() (string, error) {
+	return ak.opCtx.GetAuthrAccessToken(ak.appID)
+}

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

pay/notify/refund.go

@@ -48,7 +48,6 @@ type RefundedResp struct {
 
 // 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")
 	}

pay/order/pay.go

@@ -172,7 +172,7 @@ func (o *Order) BridgeConfig(p *Params) (cfg Config, err error) {
 // BridgeAppConfig get app bridge config
 func (o *Order) BridgeAppConfig(p *Params) (cfg ConfigForApp, err error) {
 	var (
-		timestamp = strconv.FormatInt(time.Now().Unix(), 10)
+		timestamp = strconv.FormatInt(util.GetCurrTS(), 10)
 		noncestr  = util.RandomStr(32)
 		_package  = "Sign=WXPay"
 	)
@@ -273,7 +273,7 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 	return
 }
 
-// PrePayID will request wechat merchant api and request for a pre payment order id
+// PrePayID will request wechat merchant api and request for a pre-payment order id
 func (o *Order) PrePayID(p *Params) (prePayID string, err error) {
 	order, err := o.PrePayOrder(p)
 	if err != nil {

pay/pay.go

@@ -23,12 +23,12 @@ func (pay *Pay) GetOrder() *order.Order {
 	return order.NewOrder(pay.cfg)
 }
 
-// GetNotify  通知
+// GetNotify 通知
 func (pay *Pay) GetNotify() *notify.Notify {
 	return notify.NewNotify(pay.cfg)
 }
 
-// GetRefund  退款
+// GetRefund 退款
 func (pay *Pay) GetRefund() *refund.Refund {
 	return refund.NewRefund(pay.cfg)
 }

pay/transfer/transfer_wallet.go

@@ -9,7 +9,7 @@ import (
 	"github.com/silenceper/wechat/v2/util"
 )
 
-// 付款到零钱
+// walletTransferGateway 付款到零钱
 // 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"
 
@@ -20,8 +20,7 @@ type Transfer struct {
 
 // NewTransfer return an instance of Transfer package
 func NewTransfer(cfg *config.Config) *Transfer {
-	transfer := Transfer{cfg}
-	return &transfer
+	return &Transfer{cfg}
 }
 
 // Params 调用参数

util/error.go

@@ -8,10 +8,24 @@ import (
 
 // CommonError 微信返回的通用错误json
 type CommonError struct {
+	apiName string
 	ErrCode int64  `json:"errcode"`
 	ErrMsg  string `json:"errmsg"`
 }
 
+func (c *CommonError) Error() string {
+	return fmt.Sprintf("%s Error , errcode=%d , errmsg=%s", c.apiName, c.ErrCode, c.ErrMsg)
+}
+
+// NewCommonError 新建CommonError错误，对于无errcode和errmsg的返回也可以返回该通用错误
+func NewCommonError(apiName string, code int64, msg string) *CommonError {
+	return &CommonError{
+		apiName: apiName,
+		ErrCode: code,
+		ErrMsg:  msg,
+	}
+}
+
 // DecodeWithCommonError 将返回值按照CommonError解析
 func DecodeWithCommonError(response []byte, apiName string) (err error) {
 	var commError CommonError
@@ -19,8 +33,9 @@ func DecodeWithCommonError(response []byte, apiName string) (err error) {
 	if err != nil {
 		return
 	}
+	commError.apiName = apiName
 	if commError.ErrCode != 0 {
-		return fmt.Errorf("%s Error , errcode=%d , errmsg=%s", apiName, commError.ErrCode, commError.ErrMsg)
+		return &commError
 	}
 	return nil
 }
@@ -45,7 +60,11 @@ func DecodeWithError(response []byte, obj interface{}, apiName string) error {
 		return fmt.Errorf("errcode or errmsg is invalid")
 	}
 	if errCode.Int() != 0 {
-		return fmt.Errorf("%s Error , errcode=%d , errmsg=%s", apiName, errCode.Int(), errMsg.String())
+		return &CommonError{
+			apiName: apiName,
+			ErrCode: errCode.Int(),
+			ErrMsg:  errMsg.String(),
+		}
 	}
 	return nil
 }

util/error_test.go

@@ -0,0 +1,55 @@
+package util
+
+import "testing"
+
+var okErrData string = `{"errcode": 0}`
+var errData string = `{"errcode": 43101, "errmsg": "user refuse to accept the msg"}`
+var expectError string = "Send Error , errcode=43101 , errmsg=user refuse to accept the msg"
+
+func TestDecodeWithCommonErrorNoError(t *testing.T) {
+	err := DecodeWithCommonError([]byte(okErrData), "Send")
+	if err != nil {
+		t.Error("DecodeWithCommonError should not return error")
+		return
+	}
+}
+
+func TestDecodeWithCommonError(t *testing.T) {
+	err := DecodeWithCommonError([]byte(errData), "Send")
+	if err == nil {
+		t.Error("DecodeWithCommonError should return error")
+		return
+	}
+
+	cErr, ok := err.(*CommonError)
+	if !ok {
+		t.Errorf("DecodeWithCommonError should return *CommonError but %T", err)
+		return
+	}
+	if !(cErr.ErrCode == 43101 && cErr.ErrMsg == "user refuse to accept the msg" && cErr.Error() == expectError) {
+		t.Error("DecodeWithCommonError return bad *CommonError")
+		return
+	}
+}
+
+func TestDecodeWithError(t *testing.T) {
+	type DE struct {
+		CommonError
+	}
+	var obj DE
+	err := DecodeWithError([]byte(errData), &obj, "Send")
+	if err == nil {
+		t.Error("DecodeWithError should return error")
+		return
+	}
+
+	cErr, ok := err.(*CommonError)
+	if !ok {
+		t.Errorf("DecodeWithError should return *CommonError but %T", err)
+		return
+	}
+	if !(cErr.ErrCode == 43101 && cErr.ErrMsg == "user refuse to accept the msg" && cErr.Error() == expectError) {
+		t.Error("DecodeWithError return bad *CommonError")
+		return
+	}
+}

util/http.go

@@ -9,7 +9,6 @@ import (
 	"encoding/xml"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"mime/multipart"
 	"net/http"
@@ -38,21 +37,26 @@ func HTTPGetContext(ctx context.Context, uri string) ([]byte, error) {
 	if response.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("http get error : uri=%v , statusCode=%v", uri, response.StatusCode)
 	}
-	return ioutil.ReadAll(response.Body)
+	return io.ReadAll(response.Body)
 }
 
 // HTTPPost post 请求
 func HTTPPost(uri string, data string) ([]byte, error) {
-	return HTTPPostContext(context.Background(), uri, data)
+	return HTTPPostContext(context.Background(), uri, []byte(data), nil)
 }
 
 // HTTPPostContext post 请求
-func HTTPPostContext(ctx context.Context, uri string, data string) ([]byte, error) {
-	body := bytes.NewBuffer([]byte(data))
+func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[string]string) ([]byte, error) {
+	body := bytes.NewBuffer(data)
 	request, err := http.NewRequestWithContext(ctx, http.MethodPost, uri, body)
 	if err != nil {
 		return nil, err
 	}
+
+	for key, value := range header {
+		request.Header.Set(key, value)
+	}
+
 	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return nil, err
@@ -60,9 +64,9 @@ func HTTPPostContext(ctx context.Context, uri string, data string) ([]byte, erro
 
 	defer response.Body.Close()
 	if response.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("http get error : uri=%v , statusCode=%v", uri, response.StatusCode)
+		return nil, fmt.Errorf("http post error : uri=%v , statusCode=%v", uri, response.StatusCode)
 	}
-	return ioutil.ReadAll(response.Body)
+	return io.ReadAll(response.Body)
 }
 
 // PostJSON post json 数据请求
@@ -83,7 +87,7 @@ func PostJSON(uri string, obj interface{}) ([]byte, error) {
 	if response.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("http get error : uri=%v , statusCode=%v", uri, response.StatusCode)
 	}
-	return ioutil.ReadAll(response.Body)
+	return io.ReadAll(response.Body)
 }
 
 // PostJSONWithRespContentType post json数据请求，且返回数据类型
@@ -105,17 +109,17 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
 	if response.StatusCode != http.StatusOK {
 		return nil, "", fmt.Errorf("http get error : uri=%v , statusCode=%v", uri, response.StatusCode)
 	}
-	responseData, err := ioutil.ReadAll(response.Body)
+	responseData, err := io.ReadAll(response.Body)
 	contentType := response.Header.Get("Content-Type")
 	return responseData, contentType, err
 }
 
 // PostFile 上传文件
-func PostFile(fieldname, filename, uri string) ([]byte, error) {
+func PostFile(fieldName, filename, uri string) ([]byte, error) {
 	fields := []MultipartFormField{
 		{
 			IsFile:    true,
-			Fieldname: fieldname,
+			Fieldname: fieldName,
 			Filename:  filename,
 		},
 	}
@@ -178,7 +182,7 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 	if resp.StatusCode != http.StatusOK {
 		return nil, err
 	}
-	respBody, err = ioutil.ReadAll(resp.Body)
+	respBody, err = io.ReadAll(resp.Body)
 	return
 }
 
@@ -199,13 +203,13 @@ func PostXML(uri string, obj interface{}) ([]byte, error) {
 	if response.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, response.StatusCode)
 	}
-	return ioutil.ReadAll(response.Body)
+	return io.ReadAll(response.Body)
 }
 
 // httpWithTLS CA证书
 func httpWithTLS(rootCa, key string) (*http.Client, error) {
 	var client *http.Client
-	certData, err := ioutil.ReadFile(rootCa)
+	certData, err := os.ReadFile(rootCa)
 	if err != nil {
 		return nil, fmt.Errorf("unable to find cert path=%s, error=%v", rootCa, err)
 	}
@@ -264,5 +268,5 @@ func PostXMLWithTLS(uri string, obj interface{}, ca, key string) ([]byte, error)
 	if response.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, response.StatusCode)
 	}
-	return ioutil.ReadAll(response.Body)
+	return io.ReadAll(response.Body)
 }

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"
@@ -14,7 +16,6 @@ import (
 	payConfig "github.com/silenceper/wechat/v2/pay/config"
 	"github.com/silenceper/wechat/v2/work"
 	workConfig "github.com/silenceper/wechat/v2/work/config"
-	log "github.com/sirupsen/logrus"
 )
 
 func init() {
@@ -40,8 +41,8 @@ func NewWechat() *Wechat {
 }
 
 // SetCache 设置cache
-func (wc *Wechat) SetCache(cahce cache.Cache) {
-	wc.cache = cahce
+func (wc *Wechat) SetCache(cache cache.Cache) {
+	wc.cache = cache
 }
 
 // GetOfficialAccount 获取微信公众号实例

work/addresslist/client.go

@@ -0,0 +1,17 @@
+package addresslist
+
+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/addresslist/department.go

@@ -0,0 +1,47 @@
+package addresslist
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// DepartmentSimpleListURL 获取子部门ID列表
+	DepartmentSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/simplelist?access_token=%s&id=%d"
+)
+
+type (
+	// DepartmentSimpleListResponse 获取子部门ID列表响应
+	DepartmentSimpleListResponse struct {
+		util.CommonError
+		DepartmentID []*DepartmentID `json:"department_id"`
+	}
+	// DepartmentID 子部门ID
+	DepartmentID struct {
+		ID       int `json:"id"`
+		ParentID int `json:"parentid"`
+		Order    int `json:"order"`
+	}
+)
+
+// DepartmentSimpleList 获取子部门ID列表
+// see https://developer.work.weixin.qq.com/document/path/95350
+func (r *Client) DepartmentSimpleList(departmentID int) ([]*DepartmentID, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.HTTPGet(fmt.Sprintf(DepartmentSimpleListURL, accessToken, departmentID)); err != nil {
+		return nil, err
+	}
+	result := &DepartmentSimpleListResponse{}
+	if err = util.DecodeWithError(response, result, "DepartmentSimpleList"); err != nil {
+		return nil, err
+	}
+	return result.DepartmentID, nil
+}

work/addresslist/user.go

@@ -0,0 +1,177 @@
+package addresslist
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// UserSimpleListURL 获取部门成员
+	UserSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/user/simplelist?access_token=%s&department_id=%d"
+	// UserGetURL 读取成员
+	UserGetURL = "https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token=%s&userid=%s"
+	// UserListIDURL 获取成员ID列表
+	UserListIDURL = "https://qyapi.weixin.qq.com/cgi-bin/user/list_id?access_token=%s"
+)
+
+type (
+	// UserSimpleListResponse 获取部门成员响应
+	UserSimpleListResponse struct {
+		util.CommonError
+		UserList []*UserList
+	}
+	// UserList 部门成员
+	UserList struct {
+		UserID     string `json:"userid"`
+		Name       string `json:"name"`
+		Department []int  `json:"department"`
+		OpenUserID string `json:"open_userid"`
+	}
+)
+
+// UserSimpleList 获取部门成员
+// @see https://developer.work.weixin.qq.com/document/path/90200
+func (r *Client) UserSimpleList(departmentID int) ([]*UserList, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.HTTPGet(fmt.Sprintf(UserSimpleListURL, accessToken, departmentID)); err != nil {
+		return nil, err
+	}
+	result := &UserSimpleListResponse{}
+	err = util.DecodeWithError(response, result, "UserSimpleList")
+	if err != nil {
+		return nil, err
+	}
+	return result.UserList, nil
+}
+
+// UserGetResponse 获取部门成员响应
+type UserGetResponse struct {
+	util.CommonError
+	UserID         string   `json:"userid"`            // 成员UserID。对应管理端的帐号，企业内必须唯一。不区分大小写，长度为1~64个字节；第三方应用返回的值为open_userid
+	Name           string   `json:"name"`              // 成员名称；第三方不可获取，调用时返回userid以代替name；代开发自建应用需要管理员授权才返回；对于非第三方创建的成员，第三方通讯录应用也不可获取；未返回name的情况需要通过通讯录展示组件来展示名字
+	Department     []int    `json:"department"`        // 成员所属部门id列表，仅返回该应用有查看权限的部门id；成员授权模式下，固定返回根部门id，即固定为1。对授权了“组织架构信息”权限的第三方应用，返回成员所属的全部部门id
+	Order          []int    `json:"order"`             // 部门内的排序值，默认为0。数量必须和department一致，数值越大排序越前面。值范围是[0, 2^32)。成员授权模式下不返回该字段
+	Position       string   `json:"position"`          // 职务信息；代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	Mobile         string   `json:"mobile"`            // 手机号码，代开发自建应用需要管理员授权且成员oauth2授权获取；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	Gender         string   `json:"gender"`            // 性别。0表示未定义，1表示男性，2表示女性。代开发自建应用需要管理员授权且成员oauth2授权获取；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段。注：不可获取指返回值0
+	Email          string   `json:"email"`             // 邮箱，代开发自建应用需要管理员授权且成员oauth2授权获取；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	BizMail        string   `json:"biz_mail"`          // 企业邮箱，代开发自建应用需要管理员授权且成员oauth2授权获取；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	IsLeaderInDept []int    `json:"is_leader_in_dept"` // 表示在所在的部门内是否为部门负责人，数量与department一致；第三方通讯录应用或者授权了“组织架构信息-应用可获取企业的部门组织架构信息-部门负责人”权限的第三方应用可获取；对于非第三方创建的成员，第三方通讯录应用不可获取；上游企业不可获取下游企业成员该字段
+	DirectLeader   []string `json:"direct_leader"`     // 直属上级UserID，返回在应用可见范围内的直属上级列表，最多有五个直属上级；第三方通讯录应用或者授权了“组织架构信息-应用可获取可见范围内成员组织架构信息-直属上级”权限的第三方应用可获取；对于非第三方创建的成员，第三方通讯录应用不可获取；上游企业不可获取下游企业成员该字段；代开发自建应用不可获取该字段
+	Avatar         string   `json:"avatar"`            // 头像url。 代开发自建应用需要管理员授权且成员oauth2授权获取；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	ThumbAvatar    string   `json:"thumb_avatar"`      // 头像缩略图url。第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	Telephone      string   `json:"telephone"`         // 座机。代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	Alias          string   `json:"alias"`             // 别名；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	Address        string   `json:"address"`           // 地址。代开发自建应用需要管理员授权且成员oauth2授权获取；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	OpenUserid     string   `json:"open_userid"`       // 全局唯一。对于同一个服务商，不同应用获取到企业内同一个成员的open_userid是相同的，最多64个字节。仅第三方应用可获取
+	MainDepartment int      `json:"main_department"`   // 主部门，仅当应用对主部门有查看权限时返回。
+	Extattr        struct {
+		Attrs []struct {
+			Type int    `json:"type"`
+			Name string `json:"name"`
+			Text struct {
+				Value string `json:"value"`
+			} `json:"text,omitempty"`
+			Web struct {
+				URL   string `json:"url"`
+				Title string `json:"title"`
+			} `json:"web,omitempty"`
+		} `json:"attrs"`
+	} `json:"extattr"` // 扩展属性，代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	Status           int    `json:"status"`            // 激活状态: 1=已激活，2=已禁用，4=未激活，5=退出企业。 已激活代表已激活企业微信或已关注微信插件（原企业号）。未激活代表既未激活企业微信又未关注微信插件（原企业号）。
+	QrCode           string `json:"qr_code"`           // 员工个人二维码，扫描可添加为外部联系人(注意返回的是一个url，可在浏览器上打开该url以展示二维码)；代开发自建应用需要管理员授权且成员oauth2授权获取；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	ExternalPosition string `json:"external_position"` // 对外职务，如果设置了该值，则以此作为对外展示的职务，否则以position来展示。代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+	ExternalProfile  struct {
+		ExternalCorpName string `json:"external_corp_name"`
+		WechatChannels   struct {
+			Nickname string `json:"nickname"`
+			Status   int    `json:"status"`
+		} `json:"wechat_channels"`
+		ExternalAttr []struct {
+			Type int    `json:"type"`
+			Name string `json:"name"`
+			Text struct {
+				Value string `json:"value"`
+			} `json:"text,omitempty"`
+			Web struct {
+				URL   string `json:"url"`
+				Title string `json:"title"`
+			} `json:"web,omitempty"`
+			Miniprogram struct {
+				Appid    string `json:"appid"`
+				Pagepath string `json:"pagepath"`
+				Title    string `json:"title"`
+			} `json:"miniprogram,omitempty"`
+		} `json:"external_attr"`
+	} `json:"external_profile"` // 成员对外属性，字段详情见对外属性；代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
+}
+
+// UserGet 获取部门成员
+// @see https://developer.work.weixin.qq.com/document/path/90196
+func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.HTTPGet(fmt.Sprintf(UserGetURL, accessToken, UserID)); err != nil {
+		return nil, err
+	}
+	result := &UserGetResponse{}
+	err = util.DecodeWithError(response, result, "UserGet")
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// UserListIDRequest 获取成员ID列表请求
+type UserListIDRequest struct {
+	Cursor string `json:"cursor"`
+	Limit  int    `json:"limit"`
+}
+
+// UserListIDResponse 获取成员ID列表响应
+type UserListIDResponse struct {
+	util.CommonError
+	NextCursor string      `json:"next_cursor"`
+	DeptUser   []*DeptUser `json:"dept_user"`
+}
+
+// DeptUser 用户-部门关系
+type DeptUser struct {
+	UserID     string `json:"userid"`
+	Department int    `json:"department"`
+}
+
+// UserListID 获取成员ID列表
+// see https://developer.work.weixin.qq.com/document/path/96067
+func (r *Client) UserListID(req *UserListIDRequest) (*UserListIDResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(UserListIDURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &UserListIDResponse{}
+	if err = util.DecodeWithError(response, result, "UserListID"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

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

@@ -0,0 +1,275 @@
+package externalcontact
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// AddContactWayURL 配置客户联系「联系我」方式
+	AddContactWayURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/add_contact_way?access_token=%s"
+	// GetContactWayURL 获取企业已配置的「联系我」方式
+	GetContactWayURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_contact_way?access_token=%s"
+	// UpdateContactWayURL 更新企业已配置的「联系我」方式
+	UpdateContactWayURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/update_contact_way?access_token=%s"
+	// ListContactWayURL 获取企业已配置的「联系我」列表
+	ListContactWayURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/list_contact_way?access_token=%s"
+	// DelContactWayURL 删除企业已配置的「联系我」方式
+	DelContactWayURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/del_contact_way?access_token=%s"
+)
+
+type (
+	// ConclusionsRequest 结束语请求
+	ConclusionsRequest struct {
+		Text        ConclusionsText         `json:"text"`
+		Image       ConclusionsImageRequest `json:"image"`
+		Link        ConclusionsLink         `json:"link"`
+		MiniProgram ConclusionsMiniProgram  `json:"miniprogram"`
+	}
+	// ConclusionsText 文本格式结束语
+	ConclusionsText struct {
+		Content string `json:"content"`
+	}
+	// ConclusionsImageRequest 图片格式结束语请求
+	ConclusionsImageRequest struct {
+		MediaID string `json:"media_id"`
+	}
+	// ConclusionsLink 链接格式结束语
+	ConclusionsLink struct {
+		Title  string `json:"title"`
+		PicURL string `json:"picurl"`
+		Desc   string `json:"desc"`
+		URL    string `json:"url"`
+	}
+	// ConclusionsMiniProgram 小程序格式结束语
+	ConclusionsMiniProgram struct {
+		Title      string `json:"title"`
+		PicMediaID string `json:"pic_media_id"`
+		AppID      string `json:"appid"`
+		Page       string `json:"page"`
+	}
+	// ConclusionsResponse 结束语响应
+	ConclusionsResponse struct {
+		Text        ConclusionsText          `json:"text"`
+		Image       ConclusionsImageResponse `json:"image"`
+		Link        ConclusionsLink          `json:"link"`
+		MiniProgram ConclusionsMiniProgram   `json:"miniprogram"`
+	}
+	// ConclusionsImageResponse 图片格式结束语响应
+	ConclusionsImageResponse struct {
+		PicURL string `json:"pic_url"`
+	}
+)
+
+type (
+	// AddContactWayRequest 配置客户联系「联系我」方式请求
+	AddContactWayRequest struct {
+		Type          int                `json:"type"`
+		Scene         int                `json:"scene"`
+		Style         int                `json:"style"`
+		Remark        string             `json:"remark"`
+		SkipVerify    bool               `json:"skip_verify"`
+		State         string             `json:"state"`
+		User          []string           `json:"user"`
+		Party         []int              `json:"party"`
+		IsTemp        bool               `json:"is_temp"`
+		ExpiresIn     int                `json:"expires_in"`
+		ChatExpiresIn int                `json:"chat_expires_in"`
+		UnionID       string             `json:"unionid"`
+		Conclusions   ConclusionsRequest `json:"conclusions"`
+	}
+	// AddContactWayResponse 配置客户联系「联系我」方式响应
+	AddContactWayResponse struct {
+		util.CommonError
+		ConfigID string `json:"config_id"`
+		QrCode   string `json:"qr_code"`
+	}
+)
+
+// AddContactWay 配置客户联系「联系我」方式
+// see https://developer.work.weixin.qq.com/document/path/92228
+func (r *Client) AddContactWay(req *AddContactWayRequest) (*AddContactWayResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(AddContactWayURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &AddContactWayResponse{}
+	if err = util.DecodeWithError(response, result, "AddContactWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type (
+	// GetContactWayRequest 获取企业已配置的「联系我」方式请求
+	GetContactWayRequest struct {
+		ConfigID string `json:"config_id"`
+	}
+	// GetContactWayResponse 获取企业已配置的「联系我」方式响应
+	GetContactWayResponse struct {
+		util.CommonError
+		ContactWay ContactWay `json:"contact_way"`
+	}
+	// ContactWay 「联系我」配置
+	ContactWay struct {
+		ConfigID      string              `json:"config_id"`
+		Type          int                 `json:"type"`
+		Scene         int                 `json:"scene"`
+		Style         int                 `json:"style"`
+		Remark        string              `json:"remark"`
+		SkipVerify    bool                `json:"skip_verify"`
+		State         string              `json:"state"`
+		QrCode        string              `json:"qr_code"`
+		User          []string            `json:"user"`
+		Party         []int               `json:"party"`
+		IsTemp        bool                `json:"is_temp"`
+		ExpiresIn     int                 `json:"expires_in"`
+		ChatExpiresIn int                 `json:"chat_expires_in"`
+		UnionID       string              `json:"unionid"`
+		Conclusions   ConclusionsResponse `json:"conclusions"`
+	}
+)
+
+// GetContactWay 获取企业已配置的「联系我」方式
+// see https://developer.work.weixin.qq.com/document/path/92228
+func (r *Client) GetContactWay(req *GetContactWayRequest) (*GetContactWayResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(GetContactWayURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetContactWayResponse{}
+	if err = util.DecodeWithError(response, result, "GetContactWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type (
+	// UpdateContactWayRequest 更新企业已配置的「联系我」方式请求
+	UpdateContactWayRequest struct {
+		ConfigID      string             `json:"config_id"`
+		Remark        string             `json:"remark"`
+		SkipVerify    bool               `json:"skip_verify"`
+		Style         int                `json:"style"`
+		State         string             `json:"state"`
+		User          []string           `json:"user"`
+		Party         []int              `json:"party"`
+		ExpiresIn     int                `json:"expires_in"`
+		ChatExpiresIn int                `json:"chat_expires_in"`
+		UnionID       string             `json:"unionid"`
+		Conclusions   ConclusionsRequest `json:"conclusions"`
+	}
+	// UpdateContactWayResponse 更新企业已配置的「联系我」方式响应
+	UpdateContactWayResponse struct {
+		util.CommonError
+	}
+)
+
+// UpdateContactWay 更新企业已配置的「联系我」方式
+// see https://developer.work.weixin.qq.com/document/path/92228
+func (r *Client) UpdateContactWay(req *UpdateContactWayRequest) (*UpdateContactWayResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(UpdateContactWayURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &UpdateContactWayResponse{}
+	if err = util.DecodeWithError(response, result, "UpdateContactWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type (
+	//ListContactWayRequest 获取企业已配置的「联系我」列表请求
+	ListContactWayRequest struct {
+		StartTime int    `json:"start_time"`
+		EndTime   int    `json:"end_time"`
+		Cursor    string `json:"cursor"`
+		Limit     int    `json:"limit"`
+	}
+	//ListContactWayResponse 获取企业已配置的「联系我」列表响应
+	ListContactWayResponse struct {
+		util.CommonError
+		ContactWay []*ContactWayForList `json:"contact_way"`
+		NextCursor string               `json:"next_cursor"`
+	}
+	// ContactWayForList 「联系我」配置
+	ContactWayForList struct {
+		ConfigID string `json:"config_id"`
+	}
+)
+
+// ListContactWay 获取企业已配置的「联系我」列表
+// see https://developer.work.weixin.qq.com/document/path/92228
+func (r *Client) ListContactWay(req *ListContactWayRequest) (*ListContactWayResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(ListContactWayURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &ListContactWayResponse{}
+	if err = util.DecodeWithError(response, result, "ListContactWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type (
+	// DelContactWayRequest 删除企业已配置的「联系我」方式请求
+	DelContactWayRequest struct {
+		ConfigID string `json:"config_id"`
+	}
+	// DelContactWayResponse 删除企业已配置的「联系我」方式响应
+	DelContactWayResponse struct {
+		util.CommonError
+	}
+)
+
+// DelContactWay 删除企业已配置的「联系我」方式
+// see https://developer.work.weixin.qq.com/document/path/92228
+func (r *Client) DelContactWay(req *DelContactWayRequest) (*DelContactWayResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(DelContactWayURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &DelContactWayResponse{}
+	if err = util.DecodeWithError(response, result, "DelContactWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

work/externalcontact/external_user.go

@@ -0,0 +1,216 @@
+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) {
+	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
+	ExternalContact ExternalUser `json:"external_contact"`
+	FollowUser      []FollowUser `json:"follow_user"`
+	NextCursor      string       `json:"next_cursor"`
+}
+
+// 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 跟进用户（指企业内部用户）
+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 获取外部联系人详情
+// @see https://developer.work.weixin.qq.com/document/path/92114
+func (r *Client) GetExternalUserDetail(externalUserID string, nextCursor ...string) (*ExternalUserDetailResponse, error) {
+	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
+	}
+	result := &ExternalUserDetailResponse{}
+	err = util.DecodeWithError(response, result, "get_external_user_detail")
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// BatchGetExternalUserDetailsRequest 批量获取外部联系人详情请求
+type BatchGetExternalUserDetailsRequest struct {
+	UserIDList []string `json:"userid_list"`
+	Cursor     string   `json:"cursor"`
+}
+
+// ExternalUserDetailListResponse 批量获取外部联系人详情响应
+type ExternalUserDetailListResponse struct {
+	util.CommonError
+	ExternalContactList []ExternalUserForBatch `json:"external_contact_list"`
+}
+
+// ExternalUserForBatch 批量获取外部联系人客户列表
+type ExternalUserForBatch struct {
+	ExternalContact ExternalContact `json:"external_contact"`
+	FollowInfo      FollowInfo      `json:"follow_info"`
+}
+
+// ExternalContact 批量获取外部联系人用户信息
+type ExternalContact struct {
+	ExternalUserID  string `json:"external_userid"`
+	Name            string `json:"name"`
+	Position        string `json:"position"`
+	Avatar          string `json:"avatar"`
+	CorpName        string `json:"corp_name"`
+	CorpFullName    string `json:"corp_full_name"`
+	Type            int64  `json:"type"`
+	Gender          int64  `json:"gender"`
+	UnionID         string `json:"unionid"`
+	ExternalProfile string `json:"external_profile"`
+}
+
+// FollowInfo 批量获取外部联系人跟进人信息
+type FollowInfo struct {
+	UserID         string        `json:"userid"`
+	Remark         string        `json:"remark"`
+	Description    string        `json:"description"`
+	CreateTime     int           `json:"create_time"`
+	TagID          []string      `json:"tag_id"`
+	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"`
+}
+
+// BatchGetExternalUserDetails 批量获取外部联系人详情
+// @see https://developer.work.weixin.qq.com/document/path/92994
+func (r *Client) BatchGetExternalUserDetails(request BatchGetExternalUserDetailsRequest) ([]ExternalUserForBatch, error) {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(request)
+	if err != nil {
+		return nil, err
+	}
+	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 修改客户备注信息
+// @see https://developer.work.weixin.qq.com/document/path/92115
+func (r *Client) UpdateUserRemark(request UpdateUserRemarkRequest) error {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(request)
+	if err != nil {
+		return err
+	}
+	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,38 @@
+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) {
+	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/groupchat.go

@@ -0,0 +1,143 @@
+package externalcontact
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// OpengIDToChatIDURL 客户群opengid转换URL
+const OpengIDToChatIDURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/opengid_to_chatid"
+
+type (
+	//GroupChatListRequest 获取客户群列表的请求参数
+	GroupChatListRequest struct {
+		StatusFilter int         `json:"status_filter"` // 非必填	客户群跟进状态过滤。0 - 所有列表(即不过滤) 1 - 离职待继承 2 - 离职继承中 3 - 离职继承完成
+		OwnerFilter  OwnerFilter `json:"owner_filter"`  //非必填	群主过滤。如果不填，表示获取应用可见范围内全部群主的数据（但是不建议这么用，如果可见范围人数超过1000人，为了防止数据包过大，会报错 81017）
+		Cursor       string      `json:"cursor"`        //非必填	用于分页查询的游标，字符串类型，由上一次调用返回，首次调用不填
+		Limit        int         `json:"limit"`         //必填	分页，预期请求的数据量，取值范围 1 ~ 1000
+	}
+
+	//GroupChatList 客户群列表
+	GroupChatList struct {
+		ChatID string `json:"chat_id"`
+		Status int    `json:"status"`
+	}
+	//GroupChatListResponse 获取客户群列表的返回值
+	GroupChatListResponse struct {
+		util.CommonError
+		GroupChatList []GroupChatList `json:"group_chat_list"`
+		NextCursor    string          `json:"next_cursor"` //游标
+	}
+)
+
+// GetGroupChatList 获取客户群列表
+// @see https://developer.work.weixin.qq.com/document/path/92120
+func (r *Client) GetGroupChatList(req *GroupChatListRequest) (*GroupChatListResponse, error) {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	response, err = util.PostJSON(fmt.Sprintf("%s/list?access_token=%s", GroupChatURL, accessToken), req)
+	if err != nil {
+		return nil, err
+	}
+	result := &GroupChatListResponse{}
+	if err = util.DecodeWithError(response, result, "GetGroupChatList"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type (
+	//GroupChatDetailRequest 客户群详情 请求参数
+	GroupChatDetailRequest struct {
+		ChatID   string `json:"chat_id"`
+		NeedName int    `json:"need_name"`
+	}
+	//Invitor 邀请者
+	Invitor struct {
+		UserID string `json:"userid"` //邀请者的userid
+	}
+	//GroupChatMember 群成员
+	GroupChatMember struct {
+		UserID        string  `json:"userid"`            //群成员id
+		Type          int     `json:"type"`              //成员类型。 1 - 企业成员  2 - 外部联系人
+		JoinTime      int     `json:"join_time"`         //入群时间
+		JoinScene     int     `json:"join_scene"`        //入群方式 1 - 由群成员邀请入群（直接邀请入群） 2 - 由群成员邀请入群（通过邀请链接入群） 3 - 通过扫描群二维码入群
+		Invitor       Invitor `json:"invitor,omitempty"` //邀请者。目前仅当是由本企业内部成员邀请入群时会返回该值
+		GroupNickname string  `json:"group_nickname"`    //在群里的昵称
+		Name          string  `json:"name"`              //名字。仅当 need_name = 1 时返回 如果是微信用户，则返回其在微信中设置的名字 如果是企业微信联系人，则返回其设置对外展示的别名或实名
+		UnionID       string  `json:"unionid,omitempty"` //外部联系人在微信开放平台的唯一身份标识（微信unionid），通过此字段企业可将外部联系人与公众号/小程序用户关联起来。仅当群成员类型是微信用户（包括企业成员未添加好友），且企业绑定了微信开发者ID有此字段（查看绑定方法）。第三方不可获取，上游企业不可获取下游企业客户的unionid字段
+	}
+	//GroupChatAdmin 群管理员
+	GroupChatAdmin struct {
+		UserID string `json:"userid"` //群管理员userid
+	}
+	//GroupChat 客户群详情
+	GroupChat struct {
+		ChatID     string            `json:"chat_id"`     //客户群ID
+		Name       string            `json:"name"`        //群名
+		Owner      string            `json:"owner"`       //群主ID
+		CreateTime int               `json:"create_time"` //群的创建时间
+		Notice     string            `json:"notice"`      //群公告
+		MemberList []GroupChatMember `json:"member_list"` //群成员列表
+		AdminList  []GroupChatAdmin  `json:"admin_list"`  //群管理员列表
+	}
+	//GroupChatDetailResponse 客户群详情 返回值
+	GroupChatDetailResponse struct {
+		util.CommonError
+		GroupChat GroupChat `json:"group_chat"` //客户群详情
+	}
+)
+
+// GetGroupChatDetail 获取客户群详情
+// @see https://developer.work.weixin.qq.com/document/path/92122
+func (r *Client) GetGroupChatDetail(req *GroupChatDetailRequest) (*GroupChatDetailResponse, error) {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	response, err = util.PostJSON(fmt.Sprintf("%s/get?access_token=%s", GroupChatURL, accessToken), req)
+	if err != nil {
+		return nil, err
+	}
+	result := &GroupChatDetailResponse{}
+	if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type (
+	//OpengIDToChatIDRequest 客户群opengid转换 请求参数
+	OpengIDToChatIDRequest struct {
+		OpengID string `json:"opengid"`
+	}
+	//OpengIDToChatIDResponse 客户群opengid转换 返回值
+	OpengIDToChatIDResponse struct {
+		util.CommonError
+		ChatID string `json:"chat_id"` //客户群ID
+	}
+)
+
+// OpengIDToChatID 客户群opengid转换
+// @see https://developer.work.weixin.qq.com/document/path/94828
+func (r *Client) OpengIDToChatID(req *OpengIDToChatIDRequest) (*OpengIDToChatIDResponse, error) {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	response, err = util.PostJSON(fmt.Sprintf("%s?access_token=%s", OpengIDToChatIDURL, accessToken), req)
+	if err != nil {
+		return nil, err
+	}
+	result := &OpengIDToChatIDResponse{}
+	if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

work/externalcontact/join_way.go

@@ -0,0 +1,146 @@
+package externalcontact
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// GroupChatURL 客户群
+const GroupChatURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/groupchat"
+
+type (
+	// AddJoinWayRequest 添加群配置请求参数
+	AddJoinWayRequest struct {
+		Scene          int      `json:"scene"`            // 必填 1 - 群的小程序插件,2 - 群的二维码插件
+		Remark         string   `json:"remark"`           //非必填	联系方式的备注信息，用于助记，超过30个字符将被截断
+		AutoCreateRoom int      `json:"auto_create_room"` //非必填	当群满了后，是否自动新建群。0-否；1-是。 默认为1
+		RoomBaseName   string   `json:"room_base_name"`   //非必填	自动建群的群名前缀，当auto_create_room为1时有效。最长40个utf8字符
+		RoomBaseID     int      `json:"room_base_id"`     //非必填	自动建群的群起始序号，当auto_create_room为1时有效
+		ChatIDList     []string `json:"chat_id_list"`     //必填	使用该配置的客户群ID列表，支持5个。见客户群ID获取方法
+		State          string   `json:"state"`            //非必填	企业自定义的state参数，用于区分不同的入群渠道。不超过30个UTF-8字符
+	}
+
+	// AddJoinWayResponse 添加群配置返回值
+	AddJoinWayResponse struct {
+		util.CommonError
+		ConfigID string `json:"config_id"`
+	}
+)
+
+// AddJoinWay 加入群聊
+// @see https://developer.work.weixin.qq.com/document/path/92229
+func (r *Client) AddJoinWay(req *AddJoinWayRequest) (*AddJoinWayResponse, error) {
+	var (
+		accessToken string
+		err         error
+		response    []byte
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	response, err = util.PostJSON(fmt.Sprintf("%s/add_join_way?access_token=%s", GroupChatURL, accessToken), req)
+	if err != nil {
+		return nil, err
+	}
+	result := &AddJoinWayResponse{}
+	if err = util.DecodeWithError(response, result, "AddJoinWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type (
+	//JoinWayConfigRequest 获取或删除群配置的请求参数
+	JoinWayConfigRequest struct {
+		ConfigID string `json:"config_id"`
+	}
+
+	//JoinWay 群配置
+	JoinWay struct {
+		ConfigID       string   `json:"config_id"`
+		Scene          int      `json:"scene"`
+		Remark         string   `json:"remark"`
+		AutoCreateRoom int      `json:"auto_create_room"`
+		RoomBaseName   string   `json:"room_base_name"`
+		RoomBaseID     int      `json:"room_base_id"`
+		ChatIDList     []string `json:"chat_id_list"`
+		QrCode         string   `json:"qr_code"`
+		State          string   `json:"state"`
+	}
+	//GetJoinWayResponse 获取群配置的返回值
+	GetJoinWayResponse struct {
+		util.CommonError
+		JoinWay JoinWay `json:"join_way"`
+	}
+)
+
+// GetJoinWay 获取客户群进群方式配置
+// @see https://developer.work.weixin.qq.com/document/path/92229
+func (r *Client) GetJoinWay(req *JoinWayConfigRequest) (*GetJoinWayResponse, error) {
+	var (
+		accessToken string
+		err         error
+		response    []byte
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	response, err = util.PostJSON(fmt.Sprintf("%s/get_join_way?access_token=%s", GroupChatURL, accessToken), req)
+	if err != nil {
+		return nil, err
+	}
+	result := &GetJoinWayResponse{}
+	if err = util.DecodeWithError(response, result, "GetJoinWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// UpdateJoinWayRequest 更新群配置的请求参数
+type UpdateJoinWayRequest struct {
+	ConfigID       string   `json:"config_id"`
+	Scene          int      `json:"scene"`            // 必填 1 - 群的小程序插件,2 - 群的二维码插件
+	Remark         string   `json:"remark"`           //非必填	联系方式的备注信息，用于助记，超过30个字符将被截断
+	AutoCreateRoom int      `json:"auto_create_room"` //非必填	当群满了后，是否自动新建群。0-否；1-是。 默认为1
+	RoomBaseName   string   `json:"room_base_name"`   //非必填	自动建群的群名前缀，当auto_create_room为1时有效。最长40个utf8字符
+	RoomBaseID     int      `json:"room_base_id"`     //非必填	自动建群的群起始序号，当auto_create_room为1时有效
+	ChatIDList     []string `json:"chat_id_list"`     //必填	使用该配置的客户群ID列表，支持5个。见客户群ID获取方法
+	State          string   `json:"state"`            //非必填	企业自定义的state参数，用于区分不同的入群渠道。不超过30个UTF-8字符
+}
+
+// UpdateJoinWay 更新客户群进群方式配置
+// @see https://developer.work.weixin.qq.com/document/path/92229
+func (r *Client) UpdateJoinWay(req *UpdateJoinWayRequest) error {
+	var (
+		accessToken string
+		err         error
+		response    []byte
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	response, err = util.PostJSON(fmt.Sprintf("%s/update_join_way?access_token=%s", GroupChatURL, accessToken), req)
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "UpdateJoinWay")
+}
+
+// DelJoinWay 删除客户群进群方式配置
+// @see https://developer.work.weixin.qq.com/document/path/92229
+func (r *Client) DelJoinWay(req *JoinWayConfigRequest) error {
+	var (
+		accessToken string
+		err         error
+		response    []byte
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	response, err = util.PostJSON(fmt.Sprintf("%s/del_join_way?access_token=%s", GroupChatURL, accessToken), req)
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "DelJoinWay")
+}

work/externalcontact/msg.go

@@ -0,0 +1,424 @@
+package externalcontact
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// AddMsgTemplateURL 创建企业群发
+	AddMsgTemplateURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/add_msg_template?access_token=%s"
+	// GetGroupMsgListV2URL 获取群发记录列表
+	GetGroupMsgListV2URL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_groupmsg_list_v2?access_token=%s"
+	// GetGroupMsgTaskURL 获取群发成员发送任务列表
+	GetGroupMsgTaskURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_groupmsg_task?access_token=%s"
+	// GetGroupMsgSendResultURL 获取企业群发成员执行结果
+	GetGroupMsgSendResultURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_groupmsg_send_result?access_token=%s"
+	// SendWelcomeMsgURL 发送新客户欢迎语
+	SendWelcomeMsgURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/send_welcome_msg?access_token=%s"
+	// AddGroupWelcomeTemplateURL 添加入群欢迎语素材
+	AddGroupWelcomeTemplateURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/group_welcome_template/add?access_token=%s"
+	// EditGroupWelcomeTemplateURL 编辑入群欢迎语素材
+	EditGroupWelcomeTemplateURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/group_welcome_template/edit?access_token=%s"
+	// GetGroupWelcomeTemplateURL 获取入群欢迎语素材
+	GetGroupWelcomeTemplateURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/group_welcome_template/get?access_token=%s"
+	// DelGroupWelcomeTemplateURL 删除入群欢迎语素材
+	DelGroupWelcomeTemplateURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/group_welcome_template/del?access_token=%s"
+)
+
+// AddMsgTemplateRequest 创建企业群发请求
+type AddMsgTemplateRequest struct {
+	ChatType       string        `json:"chat_type"`
+	ExternalUserID []string      `json:"external_userid"`
+	Sender         string        `json:"sender,omitempty"`
+	Text           MsgText       `json:"text"`
+	Attachments    []*Attachment `json:"attachments"`
+}
+
+// MsgText 文本消息
+type MsgText struct {
+	Content string `json:"content"`
+}
+
+type (
+	// Attachment 附件
+	Attachment struct {
+		MsgType     string                `json:"msgtype"`
+		Image       AttachmentImg         `json:"image,omitempty"`
+		Link        AttachmentLink        `json:"link,omitempty"`
+		MiniProgram AttachmentMiniProgram `json:"miniprogram,omitempty"`
+		Video       AttachmentVideo       `json:"video,omitempty"`
+		File        AttachmentFile        `json:"file,omitempty"`
+	}
+	// AttachmentImg 图片消息
+	AttachmentImg struct {
+		MediaID string `json:"media_id"`
+		PicURL  string `json:"pic_url"`
+	}
+	// AttachmentLink 图文消息
+	AttachmentLink struct {
+		Title  string `json:"title"`
+		PicURL string `json:"picurl"`
+		Desc   string `json:"desc"`
+		URL    string `json:"url"`
+	}
+	// AttachmentMiniProgram 小程序消息
+	AttachmentMiniProgram struct {
+		Title      string `json:"title"`
+		PicMediaID string `json:"pic_media_id"`
+		AppID      string `json:"appid"`
+		Page       string `json:"page"`
+	}
+	// AttachmentVideo 视频消息
+	AttachmentVideo struct {
+		MediaID string `json:"media_id"`
+	}
+	// AttachmentFile 文件消息
+	AttachmentFile struct {
+		MediaID string `json:"media_id"`
+	}
+)
+
+// AddMsgTemplateResponse 创建企业群发响应
+type AddMsgTemplateResponse struct {
+	util.CommonError
+	FailList []string `json:"fail_list"`
+	MsgID    string   `json:"msgid"`
+}
+
+// AddMsgTemplate 创建企业群发
+// see https://developer.work.weixin.qq.com/document/path/92135
+func (r *Client) AddMsgTemplate(req *AddMsgTemplateRequest) (*AddMsgTemplateResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(AddMsgTemplateURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &AddMsgTemplateResponse{}
+	if err = util.DecodeWithError(response, result, "AddMsgTemplate"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// GetGroupMsgListV2Request 获取群发记录列表请求
+type GetGroupMsgListV2Request struct {
+	ChatType   string `json:"chat_type"`
+	StartTime  int    `json:"start_time"`
+	EndTime    int    `json:"end_time"`
+	Creator    string `json:"creator,omitempty"`
+	FilterType int    `json:"filter_type"`
+	Limit      int    `json:"limit"`
+	Cursor     string `json:"cursor"`
+}
+
+// GetGroupMsgListV2Response 获取群发记录列表响应
+type GetGroupMsgListV2Response struct {
+	util.CommonError
+	NextCursor   string      `json:"next_cursor"`
+	GroupMsgList []*GroupMsg `json:"group_msg_list"`
+}
+
+// GroupMsg 群发消息
+type GroupMsg struct {
+	MsgID       string        `json:"msgid"`
+	Creator     string        `json:"creator"`
+	CreateTime  int           `json:"create_time"`
+	CreateType  int           `json:"create_type"`
+	Text        MsgText       `json:"text"`
+	Attachments []*Attachment `json:"attachments"`
+}
+
+// GetGroupMsgListV2 获取群发记录列表
+// see https://developer.work.weixin.qq.com/document/path/93338#%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%8F%91%E8%AE%B0%E5%BD%95%E5%88%97%E8%A1%A8
+func (r *Client) GetGroupMsgListV2(req *GetGroupMsgListV2Request) (*GetGroupMsgListV2Response, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(GetGroupMsgListV2URL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetGroupMsgListV2Response{}
+	if err = util.DecodeWithError(response, result, "GetGroupMsgListV2"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// GetGroupMsgTaskRequest 获取群发成员发送任务列表请求
+type GetGroupMsgTaskRequest struct {
+	MsgID  string `json:"msgid"`
+	Limit  int    `json:"limit"`
+	Cursor string `json:"cursor"`
+}
+
+// GetGroupMsgTaskResponse 获取群发成员发送任务列表响应
+type GetGroupMsgTaskResponse struct {
+	util.CommonError
+	NextCursor string  `json:"next_cursor"`
+	TaskList   []*Task `json:"task_list"`
+}
+
+// Task 获取群发成员发送任务列表任务
+type Task struct {
+	UserID   string `json:"userid"`
+	Status   int    `json:"status"`
+	SendTime int    `json:"send_time"`
+}
+
+// GetGroupMsgTask 获取群发成员发送任务列表
+// see https://developer.work.weixin.qq.com/document/path/93338#%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%8F%91%E6%88%90%E5%91%98%E5%8F%91%E9%80%81%E4%BB%BB%E5%8A%A1%E5%88%97%E8%A1%A8
+func (r *Client) GetGroupMsgTask(req *GetGroupMsgTaskRequest) (*GetGroupMsgTaskResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(GetGroupMsgTaskURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetGroupMsgTaskResponse{}
+	if err = util.DecodeWithError(response, result, "GetGroupMsgTask"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// GetGroupMsgSendResultRequest 获取企业群发成员执行结果请求
+type GetGroupMsgSendResultRequest struct {
+	MsgID  string `json:"msgid"`
+	UserID string `json:"userid"`
+	Limit  int    `json:"limit"`
+	Cursor string `json:"cursor"`
+}
+
+// GetGroupMsgSendResultResponse 获取企业群发成员执行结果响应
+type GetGroupMsgSendResultResponse struct {
+	util.CommonError
+	NextCursor string  `json:"next_cursor"`
+	SendList   []*Send `json:"send_list"`
+}
+
+// Send 企业群发成员执行结果
+type Send struct {
+	ExternalUserID string `json:"external_userid"`
+	ChatID         string `json:"chat_id"`
+	UserID         string `json:"userid"`
+	Status         int    `json:"status"`
+	SendTime       int    `json:"send_time"`
+}
+
+// GetGroupMsgSendResult 获取企业群发成员执行结果
+// see https://developer.work.weixin.qq.com/document/path/93338#%E8%8E%B7%E5%8F%96%E4%BC%81%E4%B8%9A%E7%BE%A4%E5%8F%91%E6%88%90%E5%91%98%E6%89%A7%E8%A1%8C%E7%BB%93%E6%9E%9C
+func (r *Client) GetGroupMsgSendResult(req *GetGroupMsgSendResultRequest) (*GetGroupMsgSendResultResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(GetGroupMsgSendResultURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetGroupMsgSendResultResponse{}
+	if err = util.DecodeWithError(response, result, "GetGroupMsgSendResult"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// SendWelcomeMsgRequest 发送新客户欢迎语请求
+type SendWelcomeMsgRequest struct {
+	WelcomeCode string        `json:"welcome_code"`
+	Text        MsgText       `json:"text"`
+	Attachments []*Attachment `json:"attachments"`
+}
+
+// SendWelcomeMsgResponse 发送新客户欢迎语响应
+type SendWelcomeMsgResponse struct {
+	util.CommonError
+}
+
+// SendWelcomeMsg 发送新客户欢迎语
+// see https://developer.work.weixin.qq.com/document/path/92137
+func (r *Client) SendWelcomeMsg(req *SendWelcomeMsgRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(SendWelcomeMsgURL, accessToken), req); err != nil {
+		return err
+	}
+	result := &SendWelcomeMsgResponse{}
+	if err = util.DecodeWithError(response, result, "SendWelcomeMsg"); err != nil {
+		return err
+	}
+	return nil
+}
+
+// AddGroupWelcomeTemplateRequest 添加入群欢迎语素材请求
+type AddGroupWelcomeTemplateRequest struct {
+	Text        MsgText               `json:"text"`
+	Image       AttachmentImg         `json:"image"`
+	Link        AttachmentLink        `json:"link"`
+	MiniProgram AttachmentMiniProgram `json:"miniprogram"`
+	File        AttachmentFile        `json:"file"`
+	Video       AttachmentVideo       `json:"video"`
+	AgentID     int                   `json:"agentid"`
+	Notify      int                   `json:"notify"`
+}
+
+// AddGroupWelcomeTemplateResponse 添加入群欢迎语素材响应
+type AddGroupWelcomeTemplateResponse struct {
+	util.CommonError
+	TemplateID string `json:"template_id"`
+}
+
+// AddGroupWelcomeTemplate 添加入群欢迎语素材
+// see https://developer.work.weixin.qq.com/document/path/92366#%E6%B7%BB%E5%8A%A0%E5%85%A5%E7%BE%A4%E6%AC%A2%E8%BF%8E%E8%AF%AD%E7%B4%A0%E6%9D%90
+func (r *Client) AddGroupWelcomeTemplate(req *AddGroupWelcomeTemplateRequest) (*AddGroupWelcomeTemplateResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(AddGroupWelcomeTemplateURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &AddGroupWelcomeTemplateResponse{}
+	if err = util.DecodeWithError(response, result, "AddGroupWelcomeTemplate"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// EditGroupWelcomeTemplateRequest 编辑入群欢迎语素材请求
+type EditGroupWelcomeTemplateRequest struct {
+	TemplateID  string                `json:"template_id"`
+	Text        MsgText               `json:"text"`
+	Image       AttachmentImg         `json:"image"`
+	Link        AttachmentLink        `json:"link"`
+	MiniProgram AttachmentMiniProgram `json:"miniprogram"`
+	File        AttachmentFile        `json:"file"`
+	Video       AttachmentVideo       `json:"video"`
+	AgentID     int                   `json:"agentid"`
+}
+
+// EditGroupWelcomeTemplateResponse 编辑入群欢迎语素材响应
+type EditGroupWelcomeTemplateResponse struct {
+	util.CommonError
+}
+
+// EditGroupWelcomeTemplate 编辑入群欢迎语素材
+// see https://developer.work.weixin.qq.com/document/path/92366#%E7%BC%96%E8%BE%91%E5%85%A5%E7%BE%A4%E6%AC%A2%E8%BF%8E%E8%AF%AD%E7%B4%A0%E6%9D%90
+func (r *Client) EditGroupWelcomeTemplate(req *EditGroupWelcomeTemplateRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(EditGroupWelcomeTemplateURL, accessToken), req); err != nil {
+		return err
+	}
+	result := &EditGroupWelcomeTemplateResponse{}
+	if err = util.DecodeWithError(response, result, "EditGroupWelcomeTemplate"); err != nil {
+		return err
+	}
+	return nil
+}
+
+// GetGroupWelcomeTemplateRequest 获取入群欢迎语素材请求
+type GetGroupWelcomeTemplateRequest struct {
+	TemplateID string `json:"template_id"`
+}
+
+// GetGroupWelcomeTemplateResponse 获取入群欢迎语素材响应
+type GetGroupWelcomeTemplateResponse struct {
+	util.CommonError
+	Text        MsgText               `json:"text"`
+	Image       AttachmentImg         `json:"image"`
+	Link        AttachmentLink        `json:"link"`
+	MiniProgram AttachmentMiniProgram `json:"miniprogram"`
+	File        AttachmentFile        `json:"file"`
+	Video       AttachmentVideo       `json:"video"`
+}
+
+// GetGroupWelcomeTemplate 获取入群欢迎语素材
+// see https://developer.work.weixin.qq.com/document/path/92366#%E8%8E%B7%E5%8F%96%E5%85%A5%E7%BE%A4%E6%AC%A2%E8%BF%8E%E8%AF%AD%E7%B4%A0%E6%9D%90
+func (r *Client) GetGroupWelcomeTemplate(req *GetGroupWelcomeTemplateRequest) (*GetGroupWelcomeTemplateResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(GetGroupWelcomeTemplateURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetGroupWelcomeTemplateResponse{}
+	if err = util.DecodeWithError(response, result, "GetGroupWelcomeTemplate"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// DelGroupWelcomeTemplateRequest 删除入群欢迎语素材请求
+type DelGroupWelcomeTemplateRequest struct {
+	TemplateID string `json:"template_id"`
+	AgentID    int    `json:"agentid"`
+}
+
+// DelGroupWelcomeTemplateResponse 删除入群欢迎语素材响应
+type DelGroupWelcomeTemplateResponse struct {
+	util.CommonError
+}
+
+// DelGroupWelcomeTemplate 删除入群欢迎语素材
+// see https://developer.work.weixin.qq.com/document/path/92366#%E5%88%A0%E9%99%A4%E5%85%A5%E7%BE%A4%E6%AC%A2%E8%BF%8E%E8%AF%AD%E7%B4%A0%E6%9D%90
+func (r *Client) DelGroupWelcomeTemplate(req *DelGroupWelcomeTemplateRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(DelGroupWelcomeTemplateURL, accessToken), req); err != nil {
+		return err
+	}
+	result := &DelGroupWelcomeTemplateResponse{}
+	if err = util.DecodeWithError(response, result, "DelGroupWelcomeTemplate"); err != nil {
+		return err
+	}
+	return nil
+}

work/externalcontact/statistic.go

@@ -0,0 +1,176 @@
+package externalcontact
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// GetUserBehaviorDataURL 获取「联系客户统计」数据
+	GetUserBehaviorDataURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/get_user_behavior_data"
+	// GetGroupChatStatURL 获取「群聊数据统计」数据 按群主聚合的方式
+	GetGroupChatStatURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/groupchat/statistic"
+	// GetGroupChatStatByDayURL 获取「群聊数据统计」数据 按自然日聚合的方式
+	GetGroupChatStatByDayURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/groupchat/statistic_group_by_day"
+)
+
+type (
+	// GetUserBehaviorRequest 获取「联系客户统计」数据请求
+	GetUserBehaviorRequest struct {
+		UserID    []string `json:"userid"`
+		PartyID   []int    `json:"partyid"`
+		StartTime int      `json:"start_time"`
+		EndTime   int      `json:"end_time"`
+	}
+	// GetUserBehaviorResponse 获取「联系客户统计」数据响应
+	GetUserBehaviorResponse struct {
+		util.CommonError
+		BehaviorData []BehaviorData `json:"behavior_data"`
+	}
+	// BehaviorData 联系客户统计数据
+	BehaviorData struct {
+		StatTime            int     `json:"stat_time"`
+		ChatCnt             int     `json:"chat_cnt"`
+		MessageCnt          int     `json:"message_cnt"`
+		ReplyPercentage     float64 `json:"reply_percentage"`
+		AvgReplyTime        int     `json:"avg_reply_time"`
+		NegativeFeedbackCnt int     `json:"negative_feedback_cnt"`
+		NewApplyCnt         int     `json:"new_apply_cnt"`
+		NewContactCnt       int     `json:"new_contact_cnt"`
+	}
+)
+
+// GetUserBehaviorData 获取「联系客户统计」数据
+// @see https://developer.work.weixin.qq.com/document/path/92132
+func (r *Client) GetUserBehaviorData(req *GetUserBehaviorRequest) ([]BehaviorData, error) {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", GetUserBehaviorDataURL, accessToken), string(jsonData))
+	if err != nil {
+		return nil, err
+	}
+	var result GetUserBehaviorResponse
+	err = util.DecodeWithError(response, &result, "GetUserBehaviorData")
+	if err != nil {
+		return nil, err
+	}
+	return result.BehaviorData, nil
+}
+
+type (
+	// GetGroupChatStatRequest 获取「群聊数据统计」数据 按群主聚合的方式 请求
+	GetGroupChatStatRequest struct {
+		DayBeginTime int         `json:"day_begin_time"`
+		DayEndTime   int         `json:"day_end_time"`
+		OwnerFilter  OwnerFilter `json:"owner_filter"`
+		OrderBy      int         `json:"order_by"`
+		OrderAsc     int         `json:"order_asc"`
+		Offset       int         `json:"offset"`
+		Limit        int         `json:"limit"`
+	}
+	// GetGroupChatStatResponse 获取「群聊数据统计」数据 按群主聚合的方式 响应
+	GetGroupChatStatResponse struct {
+		util.CommonError
+		Total      int                 `json:"total"`
+		NextOffset int                 `json:"next_offset"`
+		Items      []GroupChatStatItem `json:"items"`
+	}
+	// GroupChatStatItem 群聊数据统计(按群主聚合)条目
+	GroupChatStatItem struct {
+		Owner string                `json:"owner"`
+		Data  GroupChatStatItemData `json:"data"`
+	}
+)
+
+// OwnerFilter 群主过滤
+type OwnerFilter struct {
+	UseridList []string `json:"userid_list"`
+}
+
+// GroupChatStatItemData 群聊数据统计条目数据
+type GroupChatStatItemData struct {
+	NewChatCnt            int `json:"new_chat_cnt"`
+	ChatTotal             int `json:"chat_total"`
+	ChatHasMsg            int `json:"chat_has_msg"`
+	NewMemberCnt          int `json:"new_member_cnt"`
+	MemberTotal           int `json:"member_total"`
+	MemberHasMsg          int `json:"member_has_msg"`
+	MsgTotal              int `json:"msg_total"`
+	MigrateTraineeChatCnt int `json:"migrate_trainee_chat_cnt"`
+}
+
+// GetGroupChatStat 获取「群聊数据统计」数据 按群主聚合的方式
+// @see https://developer.work.weixin.qq.com/document/path/92133
+func (r *Client) GetGroupChatStat(req *GetGroupChatStatRequest) (*GetGroupChatStatResponse, error) {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", GetGroupChatStatURL, accessToken), string(jsonData))
+	if err != nil {
+		return nil, err
+	}
+	result := &GetGroupChatStatResponse{}
+	err = util.DecodeWithError(response, result, "GetGroupChatStat")
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type (
+	// GetGroupChatStatByDayRequest 获取「群聊数据统计」数据 按自然日聚合的方式 请求
+	GetGroupChatStatByDayRequest struct {
+		DayBeginTime int         `json:"day_begin_time"`
+		DayEndTime   int         `json:"day_end_time"`
+		OwnerFilter  OwnerFilter `json:"owner_filter"`
+	}
+	// GetGroupChatStatByDayResponse 获取「群聊数据统计」数据 按自然日聚合的方式 响应
+	GetGroupChatStatByDayResponse struct {
+		util.CommonError
+		Items []GetGroupChatStatByDayItem `json:"items"`
+	}
+	// GetGroupChatStatByDayItem 群聊数据统计(按自然日聚合)条目
+	GetGroupChatStatByDayItem struct {
+		StatTime int                   `json:"stat_time"`
+		Data     GroupChatStatItemData `json:"data"`
+	}
+)
+
+// GetGroupChatStatByDay 获取「群聊数据统计」数据 按自然日聚合的方式
+// @see https://developer.work.weixin.qq.com/document/path/92133
+func (r *Client) GetGroupChatStatByDay(req *GetGroupChatStatByDayRequest) ([]GetGroupChatStatByDayItem, error) {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", GetGroupChatStatByDayURL, accessToken), string(jsonData))
+	if err != nil {
+		return nil, err
+	}
+	var result GetGroupChatStatByDayResponse
+	err = util.DecodeWithError(response, &result, "GetGroupChatStatByDay")
+	if err != nil {
+		return nil, err
+	}
+	return result.Items, nil
+}

work/externalcontact/tag.go

@@ -0,0 +1,203 @@
+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 int               `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) {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+	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,omitempty"`
+	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, err := json.Marshal(req)
+	if err != nil {
+		return nil, err
+	}
+	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 {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(req)
+	if err != nil {
+		return err
+	}
+	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 {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(req)
+	if err != nil {
+		return err
+	}
+	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 给客户打标签请求
+// 相关文档地址：https://developer.work.weixin.qq.com/document/path/92118
+type MarkTagRequest struct {
+	UserID         string   `json:"userid"`
+	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 {
+	accessToken, err := r.GetAccessToken()
+	if err != nil {
+		return err
+	}
+	var response []byte
+	jsonData, err := json.Marshal(request)
+	if err != nil {
+		return err
+	}
+	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/account.go

@@ -8,7 +8,7 @@ import (
 )
 
 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"
@@ -16,7 +16,7 @@ const (
 	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"
 )
 
@@ -38,12 +38,10 @@ func (r *Client) AccountAdd(options AccountAddOptions) (info AccountAddSchema, e
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(accountAddAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(accountAddAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {
@@ -66,12 +64,10 @@ func (r *Client) AccountDel(options AccountDelOptions) (info util.CommonError, e
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(accountDelAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(accountDelAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {
@@ -96,12 +92,10 @@ func (r *Client) AccountUpdate(options AccountUpdateOptions) (info util.CommonEr
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(accountUpdateAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(accountUpdateAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {
@@ -132,12 +126,10 @@ func (r *Client) AccountList() (info AccountListSchema, err error) {
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.HTTPGet(fmt.Sprintf(accountListAddr, accessToken))
-	if err != nil {
+	if data, err = util.HTTPGet(fmt.Sprintf(accountListAddr, accessToken)); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {
@@ -171,12 +163,10 @@ func (r *Client) AddContactWay(options AddContactWayOptions) (info AddContactWay
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(addContactWayAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(addContactWayAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {

work/kf/callback.go

@@ -15,21 +15,22 @@ type SignatureOptions struct {
 }
 
 // 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, "非法请求来源")
-//		}
-//	})
+//
+//	 //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)
@@ -59,27 +60,28 @@ type CallbackMessage struct {
 }
 
 // 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")
-//	})
+//
+//	 //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 {

work/kf/client.go

@@ -23,7 +23,7 @@ func NewClient(cfg *config.Config) (client *Client, err error) {
 		return nil, NewSDKErr(50001)
 	}
 
-	//初始化 AccessToken Handle
+	// 初始化 AccessToken Handle
 	defaultAkHandle := credential.NewWorkAccessToken(cfg.CorpID, cfg.CorpSecret, credential.CacheKeyWorkPrefix, cfg.Cache)
 	ctx := &context.Context{
 		Config:            cfg,

work/kf/customer.go

@@ -38,12 +38,10 @@ func (r *Client) CustomerBatchGet(options CustomerBatchGetOptions) (info Custome
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(customerBatchGetAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(customerBatchGetAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {

work/kf/error.go

@@ -51,7 +51,7 @@ const (
 	SDKApiNotOpen Error = "API 功能没有被开启"
 )
 
-//Error 输出错误信息
+// Error 输出错误信息
 func (r Error) Error() string {
 	return reflect.ValueOf(r).String()
 }
@@ -85,7 +85,7 @@ func NewSDKErr(code int64, msgList ...string) error {
 		return err
 	}
 
-	//返回未知的自定义错误
+	// 返回未知的自定义错误
 	if len(msgList) > 0 {
 		return Error(strings.Join(msgList, ","))
 	}

work/kf/other.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	//获取视频号绑定状态
+	// 获取视频号绑定状态
 	corpQualification = "https://qyapi.weixin.qq.com/cgi-bin/kf/get_corp_qualification?access_token=%s"
 )
 
@@ -31,12 +31,10 @@ func (r *Client) GetCorpQualification() (info CorpQualificationSchema, err error
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.HTTPGet(fmt.Sprintf(corpQualification, accessToken))
-	if err != nil {
+	if data, err = util.HTTPGet(fmt.Sprintf(corpQualification, accessToken)); err != nil {
 		return info, err
 	}
 	if err = json.Unmarshal(data, &info); err != nil {

work/kf/sendmsg.go

@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	//发送消息
+	// 发送消息
 	sendMsgAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/send_msg?access_token=%s"
 )
 
@@ -31,12 +31,10 @@ func (r *Client) SendMsg(options interface{}) (info SendMsgSchema, err error) {
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(sendMsgAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(sendMsgAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {

work/kf/sendmsg/message.go

@@ -2,9 +2,9 @@ package sendmsg
 
 // Message 发送消息
 type Message struct {
-	ToUser   string `json:"touser"`    // 指定接收消息的客户UserID
-	OpenKFID string `json:"open_kfid"` // 指定发送消息的客服帐号ID
-	MsgID    string `json:"msgid"`     // 指定消息ID
+	ToUser   string `json:"touser"`          // 指定接收消息的客户UserID
+	OpenKFID string `json:"open_kfid"`       // 指定发送消息的客服帐号ID
+	MsgID    string `json:"msgid,omitempty"` // 指定消息ID
 }
 
 // Text 发送文本消息

work/kf/sendmsgonevent.go

@@ -31,19 +31,17 @@ type SendMsgOnEventSchema struct {
 // 从接待池接入会话，用于发送非工作时间的提示语或超时未回复的提示语等	1条	48小时	文本	事件回调、转接会话接口
 // 结束会话，用于发送结束会话提示语或满意度评价等	1条	20秒	文本、菜单	事件回调、转接会话接口
 //
-//「进入会话事件」响应消息：
+// 「进入会话事件」响应消息：
 // 如果满足通过API下发欢迎语条件（条件为：1. 企业没有在管理端配置了原生欢迎语；2. 用户在过去48小时里未收过欢迎语，且未向该用户发过消息），则用户进入会话事件会额外返回一个welcome_code，开发者以此为凭据调用接口（填到该接口code参数），即可向客户发送客服欢迎语。
 func (r *Client) SendMsgOnEvent(options interface{}) (info SendMsgOnEventSchema, err error) {
 	var (
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(sendMsgOnEventAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(sendMsgOnEventAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {

work/kf/servicer.go

@@ -8,11 +8,11 @@ import (
 )
 
 const (
-	//添加接待人员
+	// 添加接待人员
 	receptionistAddAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/servicer/add?access_token=%s"
-	//删除接待人员
+	// 删除接待人员
 	receptionistDelAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/servicer/del?access_token=%s"
-	//获取接待人员列表
+	// 获取接待人员列表
 	receptionistListAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/servicer/list?access_token=%s&open_kfid=%s"
 )
 
@@ -37,12 +37,10 @@ func (r *Client) ReceptionistAdd(options ReceptionistOptions) (info Receptionist
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(receptionistAddAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(receptionistAddAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {

work/kf/servicestate.go

@@ -39,12 +39,10 @@ func (r *Client) ServiceStateGet(options ServiceStateGetOptions) (info ServiceSt
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(serviceStateGetAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(serviceStateGetAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {
@@ -76,12 +74,10 @@ func (r *Client) ServiceStateTrans(options ServiceStateTransOptions) (info Servi
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(serviceStateTransAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(serviceStateTransAddr, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {

work/kf/syncmsg.go

@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	//获取消息
+	// 获取消息
 	syncMsgAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/sync_msg?access_token=%s"
 )
 
@@ -45,12 +45,10 @@ func (r *Client) SyncMsg(options SyncMsgOptions) (info SyncMsgSchema, err error)
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(syncMsgAddr, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(syncMsgAddr, accessToken), options); err != nil {
 		return
 	}
 	originInfo := syncMsgSchema{}

work/kf/upgrade.go

@@ -8,11 +8,11 @@ import (
 )
 
 const (
-	//获取配置的专员与客户群
+	// 获取配置的专员与客户群
 	upgradeServiceConfigAddr = "https://qyapi.weixin.qq.com/cgi-bin/kf/customer/get_upgrade_service_config?access_token=%s"
 	// 为客户升级为专员或客户群服务
 	upgradeService = "https://qyapi.weixin.qq.com/cgi-bin/kf/customer/upgrade_service?access_token=%s"
-	//为客户取消推荐
+	// 为客户取消推荐
 	upgradeServiceCancel = "https://qyapi.weixin.qq.com/cgi-bin/kf/customer/cancel_upgrade_service?access_token=%s"
 )
 
@@ -34,12 +34,10 @@ func (r *Client) UpgradeServiceConfig() (info UpgradeServiceConfigSchema, err er
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.HTTPGet(fmt.Sprintf(upgradeServiceConfigAddr, accessToken))
-	if err != nil {
+	if data, err = util.HTTPGet(fmt.Sprintf(upgradeServiceConfigAddr, accessToken)); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {
@@ -72,12 +70,10 @@ func (r *Client) UpgradeService(options UpgradeServiceOptions) (info util.Common
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(upgradeService, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(upgradeService, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {
@@ -106,12 +102,10 @@ func (r *Client) UpgradeMemberService(options UpgradeMemberServiceOptions) (info
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(upgradeService, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(upgradeService, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {
@@ -169,12 +163,10 @@ func (r *Client) UpgradeServiceCancel(options UpgradeServiceCancelOptions) (info
 		accessToken string
 		data        []byte
 	)
-	accessToken, err = r.ctx.GetAccessToken()
-	if err != nil {
+	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
 		return
 	}
-	data, err = util.PostJSON(fmt.Sprintf(upgradeServiceCancel, accessToken), options)
-	if err != nil {
+	if data, err = util.PostJSON(fmt.Sprintf(upgradeServiceCancel, accessToken), options); err != nil {
 		return
 	}
 	if err = json.Unmarshal(data, &info); err != nil {

work/material/client.go

@@ -0,0 +1,17 @@
+package material
+
+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/material/media.go

@@ -0,0 +1,39 @@
+package material
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// UploadImgURL 上传图片
+	UploadImgURL = "https://qyapi.weixin.qq.com/cgi-bin/media/uploadimg?access_token=%s"
+)
+
+// UploadImgResponse 上传图片响应
+type UploadImgResponse struct {
+	util.CommonError
+	URL string `json:"url"`
+}
+
+// UploadImg 上传图片
+// @see https://developer.work.weixin.qq.com/document/path/90256
+func (r *Client) UploadImg(filename string) (*UploadImgResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostFile("media", filename, fmt.Sprintf(UploadImgURL, accessToken)); err != nil {
+		return nil, err
+	}
+	result := &UploadImgResponse{}
+	if err = util.DecodeWithError(response, result, "UploadImg"); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

work/msgaudit/README.md

@@ -34,13 +34,13 @@ import (
 func main() {
 	//初始化客户端
 	wechatClient := wechat.NewWechat()
-	
+
 	workClient := wechatClient.GetWork(&config.Config{
 		CorpID:        "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
 		CorpSecret:    "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
 		RasPrivateKey: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
 	})
-	
+
 	client, err := workClient.GetMsgAudit()
 	if err != nil {
 		fmt.Printf("SDK 初始化失败：%v \n", err)
@@ -64,13 +64,14 @@ func main() {
 
 		if chatInfo.Type == "image" {
 			image, _ := chatInfo.GetImageMessage()
-			sdkfileid := image.Image.SdkFileId
+			sdkFileID := image.Image.SdkFileID
 
 			isFinish := false
 			buffer := bytes.Buffer{}
+			indexBuf := ""
 			for !isFinish {
 				//获取媒体数据
-				mediaData, err := client.GetMediaData("", sdkfileid, "", "", 5)
+				mediaData, err := client.GetMediaData(indexBuf, sdkFileID, "", "", 5)
 				if err != nil {
 					fmt.Printf("媒体数据拉取失败：%v \n", err)
 					return
@@ -79,6 +80,7 @@ func main() {
 				if mediaData.IsFinish {
 					isFinish = mediaData.IsFinish
 				}
+				indexBuf = mediaData.OutIndexBuf
 			}
 			filePath, _ := os.Getwd()
 			filePath = path.Join(filePath, "test.png")
@@ -90,11 +92,11 @@ func main() {
 			break
 		}
 	}
-	
+
 	//释放SDK实例
 	client.Free()
 }
 
 
 
-```
+```

work/msgaudit/error.go

@@ -4,19 +4,19 @@ import (
 	"fmt"
 )
 
-//返回码	错误说明
-//10000	参数错误，请求参数错误
-//10001	网络错误，网络请求错误
-//10002	数据解析失败
-//10003	系统失败
-//10004	密钥错误导致加密失败
-//10005	fileid错误
-//10006	解密失败
-//10007 找不到消息加密版本的私钥，需要重新传入私钥对
-//10008 解析encrypt_key出错
-//10009 ip非法
-//10010 数据过期
-//10011	证书错误
+// 返回码	错误说明
+// 10000	参数错误，请求参数错误
+// 10001	网络错误，网络请求错误
+// 10002	数据解析失败
+// 10003	系统失败
+// 10004	密钥错误导致加密失败
+// 10005	fileid错误
+// 10006	解密失败
+// 10007 找不到消息加密版本的私钥，需要重新传入私钥对
+// 10008 解析encrypt_key出错
+// 10009 ip非法
+// 10010 数据过期
+// 10011	证书错误
 const (
 	SDKErrMsg               = "sdk failed"
 	SDKParamsErrMsg         = "参数错误，请求参数错误"

work/oauth/oauth.go

@@ -17,6 +17,8 @@ type Oauth struct {
 var (
 	// oauthTargetURL 企业微信内跳转地址
 	oauthTargetURL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_base&state=STATE#wechat_redirect"
+	// oauthTargetURL 企业微信内跳转地址(获取成员的详细信息)
+	oauthTargetPrivateURL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_privateinfo&agentid=%s&state=STATE#wechat_redirect"
 	// oauthUserInfoURL 获取用户信息地址
 	oauthUserInfoURL = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?access_token=%s&code=%s"
 	// oauthQrContentTargetURL 构造独立窗口登录二维码
@@ -33,23 +35,32 @@ func NewOauth(ctx *context.Context) *Oauth {
 // GetTargetURL 获取授权地址
 func (ctr *Oauth) GetTargetURL(callbackURL string) string {
 	// url encode
-	urlStr := url.QueryEscape(callbackURL)
 	return fmt.Sprintf(
 		oauthTargetURL,
 		ctr.CorpID,
-		urlStr,
+		url.QueryEscape(callbackURL),
+	)
+}
+
+// GetTargetPrivateURL 获取个人信息授权地址
+func (ctr *Oauth) GetTargetPrivateURL(callbackURL string, agentID string) string {
+	// url encode
+	return fmt.Sprintf(
+		oauthTargetPrivateURL,
+		ctr.CorpID,
+		url.QueryEscape(callbackURL),
+		agentID,
 	)
 }
 
 // GetQrContentTargetURL 构造独立窗口登录二维码
 func (ctr *Oauth) GetQrContentTargetURL(callbackURL string) string {
 	// url encode
-	urlStr := url.QueryEscape(callbackURL)
 	return fmt.Sprintf(
 		oauthQrContentTargetURL,
 		ctr.CorpID,
 		ctr.AgentID,
-		urlStr,
+		url.QueryEscape(callbackURL),
 		util.RandomStr(16),
 	)
 }
@@ -61,21 +72,18 @@ type ResUserInfo struct {
 	UserID   string `json:"UserId"`
 	DeviceID string `json:"DeviceId"`
 	// 非企业成员授权时返回
-	OpenID string `json:"OpenId"`
+	OpenID         string `json:"OpenId"`
+	ExternalUserID string `json:"external_userid"`
 }
 
 // UserFromCode 根据code获取用户信息
 func (ctr *Oauth) UserFromCode(code string) (result ResUserInfo, err error) {
 	var accessToken string
-	accessToken, err = ctr.GetAccessToken()
-	if err != nil {
+	if accessToken, err = ctr.GetAccessToken(); err != nil {
 		return
 	}
 	var response []byte
-	response, err = util.HTTPGet(
-		fmt.Sprintf(oauthUserInfoURL, accessToken, code),
-	)
-	if err != nil {
+	if response, err = util.HTTPGet(fmt.Sprintf(oauthUserInfoURL, accessToken, code)); err != nil {
 		return
 	}
 	err = json.Unmarshal(response, &result)

work/robot/client.go

@@ -0,0 +1,17 @@
+package robot
+
+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/robot/robot.go

@@ -0,0 +1,29 @@
+package robot
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// WebhookSendURL 机器人发送群组消息
+	WebhookSendURL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=%s"
+)
+
+// RobotBroadcast 群机器人消息发送
+// @see https://developer.work.weixin.qq.com/document/path/91770
+func (r *Client) RobotBroadcast(webhookKey string, options interface{}) (info util.CommonError, err error) {
+	var data []byte
+	if data, err = util.PostJSON(fmt.Sprintf(WebhookSendURL, webhookKey), options); err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &info); err != nil {
+		return
+	}
+	if info.ErrCode != 0 {
+		return info, err
+	}
+	return info, nil
+}

work/robot/send_option.go

@@ -0,0 +1,126 @@
+package robot
+
+import "github.com/silenceper/wechat/v2/util"
+
+// WebhookSendResponse 机器人发送群组消息响应
+type WebhookSendResponse struct {
+	util.CommonError
+}
+
+// WebhookSendTextOption 机器人发送文本消息请求参数
+type WebhookSendTextOption struct {
+	MsgType string `json:"msgtype"` // 消息类型,此时固定为text
+	Text    struct {
+		Content             string   `json:"content"`               // 文本内容，最长不超过2048个字节，必须是utf8编码
+		MentionedList       []string `json:"mentioned_list"`        // userid的列表，提醒群中的指定成员(@某个成员)，@all表示提醒所有人，如果开发者获取不到userid，可以使用mentioned_mobile_list
+		MentionedMobileList []string `json:"mentioned_mobile_list"` // 手机号列表，提醒手机号对应的群成员(@某个成员)，@all表示提醒所有人
+	} `json:"text"` // 文本消息内容
+}
+
+// WebhookSendMarkdownOption 机器人发送markdown消息请求参数
+// 支持语法参考 https://developer.work.weixin.qq.com/document/path/91770
+type WebhookSendMarkdownOption struct {
+	MsgType  string `json:"msgtype"` // 消息类型,此时固定为markdown
+	Markdown struct {
+		Content string `json:"content"` // markdown内容，最长不超过4096个字节，必须是utf8编码
+	} `json:"markdown"` // markdown消息内容
+}
+
+// WebhookSendImageOption 机器人发送图片消息请求参数
+type WebhookSendImageOption struct {
+	MsgType string `json:"msgtype"` // 消息类型,此时固定为image
+	Image   struct {
+		Base64 string `json:"base64"` // 图片内容的base64编码
+		MD5    string `json:"md5"`    // 图片内容（base64编码前）的md5值
+	} `json:"image"` // 图片消息内容
+}
+
+// WebhookSendNewsOption 机器人发送图文消息请求参数
+type WebhookSendNewsOption struct {
+	MsgType string `json:"msgtype"` // 消息类型,此时固定为news
+	News    struct {
+		Articles []struct {
+			Title       string `json:"title"`       // 标题，不超过128个字节，超过会自动截断
+			Description string `json:"description"` // 描述，不超过512个字节，超过会自动截断
+			URL         string `json:"url"`         // 点击后跳转的链接
+			PicURL      string `json:"picurl"`      // 图文消息的图片链接，支持JPG、PNG格式，较好的效果为大图 1068*455，小图150*150
+		} `json:"articles"` // 图文消息列表 一个图文消息支持1到8条图文
+	} `json:"news"` // 图文消息内容
+}
+
+// WebhookSendFileOption 机器人发送文件消息请求参数
+type WebhookSendFileOption struct {
+	MsgType string `json:"msgtype"` // 消息类型，此时固定为file
+	File    struct {
+		MediaID string `json:"media_id"` // 文件id，通过下文的文件上传接口获取
+	} `json:"file"` // 文件类型
+}
+
+// WebHookSendTempNoticeOption 机器人发送文本通知模版消息请求参数
+type WebHookSendTempNoticeOption struct {
+	MsgType      string       `json:"msgtype"`       // 消息类型，此时的消息类型固定为template_card
+	TemplateCard TemplateCard `json:"template_card"` // 具体的模版卡片参数
+}
+
+// TemplateCard 具体的模版卡片参数
+type TemplateCard struct {
+	CardType              string        `json:"card_type"`               // 模版卡片的模版类型，文本通知模版卡片的类型为text_notice
+	Source                CardSource    `json:"source"`                  // 卡片来源样式信息，不需要来源样式可不填写
+	MainTitle             CardTitle     `json:"main_title"`              // 模版卡片的主要内容，包括一级标题和标题辅助信息
+	EmphasisContent       CardTitle     `json:"emphasis_content"`        // 关键数据样式
+	QuoteArea             CardQuoteArea `json:"quote_area"`              // 引用文献样式，建议不与关键数据共用
+	SubTitleText          string        `json:"sub_title_text"`          // 二级普通文本，建议不超过112个字。模版卡片主要内容的一级标题main_title.title和二级普通文本sub_title_text必须有一项填写
+	HorizontalContentList []CardContent `json:"horizontal_content_list"` // 二级标题+文本列表，该字段可为空数组，但有数据的话需确认对应字段是否必填，列表长度不超过6
+	JumpList              []JumpContent `json:"jump_list"`               // 跳转指引样式的列表，该字段可为空数组，但有数据的话需确认对应字段是否必填，列表长度不超过3
+	CardAction            CardAction    `json:"card_action"`             // 整体卡片的点击跳转事件，text_notice模版卡片中该字段为必填项
+}
+
+// CardSource 卡片来源样式信息，不需要来源样式可不填写
+type CardSource struct {
+	IconURL   string `json:"icon_url"`   // 来源图片的url
+	Desc      string `json:"desc"`       // 来源图片的描述，建议不超过13个字
+	DescColor int    `json:"desc_color"` // 来源文字的颜色，目前支持：0(默认) 灰色，1 黑色，2 红色，3 绿色
+}
+
+// CardTitle 标题和标题辅助信息
+type CardTitle struct {
+	Title string `json:"title"` // 标题，建议不超过26个字。模版卡片主要内容的一级标题main_title.title和二级普通文本sub_title_text必须有一项填写
+	Desc  string `json:"desc"`  // 标题辅助信息，建议不超过30个字
+}
+
+// CardQuoteArea 引用文献样式，建议不与关键数据共用
+type CardQuoteArea struct {
+	Type      int    `json:"type"`               // 引用文献样式区域点击事件，0或不填代表没有点击事件，1 代表跳转url，2 代表跳转小程序
+	URL       string `json:"url,omitempty"`      // 点击跳转的url，quote_area.type是1时必填
+	Appid     string `json:"appid,omitempty"`    // 点击跳转的小程序的appid，quote_area.type是2时必填
+	Pagepath  string `json:"pagepath,omitempty"` // 点击跳转的小程序的pagepath，quote_area.type是2时选填
+	Title     string `json:"title"`              // 引用文献样式的标题
+	QuoteText string `json:"quote_text"`         // 引用文献样式的引用文案
+}
+
+// CardContent 二级标题+文本列表，该字段可为空数组，但有数据的话需确认对应字段是否必填，列表长度不超过6
+type CardContent struct {
+	KeyName string `json:"keyname"`            // 链接类型，0或不填代表是普通文本，1 代表跳转url，2 代表下载附件，3 代表@员工
+	Value   string `json:"value"`              // 二级标题，建议不超过5个字
+	Type    int    `json:"type,omitempty"`     // 二级文本，如果horizontal_content_list.type是2，该字段代表文件名称（要包含文件类型），建议不超过26个字
+	URL     string `json:"url,omitempty"`      // 链接跳转的url，horizontal_content_list.type是1时必填
+	MediaID string `json:"media_id,omitempty"` // 附件的media_id，horizontal_content_list.type是2时必填
+	UserID  string `json:"userid,omitempty"`   // 被@的成员的userid，horizontal_content_list.type是3时必填
+}
+
+// JumpContent 跳转指引样式的列表，该字段可为空数组，但有数据的话需确认对应字段是否必填，列表长度不超过3
+type JumpContent struct {
+	Type     int    `json:"type"`               // 跳转链接类型，0或不填代表不是链接，1 代表跳转url，2 代表跳转小程序
+	URL      string `json:"url,omitempty"`      // 跳转链接的url，jump_list.type是1时必填
+	Title    string `json:"title"`              // 跳转链接样式的文案内容，建议不超过13个字
+	AppID    string `json:"appid,omitempty"`    // 跳转链接的小程序的appid，jump_list.type是2时必填
+	PagePath string `json:"pagepath,omitempty"` // 跳转链接的小程序的pagepath，jump_list.type是2时选填
+}
+
+// CardAction 整体卡片的点击跳转事件，text_notice模版卡片中该字段为必填项
+type CardAction struct {
+	Type     int    `json:"type"`               // 卡片跳转类型，1 代表跳转url，2 代表打开小程序。text_notice模版卡片中该字段取值范围为[1,2]
+	URL      string `json:"url,omitempty"`      // 跳转事件的url，card_action.type是1时必填
+	Appid    string `json:"appid,omitempty"`    // 跳转事件的小程序的appid，card_action.type是2时必填
+	PagePath string `json:"pagepath,omitempty"` // 跳转事件的小程序的pagepath，card_action.type是2时选填
+}

work/work.go

@@ -2,11 +2,15 @@ package work
 
 import (
 	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/work/addresslist"
 	"github.com/silenceper/wechat/v2/work/config"
 	"github.com/silenceper/wechat/v2/work/context"
+	"github.com/silenceper/wechat/v2/work/externalcontact"
 	"github.com/silenceper/wechat/v2/work/kf"
+	"github.com/silenceper/wechat/v2/work/material"
 	"github.com/silenceper/wechat/v2/work/msgaudit"
 	"github.com/silenceper/wechat/v2/work/oauth"
+	"github.com/silenceper/wechat/v2/work/robot"
 )
 
 // Work 企业微信
@@ -43,3 +47,23 @@ func (wk *Work) GetMsgAudit() (*msgaudit.Client, error) {
 func (wk *Work) GetKF() (*kf.Client, error) {
 	return kf.NewClient(wk.ctx.Config)
 }
+
+// GetExternalContact get external_contact
+func (wk *Work) GetExternalContact() *externalcontact.Client {
+	return externalcontact.NewClient(wk.ctx)
+}
+
+// GetAddressList get address_list
+func (wk *Work) GetAddressList() *addresslist.Client {
+	return addresslist.NewClient(wk.ctx)
+}
+
+// GetMaterial get material
+func (wk *Work) GetMaterial() *material.Client {
+	return material.NewClient(wk.ctx)
+}
+
+// GetRobot get robot
+func (wk *Work) GetRobot() *robot.Client {
+	return robot.NewClient(wk.ctx)
+}