Merge d8e3208ef2 into c22a036b7f

* feat: 公众号新增模板接口，支持模板参数传递

* fix: 公众号新增模板接口，合并定义参数

* fix: 公众号新增模板接口，统一代码风格

---------

Co-authored-by: yangj23 <yangj23@mingyuanyun.com>

.github/ISSUE_TEMPLATE/bug.md

@@ -18,4 +18,4 @@ assignees: ''
 
 
 **使用的版本**
- - SDK版本: [比如 v0.0.0]
+ - SDK 版本：[比如 v0.0.0]

.github/workflows/go.yml

@@ -2,29 +2,29 @@ name: Go
 
 on:
   push:
-    branches: [ master,release-*,v2 ]
+    branches: [ master,release-*,v2,feature/**,fix/** ]
   pull_request:
-    branches: [ master,release-*,v2 ]
+    branches: [ master,release-*,v2,feature/**,fix/** ]
 
 jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [ '1.16','1.17','1.18','1.19','1.20' ]
+        go-version:  [ '1.18','1.19','1.20','1.21.4','1.22' ]
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
       - name: Setup Golang ${{ matrix.go-version }}
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         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.52.2
+          version: v1.58.2
   build:
     name: Test
     runs-on: ubuntu-latest
@@ -42,12 +42,12 @@ jobs:
     # strategy set
     strategy:
       matrix:
-        go: [ '1.16','1.17','1.18','1.19','1.20' ]
+        go: [ '1.18','1.19','1.20','1.21','1.22' ]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Go 1.x
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go }}
         id: go

.github/workflows/release.yml

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

.golangci.yml

@@ -4,36 +4,32 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
     - depguard
     - dogsled
     - dupl
     - errcheck
+    - exportloopref
     - funlen
     - goconst
       # - gocritic
     - gocyclo
     - gofmt
     - goimports
-    - golint
     - goprintffuncname
     - gosimple
     - govet
     - ineffassign
-    - interfacer
     - misspell
     - nolintlint
     - rowserrcheck
-    - scopelint
     - staticcheck
-    - structcheck
     - stylecheck
-    - typecheck
+#    - typecheck
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
+#    - revive
 
 issues:
   include:
@@ -57,10 +53,68 @@ linters-settings:
     lines: 66
     statements: 50
 
-#issues:
+  errcheck:
-#  include:
+    # Report about not checking of errors in type assertions: `a := b.(MyStruct)`.
-#  - EXC0002 # disable excluding of issues about comments from golint
+    # Such cases aren't reported by default.
-#  exclude-rules:
+    # Default: false
-#    - linters:
+    check-type-assertions: true
-#       - stylecheck
+    # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`.
-#      text: "ST1000:"
+    # Such cases aren't reported by default.
+    # Default: false
+    check-blank: true
+    # To disable the errcheck built-in exclude list.
+    # See `-excludeonly` option in https://github.com/kisielk/errcheck#excluding-functions for details.
+    # Default: false
+    disable-default-exclusions: true
+    # List of functions to exclude from checking, where each entry is a single function to exclude.
+    # See https://github.com/kisielk/errcheck#excluding-functions for details.
+    exclude-functions:
+      - io/ioutil.ReadFile
+      - io.Copy(*bytes.Buffer)
+      - io.Copy(os.Stdout)
+      - (*bytes.Buffer).WriteString
+      - (*bytes.Buffer).Write
+      - url.Parse
+      - (*strings.Builder).WriteString
+      - io.WriteString
+      - (*bytes.Buffer).WriteByte
+      - (*hmac.New).Write
+      - (*int)
+      - (*string)
+      - (hash.Hash).Write
+
+  depguard:
+    # Rules to apply.
+    #
+    # Variables:
+    # - File Variables
+    #   you can still use and exclamation mark ! in front of a variable to say not to use it.
+    #   Example !$test will match any file that is not a go test file.
+    #
+    #   `$all` - matches all go files
+    #   `$test` - matches all go test files
+    #
+    # - Package Variables
+    #
+    #  `$gostd` - matches all of go's standard library (Pulled from `GOROOT`)
+    #
+    # Default: Only allow $gostd in all files.
+    rules:
+      # Name of a rule.
+      main:
+        # Used to determine the package matching priority.
+        # There are three different modes: `original`, `strict`, and `lax`.
+        # Default: "original"
+        list-mode: lax
+        # List of file globs that will match this list of settings to compare against.
+        # Default: $all
+        files:
+          - "!**/*_a _file.go"
+        # List of allowed packages.
+        allow:
+          - $gostd
+          - github.com/OpenPeeDeeP
+        # Packages that are not allowed where the value is a suggestion.
+        deny:
+          - pkg: "github.com/pkg/errors"
+            desc: Should be replaced by standard lib errors package

.goreleaser.yml

@@ -1,29 +0,0 @@
-# This is an example goreleaser.yaml file with some sane defaults.
-# Make sure to check the documentation at http://goreleaser.com
-before:
-  hooks:
-    # You may remove this if you don't use go modules.
-    - go mod download
-    # you may remove this if you don't need go generate
-    - go generate ./...
-builds:
-- skip: true
-
-archives:
-  - replacements:
-      darwin: Darwin
-      linux: Linux
-      windows: Windows
-      386: i386
-      amd64: x86_64
-
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ .Tag }}-next"
-changelog:
-  sort: asc
-  filters:
-    exclude:
-      - '^docs:'
-      - '^test:'

cache/memcache_test.go

@@ -22,12 +22,16 @@ func TestMemcache(t *testing.T) {
 	exists := mem.IsExist("unknown-key")
 	assert.Equal(t, false, exists)
 
-	name := mem.Get("username").(string)
+	name, ok := mem.Get("username").(string)
+	if !ok {
+		t.Error("get Error")
+	}
 	if name != "" {
 		if name != "silenceper" {
 			t.Error("get Error")
 		}
 	}
+
 	data := mem.Get("unknown-key")
 	assert.Nil(t, data)
 

cache/redis.go

@@ -16,6 +16,7 @@ type Redis struct {
 // RedisOpts redis 连接属性
 type RedisOpts struct {
 	Host        string `yml:"host" json:"host"`
+	Username    string `yaml:"username" json:"username"`
 	Password    string `yml:"password" json:"password"`
 	Database    int    `yml:"database" json:"database"`
 	MaxIdle     int    `yml:"max_idle" json:"max_idle"`
@@ -28,6 +29,7 @@ func NewRedis(ctx context.Context, opts *RedisOpts) *Redis {
 	conn := redis.NewUniversalClient(&redis.UniversalOptions{
 		Addrs:        []string{opts.Host},
 		DB:           opts.Database,
+		Username:     opts.Username,
 		Password:     opts.Password,
 		IdleTimeout:  time.Second * time.Duration(opts.IdleTimeout),
 		MinIdleConns: opts.MaxIdle,
@@ -76,8 +78,10 @@ func (r *Redis) IsExist(key string) bool {
 
 // IsExistContext 判断 key 是否存在
 func (r *Redis) IsExistContext(ctx context.Context, key string) bool {
-	result, _ := r.conn.Exists(ctx, key).Result()
+	result, err := r.conn.Exists(ctx, key).Result()
-
+	if err != nil {
+		return false
+	}
 	return result > 0
 }
 

cache/redis_test.go

@@ -35,7 +35,10 @@ func TestRedis(t *testing.T) {
 		t.Error("IsExist Error")
 	}
 
-	name := redis.Get(key).(string)
+	name, ok := redis.Get(key).(string)
+	if !ok {
+		t.Error("get Error")
+	}
 	if name != val {
 		t.Error("get Error")
 	}

credential/default_access_token.go

@@ -57,29 +57,34 @@ type ResAccessToken struct {
 	ExpiresIn   int64  `json:"expires_in"`
 }
 
-// GetAccessToken 获取access_token,先从cache中获取，没有则从服务端获取
+// GetAccessToken 获取 access_token，先从 cache 中获取，没有则从服务端获取
 func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
 	return ak.GetAccessTokenContext(context.Background())
 }
 
-// GetAccessTokenContext 获取access_token,先从cache中获取，没有则从服务端获取
+// 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)
-	val := ak.cache.Get(accessTokenCacheKey)
+
-	if accessToken = val.(string); accessToken != "" {
+	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
+		var ok bool
+		if accessToken, ok = val.(string); ok && accessToken != "" {
 			return
 		}
+	}
 
 	// 加上 lock，是为了防止在并发获取 token 时，cache 刚好失效，导致从微信服务器上获取到不同 token
 	ak.accessTokenLock.Lock()
 	defer ak.accessTokenLock.Unlock()
 
 	// 双检，防止重复从微信服务器获取
-	val = ak.cache.Get(accessTokenCacheKey)
+	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
-	if accessToken = val.(string); accessToken != "" {
+		var ok bool
+		if accessToken, ok = val.(string); ok && accessToken != "" {
 			return
 		}
+	}
 
 	// cache 失效，从微信服务器获取
 	var resAccessToken ResAccessToken
@@ -87,15 +92,15 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
 		return
 	}
 
-	if err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(resAccessToken.ExpiresIn-1500)*time.Second); err != nil {
+	expires := resAccessToken.ExpiresIn - 1500
-		return
+	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
-	}
+
 	accessToken = resAccessToken.AccessToken
 	return
 }
 
 // StableAccessToken 获取稳定版接口调用凭据 (与 getAccessToken 获取的调用凭证完全隔离，互不影响)
-// 不强制更新access_token,可用于不同环境不同服务而不需要分布式锁以及公用缓存，避免access_token争抢
+// 不强制更新 access_token，可用于不同环境不同服务而不需要分布式锁以及公用缓存，避免 access_token 争抢
 // https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getStableAccessToken.html
 type StableAccessToken struct {
 	appID          string
@@ -117,12 +122,12 @@ func NewStableAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.C
 	}
 }
 
-// GetAccessToken 获取access_token,先从cache中获取，没有则从服务端获取
+// GetAccessToken 获取 access_token，先从 cache 中获取，没有则从服务端获取
 func (ak *StableAccessToken) GetAccessToken() (accessToken string, err error) {
 	return ak.GetAccessTokenContext(context.Background())
 }
 
-// GetAccessTokenContext 获取access_token,先从cache中获取，没有则从服务端获取
+// GetAccessTokenContext 获取 access_token，先从 cache 中获取，没有则从服务端获取
 func (ak *StableAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
 	// 先从 cache 中取
 	accessTokenCacheKey := fmt.Sprintf("%s_stable_access_token_%s", ak.cacheKeyPrefix, ak.appID)
@@ -138,7 +143,7 @@ func (ak *StableAccessToken) GetAccessTokenContext(ctx context.Context) (accessT
 	}
 
 	expires := resAccessToken.ExpiresIn - 300
-	_ = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
+	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
 
 	accessToken = resAccessToken.AccessToken
 	return
@@ -190,12 +195,12 @@ func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.C
 	}
 }
 
-// GetAccessToken 企业微信获取access_token,先从cache中获取，没有则从服务端获取
+// GetAccessToken 企业微信获取 access_token，先从 cache 中获取，没有则从服务端获取
 func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
 	return ak.GetAccessTokenContext(context.Background())
 }
 
-// GetAccessTokenContext 企业微信获取access_token,先从cache中获取，没有则从服务端获取
+// GetAccessTokenContext 企业微信获取 access_token，先从 cache 中获取，没有则从服务端获取
 func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
 	// 加上 lock，是为了防止在并发获取 token 时，cache 刚好失效，导致从微信服务器上获取到不同 token
 	ak.accessTokenLock.Lock()
@@ -203,7 +208,10 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
 	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
 	val := ak.cache.Get(accessTokenCacheKey)
 	if val != nil {
-		accessToken = val.(string)
+		var ok bool
+		if accessToken, ok = val.(string); !ok {
+			accessToken = ""
+		}
 		return
 	}
 
@@ -216,9 +224,7 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
 
 	expires := resAccessToken.ExpiresIn - 1500
 	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
-	if err != nil {
+
-		return
-	}
 	accessToken = resAccessToken.AccessToken
 	return
 }

doc/api/work.md

@@ -90,10 +90,12 @@ host: https://qyapi.weixin.qq.com/
 |    名称     | 请求方式 | URL                                     | 是否已实现   | 使用方法                            | 贡献者      |
 |:---------:|------|:----------------------------------------| ---------- | -------------------------------   |----------|
 | 获取子部门 ID 列表 | GET  | /cgi-bin/department/simplelist          | YES        | (r *Client) DepartmentSimpleList| MARKWANG |
+| 获取部门列表 | GET  | /cgi-bin/department/list                 | YES        | (r *Client) DepartmentList| just5325, ourines |
 |  获取部门成员   | GET | /cgi-bin/user/simplelist                | YES        | (r *Client) UserSimpleList  | MARKWANG  |
 |  获取成员 ID 列表   | Post | /cgi-bin/user/list_id                | YES        | (r *Client) UserListId  | MARKWANG  |
 
 
+
 ## 素材管理
 [官方文档](https://developer.work.weixin.qq.com/document/path/91054)
 
@@ -116,5 +118,14 @@ host: https://qyapi.weixin.qq.com/
 | ---------------- | -------- | --------------------- | ---------- | -------------------------- | -------- |
 | 群机器人发送消息 | POST     | /cgi-bin/webhook/send | YES        | (r *Client) RobotBroadcast | chcthink |
 
+## 打卡
+
+[官方文档](https://developer.work.weixin.qq.com/document/path/96497)
+
+| 名称       | 请求方式 | URL                   | 是否已实现 | 使用方法                   | 贡献者     |
+|----------| -------- | --------------------- | ---------- | -------------------------- |---------|
+| 获取打卡日报数据 | POST     |  /cgi-bin/checkin/getcheckin_daydata | YES        | (r *Client) GetDayData | Thinker |
+| 获取打卡月报数据 | POST     |  /cgi-bin/checkin/getcheckin_monthdata | YES        | (r *Client) GetMonthData | Thinker |
+
 ## 应用管理
 TODO

go.mod

@@ -1,16 +1,30 @@
 module github.com/silenceper/wechat/v2
 
-go 1.16
+go 1.18
 
 require (
-	github.com/alicebob/miniredis/v2 v2.30.0
+	github.com/alicebob/miniredis/v2 v2.33.0
-	github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
+	github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874
 	github.com/fatih/structs v1.1.0
 	github.com/go-redis/redis/v8 v8.11.5
-	github.com/sirupsen/logrus v1.9.0
+	github.com/sirupsen/logrus v1.9.3
-	github.com/spf13/cast v1.4.1
+	github.com/spf13/cast v1.6.0
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.9.0
-	github.com/tidwall/gjson v1.14.1
+	github.com/tidwall/gjson v1.17.1
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
+	golang.org/x/crypto v0.25.0
 	gopkg.in/h2non/gock.v1 v1.1.2
 )
+
+require (
+	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/yuin/gopher-lua v1.1.1 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -1,14 +1,11 @@
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk=
 github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
-github.com/alicebob/miniredis/v2 v2.30.0 h1:uA3uhDbCxfO9+DI/DuGeAMr9qI+noVWwGPNTFuKID5M=
+github.com/alicebob/miniredis/v2 v2.33.0 h1:uvTF0EDeu9RLnUEG27Db5I68ESoIxTiXbNUiji6lZrA=
-github.com/alicebob/miniredis/v2 v2.30.0/go.mod h1:84TWKZlxYkfgMucPBf5SOQBYJceZeQRFIaQgNMiCX6Q=
+github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQevyi/DJpoj6mi0=
-github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw=
+github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874 h1:N7oVaKyGp8bttX0bfZGmcGkjz7DLQXhAn3DNd3T0ous=
-github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
+github.com/bradfitz/gomemcache v0.0.0-20230905024940-24af94b03874/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
 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=
@@ -16,132 +13,52 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 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/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
-github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
+github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
+github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 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/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo=
+github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
-github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
-github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ=
+github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
-github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
+golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-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/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=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/openapi/mgnt.go

@@ -93,10 +93,16 @@ func (o *OpenAPI) ClearQuotaByAppSecret() error {
 func (o *OpenAPI) getAppIDAndSecret() (string, string, error) {
 	switch o.ctx.(type) {
 	case *mpContext.Context:
-		c := o.ctx.(*mpContext.Context)
+		c, ok := o.ctx.(*mpContext.Context)
+		if !ok {
+			return "", "", errors.New("invalid context type")
+		}
 		return c.AppID, c.AppSecret, nil
 	case *ocContext.Context:
-		c := o.ctx.(*ocContext.Context)
+		c, ok := o.ctx.(*ocContext.Context)
+		if !ok {
+			return "", "", errors.New("invalid context type")
+		}
 		return c.AppID, c.AppSecret, nil
 	default:
 		return "", "", errors.New("invalid context type")

miniprogram/auth/auth.go

@@ -138,10 +138,8 @@ func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*Get
 	}
 
 	var result GetPhoneNumberResponse
-	if err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber"); err != nil {
+	err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber")
-		return nil, err
+	return &result, err
-	}
-	return &result, nil
 }
 
 // GetPhoneNumber 小程序通过 code 获取用户手机号

miniprogram/business/phone_number.go

@@ -45,10 +45,5 @@ func (business *Business) GetPhoneNumber(in *GetPhoneNumberRequest) (info PhoneI
 		PhoneInfo PhoneInfo `json:"phone_info"`
 	}
 	err = util.DecodeWithError(response, &resp, "business.GetPhoneNumber")
-	if nil != err {
+	return resp.PhoneInfo, err
-		return
-	}
-
-	info = resp.PhoneInfo
-	return
 }

miniprogram/message/message.go

@@ -9,6 +9,8 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/tidwall/gjson"
+
 	"github.com/silenceper/wechat/v2/miniprogram/context"
 	"github.com/silenceper/wechat/v2/miniprogram/security"
 	"github.com/silenceper/wechat/v2/util"
@@ -39,12 +41,25 @@ const (
 	EventTypeXpayGoodsDeliverNotify EventType = "xpay_goods_deliver_notify"
 	// EventTypeXpayCoinPayNotify 代币支付推送事件
 	EventTypeXpayCoinPayNotify EventType = "xpay_coin_pay_notify"
+	// EventSubscribePopup 用户操作订阅通知弹窗事件推送，用户在图文等场景内订阅通知的操作
+	EventSubscribePopup EventType = "subscribe_msg_popup_event"
+	// EventSubscribeMsgChange 用户管理订阅通知，用户在服务通知管理页面做通知管理时的操作
+	EventSubscribeMsgChange EventType = "subscribe_msg_change_event"
+	// EventSubscribeMsgSent 发送订阅通知，调用 bizsend 接口发送通知
+	EventSubscribeMsgSent EventType = "subscribe_msg_sent_event"
 	// ConfirmReceiveMethodAuto 自动确认收货
 	ConfirmReceiveMethodAuto ConfirmReceiveMethod = 1
 	// ConfirmReceiveMethodManual 手动确认收货
 	ConfirmReceiveMethodManual ConfirmReceiveMethod = 2
 )
 
+const (
+	// InfoTypeAcceptSubscribeMessage 接受订阅通知
+	InfoTypeAcceptSubscribeMessage InfoType = "accept"
+	// InfoTypeRejectSubscribeMessage 拒绝订阅通知
+	InfoTypeRejectSubscribeMessage InfoType = "reject"
+)
+
 // PushReceiver 接收消息推送
 // 暂仅支付 Aes 加密方式
 type PushReceiver struct {
@@ -188,19 +203,98 @@ func (receiver *PushReceiver) getEvent(dataType string, eventType EventType, dec
 		var pushData PushDataXpayCoinPayNotify
 		err := receiver.unmarshal(dataType, decryptMsg, &pushData)
 		return &pushData, err
+	case EventSubscribePopup:
+		// 用户操作订阅通知弹窗事件推送
+		return receiver.unmarshalSubscribePopup(dataType, decryptMsg)
+	case EventSubscribeMsgChange:
+		// 用户管理订阅通知事件推送
+		return receiver.unmarshalSubscribeMsgChange(dataType, decryptMsg)
+	case EventSubscribeMsgSent:
+		// 用户发送订阅通知事件推送
+		return receiver.unmarshalSubscribeMsgSent(dataType, decryptMsg)
 	}
 	// 暂不支持其他事件类型，直接返回解密后的数据，由调用方处理
 	return decryptMsg, nil
 }
 
 // unmarshal 解析推送的数据
-func (receiver *PushReceiver) unmarshal(dateType string, decryptMsg []byte, pushData interface{}) error {
+func (receiver *PushReceiver) unmarshal(dataType string, decryptMsg []byte, pushData interface{}) error {
-	if dateType == DataTypeXML {
+	if dataType == DataTypeXML {
 		return xml.Unmarshal(decryptMsg, pushData)
 	}
 	return json.Unmarshal(decryptMsg, pushData)
 }
 
+// unmarshalSubscribePopup
+func (receiver *PushReceiver) unmarshalSubscribePopup(dataType string, decryptMsg []byte) (PushData, error) {
+	var pushData PushDataSubscribePopup
+	err := receiver.unmarshal(dataType, decryptMsg, &pushData)
+	if err == nil {
+		listData := gjson.Get(string(decryptMsg), "List")
+		if listData.IsObject() {
+			listItem := SubscribeMsgPopupEventList{}
+			if parseErr := json.Unmarshal([]byte(listData.Raw), &listItem); parseErr != nil {
+				return &pushData, parseErr
+			}
+			pushData.SetSubscribeMsgPopupEvents([]SubscribeMsgPopupEventList{listItem})
+		} else if listData.IsArray() {
+			listItems := make([]SubscribeMsgPopupEventList, 0)
+			if parseErr := json.Unmarshal([]byte(listData.Raw), &listItems); parseErr != nil {
+				return &pushData, parseErr
+			}
+			pushData.SetSubscribeMsgPopupEvents(listItems)
+		}
+	}
+
+	return &pushData, err
+}
+
+// unmarshalSubscribeMsgChange 解析用户管理订阅通知事件推送
+func (receiver *PushReceiver) unmarshalSubscribeMsgChange(dataType string, decryptMsg []byte) (PushData, error) {
+	var pushData PushDataSubscribeMsgChange
+	err := receiver.unmarshal(dataType, decryptMsg, &pushData)
+	if err == nil {
+		listData := gjson.Get(string(decryptMsg), "List")
+		if listData.IsObject() {
+			listItem := SubscribeMsgChangeList{}
+			if parseErr := json.Unmarshal([]byte(listData.Raw), &listItem); parseErr != nil {
+				return &pushData, parseErr
+			}
+			pushData.SetSubscribeMsgChangeEvents([]SubscribeMsgChangeList{listItem})
+		} else if listData.IsArray() {
+			listItems := make([]SubscribeMsgChangeList, 0)
+			if parseErr := json.Unmarshal([]byte(listData.Raw), &listItems); parseErr != nil {
+				return &pushData, parseErr
+			}
+			pushData.SetSubscribeMsgChangeEvents(listItems)
+		}
+	}
+	return &pushData, err
+}
+
+// unmarshalSubscribeMsgSent 解析用户发送订阅通知事件推送
+func (receiver *PushReceiver) unmarshalSubscribeMsgSent(dataType string, decryptMsg []byte) (PushData, error) {
+	var pushData PushDataSubscribeMsgSent
+	err := receiver.unmarshal(dataType, decryptMsg, &pushData)
+	if err == nil {
+		listData := gjson.Get(string(decryptMsg), "List")
+		if listData.IsObject() {
+			listItem := SubscribeMsgSentList{}
+			if parseErr := json.Unmarshal([]byte(listData.Raw), &listItem); parseErr != nil {
+				return &pushData, parseErr
+			}
+			pushData.SetSubscribeMsgSentEvents([]SubscribeMsgSentList{listItem})
+		} else if listData.IsArray() {
+			listItems := make([]SubscribeMsgSentList, 0)
+			if parseErr := json.Unmarshal([]byte(listData.Raw), &listItems); parseErr != nil {
+				return &pushData, parseErr
+			}
+			pushData.SetSubscribeMsgSentEvents(listItems)
+		}
+	}
+	return &pushData, err
+}
+
 // DataReceived 接收到的数据
 type DataReceived struct {
 	Encrypt string `json:"Encrypt" xml:"Encrypt"` // 加密的消息体
@@ -304,10 +398,10 @@ type PushDataSecVodUpload struct {
 
 // SecVodUploadEvent 短剧媒资上传完成事件
 type SecVodUploadEvent struct {
-	MediaID       string `json:"media_id" xml:"media_id"`             // 媒资id
+	MediaID       int64  `json:"media_id" xml:"media_id"`             // 媒资 id
 	SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值。
-	Errcode       int    `json:"errcode" xml:"errcode"`               // 错误码，上传失败时该值非
+	ErrCode       int    `json:"errcode" xml:"errcode"`               // 错误码，上传失败时该值非
-	Errmsg        string `json:"errmsg" xml:"errmsg"`                 // 错误提示
+	ErrMsg        string `json:"errmsg" xml:"errmsg"`                 // 错误提示
 }
 
 // PushDataSecVodAudit 短剧媒资审核状态
@@ -318,7 +412,7 @@ type PushDataSecVodAudit struct {
 
 // SecVodAuditEvent 短剧媒资审核状态事件
 type SecVodAuditEvent struct {
-	DramaID       string           `json:"drama_id" xml:"drama_id"`             // 剧目id
+	DramaID       int64            `json:"drama_id" xml:"drama_id"`             // 剧目 id
 	SourceContext string           `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值
 	AuditDetail   DramaAuditDetail `json:"audit_detail" xml:"audit_detail"`     // 剧目审核结果，单独每一集的审核结果可以根据 drama_id 查询剧集详情得到
 }
@@ -373,3 +467,113 @@ type CoinInfo struct {
 	ActualPrice int64  `json:"ActualPrice" xml:"ActualPrice"` // 物品实际支付价格（单位：分）
 	Attach      string `json:"Attach" xml:"Attach"`           // 透传信息
 }
+
+// PushDataSubscribePopup 用户操作订阅通知弹窗事件推送
+type PushDataSubscribePopup struct {
+	CommonPushData
+	subscribeMsgPopupEventList []SubscribeMsgPopupEventList `json:"-"`
+	SubscribeMsgPopupEvent     SubscribeMsgPopupEvent       `xml:"SubscribeMsgPopupEvent"`
+}
+
+// SubscribeMsgPopupEvent 用户操作订阅通知弹窗消息回调
+type SubscribeMsgPopupEvent struct {
+	List []SubscribeMsgPopupEventList `xml:"List"`
+}
+
+// SubscribeMsgPopupEventList 订阅消息事件列表
+type SubscribeMsgPopupEventList struct {
+	TemplateID            string `xml:"TemplateId" json:"TemplateId"`
+	SubscribeStatusString string `xml:"SubscribeStatusString" json:"SubscribeStatusString"`
+	PopupScene            string `xml:"PopupScene" json:"PopupScene"`
+}
+
+// SetSubscribeMsgPopupEvents 设置订阅消息事件
+func (s *PushDataSubscribePopup) SetSubscribeMsgPopupEvents(list []SubscribeMsgPopupEventList) {
+	s.subscribeMsgPopupEventList = list
+}
+
+// GetSubscribeMsgPopupEvents 获取订阅消息事件数据
+func (s *PushDataSubscribePopup) GetSubscribeMsgPopupEvents() []SubscribeMsgPopupEventList {
+	if s.subscribeMsgPopupEventList != nil {
+		return s.subscribeMsgPopupEventList
+	}
+
+	if s.SubscribeMsgPopupEvent.List == nil || len(s.SubscribeMsgPopupEvent.List) < 1 {
+		return nil
+	}
+	return s.SubscribeMsgPopupEvent.List
+}
+
+// PushDataSubscribeMsgChange 用户管理订阅通知事件推送
+type PushDataSubscribeMsgChange struct {
+	CommonPushData
+	SubscribeMsgChangeEvent SubscribeMsgChangeEvent  `xml:"SubscribeMsgChangeEvent"`
+	subscribeMsgChangeList  []SubscribeMsgChangeList `json:"-"`
+}
+
+// SubscribeMsgChangeEvent 用户管理订阅通知回调
+type SubscribeMsgChangeEvent struct {
+	List []SubscribeMsgChangeList `xml:"List" json:"List"`
+}
+
+// SubscribeMsgChangeList 订阅消息事件列表
+type SubscribeMsgChangeList struct {
+	TemplateID            string `xml:"TemplateId" json:"TemplateId"`
+	SubscribeStatusString string `xml:"SubscribeStatusString" json:"SubscribeStatusString"`
+}
+
+// SetSubscribeMsgChangeEvents 设置订阅消息事件
+func (s *PushDataSubscribeMsgChange) SetSubscribeMsgChangeEvents(list []SubscribeMsgChangeList) {
+	s.subscribeMsgChangeList = list
+}
+
+// GetSubscribeMsgChangeEvents 获取订阅消息事件数据
+func (s *PushDataSubscribeMsgChange) GetSubscribeMsgChangeEvents() []SubscribeMsgChangeList {
+	if s.subscribeMsgChangeList != nil {
+		return s.subscribeMsgChangeList
+	}
+
+	if s.SubscribeMsgChangeEvent.List == nil || len(s.SubscribeMsgChangeEvent.List) < 1 {
+		return nil
+	}
+
+	return s.SubscribeMsgChangeEvent.List
+}
+
+// PushDataSubscribeMsgSent 用户发送订阅通知事件推送
+type PushDataSubscribeMsgSent struct {
+	CommonPushData
+	SubscribeMsgSentEvent     SubscribeMsgSentEvent  `xml:"SubscribeMsgSentEvent"`
+	subscribeMsgSentEventList []SubscribeMsgSentList `json:"-"`
+}
+
+// SubscribeMsgSentEvent 用户发送订阅通知回调
+type SubscribeMsgSentEvent struct {
+	List []SubscribeMsgSentList `xml:"List" json:"List"`
+}
+
+// SubscribeMsgSentList 订阅消息事件列表
+type SubscribeMsgSentList struct {
+	TemplateID  string `xml:"TemplateId" json:"TemplateId"`
+	MsgID       string `xml:"MsgID" json:"MsgID"`
+	ErrorCode   int    `xml:"ErrorCode" json:"ErrorCode"`
+	ErrorStatus string `xml:"ErrorStatus" json:"ErrorStatus"`
+}
+
+// SetSubscribeMsgSentEvents 设置订阅消息事件
+func (s *PushDataSubscribeMsgSent) SetSubscribeMsgSentEvents(list []SubscribeMsgSentList) {
+	s.subscribeMsgSentEventList = list
+}
+
+// GetSubscribeMsgSentEvents 获取订阅消息事件数据
+func (s *PushDataSubscribeMsgSent) GetSubscribeMsgSentEvents() []SubscribeMsgSentList {
+	if s.subscribeMsgSentEventList != nil {
+		return s.subscribeMsgSentEventList
+	}
+
+	if s.SubscribeMsgSentEvent.List == nil || len(s.SubscribeMsgSentEvent.List) < 1 {
+		return nil
+	}
+
+	return s.SubscribeMsgSentEvent.List
+}

miniprogram/message/reply.go

@@ -0,0 +1,15 @@
+package message
+
+import "errors"
+
+// ErrInvalidReply 无效的回复
+var ErrInvalidReply = errors.New("无效的回复信息")
+
+// ErrUnsupportedReply 不支持的回复类型
+var ErrUnsupportedReply = errors.New("不支持的回复消息")
+
+// Reply 消息回复
+type Reply struct {
+	MsgType MsgType
+	MsgData interface{}
+}

miniprogram/message/updatable_msg.go

@@ -0,0 +1,102 @@
+package message
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// createActivityURL 创建 activity_id
+	createActivityURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?access_token=%s"
+	// SendUpdatableMsgURL 修改动态消息
+	setUpdatableMsgURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/send?access_token=%s"
+)
+
+// UpdatableTargetState 动态消息状态
+type UpdatableTargetState int
+
+const (
+	// TargetStateNotStarted 未开始
+	TargetStateNotStarted UpdatableTargetState = 0
+	// TargetStateStarted 已开始
+	TargetStateStarted UpdatableTargetState = 1
+	// TargetStateFinished 已结束
+	TargetStateFinished UpdatableTargetState = 2
+)
+
+// UpdatableMessage 动态消息
+type UpdatableMessage struct {
+	*context.Context
+}
+
+// NewUpdatableMessage 实例化
+func NewUpdatableMessage(ctx *context.Context) *UpdatableMessage {
+	return &UpdatableMessage{
+		Context: ctx,
+	}
+}
+
+// CreateActivityID 创建 activity_id
+func (updatableMessage *UpdatableMessage) CreateActivityID() (res CreateActivityIDResponse, err error) {
+	accessToken, err := updatableMessage.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf(createActivityURL, accessToken)
+	response, err := util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	err = util.DecodeWithError(response, &res, "CreateActivityID")
+	return
+}
+
+// SetUpdatableMsg 修改动态消息
+func (updatableMessage *UpdatableMessage) SetUpdatableMsg(activityID string, targetState UpdatableTargetState, template UpdatableMsgTemplate) (err error) {
+	accessToken, err := updatableMessage.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf(setUpdatableMsgURL, accessToken)
+	data := SendUpdatableMsgReq{
+		ActivityID:   activityID,
+		TargetState:  targetState,
+		TemplateInfo: template,
+	}
+
+	response, err := util.PostJSON(uri, data)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(response, "SendUpdatableMsg")
+}
+
+// CreateActivityIDResponse 创建 activity_id 返回
+type CreateActivityIDResponse struct {
+	util.CommonError
+
+	ActivityID     string `json:"activity_id"`
+	ExpirationTime int64  `json:"expiration_time"`
+}
+
+// UpdatableMsgTemplate 动态消息模板
+type UpdatableMsgTemplate struct {
+	ParameterList []UpdatableMsgParameter `json:"parameter_list"`
+}
+
+// UpdatableMsgParameter 动态消息参数
+type UpdatableMsgParameter struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+// SendUpdatableMsgReq 修改动态消息参数
+type SendUpdatableMsgReq struct {
+	ActivityID   string               `json:"activity_id"`
+	TemplateInfo UpdatableMsgTemplate `json:"template_info"`
+	TargetState  UpdatableTargetState `json:"target_state"`
+}

miniprogram/minidrama/domain.go

@@ -180,7 +180,7 @@ type MediaInfo struct {
 	CreateTime  int64             `json:"create_time"`  // 	上传时间，时间戳。
 	ExpireTime  int64             `json:"expire_time"`  // 过期时间，时间戳。
 	DramaID     int64             `json:"drama_id"`     // 所属剧目 id。
-	FileSize    string            `json:"file_size"`    // 媒资文件大小，单位：字节。
+	FileSize    int64             `json:"file_size"`    // 媒资文件大小，单位：字节。
 	Duration    int64             `json:"duration"`     // 播放时长，单位：秒。
 	Name        string            `json:"name"`         // 媒资文件名。
 	Description string            `json:"description"`  // 描述。

miniprogram/minidrama/minidrama.go

@@ -27,7 +27,7 @@ import (
 )
 
 // SingleFileUpload 单文件上传
-func (s *MiniDrama) SingleFileUpload(ctx context.Context, in *SingleFileUploadRequest) (out *SingleFileUploadResponse, err error) {
+func (s *MiniDrama) SingleFileUpload(ctx context.Context, in *SingleFileUploadRequest) (out SingleFileUploadResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, singleFileUpload); err != nil {
 		return
@@ -76,12 +76,12 @@ func (s *MiniDrama) SingleFileUpload(ctx context.Context, in *SingleFileUploadRe
 		return
 	}
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "SingleFileUpload")
+	err = util.DecodeWithError(response, &out, "SingleFileUpload")
 	return
 }
 
 // PullUpload 拉取上传
-func (s *MiniDrama) PullUpload(ctx context.Context, in *PullUploadRequest) (out *PullUploadResponse, err error) {
+func (s *MiniDrama) PullUpload(ctx context.Context, in *PullUploadRequest) (out PullUploadResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, pullUpload); err != nil {
 		return
@@ -92,12 +92,12 @@ func (s *MiniDrama) PullUpload(ctx context.Context, in *PullUploadRequest) (out
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "PullUpload")
+	err = util.DecodeWithError(response, &out, "PullUpload")
 	return
 }
 
 // GetTask 查询任务状态
-func (s *MiniDrama) GetTask(ctx context.Context, in *GetTaskRequest) (out *GetTaskResponse, err error) {
+func (s *MiniDrama) GetTask(ctx context.Context, in *GetTaskRequest) (out GetTaskResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, getTask); err != nil {
 		return
@@ -109,12 +109,12 @@ func (s *MiniDrama) GetTask(ctx context.Context, in *GetTaskRequest) (out *GetTa
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "GetTask")
+	err = util.DecodeWithError(response, &out, "GetTask")
 	return
 }
 
 // ApplyUpload 申请分片上传
-func (s *MiniDrama) ApplyUpload(ctx context.Context, in *ApplyUploadRequest) (out *ApplyUploadResponse, err error) {
+func (s *MiniDrama) ApplyUpload(ctx context.Context, in *ApplyUploadRequest) (out ApplyUploadResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, applyUpload); err != nil {
 		return
@@ -126,13 +126,13 @@ func (s *MiniDrama) ApplyUpload(ctx context.Context, in *ApplyUploadRequest) (ou
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "ApplyUpload")
+	err = util.DecodeWithError(response, &out, "ApplyUpload")
 	return
 }
 
 // UploadPart 上传分片
 // Content-Type 需要指定为 multipart/form-data; boundary=<delimiter>，<箭头括号>表示必须替换为有效值的变量。
-func (s *MiniDrama) UploadPart(ctx context.Context, in *UploadPartRequest) (out *UploadPartResponse, err error) {
+func (s *MiniDrama) UploadPart(ctx context.Context, in *UploadPartRequest) (out UploadPartResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, uploadPart); err != nil {
 		return
@@ -165,12 +165,12 @@ func (s *MiniDrama) UploadPart(ctx context.Context, in *UploadPartRequest) (out
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "UploadPart")
+	err = util.DecodeWithError(response, &out, "UploadPart")
 	return
 }
 
 // CommitUpload 确认上传
-func (s *MiniDrama) CommitUpload(ctx context.Context, in *CommitUploadRequest) (out *CommitUploadResponse, err error) {
+func (s *MiniDrama) CommitUpload(ctx context.Context, in *CommitUploadRequest) (out CommitUploadResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, commitUpload); err != nil {
 		return
@@ -182,12 +182,12 @@ func (s *MiniDrama) CommitUpload(ctx context.Context, in *CommitUploadRequest) (
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "CommitUpload")
+	err = util.DecodeWithError(response, &out, "CommitUpload")
 	return
 }
 
 // ListMedia 获取媒体列表
-func (s *MiniDrama) ListMedia(ctx context.Context, in *ListMediaRequest) (out *ListMediaResponse, err error) {
+func (s *MiniDrama) ListMedia(ctx context.Context, in *ListMediaRequest) (out ListMediaResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, listMedia); err != nil {
 		return
@@ -199,12 +199,12 @@ func (s *MiniDrama) ListMedia(ctx context.Context, in *ListMediaRequest) (out *L
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "ListMedia")
+	err = util.DecodeWithError(response, &out, "ListMedia")
 	return
 }
 
 // GetMedia 获取媒资详细信息
-func (s *MiniDrama) GetMedia(ctx context.Context, in *GetMediaRequest) (out *GetMediaResponse, err error) {
+func (s *MiniDrama) GetMedia(ctx context.Context, in *GetMediaRequest) (out GetMediaResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, getMedia); err != nil {
 		return
@@ -216,12 +216,12 @@ func (s *MiniDrama) GetMedia(ctx context.Context, in *GetMediaRequest) (out *Get
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "GetMedia")
+	err = util.DecodeWithError(response, &out, "GetMedia")
 	return
 }
 
 // GetMediaLink 获取媒资播放链接
-func (s *MiniDrama) GetMediaLink(ctx context.Context, in *GetMediaLinkRequest) (out *GetMediaLinkResponse, err error) {
+func (s *MiniDrama) GetMediaLink(ctx context.Context, in *GetMediaLinkRequest) (out GetMediaLinkResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, getMediaLink); err != nil {
 		return
@@ -233,12 +233,12 @@ func (s *MiniDrama) GetMediaLink(ctx context.Context, in *GetMediaLinkRequest) (
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "GetMediaLink")
+	err = util.DecodeWithError(response, &out, "GetMediaLink")
 	return
 }
 
 // DeleteMedia 删除媒体
-func (s *MiniDrama) DeleteMedia(ctx context.Context, in *DeleteMediaRequest) (out *DeleteMediaResponse, err error) {
+func (s *MiniDrama) DeleteMedia(ctx context.Context, in *DeleteMediaRequest) (out DeleteMediaResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, deleteMedia); err != nil {
 		return
@@ -250,12 +250,12 @@ func (s *MiniDrama) DeleteMedia(ctx context.Context, in *DeleteMediaRequest) (ou
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "DeleteMedia")
+	err = util.DecodeWithError(response, &out, "DeleteMedia")
 	return
 }
 
 // AuditDrama 审核剧本
-func (s *MiniDrama) AuditDrama(ctx context.Context, in *AuditDramaRequest) (out *AuditDramaResponse, err error) {
+func (s *MiniDrama) AuditDrama(ctx context.Context, in *AuditDramaRequest) (out AuditDramaResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, auditDrama); err != nil {
 		return
@@ -267,12 +267,12 @@ func (s *MiniDrama) AuditDrama(ctx context.Context, in *AuditDramaRequest) (out
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "AuditDrama")
+	err = util.DecodeWithError(response, &out, "AuditDrama")
 	return
 }
 
 // ListDramas 获取剧目列表
-func (s *MiniDrama) ListDramas(ctx context.Context, in *ListDramasRequest) (out *ListDramasResponse, err error) {
+func (s *MiniDrama) ListDramas(ctx context.Context, in *ListDramasRequest) (out ListDramasResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, listDramas); err != nil {
 		return
@@ -284,12 +284,12 @@ func (s *MiniDrama) ListDramas(ctx context.Context, in *ListDramasRequest) (out
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "ListDramas")
+	err = util.DecodeWithError(response, &out, "ListDramas")
 	return
 }
 
 // GetDrama 获取剧目信息
-func (s *MiniDrama) GetDrama(ctx context.Context, in *GetDramaRequest) (out *GetDramaResponse, err error) {
+func (s *MiniDrama) GetDrama(ctx context.Context, in *GetDramaRequest) (out GetDramaResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, getDrama); err != nil {
 		return
@@ -300,12 +300,12 @@ func (s *MiniDrama) GetDrama(ctx context.Context, in *GetDramaRequest) (out *Get
 		return
 	}
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "GetDrama")
+	err = util.DecodeWithError(response, &out, "GetDrama")
 	return
 }
 
 // GetCdnUsageData 查询 CDN 用量数据
-func (s *MiniDrama) GetCdnUsageData(ctx context.Context, in *GetCdnUsageDataRequest) (out *GetCdnUsageDataResponse, err error) {
+func (s *MiniDrama) GetCdnUsageData(ctx context.Context, in *GetCdnUsageDataRequest) (out GetCdnUsageDataResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, getCdnUsageData); err != nil {
 		return
@@ -316,12 +316,12 @@ func (s *MiniDrama) GetCdnUsageData(ctx context.Context, in *GetCdnUsageDataRequ
 		return
 	}
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "GetCdnUsageData")
+	err = util.DecodeWithError(response, &out, "GetCdnUsageData")
 	return
 }
 
 // GetCdnLogs 查询 CDN 日志
-func (s *MiniDrama) GetCdnLogs(ctx context.Context, in *GetCdnLogsRequest) (out *GetCdnLogsResponse, err error) {
+func (s *MiniDrama) GetCdnLogs(ctx context.Context, in *GetCdnLogsRequest) (out GetCdnLogsResponse, err error) {
 	var address string
 	if address, err = s.requestAddress(ctx, getCdnLogs); err != nil {
 		return
@@ -332,7 +332,7 @@ func (s *MiniDrama) GetCdnLogs(ctx context.Context, in *GetCdnLogsRequest) (out
 		return
 	}
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "GetCdnLogs")
+	err = util.DecodeWithError(response, &out, "GetCdnLogs")
 	return
 }
 

miniprogram/miniprogram.go

@@ -15,6 +15,7 @@ import (
 	"github.com/silenceper/wechat/v2/miniprogram/order"
 	"github.com/silenceper/wechat/v2/miniprogram/privacy"
 	"github.com/silenceper/wechat/v2/miniprogram/qrcode"
+	"github.com/silenceper/wechat/v2/miniprogram/redpacketcover"
 	"github.com/silenceper/wechat/v2/miniprogram/riskcontrol"
 	"github.com/silenceper/wechat/v2/miniprogram/security"
 	"github.com/silenceper/wechat/v2/miniprogram/shortlink"
@@ -155,3 +156,13 @@ func (miniProgram *MiniProgram) GetShipping() *order.Shipping {
 func (miniProgram *MiniProgram) GetMiniDrama() *minidrama.MiniDrama {
 	return minidrama.NewMiniDrama(miniProgram.ctx)
 }
+
+// GetRedPacketCover 小程序微信红包封面 API
+func (miniProgram *MiniProgram) GetRedPacketCover() *redpacketcover.RedPacketCover {
+	return redpacketcover.NewRedPacketCover(miniProgram.ctx)
+}
+
+// GetUpdatableMessage 小程序动态消息
+func (miniProgram *MiniProgram) GetUpdatableMessage() *message.UpdatableMessage {
+	return message.NewUpdatableMessage(miniProgram.ctx)
+}

miniprogram/order/shipping.go

@@ -183,7 +183,7 @@ type GetShippingOrderRequest struct {
 
 // ShippingItem 物流信息
 type ShippingItem struct {
-	TrackingNo     string `json:"tracking_no"`     // 物流单号，示例值: "323244567777
+	TrackingNo     string `json:"tracking_no"`     // 物流单号，示例值："323244567777
 	ExpressCompany string `json:"express_company"` // 物流公司编码，快递公司 ID，物流快递发货时必填；参见「查询物流公司编码列表」
 	UploadTime     int64  `json:"upload_time"`     // 上传物流信息时间，时间戳形式
 }

miniprogram/privacy/privacy.go

@@ -103,11 +103,8 @@ func (s *Privacy) GetPrivacySetting(privacyVer int) (GetPrivacySettingResponse,
 	}
 	// 返回错误信息
 	var result GetPrivacySettingResponse
-	if err = util.DecodeWithError(response, &result, "getprivacysetting"); err != nil {
+	err = util.DecodeWithError(response, &result, "getprivacysetting")
-		return GetPrivacySettingResponse{}, err
+	return result, err
-	}
-
-	return result, nil
 }
 
 // SetPrivacySetting 更新小程序权限配置
@@ -130,11 +127,7 @@ func (s *Privacy) SetPrivacySetting(privacyVer int, ownerSetting OwnerSetting, s
 	}
 
 	// 返回错误信息
-	if err = util.DecodeWithCommonError(response, "setprivacysetting"); err != nil {
+	return util.DecodeWithCommonError(response, "setprivacysetting")
-		return err
-	}
-
-	return err
 }
 
 // UploadPrivacyExtFileResponse 上传权限定义模板响应参数
@@ -159,9 +152,6 @@ func (s *Privacy) UploadPrivacyExtFile(fileData []byte) (UploadPrivacyExtFileRes
 
 	// 返回错误信息
 	var result UploadPrivacyExtFileResponse
-	if err = util.DecodeWithError(response, &result, "setprivacysetting"); err != nil {
+	err = util.DecodeWithError(response, &result, "setprivacysetting")
-		return UploadPrivacyExtFileResponse{}, err
-	}
-
 	return result, err
 }

miniprogram/qrcode/qrcode.go

@@ -36,7 +36,7 @@ type Color struct {
 
 // QRCoder 小程序码参数
 type QRCoder struct {
-	// page 必须是已经发布的小程序存在的页面,根路径前不要填加 /,不能携带参数（参数请放在scene字段里），如果不填写这个字段，默认跳主页面
+	// page 必须是已经发布的小程序存在的页面，根路径前不要填加 /,不能携带参数（参数请放在 scene 字段里），如果不填写这个字段，默认跳主页面
 	Page string `json:"page,omitempty"`
 	// path 扫码进入的小程序页面路径
 	Path string `json:"path,omitempty"`

miniprogram/redpacketcover/redpacketcover.go

@@ -0,0 +1,59 @@
+package redpacketcover
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	getRedPacketCoverURL = "https://api.weixin.qq.com/redpacketcover/wxapp/cover_url/get_by_token?access_token=%s"
+)
+
+// RedPacketCover struct
+type RedPacketCover struct {
+	*context.Context
+}
+
+// NewRedPacketCover 实例
+func NewRedPacketCover(context *context.Context) *RedPacketCover {
+	redPacketCover := new(RedPacketCover)
+	redPacketCover.Context = context
+	return redPacketCover
+}
+
+// GetRedPacketCoverRequest 获取微信红包封面参数
+type GetRedPacketCoverRequest struct {
+	// openid 可领取用户的 openid
+	OpenID string `json:"openid"`
+	// ctoken 在红包封面平台获取发放 ctoken（需要指定可以发放的 appid）
+	CToken string `json:"ctoken"`
+}
+
+// GetRedPacketCoverResp 获取微信红包封面
+type GetRedPacketCoverResp struct {
+	util.CommonError
+	Data struct {
+		URL string `json:"url"`
+	} `json:"data"` // 唯一请求标识
+}
+
+// GetRedPacketCoverURL 获得指定用户可以领取的红包封面链接。获取参数 ctoken 参考微信红包封面开放平台
+// 文档地址：https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/red-packet-cover/getRedPacketCoverUrl.html
+func (cover *RedPacketCover) GetRedPacketCoverURL(coderParams GetRedPacketCoverRequest) (res GetRedPacketCoverResp, err error) {
+	accessToken, err := cover.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf(getRedPacketCoverURL, accessToken)
+	response, err := util.PostJSON(uri, coderParams)
+	if err != nil {
+		return
+	}
+
+	// 使用通用方法返回错误
+	err = util.DecodeWithError(response, &res, "GetRedPacketCoverURL")
+	return
+}

miniprogram/security/security.go

@@ -51,12 +51,7 @@ func (security *Security) MediaCheckAsyncV1(in *MediaCheckAsyncV1Request) (trace
 		TraceID string `json:"trace_id"`
 	}
 	err = util.DecodeWithError(response, &res, "MediaCheckAsyncV1")
-	if err != nil {
+	return res.TraceID, err
-		return
-	}
-
-	traceID = res.TraceID
-	return
 }
 
 // MediaCheckAsyncRequest 图片/音频异步校验请求参数
@@ -93,12 +88,7 @@ func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID s
 		TraceID string `json:"trace_id"`
 	}
 	err = util.DecodeWithError(response, &res, "MediaCheckAsync")
-	if err != nil {
+	return res.TraceID, err
-		return
-	}
-
-	traceID = res.TraceID
-	return
 }
 
 // ImageCheckV1 校验一张图片是否含有违法违规内容（同步）

miniprogram/shortlink/shortlink.go

@@ -60,11 +60,7 @@ func (shortLink *ShortLink) generate(shortLinkParams ShortLinker) (string, error
 	// 使用通用方法返回错误
 	var res resShortLinker
 	err = util.DecodeWithError(response, &res, "GenerateShortLink")
-	if err != nil {
+	return res.Link, err
-		return "", err
-	}
-
-	return res.Link, nil
 }
 
 // GenerateShortLinkPermanent 生成永久 shortLink

miniprogram/subscribe/subscribe.go

@@ -43,8 +43,8 @@ func NewSubscribe(ctx *context.Context) *Subscribe {
 type Message struct {
 	ToUser           string               `json:"touser"`            // 必选，接收者（用户）的 openid
 	TemplateID       string               `json:"template_id"`       // 必选，所需下发的订阅模板 id
-	Page             string               `json:"page"`              // 可选，点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。
+	Page             string               `json:"page"`              // 可选，点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数，（示例 index?foo=bar）。该字段不填则模板无跳转。
-	Data             map[string]*DataItem `json:"data"`              // 必选, 模板内容
+	Data             map[string]*DataItem `json:"data"`              // 必选，模板内容
 	MiniprogramState string               `json:"miniprogram_state"` // 可选，跳转小程序类型：developer 为开发版；trial 为体验版；formal 为正式版；默认为正式版
 	Lang             string               `json:"lang"`              // 入小程序查看”的语言类型，支持 zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为 zh_CN
 }
@@ -168,11 +168,7 @@ func (s *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (templa
 	}
 	var result resSubscribeAdd
 	err = util.DecodeWithError(response, &result, "AddSubscribe")
-	if err != nil {
+	return result.TemplateID, err
-		return
-	}
-	templateID = result.TemplateID
-	return
 }
 
 // Delete 删除私有模板

miniprogram/urllink/urllink.go

@@ -65,8 +65,5 @@ func (u *URLLink) Generate(params *ULParams) (string, error) {
 	}
 	var resp ULResult
 	err = util.DecodeWithError(response, &resp, "URLLink.Generate")
-	if err != nil {
+	return resp.URLLink, err
-		return "", err
-	}
-	return resp.URLLink, nil
 }

miniprogram/urlscheme/query.go

@@ -37,7 +37,7 @@ type SchemeInfo struct {
 // https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
 type resQueryScheme struct {
 	// 通用错误
-	*util.CommonError
+	util.CommonError
 	// scheme 配置
 	SchemeInfo SchemeInfo `json:"scheme_info"`
 	// 访问该链接的 openid，没有用户访问过则为空字符串
@@ -62,9 +62,5 @@ func (u *URLScheme) QueryScheme(querySchemeParams QueryScheme) (schemeInfo Schem
 	// 使用通用方法返回错误
 	var res resQueryScheme
 	err = util.DecodeWithError(response, &res, "QueryScheme")
-	if err != nil {
+	return res.SchemeInfo, res.VisitOpenid, err
-		return
-	}
-
-	return res.SchemeInfo, res.VisitOpenid, nil
 }

miniprogram/urlscheme/urlscheme.go

@@ -78,8 +78,5 @@ func (u *URLScheme) Generate(params *USParams) (string, error) {
 	}
 	var resp USResult
 	err = util.DecodeWithError(response, &resp, "URLScheme.Generate")
-	if err != nil {
+	return resp.OpenLink, err
-		return "", err
-	}
-	return resp.OpenLink, nil
 }

miniprogram/virtualpayment/virtualpayment.go

@@ -37,7 +37,7 @@ func (s *VirtualPayment) SetSessionKey(sessionKey string) {
 }
 
 // QueryUserBalance 查询虚拟支付余额
-func (s *VirtualPayment) QueryUserBalance(ctx context.Context, in *QueryUserBalanceRequest) (out *QueryUserBalanceResponse, err error) {
+func (s *VirtualPayment) QueryUserBalance(ctx context.Context, in *QueryUserBalanceRequest) (out QueryUserBalanceResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -60,12 +60,12 @@ func (s *VirtualPayment) QueryUserBalance(ctx context.Context, in *QueryUserBala
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "QueryUserBalance")
+	err = util.DecodeWithError(response, &out, "QueryUserBalance")
 	return
 }
 
 // CurrencyPay currency pay 扣减代币（一般用于代币支付）
-func (s *VirtualPayment) CurrencyPay(ctx context.Context, in *CurrencyPayRequest) (out *CurrencyPayResponse, err error) {
+func (s *VirtualPayment) CurrencyPay(ctx context.Context, in *CurrencyPayRequest) (out CurrencyPayResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -88,12 +88,12 @@ func (s *VirtualPayment) CurrencyPay(ctx context.Context, in *CurrencyPayRequest
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "CurrencyPay")
+	err = util.DecodeWithError(response, &out, "CurrencyPay")
 	return
 }
 
 // QueryOrder 查询创建的订单（现金单，非代币单）
-func (s *VirtualPayment) QueryOrder(ctx context.Context, in *QueryOrderRequest) (out *QueryOrderResponse, err error) {
+func (s *VirtualPayment) QueryOrder(ctx context.Context, in *QueryOrderRequest) (out QueryOrderResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -116,12 +116,12 @@ func (s *VirtualPayment) QueryOrder(ctx context.Context, in *QueryOrderRequest)
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "QueryOrder")
+	err = util.DecodeWithError(response, &out, "QueryOrder")
 	return
 }
 
 // CancelCurrencyPay 取消订单 代币支付退款 (currency_pay 接口的逆操作)
-func (s *VirtualPayment) CancelCurrencyPay(ctx context.Context, in *CancelCurrencyPayRequest) (out *CancelCurrencyPayResponse, err error) {
+func (s *VirtualPayment) CancelCurrencyPay(ctx context.Context, in *CancelCurrencyPayRequest) (out CancelCurrencyPayResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -144,13 +144,13 @@ func (s *VirtualPayment) CancelCurrencyPay(ctx context.Context, in *CancelCurren
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "CancelCurrencyPay")
+	err = util.DecodeWithError(response, &out, "CancelCurrencyPay")
 	return
 }
 
 // NotifyProvideGoods 通知发货
 // 通知已经发货完成（只能通知现金单）,正常通过 xpay_goods_deliver_notify 消息推送返回成功就不需要调用这个 api 接口。这个接口用于异常情况推送不成功时手动将单改成已发货状态
-func (s *VirtualPayment) NotifyProvideGoods(ctx context.Context, in *NotifyProvideGoodsRequest) (out *NotifyProvideGoodsResponse, err error) {
+func (s *VirtualPayment) NotifyProvideGoods(ctx context.Context, in *NotifyProvideGoodsRequest) (out NotifyProvideGoodsResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -174,12 +174,12 @@ func (s *VirtualPayment) NotifyProvideGoods(ctx context.Context, in *NotifyProvi
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "NotifyProvideGoods")
+	err = util.DecodeWithError(response, &out, "NotifyProvideGoods")
 	return
 }
 
 // PresentCurrency 代币赠送接口，由于目前不支付按单号查赠送单的功能，所以当需要赠送的时候可以一直重试到返回 0 或者返回 268490004（重复操作）为止
-func (s *VirtualPayment) PresentCurrency(ctx context.Context, in *PresentCurrencyRequest) (out *PresentCurrencyResponse, err error) {
+func (s *VirtualPayment) PresentCurrency(ctx context.Context, in *PresentCurrencyRequest) (out PresentCurrencyResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -203,12 +203,12 @@ func (s *VirtualPayment) PresentCurrency(ctx context.Context, in *PresentCurrenc
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "PresentCurrency")
+	err = util.DecodeWithError(response, &out, "PresentCurrency")
 	return
 }
 
 // DownloadBill 下载订单交易账单
-func (s *VirtualPayment) DownloadBill(ctx context.Context, in *DownloadBillRequest) (out *DownloadBillResponse, err error) {
+func (s *VirtualPayment) DownloadBill(ctx context.Context, in *DownloadBillRequest) (out DownloadBillResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -232,12 +232,12 @@ func (s *VirtualPayment) DownloadBill(ctx context.Context, in *DownloadBillReque
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "DownloadBill")
+	err = util.DecodeWithError(response, &out, "DownloadBill")
 	return
 }
 
 // RefundOrder 退款 对使用 jsapi 接口下的单进行退款
-func (s *VirtualPayment) RefundOrder(ctx context.Context, in *RefundOrderRequest) (out *RefundOrderResponse, err error) {
+func (s *VirtualPayment) RefundOrder(ctx context.Context, in *RefundOrderRequest) (out RefundOrderResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -261,12 +261,12 @@ func (s *VirtualPayment) RefundOrder(ctx context.Context, in *RefundOrderRequest
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "RefundOrder")
+	err = util.DecodeWithError(response, &out, "RefundOrder")
 	return
 }
 
 // CreateWithdrawOrder 创建提现单
-func (s *VirtualPayment) CreateWithdrawOrder(ctx context.Context, in *CreateWithdrawOrderRequest) (out *CreateWithdrawOrderResponse, err error) {
+func (s *VirtualPayment) CreateWithdrawOrder(ctx context.Context, in *CreateWithdrawOrderRequest) (out CreateWithdrawOrderResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -290,12 +290,12 @@ func (s *VirtualPayment) CreateWithdrawOrder(ctx context.Context, in *CreateWith
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "CreateWithdrawOrder")
+	err = util.DecodeWithError(response, &out, "CreateWithdrawOrder")
 	return
 }
 
 // QueryWithdrawOrder 查询提现单
-func (s *VirtualPayment) QueryWithdrawOrder(ctx context.Context, in *QueryWithdrawOrderRequest) (out *QueryWithdrawOrderResponse, err error) {
+func (s *VirtualPayment) QueryWithdrawOrder(ctx context.Context, in *QueryWithdrawOrderRequest) (out QueryWithdrawOrderResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -319,12 +319,12 @@ func (s *VirtualPayment) QueryWithdrawOrder(ctx context.Context, in *QueryWithdr
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "QueryWithdrawOrder")
+	err = util.DecodeWithError(response, &out, "QueryWithdrawOrder")
 	return
 }
 
 // StartUploadGoods 开始上传商品
-func (s *VirtualPayment) StartUploadGoods(ctx context.Context, in *StartUploadGoodsRequest) (out *StartUploadGoodsResponse, err error) {
+func (s *VirtualPayment) StartUploadGoods(ctx context.Context, in *StartUploadGoodsRequest) (out StartUploadGoodsResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -348,12 +348,12 @@ func (s *VirtualPayment) StartUploadGoods(ctx context.Context, in *StartUploadGo
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "StartUploadGoods")
+	err = util.DecodeWithError(response, &out, "StartUploadGoods")
 	return
 }
 
 // QueryUploadGoods 查询上传商品
-func (s *VirtualPayment) QueryUploadGoods(ctx context.Context, in *QueryUploadGoodsRequest) (out *QueryUploadGoodsResponse, err error) {
+func (s *VirtualPayment) QueryUploadGoods(ctx context.Context, in *QueryUploadGoodsRequest) (out QueryUploadGoodsResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -377,12 +377,12 @@ func (s *VirtualPayment) QueryUploadGoods(ctx context.Context, in *QueryUploadGo
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "QueryUploadGoods")
+	err = util.DecodeWithError(response, &out, "QueryUploadGoods")
 	return
 }
 
 // StartPublishGoods 开始发布商品
-func (s *VirtualPayment) StartPublishGoods(ctx context.Context, in *StartPublishGoodsRequest) (out *StartPublishGoodsResponse, err error) {
+func (s *VirtualPayment) StartPublishGoods(ctx context.Context, in *StartPublishGoodsRequest) (out StartPublishGoodsResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -406,12 +406,12 @@ func (s *VirtualPayment) StartPublishGoods(ctx context.Context, in *StartPublish
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "StartPublishGoods")
+	err = util.DecodeWithError(response, &out, "StartPublishGoods")
 	return
 }
 
 // QueryPublishGoods 查询发布商品
-func (s *VirtualPayment) QueryPublishGoods(ctx context.Context, in *QueryPublishGoodsRequest) (out *QueryPublishGoodsResponse, err error) {
+func (s *VirtualPayment) QueryPublishGoods(ctx context.Context, in *QueryPublishGoodsRequest) (out QueryPublishGoodsResponse, err error) {
 	var jsonByte []byte
 	if jsonByte, err = json.Marshal(in); err != nil {
 		return
@@ -435,7 +435,7 @@ func (s *VirtualPayment) QueryPublishGoods(ctx context.Context, in *QueryPublish
 	}
 
 	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, out, "QueryPublishGoods")
+	err = util.DecodeWithError(response, &out, "QueryPublishGoods")
 	return
 }
 

officialaccount/basic/qr.go

@@ -77,19 +77,27 @@ func ShowQRCode(tk *Ticket) string {
 
 // NewTmpQrRequest 新建临时二维码请求实例
 func NewTmpQrRequest(exp time.Duration, scene interface{}) *Request {
-	tq := &Request{
+	var (
+		tq = &Request{
 			ExpireSeconds: int64(exp.Seconds()),
 		}
+		ok bool
+	)
 	switch reflect.ValueOf(scene).Kind() {
 	case reflect.String:
 		tq.ActionName = actionStr
-		tq.ActionInfo.Scene.SceneStr = scene.(string)
+		if tq.ActionInfo.Scene.SceneStr, ok = scene.(string); !ok {
+			panic("scene must be string")
+		}
 	case reflect.Int, reflect.Int8, reflect.Int16,
 		reflect.Int32, reflect.Int64,
 		reflect.Uint, reflect.Uint8, reflect.Uint16,
 		reflect.Uint32, reflect.Uint64:
 		tq.ActionName = actionID
-		tq.ActionInfo.Scene.SceneID = scene.(int)
+		if tq.ActionInfo.Scene.SceneID, ok = scene.(int); !ok {
+			panic("scene must be int")
+		}
+	default:
 	}
 
 	return tq
@@ -97,17 +105,25 @@ func NewTmpQrRequest(exp time.Duration, scene interface{}) *Request {
 
 // NewLimitQrRequest 新建永久二维码请求实例
 func NewLimitQrRequest(scene interface{}) *Request {
-	tq := &Request{}
+	var (
+		tq = &Request{}
+		ok bool
+	)
 	switch reflect.ValueOf(scene).Kind() {
 	case reflect.String:
 		tq.ActionName = actionLimitStr
-		tq.ActionInfo.Scene.SceneStr = scene.(string)
+		if tq.ActionInfo.Scene.SceneStr, ok = scene.(string); !ok {
+			panic("scene must be string")
+		}
 	case reflect.Int, reflect.Int8, reflect.Int16,
 		reflect.Int32, reflect.Int64,
 		reflect.Uint, reflect.Uint8, reflect.Uint16,
 		reflect.Uint32, reflect.Uint64:
 		tq.ActionName = actionLimitID
-		tq.ActionInfo.Scene.SceneID = scene.(int)
+		if tq.ActionInfo.Scene.SceneID, ok = scene.(int); !ok {
+			panic("scene must be int")
+		}
+	default:
 	}
 
 	return tq

officialaccount/basic/short_url.go

@@ -44,9 +44,6 @@ func (basic *Basic) Long2ShortURL(longURL string) (shortURL string, err error) {
 	if err != nil {
 		return
 	}
-	if err = util.DecodeWithError(responseBytes, resp, long2shortAction); err != nil {
+	err = util.DecodeWithError(responseBytes, resp, long2shortAction)
-		return
+	return resp.ShortURL, err
-	}
-	shortURL = resp.ShortURL
-	return
 }

officialaccount/broadcast/broadcast.go

@@ -79,6 +79,10 @@ type sendRequest struct {
 	Mpnews map[string]interface{} `json:"mpnews,omitempty"`
 	// 发送语音
 	Voice map[string]interface{} `json:"voice,omitempty"`
+	// 发送视频
+	Mpvideo map[string]interface{} `json:"mpvideo,omitempty"`
+	// 发送图片 - 预览使用
+	Image map[string]interface{} `json:"image,omitempty"`
 	// 发送图片
 	Images *Image `json:"images,omitempty"`
 	// 发送卡券
@@ -183,7 +187,13 @@ func (broadcast *Broadcast) SendImage(user *User, images *Image) (*Result, error
 		ToUser:  nil,
 		MsgType: MsgTypeImage,
 	}
+	if broadcast.preview {
+		req.Image = map[string]interface{}{
+			"media_id": images.MediaIDs[0],
+		}
+	} else {
 		req.Images = images
+	}
 	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
 	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
 	data, err := util.PostJSON(url, req)
@@ -205,7 +215,7 @@ func (broadcast *Broadcast) SendVideo(user *User, mediaID string, title, descrip
 		ToUser:  nil,
 		MsgType: MsgTypeVideo,
 	}
-	req.Voice = map[string]interface{}{
+	req.Mpvideo = map[string]interface{}{
 		"media_id":    mediaID,
 		"title":       title,
 		"description": description,

officialaccount/customerservice/manager.go

@@ -72,11 +72,7 @@ func (csm *Manager) List() (customerServiceList []*KeFuInfo, err error) {
 	}
 	var res resKeFuList
 	err = util.DecodeWithError(response, &res, "ListCustomerService")
-	if err != nil {
+	return res.KfList, err
-		return
-	}
-	customerServiceList = res.KfList
-	return
 }
 
 // KeFuOnlineInfo 客服在线信息
@@ -107,11 +103,7 @@ func (csm *Manager) OnlineList() (customerServiceOnlineList []*KeFuOnlineInfo, e
 	}
 	var res resKeFuOnlineList
 	err = util.DecodeWithError(response, &res, "ListOnlineCustomerService")
-	if err != nil {
+	return res.KfOnlineList, err
-		return
-	}
-	customerServiceOnlineList = res.KfOnlineList
-	return
 }
 
 // Add 添加客服账号

officialaccount/datacube/publisher.go

@@ -183,9 +183,6 @@ func (cube *DataCube) fetchData(params ParamsPublisher) (response []byte, err er
 	uri := fmt.Sprintf("%s?%s", publisherURL, v.Encode())
 
 	response, err = util.HTTPGet(uri)
-	if err != nil {
-		return
-	}
 	return
 }
 

officialaccount/draft/draft.go

@@ -64,11 +64,7 @@ func (draft *Draft) AddDraft(articles []*Article) (mediaID string, err error) {
 		MediaID string `json:"media_id"`
 	}
 	err = util.DecodeWithError(response, &res, "AddDraft")
-	if err != nil {
+	return res.MediaID, err
-		return
-	}
-	mediaID = res.MediaID
-	return
 }
 
 // GetDraft 获取草稿
@@ -94,12 +90,7 @@ func (draft *Draft) GetDraft(mediaID string) (articles []*Article, err error) {
 		NewsItem []*Article `json:"news_item"`
 	}
 	err = util.DecodeWithError(response, &res, "GetDraft")
-	if err != nil {
+	return res.NewsItem, err
-		return
-	}
-
-	articles = res.NewsItem
-	return
 }
 
 // DeleteDraft 删除草稿
@@ -172,12 +163,7 @@ func (draft *Draft) CountDraft() (total uint, err error) {
 		Total uint `json:"total_count"`
 	}
 	err = util.DecodeWithError(response, &res, "CountDraft")
-	if nil != err {
+	return res.Total, err
-		return
-	}
-
-	total = res.Total
-	return
 }
 
 // ArticleList 草稿列表

officialaccount/freepublish/freepublish.go

@@ -73,12 +73,7 @@ func (freePublish *FreePublish) Publish(mediaID string) (publishID int64, err er
 		PublishID int64 `json:"publish_id"`
 	}
 	err = util.DecodeWithError(response, &res, "SubmitFreePublish")
-	if err != nil {
+	return res.PublishID, err
-		return
-	}
-
-	publishID = res.PublishID
-	return
 }
 
 // PublishStatusList 发布任务状态列表
@@ -191,12 +186,7 @@ func (freePublish *FreePublish) First(articleID string) (list []Article, err err
 		NewsItem []Article `json:"news_item"`
 	}
 	err = util.DecodeWithError(response, &res, "FirstFreePublish")
-	if err != nil {
+	return res.NewsItem, err
-		return
-	}
-
-	list = res.NewsItem
-	return
 }
 
 // ArticleList 发布列表

officialaccount/material/material.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"os"
 
 	"github.com/silenceper/wechat/v2/officialaccount/context"
 	"github.com/silenceper/wechat/v2/util"
@@ -160,8 +162,8 @@ type resAddMaterial struct {
 	URL     string `json:"url"`
 }
 
-// AddMaterial 上传永久性素材（处理视频需要单独上传）
+// AddMaterialFromReader 上传永久性素材（处理视频需要单独上传），从 io.Reader 中读取
-func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
+func (material *Material) AddMaterialFromReader(mediaType MediaType, filename string, reader io.Reader) (mediaID string, url string, err error) {
 	if mediaType == MediaTypeVideo {
 		err = errors.New("永久视频素材上传使用 AddVideo 方法")
 		return
@@ -174,7 +176,7 @@ func (material *Material) AddMaterial(mediaType MediaType, filename string) (med
 
 	uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType)
 	var response []byte
-	response, err = util.PostFile("media", filename, uri)
+	response, err = util.PostFileFromReader("media", filename, uri, reader)
 	if err != nil {
 		return
 	}
@@ -192,13 +194,24 @@ func (material *Material) AddMaterial(mediaType MediaType, filename string) (med
 	return
 }
 
+// AddMaterial 上传永久性素材（处理视频需要单独上传）
+func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return
+	}
+	defer func() { _ = f.Close() }()
+
+	return material.AddMaterialFromReader(mediaType, filename, f)
+}
+
 type reqVideo struct {
 	Title        string `json:"title"`
 	Introduction string `json:"introduction"`
 }
 
-// AddVideo 永久视频素材文件上传
+// AddVideoFromReader 永久视频素材文件上传，从 io.Reader 中读取
-func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) {
+func (material *Material) AddVideoFromReader(filename, title, introduction string, reader io.Reader) (mediaID string, url string, err error) {
 	var accessToken string
 	accessToken, err = material.GetAccessToken()
 	if err != nil {
@@ -222,6 +235,7 @@ func (material *Material) AddVideo(filename, title, introduction string) (mediaI
 			IsFile:     true,
 			Fieldname:  "media",
 			Filename:   filename,
+			FileReader: reader,
 		},
 		{
 			IsFile:    false,
@@ -250,6 +264,17 @@ func (material *Material) AddVideo(filename, title, introduction string) (mediaI
 	return
 }
 
+// AddVideo 永久视频素材文件上传
+func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return "", "", err
+	}
+	defer func() { _ = f.Close() }()
+
+	return material.AddVideoFromReader(filename, title, introduction, f)
+}
+
 type reqDeleteMaterial struct {
 	MediaID string `json:"media_id"`
 }

officialaccount/material/media.go

@@ -11,13 +11,13 @@ import (
 type MediaType string
 
 const (
-	// MediaTypeImage 媒体文件:图片
+	// MediaTypeImage 媒体文件：图片
 	MediaTypeImage MediaType = "image"
-	// MediaTypeVoice 媒体文件:声音
+	// MediaTypeVoice 媒体文件：声音
 	MediaTypeVoice MediaType = "voice"
-	// MediaTypeVideo 媒体文件:视频
+	// MediaTypeVideo 媒体文件：视频
 	MediaTypeVideo MediaType = "video"
-	// MediaTypeThumb 媒体文件:缩略图
+	// MediaTypeThumb 媒体文件：缩略图
 	MediaTypeThumb MediaType = "thumb"
 )
 

officialaccount/message/message.go

@@ -282,7 +282,7 @@ type ResponseEncryptedXMLMsg struct {
 	Nonce        string   `xml:"Nonce"        json:"Nonce"`
 }
 
-// CDATA  使用该类型,在序列化为 xml 文本时文本会被解析器忽略
+// CDATA  使用该类型，在序列化为 xml 文本时文本会被解析器忽略
 type CDATA string
 
 // MarshalXML 实现自己的序列化方法

officialaccount/message/subscribe.go

@@ -31,14 +31,14 @@ func NewSubscribe(context *context.Context) *Subscribe {
 
 // SubscribeMessage 发送的订阅消息内容
 type SubscribeMessage struct {
-	ToUser      string                        `json:"touser"`         // 必须, 接受者OpenID
+	ToUser      string                        `json:"touser"`         // 必须，接受者 OpenID
-	TemplateID  string                        `json:"template_id"`    // 必须, 模版ID
+	TemplateID  string                        `json:"template_id"`    // 必须，模版 ID
-	Page        string                        `json:"page,omitempty"` // 可选, 跳转网页时填写
+	Page        string                        `json:"page,omitempty"` // 可选，跳转网页时填写
-	Data        map[string]*SubscribeDataItem `json:"data"`           // 必须, 模板数据
+	Data        map[string]*SubscribeDataItem `json:"data"`           // 必须，模板数据
 	MiniProgram struct {
 		AppID    string `json:"appid"`    // 所需跳转到的小程序 appid（该小程序 appid 必须与发模板消息的公众号是绑定关联关系）
-		PagePath string `json:"pagepath"` // 所需跳转到小程序的具体页面路径，支持带参数,（示例index?foo=bar）
+		PagePath string `json:"pagepath"` // 所需跳转到小程序的具体页面路径，支持带参数，（示例 index?foo=bar）
-	} `json:"miniprogram"` // 可选,跳转至小程序地址
+	} `json:"miniprogram"` // 可选，跳转至小程序地址
 }
 
 // SubscribeDataItem 模版内某个 .DATA 的值
@@ -90,11 +90,7 @@ func (tpl *Subscribe) List() (templateList []*PrivateSubscribeItem, err error) {
 	}
 	var res resPrivateSubscribeList
 	err = util.DecodeWithError(response, &res, "ListSubscribe")
-	if err != nil {
+	return res.SubscriptionList, err
-		return
-	}
-	templateList = res.SubscriptionList
-	return
 }
 
 type resSubscribeAdd struct {
@@ -123,11 +119,7 @@ func (tpl *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (temp
 	}
 	var result resSubscribeAdd
 	err = util.DecodeWithError(response, &result, "AddSubscribe")
-	if err != nil {
+	return result.TemplateID, err
-		return
-	}
-	templateID = result.TemplateID
-	return
 }
 
 // Delete 删除私有模板
@@ -175,11 +167,7 @@ func (tpl *Subscribe) GetCategory() (categoryList []*PublicTemplateCategory, err
 	}
 	var result resSubscribeCategoryList
 	err = util.DecodeWithError(response, &result, "GetCategory")
-	if err != nil {
+	return result.CategoryList, err
-		return
-	}
-	categoryList = result.CategoryList
-	return
 }
 
 // PublicTemplateKeyWords 模板中的关键词
@@ -210,11 +198,7 @@ func (tpl *Subscribe) GetPubTplKeyWordsByID(titleID string) (keyWordsList []*Pub
 	}
 	var result resPublicTemplateKeyWordsList
 	err = util.DecodeWithError(response, &result, "GetPublicTemplateKeyWords")
-	if err != nil {
+	return result.KeyWordsList, err
-		return
-	}
-	keyWordsList = result.KeyWordsList
-	return
 }
 
 // PublicTemplateTitle 类目下的公共模板
@@ -246,10 +230,5 @@ func (tpl *Subscribe) GetPublicTemplateTitleList(ids string, start int, limit in
 	}
 	var result resPublicTemplateTitleList
 	err = util.DecodeWithError(response, &result, "GetPublicTemplateTitle")
-	if err != nil {
+	return result.Count, result.TemplateTitleList, err
-		return
-	}
-	count = result.Count
-	templateTitleList = result.TemplateTitleList
-	return
 }

officialaccount/message/template.go

@@ -29,17 +29,17 @@ func NewTemplate(context *context.Context) *Template {
 
 // TemplateMessage 发送的模板消息内容
 type TemplateMessage struct {
-	ToUser      string                       `json:"touser"`                  // 必须, 接受者OpenID
+	ToUser      string                       `json:"touser"`                  // 必须，接受者 OpenID
-	TemplateID  string                       `json:"template_id"`             // 必须, 模版ID
+	TemplateID  string                       `json:"template_id"`             // 必须，模版 ID
-	URL         string                       `json:"url,omitempty"`           // 可选, 用户点击后跳转的URL, 该URL必须处于开发者在公众平台网站中设置的域中
+	URL         string                       `json:"url,omitempty"`           // 可选，用户点击后跳转的 URL, 该 URL 必须处于开发者在公众平台网站中设置的域中
-	Color       string                       `json:"color,omitempty"`         // 可选, 整个消息的颜色, 可以不设置
+	Color       string                       `json:"color,omitempty"`         // 可选，整个消息的颜色，可以不设置
-	Data        map[string]*TemplateDataItem `json:"data"`                    // 必须, 模板数据
+	Data        map[string]*TemplateDataItem `json:"data"`                    // 必须，模板数据
-	ClientMsgID string                       `json:"client_msg_id,omitempty"` // 可选, 防重入ID
+	ClientMsgID string                       `json:"client_msg_id,omitempty"` // 可选，防重入 ID
 
 	MiniProgram struct {
 		AppID    string `json:"appid"`    // 所需跳转到的小程序 appid（该小程序 appid 必须与发模板消息的公众号是绑定关联关系）
-		PagePath string `json:"pagepath"` // 所需跳转到小程序的具体页面路径，支持带参数,（示例index?foo=bar）
+		PagePath string `json:"pagepath"` // 所需跳转到小程序的具体页面路径，支持带参数，（示例 index?foo=bar）
-	} `json:"miniprogram"` // 可选,跳转至小程序地址
+	} `json:"miniprogram"` // 可选，跳转至小程序地址
 }
 
 // TemplateDataItem 模版内某个 .DATA 的值
@@ -61,15 +61,15 @@ func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) {
 	if err != nil {
 		return
 	}
-	uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
+	var (
-	var response []byte
+		uri      = fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
-	response, err = util.PostJSON(uri, msg)
+		response []byte
-	if err != nil {
+	)
+	if response, err = util.PostJSON(uri, msg); err != nil {
 		return
 	}
 	var result resTemplateSend
-	err = json.Unmarshal(response, &result)
+	if err = json.Unmarshal(response, &result); err != nil {
-	if err != nil {
 		return
 	}
 	if result.ErrCode != 0 {
@@ -80,7 +80,7 @@ func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) {
 	return
 }
 
-// TemplateItem 模板消息.
+// TemplateItem 模板消息。
 type TemplateItem struct {
 	TemplateID      string `json:"template_id"`
 	Title           string `json:"title"`
@@ -103,19 +103,16 @@ func (tpl *Template) List() (templateList []*TemplateItem, err error) {
 	if err != nil {
 		return
 	}
-	uri := fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
+	var (
-	var response []byte
+		uri      = fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
-	response, err = util.HTTPGet(uri)
+		response []byte
-	if err != nil {
+	)
+	if response, err = util.HTTPGet(uri); err != nil {
 		return
 	}
 	var res resTemplateList
 	err = util.DecodeWithError(response, &res, "ListTemplate")
-	if err != nil {
+	return res.TemplateList, err
-		return
-	}
-	templateList = res.TemplateList
-	return
 }
 
 type resTemplateAdd struct {
@@ -124,47 +121,44 @@ type resTemplateAdd struct {
 	TemplateID string `json:"template_id"`
 }
 
-// Add 添加模板.
+// Add 添加模板。
-func (tpl *Template) Add(shortID string) (templateID string, err error) {
+func (tpl *Template) Add(shortID string, keyNameList []string) (templateID string, err error) {
 	var accessToken string
 	accessToken, err = tpl.GetAccessToken()
 	if err != nil {
 		return
 	}
-	var msg = struct {
+	var (
+		msg = struct {
 			ShortID     string   `json:"template_id_short"`
-	}{ShortID: shortID}
+			KeyNameList []string `json:"keyword_name_list"`
-	uri := fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
+		}{ShortID: shortID, KeyNameList: keyNameList}
-	var response []byte
+		uri      = fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
-	response, err = util.PostJSON(uri, msg)
+		response []byte
-	if err != nil {
+	)
+	if response, err = util.PostJSON(uri, msg); err != nil {
 		return
 	}
-
 	var result resTemplateAdd
 	err = util.DecodeWithError(response, &result, "AddTemplate")
-	if err != nil {
+	return result.TemplateID, err
-		return
-	}
-	templateID = result.TemplateID
-	return
 }
 
-// Delete 删除私有模板.
+// Delete 删除私有模板。
 func (tpl *Template) Delete(templateID string) (err error) {
 	var accessToken string
 	accessToken, err = tpl.GetAccessToken()
 	if err != nil {
 		return
 	}
-	var msg = struct {
+	var (
+		msg = struct {
 			TemplateID string `json:"template_id"`
 		}{TemplateID: templateID}
-
+		uri      = fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
-	uri := fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
+		response []byte
-	var response []byte
+	)
-	response, err = util.PostJSON(uri, msg)
+	if response, err = util.PostJSON(uri, msg); err != nil {
-	if err != nil {
 		return
 	}
 	return util.DecodeWithCommonError(response, "DeleteTemplate")

officialaccount/oauth/oauth.go

@@ -1,6 +1,7 @@
 package oauth
 
 import (
+	ctx2 "context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -73,11 +74,28 @@ type ResAccessToken struct {
 	UnionID string `json:"unionid"`
 }
 
+// GetUserInfoByCodeContext 通过网页授权的 code 换取用户的信息
+func (oauth *Oauth) GetUserInfoByCodeContext(ctx ctx2.Context, code string) (result UserInfo, err error) {
+	var (
+		token ResAccessToken
+	)
+	if token, err = oauth.GetUserAccessTokenContext(ctx, code); err != nil {
+		return
+	}
+
+	return oauth.GetUserInfoContext(ctx, token.AccessToken, token.OpenID, "")
+}
+
 // GetUserAccessToken 通过网页授权的 code 换取 access_token(区别于 context 中的 access_token)
 func (oauth *Oauth) GetUserAccessToken(code string) (result ResAccessToken, err error) {
+	return oauth.GetUserAccessTokenContext(ctx2.Background(), code)
+}
+
+// GetUserAccessTokenContext 通过网页授权的 code 换取 access_token(区别于 context 中的 access_token) with context
+func (oauth *Oauth) GetUserAccessTokenContext(ctx ctx2.Context, code string) (result ResAccessToken, err error) {
 	urlStr := fmt.Sprintf(accessTokenURL, oauth.AppID, oauth.AppSecret, code)
 	var response []byte
-	response, err = util.HTTPGet(urlStr)
+	response, err = util.HTTPGetContext(ctx, urlStr)
 	if err != nil {
 		return
 	}
@@ -94,9 +112,14 @@ func (oauth *Oauth) GetUserAccessToken(code string) (result ResAccessToken, err
 
 // RefreshAccessToken 刷新 access_token
 func (oauth *Oauth) RefreshAccessToken(refreshToken string) (result ResAccessToken, err error) {
+	return oauth.RefreshAccessTokenContext(ctx2.Background(), refreshToken)
+}
+
+// RefreshAccessTokenContext 刷新 access_token with context
+func (oauth *Oauth) RefreshAccessTokenContext(ctx ctx2.Context, refreshToken string) (result ResAccessToken, err error) {
 	urlStr := fmt.Sprintf(refreshAccessTokenURL, oauth.AppID, refreshToken)
 	var response []byte
-	response, err = util.HTTPGet(urlStr)
+	response, err = util.HTTPGetContext(ctx, urlStr)
 	if err != nil {
 		return
 	}
@@ -113,9 +136,14 @@ func (oauth *Oauth) RefreshAccessToken(refreshToken string) (result ResAccessTok
 
 // CheckAccessToken 检验 access_token 是否有效
 func (oauth *Oauth) CheckAccessToken(accessToken, openID string) (b bool, err error) {
+	return oauth.CheckAccessTokenContext(ctx2.Background(), accessToken, openID)
+}
+
+// CheckAccessTokenContext 检验 access_token 是否有效 with context
+func (oauth *Oauth) CheckAccessTokenContext(ctx ctx2.Context, accessToken, openID string) (b bool, err error) {
 	urlStr := fmt.Sprintf(checkAccessTokenURL, accessToken, openID)
 	var response []byte
-	response, err = util.HTTPGet(urlStr)
+	response, err = util.HTTPGetContext(ctx, urlStr)
 	if err != nil {
 		return
 	}
@@ -149,12 +177,17 @@ type UserInfo struct {
 
 // GetUserInfo 如果 scope 为 snsapi_userinfo 则可以通过此方法获取到用户基本信息
 func (oauth *Oauth) GetUserInfo(accessToken, openID, lang string) (result UserInfo, err error) {
+	return oauth.GetUserInfoContext(ctx2.Background(), accessToken, openID, lang)
+}
+
+// GetUserInfoContext 如果 scope 为 snsapi_userinfo 则可以通过此方法获取到用户基本信息 with context
+func (oauth *Oauth) GetUserInfoContext(ctx ctx2.Context, accessToken, openID, lang string) (result UserInfo, err error) {
 	if lang == "" {
 		lang = "zh_CN"
 	}
 	urlStr := fmt.Sprintf(userInfoURL, accessToken, openID, lang)
 	var response []byte
-	response, err = util.HTTPGet(urlStr)
+	response, err = util.HTTPGetContext(ctx, urlStr)
 	if err != nil {
 		return
 	}

officialaccount/officialaccount.go

@@ -4,25 +4,23 @@ import (
 	stdcontext "context"
 	"net/http"
 
-	"github.com/silenceper/wechat/v2/internal/openapi"
-	"github.com/silenceper/wechat/v2/officialaccount/draft"
-	"github.com/silenceper/wechat/v2/officialaccount/freepublish"
-	"github.com/silenceper/wechat/v2/officialaccount/ocr"
-
-	"github.com/silenceper/wechat/v2/officialaccount/datacube"
-
 	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/internal/openapi"
 	"github.com/silenceper/wechat/v2/officialaccount/basic"
 	"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/datacube"
 	"github.com/silenceper/wechat/v2/officialaccount/device"
+	"github.com/silenceper/wechat/v2/officialaccount/draft"
+	"github.com/silenceper/wechat/v2/officialaccount/freepublish"
 	"github.com/silenceper/wechat/v2/officialaccount/js"
 	"github.com/silenceper/wechat/v2/officialaccount/material"
 	"github.com/silenceper/wechat/v2/officialaccount/menu"
 	"github.com/silenceper/wechat/v2/officialaccount/message"
 	"github.com/silenceper/wechat/v2/officialaccount/oauth"
+	"github.com/silenceper/wechat/v2/officialaccount/ocr"
 	"github.com/silenceper/wechat/v2/officialaccount/server"
 	"github.com/silenceper/wechat/v2/officialaccount/user"
 )

officialaccount/user/migrate.go

@@ -62,10 +62,6 @@ func (user *User) ListChangeOpenIDs(fromAppID string, openIDs ...string) (list *
 	}
 
 	err = util.DecodeWithError(resp, list, "ListChangeOpenIDs")
-	if err != nil {
-		return
-	}
-
 	return
 }
 

officialaccount/user/tag.go

@@ -126,10 +126,7 @@ func (user *User) GetTag() (tags []*TagInfo, err error) {
 		Tags []*TagInfo `json:"tags"`
 	}
 	err = json.Unmarshal(response, &result)
-	if err != nil {
+	return result.Tags, err
-		return
-	}
-	return result.Tags, nil
 }
 
 // OpenIDListByTag 获取标签下粉丝列表
@@ -154,9 +151,6 @@ func (user *User) OpenIDListByTag(tagID int32, nextOpenID ...string) (userList *
 	}
 	userList = new(TagOpenIDList)
 	err = json.Unmarshal(response, &userList)
-	if err != nil {
-		return
-	}
 	return
 }
 

officialaccount/user/user.go

@@ -161,7 +161,10 @@ func (user *User) ListUserOpenIDs(nextOpenid ...string) (*OpenidList, error) {
 		return nil, err
 	}
 
-	uri, _ := url.Parse(userListURL)
+	uri, err := url.Parse(userListURL)
+	if err != nil {
+		return nil, err
+	}
 	q := uri.Query()
 	q.Set("access_token", accessToken)
 	if len(nextOpenid) > 0 && nextOpenid[0] != "" {

openplatform/context/accessToken.go

@@ -100,11 +100,8 @@ func (ctx *Context) GetPreCodeContext(stdCtx context.Context) (string, error) {
 	var ret struct {
 		PreCode string `json:"pre_auth_code"`
 	}
-	if err := json.Unmarshal(body, &ret); err != nil {
+	err = json.Unmarshal(body, &ret)
-		return "", err
+	return ret.PreCode, err
-	}
-
-	return ret.PreCode, nil
 }
 
 // GetPreCode 获取预授权码

openplatform/miniprogram/basic/basic.go

@@ -9,6 +9,12 @@ import (
 
 const (
 	getAccountBasicInfoURL = "https://api.weixin.qq.com/cgi-bin/account/getaccountbasicinfo"
+	checkNickNameURL       = "https://api.weixin.qq.com/cgi-bin/wxverify/checkwxverifynickname"
+	setNickNameURL         = "https://api.weixin.qq.com/wxa/setnickname"
+	setSignatureURL        = "https://api.weixin.qq.com/cgi-bin/account/modifysignature"
+	setHeadImageURL        = "https://api.weixin.qq.com/cgi-bin/account/modifyheadimage"
+	getSearchStatusURL     = "https://api.weixin.qq.com/wxa/getwxasearchstatus"
+	setSearchStatusURL     = "https://api.weixin.qq.com/wxa/changewxasearchstatus"
 )
 
 // Basic 基础信息设置
@@ -51,3 +57,181 @@ func (basic *Basic) GetAccountBasicInfo() (*AccountBasicInfo, error) {
 // TODO
 // func (encryptor *Basic) modifyDomain() {
 // }
+
+// CheckNickNameResp 小程序名称检测结果
+type CheckNickNameResp struct {
+	util.CommonError
+	HitCondition bool   `json:"hit_condition"` // 是否命中关键字策略。若命中，可以选填关键字材料
+	Wording      string `json:"wording"`       // 命中关键字的说明描述
+}
+
+// CheckNickName 检测微信认证的名称是否符合规则
+// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/checkNickName.html
+func (basic *Basic) CheckNickName(nickname string) (*CheckNickNameResp, error) {
+	ak, err := basic.GetAuthrAccessToken(basic.AppID)
+	if err != nil {
+		return nil, err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", checkNickNameURL, ak)
+	data, err := util.PostJSON(url, map[string]string{
+		"nick_name": nickname,
+	})
+	if err != nil {
+		return nil, err
+	}
+	res := &CheckNickNameResp{}
+	err = util.DecodeWithError(data, res, "CheckNickName")
+	return res, err
+}
+
+// SetNickNameResp 设置小程序名称结果
+type SetNickNameResp struct {
+	util.CommonError
+	AuditID int64  `json:"audit_id"` // 审核单 Id，通过用于查询改名审核状态
+	Wording string `json:"wording"`  // 材料说明
+}
+
+// SetNickNameParam 设置小程序名称参数
+type SetNickNameParam struct {
+	NickName           string `json:"nick_name"`                      // 昵称，不支持包含“小程序”关键字的昵称
+	IDCard             string `json:"id_card,omitempty"`              // 身份证照片 mediaid，个人号必填
+	License            string `json:"license,omitempty"`              // 组织机构代码证或营业执照 mediaid，组织号必填
+	NameingOtherStuff1 string `json:"naming_other_stuff_1,omitempty"` // 其他证明材料 mediaid，选填
+	NameingOtherStuff2 string `json:"naming_other_stuff_2,omitempty"` // 其他证明材料 mediaid，选填
+	NameingOtherStuff3 string `json:"naming_other_stuff_3,omitempty"` // 其他证明材料 mediaid，选填
+	NameingOtherStuff4 string `json:"naming_other_stuff_4,omitempty"` // 其他证明材料 mediaid，选填
+	NameingOtherStuff5 string `json:"naming_other_stuff_5,omitempty"` // 其他证明材料 mediaid，选填
+}
+
+// SetNickName 设置小程序名称
+func (basic *Basic) SetNickName(nickname string) (*SetNickNameResp, error) {
+	return basic.SetNickNameFull(&SetNickNameParam{
+		NickName: nickname,
+	})
+}
+
+// SetNickNameFull 设置小程序名称
+// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/setNickName.html
+func (basic *Basic) SetNickNameFull(param *SetNickNameParam) (*SetNickNameResp, error) {
+	ak, err := basic.GetAuthrAccessToken(basic.AppID)
+	if err != nil {
+		return nil, err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", setNickNameURL, ak)
+	data, err := util.PostJSON(url, param)
+	if err != nil {
+		return nil, err
+	}
+	res := &SetNickNameResp{}
+	err = util.DecodeWithError(data, res, "SetNickName")
+	return res, err
+}
+
+// SetSignatureResp 小程序功能介绍修改结果
+type SetSignatureResp struct {
+	util.CommonError
+}
+
+// SetSignature 小程序修改功能介绍
+// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/setSignature.html
+func (basic *Basic) SetSignature(signature string) error {
+	ak, err := basic.GetAuthrAccessToken(basic.AppID)
+	if err != nil {
+		return err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", setSignatureURL, ak)
+	data, err := util.PostJSON(url, map[string]string{
+		"signature": signature,
+	})
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithError(data, &SetSignatureResp{}, "SetSignature")
+}
+
+// GetSearchStatusResp 查询小程序当前是否可被搜索
+type GetSearchStatusResp struct {
+	util.CommonError
+	Status int `json:"status"` // 1 表示不可搜索，0 表示可搜索
+}
+
+// GetSearchStatus 查询小程序当前是否可被搜索
+// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/getSearchStatus.html
+func (basic *Basic) GetSearchStatus(signature string) (*GetSearchStatusResp, error) {
+	ak, err := basic.GetAuthrAccessToken(basic.AppID)
+	if err != nil {
+		return nil, err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", getSearchStatusURL, ak)
+	data, err := util.HTTPGet(url)
+	if err != nil {
+		return nil, err
+	}
+	res := &GetSearchStatusResp{}
+	err = util.DecodeWithError(data, res, "GetSearchStatus")
+	return res, err
+}
+
+// SetSearchStatusResp 小程序是否可被搜索修改结果
+type SetSearchStatusResp struct {
+	util.CommonError
+}
+
+// SetSearchStatus 修改小程序是否可被搜索
+// status: 1 表示不可搜索，0 表示可搜索
+// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/setSearchStatus.html
+func (basic *Basic) SetSearchStatus(status int) error {
+	ak, err := basic.GetAuthrAccessToken(basic.AppID)
+	if err != nil {
+		return err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", setSearchStatusURL, ak)
+	data, err := util.PostJSON(url, map[string]int{
+		"status": status,
+	})
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithError(data, &SetSearchStatusResp{}, "SetSearchStatus")
+}
+
+// SetHeadImageResp 小程序头像修改结果
+type SetHeadImageResp struct {
+	util.CommonError
+}
+
+// SetHeadImageParam 小程序头像修改参数
+type SetHeadImageParam struct {
+	HeadImageMediaID string `json:"head_img_media_id"` // 头像素材 media_id
+	X1               string `json:"x1"`                // 裁剪框左上角 x 坐标（取值范围：[0, 1]）
+	Y1               string `json:"y1"`                // 裁剪框左上角 y 坐标（取值范围：[0, 1]）
+	X2               string `json:"x2"`                // 裁剪框右下角 x 坐标（取值范围：[0, 1]）
+	Y2               string `json:"y2"`                // 裁剪框右下角 y 坐标（取值范围：[0, 1]）
+}
+
+// SetHeadImage 修改小程序头像
+func (basic *Basic) SetHeadImage(imgMediaID string) error {
+	return basic.SetHeadImageFull(&SetHeadImageParam{
+		HeadImageMediaID: imgMediaID,
+		X1:               "0",
+		Y1:               "0",
+		X2:               "1",
+		Y2:               "1",
+	})
+}
+
+// SetHeadImageFull 修改小程序头像
+// 新增临时素材：https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/New_temporary_materials.html
+// ref: https://developers.weixin.qq.com/doc/oplatform/openApi/OpenApiDoc/miniprogram-management/basic-info-management/setHeadImage.html
+func (basic *Basic) SetHeadImageFull(param *SetHeadImageParam) error {
+	ak, err := basic.GetAuthrAccessToken(basic.AppID)
+	if err != nil {
+		return err
+	}
+	url := fmt.Sprintf("%s?access_token=%s", setHeadImageURL, ak)
+	data, err := util.PostJSON(url, param)
+	if err != nil {
+		return err
+	}
+	return util.DecodeWithError(data, &SetHeadImageResp{}, "account/setheadimage")
+}

openplatform/miniprogram/component/component.go

@@ -54,7 +54,7 @@ type GetRegistrationStatusParam struct {
 
 }
 
-// GetRegistrationStatus 查询创建任务状态.
+// GetRegistrationStatus 查询创建任务状态。
 func (component *Component) GetRegistrationStatus(param *GetRegistrationStatusParam) error {
 	componentAK, err := component.GetComponentAccessToken()
 	if err != nil {

util/crypto.go

@@ -44,7 +44,7 @@ func EncryptMsg(random, rawXMLMsg []byte, appID, aesKey string) (encrtptMsg []by
 func AESEncryptMsg(random, rawXMLMsg []byte, appID string, aesKey []byte) (ciphertext []byte) {
 	const (
 		BlockSize = 32            // PKCS#7
-		BlockMask = BlockSize - 1 // BLOCK_SIZE 为 2^n 时, 可以用 mask 获取针对 BLOCK_SIZE 的余数
+		BlockMask = BlockSize - 1 // BLOCK_SIZE 为 2^n 时，可以用 mask 获取针对 BLOCK_SIZE 的余数
 	)
 
 	appIDOffset := 20 + len(rawXMLMsg)
@@ -127,7 +127,7 @@ func aesKeyDecode(encodedAESKey string) (key []byte, err error) {
 func AESDecryptMsg(ciphertext []byte, aesKey []byte) (random, rawXMLMsg, appID []byte, err error) {
 	const (
 		BlockSize = 32            // PKCS#7
-		BlockMask = BlockSize - 1 // BLOCK_SIZE 为 2^n 时, 可以用 mask 获取针对 BLOCK_SIZE 的余数
+		BlockMask = BlockSize - 1 // BLOCK_SIZE 为 2^n 时，可以用 mask 获取针对 BLOCK_SIZE 的余数
 	)
 
 	if len(ciphertext) < BlockSize {

util/http.go

@@ -17,6 +17,19 @@ import (
 	"golang.org/x/crypto/pkcs12"
 )
 
+// URIModifier URI 修改器
+type URIModifier func(uri string) string
+
+var uriModifier URIModifier
+
+// DefaultHTTPClient 默认 httpClient
+var DefaultHTTPClient = http.DefaultClient
+
+// SetURIModifier 设置 URI 修改器
+func SetURIModifier(fn URIModifier) {
+	uriModifier = fn
+}
+
 // HTTPGet get 请求
 func HTTPGet(uri string) ([]byte, error) {
 	return HTTPGetContext(context.Background(), uri)
@@ -24,11 +37,14 @@ func HTTPGet(uri string) ([]byte, error) {
 
 // HTTPGetContext get 请求
 func HTTPGetContext(ctx context.Context, uri string) ([]byte, error) {
+	if uriModifier != nil {
+		uri = uriModifier(uri)
+	}
 	request, err := http.NewRequestWithContext(ctx, http.MethodGet, uri, nil)
 	if err != nil {
 		return nil, err
 	}
-	response, err := http.DefaultClient.Do(request)
+	response, err := DefaultHTTPClient.Do(request)
 	if err != nil {
 		return nil, err
 	}
@@ -47,6 +63,9 @@ func HTTPPost(uri string, data string) ([]byte, error) {
 
 // HTTPPostContext post 请求
 func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[string]string) ([]byte, error) {
+	if uriModifier != nil {
+		uri = uriModifier(uri)
+	}
 	body := bytes.NewBuffer(data)
 	request, err := http.NewRequestWithContext(ctx, http.MethodPost, uri, body)
 	if err != nil {
@@ -57,7 +76,7 @@ func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[st
 		request.Header.Set(key, value)
 	}
 
-	response, err := http.DefaultClient.Do(request)
+	response, err := DefaultHTTPClient.Do(request)
 	if err != nil {
 		return nil, err
 	}
@@ -71,6 +90,9 @@ func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[st
 
 // PostJSONContext post json 数据请求
 func PostJSONContext(ctx context.Context, uri string, obj interface{}) ([]byte, error) {
+	if uriModifier != nil {
+		uri = uriModifier(uri)
+	}
 	jsonBuf := new(bytes.Buffer)
 	enc := json.NewEncoder(jsonBuf)
 	enc.SetEscapeHTML(false)
@@ -83,7 +105,7 @@ func PostJSONContext(ctx context.Context, uri string, obj interface{}) ([]byte,
 		return nil, err
 	}
 	req.Header.Set("Content-Type", "application/json;charset=utf-8")
-	response, err := http.DefaultClient.Do(req)
+	response, err := DefaultHTTPClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -110,7 +132,7 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
 		return nil, "", err
 	}
 
-	response, err := http.Post(uri, "application/json;charset=utf-8", jsonBuf)
+	response, err := DefaultHTTPClient.Post(uri, "application/json;charset=utf-8", jsonBuf)
 	if err != nil {
 		return nil, "", err
 	}
@@ -136,16 +158,33 @@ func PostFile(fieldName, filename, uri string) ([]byte, error) {
 	return PostMultipartForm(fields, uri)
 }
 
+// PostFileFromReader 上传文件，从 io.Reader 中读取
+func PostFileFromReader(filedName, fileName, uri string, reader io.Reader) ([]byte, error) {
+	fields := []MultipartFormField{
+		{
+			IsFile:     true,
+			Fieldname:  filedName,
+			Filename:   fileName,
+			FileReader: reader,
+		},
+	}
+	return PostMultipartForm(fields, uri)
+}
+
 // MultipartFormField 保存文件或其他字段信息
 type MultipartFormField struct {
 	IsFile     bool
 	Fieldname  string
 	Value      []byte
 	Filename   string
+	FileReader io.Reader
 }
 
 // PostMultipartForm 上传文件或其他多个字段
 func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte, err error) {
+	if uriModifier != nil {
+		uri = uriModifier(uri)
+	}
 	bodyBuf := &bytes.Buffer{}
 	bodyWriter := multipart.NewWriter(bodyBuf)
 
@@ -157,16 +196,22 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 				return
 			}
 
+			if field.FileReader == nil {
 				fh, e := os.Open(field.Filename)
 				if e != nil {
 					err = fmt.Errorf("error opening file , err=%v", e)
 					return
 				}
-			defer fh.Close()
+				_, err = io.Copy(fileWriter, fh)
-
+				_ = fh.Close()
-			if _, err = io.Copy(fileWriter, fh); err != nil {
+				if err != nil {
 					return
 				}
+			} else {
+				if _, err = io.Copy(fileWriter, field.FileReader); err != nil {
+					return
+				}
+			}
 		} else {
 			partWriter, e := bodyWriter.CreateFormField(field.Fieldname)
 			if e != nil {
@@ -183,14 +228,14 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 	contentType := bodyWriter.FormDataContentType()
 	bodyWriter.Close()
 
-	resp, e := http.Post(uri, contentType, bodyBuf)
+	resp, e := DefaultHTTPClient.Post(uri, contentType, bodyBuf)
 	if e != nil {
 		err = e
 		return
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
-		return nil, err
+		return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, resp.StatusCode)
 	}
 	respBody, err = io.ReadAll(resp.Body)
 	return
@@ -198,13 +243,16 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 
 // PostXML perform a HTTP/POST request with XML body
 func PostXML(uri string, obj interface{}) ([]byte, error) {
+	if uriModifier != nil {
+		uri = uriModifier(uri)
+	}
 	xmlData, err := xml.Marshal(obj)
 	if err != nil {
 		return nil, err
 	}
 
 	body := bytes.NewBuffer(xmlData)
-	response, err := http.Post(uri, "application/xml;charset=utf-8", body)
+	response, err := DefaultHTTPClient.Post(uri, "application/xml;charset=utf-8", body)
 	if err != nil {
 		return nil, err
 	}
@@ -227,11 +275,10 @@ func httpWithTLS(rootCa, key string) (*http.Client, error) {
 	config := &tls.Config{
 		Certificates: []tls.Certificate{cert},
 	}
-	tr := &http.Transport{
+	trans := (DefaultHTTPClient.Transport.(*http.Transport)).Clone()
-		TLSClientConfig:    config,
+	trans.TLSClientConfig = config
-		DisableCompression: true,
+	trans.DisableCompression = true
-	}
+	client = &http.Client{Transport: trans}
-	client = &http.Client{Transport: tr}
 	return client, nil
 }
 
@@ -259,6 +306,9 @@ func pkcs12ToPem(p12 []byte, password string) tls.Certificate {
 
 // PostXMLWithTLS perform a HTTP/POST request with XML body and TLS
 func PostXMLWithTLS(uri string, obj interface{}, ca, key string) ([]byte, error) {
+	if uriModifier != nil {
+		uri = uriModifier(uri)
+	}
 	xmlData, err := xml.Marshal(obj)
 	if err != nil {
 		return nil, err

util/rsa.go

@@ -25,7 +25,10 @@ func RSADecrypt(privateKey string, ciphertext []byte) ([]byte, error) {
 		}
 		switch t := key.(type) {
 		case *rsa.PrivateKey:
-			priv = key.(*rsa.PrivateKey)
+			var ok bool
+			if priv, ok = key.(*rsa.PrivateKey); !ok {
+				return nil, fmt.Errorf(" ParsePKCS8PrivateKey error: Not supported privatekey format, should be *rsa.PrivateKey, got %T", t)
+			}
 		default:
 			return nil, fmt.Errorf("ParsePKCS1PrivateKey error: %s, ParsePKCS8PrivateKey error: Not supported privatekey format, should be *rsa.PrivateKey, got %T", oldErr.Error(), t)
 		}

util/template.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-// Template 对字符串中的和map的key相同的字符串进行模板替换 仅支持 形如: {name}
+// Template 对字符串中的和 map 的 key 相同的字符串进行模板替换 仅支持 形如：{name}
 func Template(source string, data map[string]interface{}) string {
 	sourceCopy := &source
 	for k, val := range data {

wechat.go

@@ -1,6 +1,7 @@
 package wechat
 
 import (
+	"net/http"
 	"os"
 
 	log "github.com/sirupsen/logrus"
@@ -14,6 +15,7 @@ import (
 	openConfig "github.com/silenceper/wechat/v2/openplatform/config"
 	"github.com/silenceper/wechat/v2/pay"
 	payConfig "github.com/silenceper/wechat/v2/pay/config"
+	"github.com/silenceper/wechat/v2/util"
 	"github.com/silenceper/wechat/v2/work"
 	workConfig "github.com/silenceper/wechat/v2/work/config"
 )
@@ -81,3 +83,8 @@ func (wc *Wechat) GetWork(cfg *workConfig.Config) *work.Work {
 	}
 	return work.NewWork(cfg)
 }
+
+// SetHTTPClient  设置 HTTPClient
+func (wc *Wechat) SetHTTPClient(client *http.Client) {
+	util.DefaultHTTPClient = client
+}

work/addresslist/department.go

@@ -13,6 +13,7 @@ const (
 	departmentSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/simplelist?access_token=%s&id=%d"
 	// departmentListURL 获取部门列表
 	departmentListURL     = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s"
+	departmentListByIDURL = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s&id=%d"
 	// departmentGetURL 获取单个部门详情 https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=ACCESS_TOKEN&id=ID
 	departmentGetURL = "https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=%s&id=%d"
 )
@@ -58,6 +59,11 @@ type (
 		ParentID         int      `json:"parentid"`          // 父部门 id。根部门为 1
 		Order            int      `json:"order"`             // 在父部门中的次序值。order 值大的排序靠前
 	}
+	// DepartmentGetResponse 获取单个部门详情
+	DepartmentGetResponse struct {
+		util.CommonError
+		Department Department `json:"department"`
+	}
 )
 
 // DepartmentCreate 创建部门
@@ -75,10 +81,8 @@ func (r *Client) DepartmentCreate(req *DepartmentCreateRequest) (*DepartmentCrea
 		return nil, err
 	}
 	result := &DepartmentCreateResponse{}
-	if err = util.DecodeWithError(response, result, "DepartmentCreate"); err != nil {
+	err = util.DecodeWithError(response, result, "DepartmentCreate")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // DepartmentSimpleList 获取子部门 ID 列表
@@ -96,30 +100,44 @@ func (r *Client) DepartmentSimpleList(departmentID int) ([]*DepartmentID, error)
 		return nil, err
 	}
 	result := &DepartmentSimpleListResponse{}
-	if err = util.DecodeWithError(response, result, "DepartmentSimpleList"); err != nil {
+	err = util.DecodeWithError(response, result, "DepartmentSimpleList")
-		return nil, err
+	return result.DepartmentID, err
-	}
-	return result.DepartmentID, nil
 }
 
 // DepartmentList 获取部门列表
 // @desc https://developer.work.weixin.qq.com/document/path/90208
 func (r *Client) DepartmentList() ([]*Department, error) {
+	return r.DepartmentListByID(0)
+}
+
+// DepartmentListByID 获取部门列表
+//
+// departmentID 部门 id。获取指定部门及其下的子部门（以及子部门的子部门等等，递归）
+//
+// @desc https://developer.work.weixin.qq.com/document/path/90208
+func (r *Client) DepartmentListByID(departmentID int) ([]*Department, error) {
+	var formatURL string
+
 	// 获取 accessToken
 	accessToken, err := r.GetAccessToken()
 	if err != nil {
 		return nil, err
 	}
+
+	if departmentID > 0 {
+		formatURL = fmt.Sprintf(departmentListByIDURL, accessToken, departmentID)
+	} else {
+		formatURL = fmt.Sprintf(departmentListURL, accessToken)
+	}
+
 	// 发起 http 请求
-	response, err := util.HTTPGet(fmt.Sprintf(departmentListURL, accessToken))
+	response, err := util.HTTPGet(formatURL)
 	if err != nil {
 		return nil, err
 	}
 	// 按照结构体解析返回值
 	result := &DepartmentListResponse{}
-	if err = util.DecodeWithError(response, result, "DepartmentList"); err != nil {
+	err = util.DecodeWithError(response, result, "DepartmentList")
-		return nil, err
-	}
 	// 返回数据
 	return result.Department, err
 }
@@ -138,9 +156,7 @@ func (r *Client) DepartmentGet(departmentID int) (*Department, error) {
 	if response, err = util.HTTPGet(fmt.Sprintf(departmentGetURL, accessToken, departmentID)); err != nil {
 		return nil, err
 	}
-	result := &Department{}
+	result := &DepartmentGetResponse{}
-	if err = util.DecodeWithError(response, result, "DepartmentGet"); err != nil {
+	err = util.DecodeWithError(response, result, "DepartmentGet")
-		return nil, err
+	return &result.Department, err
-	}
-	return result, nil
 }

work/addresslist/linkedcorp.go

@@ -41,10 +41,8 @@ func (r *Client) GetPermList() (*GetPermListResponse, error) {
 		return nil, err
 	}
 	result := &GetPermListResponse{}
-	if err = util.DecodeWithError(response, result, "GetPermList"); err != nil {
+	err = util.DecodeWithError(response, result, "GetPermList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetLinkedCorpUserRequest 获取互联企业成员详细信息请求
@@ -111,10 +109,8 @@ func (r *Client) GetLinkedCorpUser(req *GetLinkedCorpUserRequest) (*GetLinkedCor
 		return nil, err
 	}
 	result := &GetLinkedCorpUserResponse{}
-	if err = util.DecodeWithError(response, result, "GetLinkedCorpUser"); err != nil {
+	err = util.DecodeWithError(response, result, "GetLinkedCorpUser")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // LinkedCorpSimpleListRequest 获取互联企业部门成员请求
@@ -151,10 +147,8 @@ func (r *Client) LinkedCorpSimpleList(req *LinkedCorpSimpleListRequest) (*Linked
 		return nil, err
 	}
 	result := &LinkedCorpSimpleListResponse{}
-	if err = util.DecodeWithError(response, result, "LinkedCorpSimpleList"); err != nil {
+	err = util.DecodeWithError(response, result, "LinkedCorpSimpleList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // LinkedCorpUserListRequest 获取互联企业部门成员详情请求
@@ -183,10 +177,8 @@ func (r *Client) LinkedCorpUserList(req *LinkedCorpUserListRequest) (*LinkedCorp
 		return nil, err
 	}
 	result := &LinkedCorpUserListResponse{}
-	if err = util.DecodeWithError(response, result, "LinkedCorpUserList"); err != nil {
+	err = util.DecodeWithError(response, result, "LinkedCorpUserList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // LinkedCorpDepartmentListRequest 获取互联企业部门列表请求
@@ -223,8 +215,6 @@ func (r *Client) LinkedCorpDepartmentList(req *LinkedCorpDepartmentListRequest)
 		return nil, err
 	}
 	result := &LinkedCorpDepartmentListResponse{}
-	if err = util.DecodeWithError(response, result, "LinkedCorpDepartmentList"); err != nil {
+	err = util.DecodeWithError(response, result, "LinkedCorpDepartmentList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/addresslist/tag.go

@@ -51,10 +51,8 @@ func (r *Client) CreateTag(req *CreateTagRequest) (*CreateTagResponse, error) {
 		return nil, err
 	}
 	result := &CreateTagResponse{}
-	if err = util.DecodeWithError(response, result, "CreateTag"); err != nil {
+	err = util.DecodeWithError(response, result, "CreateTag")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -129,10 +127,8 @@ func (r *Client) GetTag(tagID int) (*GetTagResponse, error) {
 		return nil, err
 	}
 	result := &GetTagResponse{}
-	if err = util.DecodeWithError(response, result, "GetTag"); err != nil {
+	err = util.DecodeWithError(response, result, "GetTag")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -165,10 +161,8 @@ func (r *Client) AddTagUsers(req *AddTagUsersRequest) (*AddTagUsersResponse, err
 		return nil, err
 	}
 	result := &AddTagUsersResponse{}
-	if err = util.DecodeWithError(response, result, "AddTagUsers"); err != nil {
+	err = util.DecodeWithError(response, result, "AddTagUsers")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -201,10 +195,8 @@ func (r *Client) DelTagUsers(req *DelTagUsersRequest) (*DelTagUsersResponse, err
 		return nil, err
 	}
 	result := &DelTagUsersResponse{}
-	if err = util.DecodeWithError(response, result, "DelTagUsers"); err != nil {
+	err = util.DecodeWithError(response, result, "DelTagUsers")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -235,8 +227,6 @@ func (r *Client) ListTag() (*ListTagResponse, error) {
 		return nil, err
 	}
 	result := &ListTagResponse{}
-	if err = util.DecodeWithError(response, result, "ListTag"); err != nil {
+	err = util.DecodeWithError(response, result, "ListTag")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/addresslist/user.go

@@ -61,10 +61,7 @@ func (r *Client) UserSimpleList(departmentID int) ([]*UserList, error) {
 	}
 	result := &UserSimpleListResponse{}
 	err = util.DecodeWithError(response, result, "UserSimpleList")
-	if err != nil {
+	return result.UserList, err
-		return nil, err
-	}
-	return result.UserList, nil
 }
 
 type (
@@ -153,10 +150,8 @@ func (r *Client) UserCreate(req *UserCreateRequest) (*UserCreateResponse, error)
 		return nil, err
 	}
 	result := &UserCreateResponse{}
-	if err = util.DecodeWithError(response, result, "UserCreate"); err != nil {
+	err = util.DecodeWithError(response, result, "UserCreate")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // UserGetResponse 获取部门成员响应
@@ -193,7 +188,7 @@ type UserGetResponse struct {
 			} `json:"web,omitempty"`
 		} `json:"attrs"`
 	} `json:"extattr"` // 扩展属性，代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
-	Status           int    `json:"status"`            // 激活状态: 1=已激活，2=已禁用，4=未激活，5=退出企业。 已激活代表已激活企业微信或已关注微信插件（原企业号）。未激活代表既未激活企业微信又未关注微信插件（原企业号）。
+	Status           int    `json:"status"`            // 激活状态：1=已激活，2=已禁用，4=未激活，5=退出企业。已激活代表已激活企业微信或已关注微信插件（原企业号）。未激活代表既未激活企业微信又未关注微信插件（原企业号）。
 	QrCode           string `json:"qr_code"`           // 员工个人二维码，扫描可添加为外部联系人 (注意返回的是一个 url，可在浏览器上打开该 url 以展示二维码)；代开发自建应用需要管理员授权且成员 oauth2 授权获取；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
 	ExternalPosition string `json:"external_position"` // 对外职务，如果设置了该值，则以此作为对外展示的职务，否则以 position 来展示。代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
 	ExternalProfile  struct {
@@ -245,10 +240,7 @@ func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
 	}
 	result := &UserGetResponse{}
 	err = util.DecodeWithError(response, result, "UserGet")
-	if err != nil {
+	return result, err
-		return nil, err
-	}
-	return result, nil
 }
 
 type (
@@ -279,10 +271,8 @@ func (r *Client) UserDelete(userID string) (*UserDeleteResponse, error) {
 		return nil, err
 	}
 	result := &UserDeleteResponse{}
-	if err = util.DecodeWithError(response, result, "UserDelete"); err != nil {
+	err = util.DecodeWithError(response, result, "UserDelete")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // UserListIDRequest 获取成员 ID 列表请求
@@ -324,10 +314,8 @@ func (r *Client) UserListID(req *UserListIDRequest) (*UserListIDResponse, error)
 		return nil, err
 	}
 	result := &UserListIDResponse{}
-	if err = util.DecodeWithError(response, result, "UserListID"); err != nil {
+	err = util.DecodeWithError(response, result, "UserListID")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -366,10 +354,8 @@ func (r *Client) ConvertToOpenID(userID string) (string, error) {
 		return "", err
 	}
 	result := &convertToOpenIDResponse{}
-	if err = util.DecodeWithError(response, result, "ConvertToOpenID"); err != nil {
+	err = util.DecodeWithError(response, result, "ConvertToOpenID")
-		return "", err
+	return result.OpenID, err
-	}
-	return result.OpenID, nil
 }
 
 type (
@@ -408,8 +394,6 @@ func (r *Client) ConvertToUserID(openID string) (string, error) {
 		return "", err
 	}
 	result := &convertToUserIDResponse{}
-	if err = util.DecodeWithError(response, result, "ConvertToUserID"); err != nil {
+	err = util.DecodeWithError(response, result, "ConvertToUserID")
-		return "", err
+	return result.UserID, err
-	}
-	return result.UserID, nil
 }

work/appchat/appchat.go

@@ -82,11 +82,9 @@ func (r *Client) Send(apiName string, request interface{}) (*SendResponse, error
 	}
 	// 按照结构体解析返回值
 	result := &SendResponse{}
-	if err = util.DecodeWithError(response, result, apiName); err != nil {
+	err = util.DecodeWithError(response, result, apiName)
-		return nil, err
-	}
 	// 返回数据
-	return result, nil
+	return result, err
 }
 
 // SendText 发送文本消息

work/appchat/client.go

@@ -1,4 +1,4 @@
-// Package appchat 应用发送消息到群聊会话,企业微信接口：https://developer.work.weixin.qq.com/document/path/90248
+// Package appchat 应用发送消息到群聊会话，企业微信接口：https://developer.work.weixin.qq.com/document/path/90248
 package appchat
 
 import (

work/checkin/checkin.go

@@ -7,63 +7,381 @@ import (
 )
 
 const (
-	// getCheckinDataURL 获取打卡记录数据
+	// setScheduleListURL 为打卡人员排班
-	getCheckinDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckindata?access_token=%s"
+	setScheduleListURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/setcheckinschedulist?access_token=%s"
+	// punchCorrectionURL 为打卡人员补卡
+	punchCorrectionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/punch_correction?access_token=%s"
+	// addUserFaceURL 录入打卡人员人脸信息
+	addUserFaceURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/addcheckinuserface?access_token=%s"
+	// addOptionURL 创建打卡规则
+	addOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/add_checkin_option?access_token=%s"
+	// updateOptionURL 修改打卡规则
+	updateOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/update_checkin_option?access_token=%s"
+	// clearOptionURL 清空打卡规则数组元素
+	clearOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/clear_checkin_option_array_field?access_token=%s"
+	// delOptionURL 删除打卡规则
+	delOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/del_checkin_option?access_token=%s"
 )
 
-type (
+// SetScheduleListRequest 为打卡人员排班请求
-	// GetCheckinDataRequest 获取打卡记录数据请求
+type SetScheduleListRequest struct {
-	GetCheckinDataRequest struct {
-		OpenCheckinDataType int64    `json:"opencheckindatatype"`
-		StartTime           int64    `json:"starttime"`
-		EndTime             int64    `json:"endtime"`
-		UserIDList          []string `json:"useridlist"`
-	}
-	// GetCheckinDataResponse 获取打卡记录数据响应
-	GetCheckinDataResponse struct {
-		util.CommonError
-		CheckinData []*GetCheckinDataItem `json:"checkindata"`
-	}
-	// GetCheckinDataItem 打卡记录数据
-	GetCheckinDataItem struct {
-		UserID         string   `json:"userid"`
-		GroupName      string   `json:"groupname"`
-		CheckinType    string   `json:"checkin_type"`
-		ExceptionType  string   `json:"exception_type"`
-		CheckinTime    int64    `json:"checkin_time"`
-		LocationTitle  string   `json:"location_title"`
-		LocationDetail string   `json:"location_detail"`
-		WifiName       string   `json:"wifiname"`
-		Notes          string   `json:"notes"`
-		WifiMac        string   `json:"wifimac"`
-		MediaIDs       []string `json:"mediaids"`
-		SchCheckinTime int64    `json:"sch_checkin_time"`
 	GroupID   int64                 `json:"groupid"`
-		ScheduleID     int64    `json:"schedule_id"`
+	Items     []SetScheduleListItem `json:"items"`
-		TimelineID     int64    `json:"timeline_id"`
+	YearMonth int64                 `json:"yearmonth"`
-		Lat            int64    `json:"lat,omitempty"`
-		Lng            int64    `json:"lng,omitempty"`
-		DeviceID       string   `json:"deviceid,omitempty"`
 }
-)
 
-// GetCheckinData 获取打卡记录数据
+// SetScheduleListItem 排班表信息
-// @see https://developer.work.weixin.qq.com/document/path/90262
+type SetScheduleListItem struct {
-func (r *Client) GetCheckinData(req *GetCheckinDataRequest) (*GetCheckinDataResponse, error) {
+	UserID     string `json:"userid"`
+	Day        int64  `json:"day"`
+	ScheduleID int64  `json:"schedule_id"`
+}
+
+// SetScheduleList 为打卡人员排班
+// see https://developer.work.weixin.qq.com/document/path/93385
+func (r *Client) SetScheduleList(req *SetScheduleListRequest) error {
 	var (
 		accessToken string
 		err         error
 	)
 	if accessToken, err = r.GetAccessToken(); err != nil {
-		return nil, err
+		return err
 	}
 	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(getCheckinDataURL, accessToken), req); err != nil {
+	if response, err = util.PostJSON(fmt.Sprintf(setScheduleListURL, accessToken), req); err != nil {
-		return nil, err
+		return err
 	}
-	result := &GetCheckinDataResponse{}
+	return util.DecodeWithCommonError(response, "SetScheduleList")
-	if err = util.DecodeWithError(response, result, "GetCheckinData"); err != nil {
-		return nil, err
 }
-	return result, nil
+
+// PunchCorrectionRequest 为打卡人员补卡请求
+type PunchCorrectionRequest struct {
+	UserID              string `json:"userid"`
+	ScheduleDateTime    int64  `json:"schedule_date_time"`
+	ScheduleCheckinTime int64  `json:"schedule_checkin_time"`
+	CheckinTime         int64  `json:"checkin_time"`
+	Remark              string `json:"remark"`
+}
+
+// PunchCorrection 为打卡人员补卡
+// see https://developer.work.weixin.qq.com/document/path/95803
+func (r *Client) PunchCorrection(req *PunchCorrectionRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(punchCorrectionURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "PunchCorrection")
+}
+
+// AddUserFaceRequest 录入打卡人员人脸信息请求
+type AddUserFaceRequest struct {
+	UserID   string `json:"userid"`
+	UserFace string `json:"userface"`
+}
+
+// AddUserFace 录入打卡人员人脸信息
+// see https://developer.work.weixin.qq.com/document/path/93378
+func (r *Client) AddUserFace(req *AddUserFaceRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(addUserFaceURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "AddUserFace")
+}
+
+// AddOptionRequest 创建打卡规则请求
+type AddOptionRequest struct {
+	EffectiveNow bool            `json:"effective_now,omitempty"`
+	Group        OptionGroupRule `json:"group,omitempty"`
+}
+
+// OptionGroupRule 打卡规则字段
+type OptionGroupRule struct {
+	GroupID                int64                        `json:"groupid,omitempty"`
+	GroupType              int64                        `json:"grouptype"`
+	GroupName              string                       `json:"groupname"`
+	CheckinDate            []OptionGroupRuleCheckinDate `json:"checkindate,omitempty"`
+	SpeWorkdays            []OptionGroupSpeWorkdays     `json:"spe_workdays,omitempty"`
+	SpeOffDays             []OptionGroupSpeOffDays      `json:"spe_offdays,omitempty"`
+	SyncHolidays           bool                         `json:"sync_holidays,omitempty"`
+	NeedPhoto              bool                         `json:"need_photo,omitempty"`
+	NoteCanUseLocalPic     bool                         `json:"note_can_use_local_pic,omitempty"`
+	WifiMacInfos           []OptionGroupWifiMacInfos    `json:"wifimac_infos,omitempty"`
+	LocInfos               []OptionGroupLocInfos        `json:"loc_infos,omitempty"`
+	AllowCheckinOffWorkday bool                         `json:"allow_checkin_offworkday,omitempty"`
+	AllowApplyOffWorkday   bool                         `json:"allow_apply_offworkday,omitempty"`
+	Range                  []OptionGroupRange           `json:"range"`
+	WhiteUsers             []string                     `json:"white_users,omitempty"`
+	Type                   int64                        `json:"type,omitempty"`
+	ReporterInfo           OptionGroupReporterInfo      `json:"reporterinfo,omitempty"`
+	AllowApplyBkCnt        int64                        `json:"allow_apply_bk_cnt,omitempty"`
+	AllowApplyBkDayLimit   int64                        `json:"allow_apply_bk_day_limit,omitempty"`
+	BukaLimitNextMonth     int64                        `json:"buka_limit_next_month,omitempty"`
+	OptionOutRange         int64                        `json:"option_out_range,omitempty"`
+	ScheduleList           []OptionGroupScheduleList    `json:"schedulelist,omitempty"`
+	OffWorkIntervalTime    int64                        `json:"offwork_interval_time,omitempty"`
+	UseFaceDetect          bool                         `json:"use_face_detect,omitempty"`
+	OpenFaceLiveDetect     bool                         `json:"open_face_live_detect,omitempty"`
+	OtInfoV2               OptionGroupOtInfoV2          `json:"ot_info_v2,omitempty"`
+	SyncOutCheckin         bool                         `json:"sync_out_checkin,omitempty"`
+	BukaRemind             OptionGroupBukaRemind        `json:"buka_remind,omitempty"`
+	BukaRestriction        int64                        `json:"buka_restriction,omitempty"`
+	SpanDayTime            int64                        `json:"span_day_time,omitempty"`
+	StandardWorkDuration   int64                        `json:"standard_work_duration,omitempty"`
+}
+
+// OptionGroupRuleCheckinDate 固定时间上下班打卡时间
+type OptionGroupRuleCheckinDate struct {
+	Workdays            []int64                      `json:"workdays"`
+	CheckinTime         []OptionGroupRuleCheckinTime `json:"checkintime"`
+	FlexTime            int64                        `json:"flex_time"`
+	AllowFlex           bool                         `json:"allow_flex"`
+	FlexOnDutyTime      int64                        `json:"flex_on_duty_time"`
+	FlexOffDutyTime     int64                        `json:"flex_off_duty_time"`
+	MaxAllowArriveEarly int64                        `json:"max_allow_arrive_early"`
+	MaxAllowArriveLate  int64                        `json:"max_allow_arrive_late"`
+	LateRule            OptionGroupLateRule          `json:"late_rule"`
+}
+
+// OptionGroupRuleCheckinTime 工作日上下班打卡时间信息
+type OptionGroupRuleCheckinTime struct {
+	TimeID             int64 `json:"time_id"`
+	WorkSec            int64 `json:"work_sec"`
+	OffWorkSec         int64 `json:"off_work_sec"`
+	RemindWorkSec      int64 `json:"remind_work_sec"`
+	RemindOffWorkSec   int64 `json:"remind_off_work_sec"`
+	AllowRest          bool  `json:"allow_rest"`
+	RestBeginTime      int64 `json:"rest_begin_time"`
+	RestEndTime        int64 `json:"rest_end_time"`
+	EarliestWorkSec    int64 `json:"earliest_work_sec"`
+	LatestWorkSec      int64 `json:"latest_work_sec"`
+	EarliestOffWorkSec int64 `json:"earliest_off_work_sec"`
+	LatestOffWorkSec   int64 `json:"latest_off_work_sec"`
+	NoNeedCheckOn      bool  `json:"no_need_checkon"`
+	NoNeedCheckOff     bool  `json:"no_need_checkoff"`
+}
+
+// OptionGroupLateRule 晚走晚到时间规则信息
+type OptionGroupLateRule struct {
+	OffWorkAfterTime      int64                 `json:"offwork_after_time"`
+	OnWorkFlexTime        int64                 `json:"onwork_flex_time"`
+	AllowOffWorkAfterTime int64                 `json:"allow_offwork_after_time"`
+	TimeRules             []OptionGroupTimeRule `json:"timerules"`
+}
+
+// OptionGroupTimeRule 晚走晚到时间规则
+type OptionGroupTimeRule struct {
+	OffWorkAfterTime int64 `json:"offwork_after_time"`
+	OnWorkFlexTime   int64 `json:"onwork_flex_time"`
+}
+
+// OptionGroupSpeWorkdays 特殊工作日
+type OptionGroupSpeWorkdays struct {
+	Timestamp   int64                    `json:"timestamp"`
+	Notes       string                   `json:"notes"`
+	CheckinTime []OptionGroupCheckinTime `json:"checkintime"`
+	Type        int64                    `json:"type"`
+	BegTime     int64                    `json:"begtime"`
+	EndTime     int64                    `json:"endtime"`
+}
+
+// OptionGroupCheckinTime 特殊工作日的上下班打卡时间配置
+type OptionGroupCheckinTime struct {
+	TimeID           int64 `json:"time_id"`
+	WorkSec          int64 `json:"work_sec"`
+	OffWorkSec       int64 `json:"off_work_sec"`
+	RemindWorkSec    int64 `json:"remind_work_sec"`
+	RemindOffWorkSec int64 `json:"remind_off_work_sec"`
+}
+
+// OptionGroupSpeOffDays 特殊非工作日
+type OptionGroupSpeOffDays struct {
+	Timestamp int64  `json:"timestamp"`
+	Notes     string `json:"notes"`
+	Type      int64  `json:"type"`
+	BegTime   int64  `json:"begtime"`
+	EndTime   int64  `json:"endtime"`
+}
+
+// OptionGroupWifiMacInfos WIFI 信息
+type OptionGroupWifiMacInfos struct {
+	WifiName string `json:"wifiname"`
+	WifiMac  string `json:"wifimac"`
+}
+
+// OptionGroupLocInfos 地点信息
+type OptionGroupLocInfos struct {
+	Lat       int64  `json:"lat"`
+	Lng       int64  `json:"lng"`
+	LocTitle  string `json:"loc_title"`
+	LocDetail string `json:"loc_detail"`
+	Distance  int64  `json:"distance"`
+}
+
+// OptionGroupRange 人员信息
+type OptionGroupRange struct {
+	PartyID []string `json:"party_id"`
+	UserID  []string `json:"userid"`
+	TagID   []int64  `json:"tagid"`
+}
+
+// OptionGroupReporterInfo 汇报人
+type OptionGroupReporterInfo struct {
+	Reporters []OptionGroupReporters `json:"reporters"`
+}
+
+// OptionGroupReporters 汇报对象
+type OptionGroupReporters struct {
+	UserID string `json:"userid"`
+	TagID  int64  `json:"tagid"`
+}
+
+// OptionGroupScheduleList 自定义排班规则所有排班
+type OptionGroupScheduleList struct {
+	ScheduleID          int64                    `json:"schedule_id"`
+	ScheduleName        string                   `json:"schedule_name"`
+	TimeSection         []OptionGroupTimeSection `json:"time_section"`
+	AllowFlex           bool                     `json:"allow_flex"`
+	FlexOnDutyTime      int64                    `json:"flex_on_duty_time"`
+	FlexOffDutyTime     int64                    `json:"flex_off_duty_time"`
+	LateRule            OptionGroupLateRule      `json:"late_rule"`
+	MaxAllowArriveEarly int64                    `json:"max_allow_arrive_early"`
+	MaxAllowArriveLate  int64                    `json:"max_allow_arrive_late"`
+}
+
+// OptionGroupTimeSection 班次上下班时段信息
+type OptionGroupTimeSection struct {
+	TimeID             int64 `json:"time_id"`
+	WorkSec            int64 `json:"work_sec"`
+	OffWorkSec         int64 `json:"off_work_sec"`
+	RemindWorkSec      int64 `json:"remind_work_sec"`
+	RemindOffWorkSec   int64 `json:"remind_off_work_sec"`
+	RestBeginTime      int64 `json:"rest_begin_time"`
+	RestEndTime        int64 `json:"rest_end_time"`
+	AllowRest          bool  `json:"allow_rest"`
+	EarliestWorkSec    int64 `json:"earliest_work_sec"`
+	LatestWorkSec      int64 `json:"latest_work_sec"`
+	EarliestOffWorkSec int64 `json:"earliest_off_work_sec"`
+	LatestOffWorkSec   int64 `json:"latest_off_work_sec"`
+	NoNeedCheckOn      bool  `json:"no_need_checkon"`
+	NoNeedCheckOff     bool  `json:"no_need_checkoff"`
+}
+
+// OptionGroupOtInfoV2 加班配置
+type OptionGroupOtInfoV2 struct {
+	WorkdayConf OptionGroupWorkdayConf `json:"workdayconf"`
+}
+
+// OptionGroupWorkdayConf 工作日加班配置
+type OptionGroupWorkdayConf struct {
+	AllowOt bool  `json:"allow_ot"`
+	Type    int64 `json:"type"`
+}
+
+// OptionGroupBukaRemind 补卡提醒
+type OptionGroupBukaRemind struct {
+	OpenRemind      bool  `json:"open_remind"`
+	BukaRemindDay   int64 `json:"buka_remind_day"`
+	BukaRemindMonth int64 `json:"buka_remind_month"`
+}
+
+// AddOption 创建打卡规则
+// see https://developer.work.weixin.qq.com/document/path/98041#%E5%88%9B%E5%BB%BA%E6%89%93%E5%8D%A1%E8%A7%84%E5%88%99
+func (r *Client) AddOption(req *AddOptionRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(addOptionURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "AddOption")
+}
+
+// UpdateOptionRequest 修改打卡规则请求
+type UpdateOptionRequest struct {
+	EffectiveNow bool            `json:"effective_now,omitempty"`
+	Group        OptionGroupRule `json:"group,omitempty"`
+}
+
+// UpdateOption 修改打卡规则
+// see https://developer.work.weixin.qq.com/document/path/98041#%E4%BF%AE%E6%94%B9%E6%89%93%E5%8D%A1%E8%A7%84%E5%88%99
+func (r *Client) UpdateOption(req *UpdateOptionRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(updateOptionURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "UpdateOption")
+}
+
+// ClearOptionRequest 清空打卡规则数组元素请求
+type ClearOptionRequest struct {
+	GroupID      int64   `json:"groupid"`
+	ClearField   []int64 `json:"clear_field"`
+	EffectiveNow bool    `json:"effective_now"`
+}
+
+// ClearOption 清空打卡规则数组元素
+// see https://developer.work.weixin.qq.com/document/path/98041#%E6%B8%85%E7%A9%BA%E6%89%93%E5%8D%A1%E8%A7%84%E5%88%99%E6%95%B0%E7%BB%84%E5%85%83%E7%B4%A0
+func (r *Client) ClearOption(req *ClearOptionRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(clearOptionURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "ClearOption")
+}
+
+// DelOptionRequest 删除打卡规则请求
+type DelOptionRequest struct {
+	GroupID      int64 `json:"groupid"`
+	EffectiveNow bool  `json:"effective_now"`
+}
+
+// DelOption 删除打卡规则
+// see https://developer.work.weixin.qq.com/document/path/98041#%E5%88%A0%E9%99%A4%E6%89%93%E5%8D%A1%E8%A7%84%E5%88%99
+func (r *Client) DelOption(req *DelOptionRequest) error {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(delOptionURL, accessToken), req); err != nil {
+		return err
+	}
+	return util.DecodeWithCommonError(response, "DelOption")
 }

work/checkin/record.go

@@ -0,0 +1,660 @@
+package checkin
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	// getCheckinDataURL 获取打卡记录数据
+	getCheckinDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckindata?access_token=%s"
+	// getDayDataURL 获取打卡日报数据
+	getDayDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckin_daydata?access_token=%s"
+	// getMonthDataURL 获取打卡月报数据
+	getMonthDataURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckin_monthdata?access_token=%s"
+	// getCorpOptionURL 获取企业所有打卡规则
+	getCorpOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcorpcheckinoption?access_token=%s"
+	// getOptionURL 获取员工打卡规则
+	getOptionURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckinoption?access_token=%s"
+	// getScheduleListURL 获取打卡人员排班信息
+	getScheduleListURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckinschedulist?access_token=%s"
+	// getHardwareDataURL 获取设备打卡数据
+	getHardwareDataURL = "https://qyapi.weixin.qq.com/cgi-bin/hardware/get_hardware_checkin_data?access_token=%s"
+)
+
+type (
+	// GetCheckinDataRequest 获取打卡记录数据请求
+	GetCheckinDataRequest struct {
+		OpenCheckinDataType int64    `json:"opencheckindatatype"`
+		StartTime           int64    `json:"starttime"`
+		EndTime             int64    `json:"endtime"`
+		UserIDList          []string `json:"useridlist"`
+	}
+	// GetCheckinDataResponse 获取打卡记录数据响应
+	GetCheckinDataResponse struct {
+		util.CommonError
+		CheckinData []*GetCheckinDataItem `json:"checkindata"`
+	}
+	// GetCheckinDataItem 打卡记录数据
+	GetCheckinDataItem struct {
+		UserID         string   `json:"userid"`
+		GroupName      string   `json:"groupname"`
+		CheckinType    string   `json:"checkin_type"`
+		ExceptionType  string   `json:"exception_type"`
+		CheckinTime    int64    `json:"checkin_time"`
+		LocationTitle  string   `json:"location_title"`
+		LocationDetail string   `json:"location_detail"`
+		WifiName       string   `json:"wifiname"`
+		Notes          string   `json:"notes"`
+		WifiMac        string   `json:"wifimac"`
+		MediaIDs       []string `json:"mediaids"`
+		SchCheckinTime int64    `json:"sch_checkin_time"`
+		GroupID        int64    `json:"groupid"`
+		ScheduleID     int64    `json:"schedule_id"`
+		TimelineID     int64    `json:"timeline_id"`
+		Lat            int64    `json:"lat,omitempty"`
+		Lng            int64    `json:"lng,omitempty"`
+		DeviceID       string   `json:"deviceid,omitempty"`
+	}
+)
+
+// GetCheckinData 获取打卡记录数据
+// @see https://developer.work.weixin.qq.com/document/path/90262
+func (r *Client) GetCheckinData(req *GetCheckinDataRequest) (*GetCheckinDataResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(getCheckinDataURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetCheckinDataResponse{}
+	err = util.DecodeWithError(response, result, "GetCheckinData")
+	return result, err
+}
+
+type (
+	// GetDayDataResponse 获取打卡日报数据
+	GetDayDataResponse struct {
+		util.CommonError
+		Datas []DayDataItem `json:"datas"`
+	}
+
+	// DayDataItem 日报
+	DayDataItem struct {
+		BaseInfo       DayBaseInfo     `json:"base_info"`
+		SummaryInfo    DaySummaryInfo  `json:"summary_info"`
+		HolidayInfos   []HolidayInfo   `json:"holiday_infos"`
+		ExceptionInfos []ExceptionInfo `json:"exception_infos"`
+		OtInfo         OtInfo          `json:"ot_info"`
+		SpItems        []SpItem        `json:"sp_items"`
+	}
+
+	// DayBaseInfo 基础信息
+	DayBaseInfo struct {
+		Date        int64       `json:"date"`
+		RecordType  int64       `json:"record_type"`
+		Name        string      `json:"name"`
+		NameEx      string      `json:"name_ex"`
+		DepartsName string      `json:"departs_name"`
+		AcctID      string      `json:"acctid"`
+		DayType     int64       `json:"day_type"`
+		RuleInfo    DayRuleInfo `json:"rule_info"`
+	}
+
+	// DayCheckInTime 当日打卡时间
+	DayCheckInTime struct {
+		WorkSec    int64 `json:"work_sec"`
+		OffWorkSec int64 `json:"off_work_sec"`
+	}
+
+	// DayRuleInfo 打卡人员所属规则信息
+	DayRuleInfo struct {
+		GroupID      int64            `json:"groupid"`
+		GroupName    string           `json:"groupname"`
+		ScheduleID   int64            `json:"scheduleid"`
+		ScheduleName string           `json:"schedulename"`
+		CheckInTimes []DayCheckInTime `json:"checkintime"`
+	}
+
+	// DaySummaryInfo 汇总信息
+	DaySummaryInfo struct {
+		CheckinCount    int64 `json:"checkin_count"`
+		RegularWorkSec  int64 `json:"regular_work_sec"`
+		StandardWorkSec int64 `json:"standard_work_sec"`
+		EarliestTime    int64 `json:"earliest_time"`
+		LastestTime     int64 `json:"lastest_time"`
+	}
+
+	// HolidayInfo 假勤相关信息
+	HolidayInfo struct {
+		SpNumber      string        `json:"sp_number"`
+		SpTitle       SpTitle       `json:"sp_title"`
+		SpDescription SpDescription `json:"sp_description"`
+	}
+
+	// SpTitle 假勤信息摘要 - 标题信息
+	SpTitle struct {
+		Data []SpData `json:"data"`
+	}
+
+	// SpDescription 假勤信息摘要 - 描述信息
+	SpDescription struct {
+		Data []SpData `json:"data"`
+	}
+
+	// SpData 假勤信息 (多种语言描述，目前只有中文一种)
+	SpData struct {
+		Lang string `json:"lang"`
+		Text string `json:"text"`
+	}
+
+	// SpItem 假勤统计信息
+	SpItem struct {
+		Count      int64  `json:"count"`
+		Duration   int64  `json:"duration"`
+		TimeType   int64  `json:"time_type"`
+		Type       int64  `json:"type"`
+		VacationID int64  `json:"vacation_id"`
+		Name       string `json:"name"`
+	}
+
+	// ExceptionInfo 校准状态信息
+	ExceptionInfo struct {
+		Count     int64 `json:"count"`
+		Duration  int64 `json:"duration"`
+		Exception int64 `json:"exception"`
+	}
+
+	// OtInfo 加班信息
+	OtInfo struct {
+		OtStatus          int64    `json:"ot_status"`
+		OtDuration        int64    `json:"ot_duration"`
+		ExceptionDuration []uint64 `json:"exception_duration"`
+	}
+)
+
+// GetDayData 获取打卡日报数据
+// @see https://developer.work.weixin.qq.com/document/path/96498
+func (r *Client) GetDayData(req *GetCheckinDataRequest) (result *GetDayDataResponse, err error) {
+	var (
+		response    []byte
+		accessToken string
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return
+	}
+	if response, err = util.PostJSON(fmt.Sprintf(getDayDataURL, accessToken), req); err != nil {
+		return
+	}
+
+	result = new(GetDayDataResponse)
+	err = util.DecodeWithError(response, result, "GetDayData")
+	return
+}
+
+type (
+	// GetMonthDataResponse 获取打卡月报数据
+	GetMonthDataResponse struct {
+		util.CommonError
+		Datas []MonthDataItem `json:"datas"`
+	}
+
+	// MonthDataItem 月报数据
+	MonthDataItem struct {
+		BaseInfo       MonthBaseInfo    `json:"base_info"`
+		SummaryInfo    MonthSummaryInfo `json:"summary_info"`
+		ExceptionInfos []ExceptionInfo  `json:"exception_infos"`
+		SpItems        []SpItem         `json:"sp_items"`
+		OverWorkInfo   OverWorkInfo     `json:"overwork_info"`
+	}
+
+	// MonthBaseInfo 基础信息
+	MonthBaseInfo struct {
+		RecordType  int64         `json:"record_type"`
+		Name        string        `json:"name"`
+		NameEx      string        `json:"name_ex"`
+		DepartsName string        `json:"departs_name"`
+		AcctID      string        `json:"acctid"`
+		RuleInfo    MonthRuleInfo `json:"rule_info"`
+	}
+
+	// MonthRuleInfo 打卡人员所属规则信息
+	MonthRuleInfo struct {
+		GroupID   int64  `json:"groupid"`
+		GroupName string `json:"groupname"`
+	}
+
+	// MonthSummaryInfo 汇总信息
+	MonthSummaryInfo struct {
+		WorkDays        int64 `json:"work_days"`
+		ExceptDays      int64 `json:"except_days"`
+		RegularDays     int64 `json:"regular_days"`
+		RegularWorkSec  int64 `json:"regular_work_sec"`
+		StandardWorkSec int64 `json:"standard_work_sec"`
+	}
+
+	// OverWorkInfo 加班情况
+	OverWorkInfo struct {
+		WorkdayOverSec int64 `json:"workday_over_sec"`
+		HolidayOverSec int64 `json:"holidays_over_sec"`
+		RestDayOverSec int64 `json:"restdays_over_sec"`
+	}
+)
+
+// GetMonthData 获取打卡月报数据
+// @see https://developer.work.weixin.qq.com/document/path/96499
+func (r *Client) GetMonthData(req *GetCheckinDataRequest) (result *GetMonthDataResponse, err error) {
+	var (
+		response    []byte
+		accessToken string
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return
+	}
+	if response, err = util.PostJSON(fmt.Sprintf(getMonthDataURL, accessToken), req); err != nil {
+		return
+	}
+
+	result = new(GetMonthDataResponse)
+	err = util.DecodeWithError(response, result, "GetMonthData")
+	return
+}
+
+// GetCorpOptionResponse 获取企业所有打卡规则响应
+type GetCorpOptionResponse struct {
+	util.CommonError
+	Group []CorpOptionGroup `json:"group"`
+}
+
+// CorpOptionGroup 企业规则信息列表
+type CorpOptionGroup struct {
+	GroupType              int64              `json:"grouptype"`
+	GroupID                int64              `json:"groupid"`
+	GroupName              string             `json:"groupname"`
+	CheckinDate            []GroupCheckinDate `json:"checkindate"`
+	SpeWorkdays            []SpeWorkdays      `json:"spe_workdays"`
+	SpeOffDays             []SpeOffDays       `json:"spe_offdays"`
+	SyncHolidays           bool               `json:"sync_holidays"`
+	NeedPhoto              bool               `json:"need_photo"`
+	NoteCanUseLocalPic     bool               `json:"note_can_use_local_pic"`
+	AllowCheckinOffWorkday bool               `json:"allow_checkin_offworkday"`
+	AllowApplyOffWorkday   bool               `json:"allow_apply_offworkday"`
+	WifiMacInfos           []WifiMacInfos     `json:"wifimac_infos"`
+	LocInfos               []LocInfos         `json:"loc_infos"`
+	Range                  []Range            `json:"range"`
+	CreateTime             int64              `json:"create_time"`
+	WhiteUsers             []string           `json:"white_users"`
+	Type                   int64              `json:"type"`
+	ReporterInfo           ReporterInfo       `json:"reporterinfo"`
+	OtInfo                 GroupOtInfo        `json:"ot_info"`
+	OtApplyInfo            OtApplyInfo        `json:"otapplyinfo"`
+	Uptime                 int64              `json:"uptime"`
+	AllowApplyBkCnt        int64              `json:"allow_apply_bk_cnt"`
+	OptionOutRange         int64              `json:"option_out_range"`
+	CreateUserID           string             `json:"create_userid"`
+	UseFaceDetect          bool               `json:"use_face_detect"`
+	AllowApplyBkDayLimit   int64              `json:"allow_apply_bk_day_limit"`
+	UpdateUserID           string             `json:"update_userid"`
+	BukaRestriction        int64              `json:"buka_restriction"`
+	ScheduleList           []ScheduleList     `json:"schedulelist"`
+	OffWorkIntervalTime    int64              `json:"offwork_interval_time"`
+}
+
+// GroupCheckinDate 打卡时间，当规则类型为排班时没有意义
+type GroupCheckinDate struct {
+	Workdays        []int64            `json:"workdays"`
+	CheckinTime     []GroupCheckinTime `json:"checkintime"`
+	NoNeedOffWork   bool               `json:"noneed_offwork"`
+	LimitAheadTime  int64              `json:"limit_aheadtime"`
+	FlexOnDutyTime  int64              `json:"flex_on_duty_time"`
+	FlexOffDutyTime int64              `json:"flex_off_duty_time"`
+}
+
+// GroupCheckinTime 工作日上下班打卡时间信息
+type GroupCheckinTime struct {
+	WorkSec          int64 `json:"work_sec"`
+	OffWorkSec       int64 `json:"off_work_sec"`
+	RemindWorkSec    int64 `json:"remind_work_sec"`
+	RemindOffWorkSec int64 `json:"remind_off_work_sec"`
+}
+
+// SpeWorkdays 特殊日期 - 必须打卡日期信息
+type SpeWorkdays struct {
+	Timestamp   int64              `json:"timestamp"`
+	Notes       string             `json:"notes"`
+	CheckinTime []GroupCheckinTime `json:"checkintime"`
+}
+
+// SpeOffDays 特殊日期 - 不用打卡日期信息
+type SpeOffDays struct {
+	Timestamp int64  `json:"timestamp"`
+	Notes     string `json:"notes"`
+}
+
+// WifiMacInfos 打卡地点-WiFi 打卡信息
+type WifiMacInfos struct {
+	WifiName string `json:"wifiname"`
+	WifiMac  string `json:"wifimac"`
+}
+
+// LocInfos 打卡地点 - 位置打卡信息
+type LocInfos struct {
+	Lat       int64  `json:"lat"`
+	Lng       int64  `json:"lng"`
+	LocTitle  string `json:"loc_title"`
+	LocDetail string `json:"loc_detail"`
+	Distance  int64  `json:"distance"`
+}
+
+// Range 打卡人员信息
+type Range struct {
+	PartyID []string `json:"partyid"`
+	UserID  []string `json:"userid"`
+	TagID   []int64  `json:"tagid"`
+}
+
+// ReporterInfo 汇报对象信息
+type ReporterInfo struct {
+	Reporters  []Reporters `json:"reporters"`
+	UpdateTime int64       `json:"updatetime"`
+}
+
+// Reporters 汇报对象，每个汇报人用 userid 表示
+type Reporters struct {
+	UserID string `json:"userid"`
+}
+
+// GroupOtInfo 加班信息
+type GroupOtInfo struct {
+	Type                 int64       `json:"type"`
+	AllowOtWorkingDay    bool        `json:"allow_ot_workingday"`
+	AllowOtNonWorkingDay bool        `json:"allow_ot_nonworkingday"`
+	OtCheckInfo          OtCheckInfo `json:"otcheckinfo"`
+}
+
+// OtCheckInfo 以打卡时间为准 - 加班时长计算规则信息
+type OtCheckInfo struct {
+	OtWorkingDayTimeStart      int64      `json:"ot_workingday_time_start"`
+	OtWorkingDayTimeMin        int64      `json:"ot_workingday_time_min"`
+	OtWorkingDayTimeMax        int64      `json:"ot_workingday_time_max"`
+	OtNonworkingDayTimeMin     int64      `json:"ot_nonworkingday_time_min"`
+	OtNonworkingDayTimeMax     int64      `json:"ot_nonworkingday_time_max"`
+	OtNonworkingDaySpanDayTime int64      `json:"ot_nonworkingday_spanday_time"`
+	OtWorkingDayRestInfo       OtRestInfo `json:"ot_workingday_restinfo"`
+	OtNonWorkingDayRestInfo    OtRestInfo `json:"ot_nonworkingday_restinfo"`
+}
+
+// OtRestInfo 加班 - 休息扣除配置信息
+type OtRestInfo struct {
+	Type          int64         `json:"type"`
+	FixTimeRule   FixTimeRule   `json:"fix_time_rule"`
+	CalOtTimeRule CalOtTimeRule `json:"cal_ottime_rule"`
+}
+
+// FixTimeRule 工作日加班 - 指定休息时间配置信息
+type FixTimeRule struct {
+	FixTimeBeginSec int64 `json:"fix_time_begin_sec"`
+	FixTimeEndSec   int64 `json:"fix_time_end_sec"`
+}
+
+// CalOtTimeRule 工作日加班 - 按加班时长扣除配置信息
+type CalOtTimeRule struct {
+	Items []CalOtTimeRuleItem `json:"items"`
+}
+
+// CalOtTimeRuleItem 工作日加班 - 按加班时长扣除条件信息
+type CalOtTimeRuleItem struct {
+	OtTime   int64 `json:"ot_time"`
+	RestTime int64 `json:"rest_time"`
+}
+
+// OtApplyInfo 以加班申请核算打卡记录相关信息
+type OtApplyInfo struct {
+	AllowOtWorkingDay          bool       `json:"allow_ot_workingday"`
+	AllowOtNonWorkingDay       bool       `json:"allow_ot_nonworkingday"`
+	Uiptime                    int64      `json:"uptime"`
+	OtNonworkingDaySpanDayTime int64      `json:"ot_nonworkingday_spanday_time"`
+	OtWorkingDayRestInfo       OtRestInfo `json:"ot_workingday_restinfo"`
+	OtNonWorkingDayRestInfo    OtRestInfo `json:"ot_nonworkingday_restinfo"`
+}
+
+// ScheduleList 排班信息列表
+type ScheduleList struct {
+	ScheduleID          int64         `json:"schedule_id"`
+	ScheduleName        string        `json:"schedule_name"`
+	TimeSection         []TimeSection `json:"time_section"`
+	LimitAheadTime      int64         `json:"limit_aheadtime"`
+	NoNeedOffWork       bool          `json:"noneed_offwork"`
+	LimitOffTime        int64         `json:"limit_offtime"`
+	FlexOnDutyTime      int64         `json:"flex_on_duty_time"`
+	FlexOffDutyTime     int64         `json:"flex_off_duty_time"`
+	AllowFlex           bool          `json:"allow_flex"`
+	LateRule            LateRule      `json:"late_rule"`
+	MaxAllowArriveEarly int64         `json:"max_allow_arrive_early"`
+	MaxAllowArriveLate  int64         `json:"max_allow_arrive_late"`
+}
+
+// TimeSection 班次上下班时段信息
+type TimeSection struct {
+	TimeID           int64 `json:"time_id"`
+	WorkSec          int64 `json:"work_sec"`
+	OffWorkSec       int64 `json:"off_work_sec"`
+	RemindWorkSec    int64 `json:"remind_work_sec"`
+	RemindOffWorkSec int64 `json:"remind_off_work_sec"`
+	RestBeginTime    int64 `json:"rest_begin_time"`
+	RestEndTime      int64 `json:"rest_end_time"`
+	AllowRest        bool  `json:"allow_rest"`
+}
+
+// LateRule 晚走晚到时间规则信息
+type LateRule struct {
+	AllowOffWorkAfterTime bool       `json:"allow_offwork_after_time"`
+	TimeRules             []TimeRule `json:"timerules"`
+}
+
+// TimeRule 迟到规则时间
+type TimeRule struct {
+	OffWorkAfterTime int64 `json:"offwork_after_time"`
+	OnWorkFlexTime   int64 `json:"onwork_flex_time"`
+}
+
+// GetCorpOption 获取企业所有打卡规则
+// @see https://developer.work.weixin.qq.com/document/path/93384
+func (r *Client) GetCorpOption() (*GetCorpOptionResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.HTTPPost(fmt.Sprintf(getCorpOptionURL, accessToken), ""); err != nil {
+		return nil, err
+	}
+	result := &GetCorpOptionResponse{}
+	err = util.DecodeWithError(response, result, "GetCorpOption")
+	return result, err
+}
+
+// GetOptionRequest 获取员工打卡规则请求
+type GetOptionRequest struct {
+	Datetime   int64    `json:"datetime"`
+	UserIDList []string `json:"useridlist"`
+}
+
+// GetOptionResponse 获取员工打卡规则响应
+type GetOptionResponse struct {
+	util.CommonError
+	Info []OptionInfo `json:"info"`
+}
+
+// OptionInfo 打卡规则列表
+type OptionInfo struct {
+	UserID string      `json:"userid"`
+	Group  OptionGroup `json:"group"`
+}
+
+// OptionGroup 打卡规则相关信息
+type OptionGroup struct {
+	GroupType              int64               `json:"grouptype"`
+	GroupID                int64               `json:"groupid"`
+	GroupName              string              `json:"groupname"`
+	CheckinDate            []OptionCheckinDate `json:"checkindate"`
+	SpeWorkdays            []SpeWorkdays       `json:"spe_workdays"`
+	SpeOffDays             []SpeOffDays        `json:"spe_offdays"`
+	SyncHolidays           bool                `json:"sync_holidays"`
+	NeedPhoto              bool                `json:"need_photo"`
+	WifiMacInfos           []WifiMacInfos      `json:"wifimac_infos"`
+	NoteCanUseLocalPic     bool                `json:"note_can_use_local_pic"`
+	AllowCheckinOffWorkday bool                `json:"allow_checkin_offworkday"`
+	AllowApplyOffWorkday   bool                `json:"allow_apply_offworkday"`
+	LocInfos               []LocInfos          `json:"loc_infos"`
+	ScheduleList           []ScheduleList      `json:"schedulelist"`
+	BukaRestriction        int64               `json:"buka_restriction"`
+}
+
+// OptionCheckinDate 打卡时间配置
+type OptionCheckinDate struct {
+	Workdays        []int64            `json:"workdays"`
+	CheckinTime     []GroupCheckinTime `json:"checkintime"`
+	FlexTime        int64              `json:"flex_time"`
+	NoNeedOffWork   bool               `json:"noneed_offwork"`
+	LimitAheadTime  int64              `json:"limit_aheadtime"`
+	FlexOnDutyTime  int64              `json:"flex_on_duty_time"`
+	FlexOffDutyTime int64              `json:"flex_off_duty_time"`
+}
+
+// GetOption 获取员工打卡规则
+// see https://developer.work.weixin.qq.com/document/path/90263
+func (r *Client) GetOption(req *GetOptionRequest) (*GetOptionResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(getOptionURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetOptionResponse{}
+	err = util.DecodeWithError(response, result, "GetOption")
+	return result, err
+}
+
+// GetScheduleListRequest 获取打卡人员排班信息请求
+type GetScheduleListRequest struct {
+	StartTime  int64    `json:"starttime"`
+	EndTime    int64    `json:"endtime"`
+	UserIDList []string `json:"useridlist"`
+}
+
+// GetScheduleListResponse 获取打卡人员排班信息响应
+type GetScheduleListResponse struct {
+	util.CommonError
+	ScheduleList []ScheduleItem `json:"schedule_list"`
+}
+
+// ScheduleItem 排班表信息
+type ScheduleItem struct {
+	UserID    string   `json:"userid"`
+	YearMonth int64    `json:"yearmonth"`
+	GroupID   int64    `json:"groupid"`
+	GroupName string   `json:"groupname"`
+	Schedule  Schedule `json:"schedule"`
+}
+
+// Schedule 个人排班信息
+type Schedule struct {
+	ScheduleList []ScheduleListItem `json:"scheduleList"`
+}
+
+// ScheduleListItem 个人排班表信息
+type ScheduleListItem struct {
+	Day          int64        `json:"day"`
+	ScheduleInfo ScheduleInfo `json:"schedule_info"`
+}
+
+// ScheduleInfo 个人当日排班信息
+type ScheduleInfo struct {
+	ScheduleID   int64                 `json:"schedule_id"`
+	ScheduleName string                `json:"schedule_name"`
+	TimeSection  []ScheduleTimeSection `json:"time_section"`
+}
+
+// ScheduleTimeSection 班次上下班时段信息
+type ScheduleTimeSection struct {
+	ID               int64 `json:"id"`
+	WorkSec          int64 `json:"work_sec"`
+	OffWorkSec       int64 `json:"off_work_sec"`
+	RemindWorkSec    int64 `json:"remind_work_sec"`
+	RemindOffWorkSec int64 `json:"remind_off_work_sec"`
+}
+
+// GetScheduleList 获取打卡人员排班信息
+// see https://developer.work.weixin.qq.com/document/path/93380
+func (r *Client) GetScheduleList(req *GetScheduleListRequest) (*GetScheduleListResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(getScheduleListURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetScheduleListResponse{}
+	err = util.DecodeWithError(response, result, "GetScheduleList")
+	return result, err
+}
+
+// GetHardwareDataRequest 获取设备打卡数据请求
+type GetHardwareDataRequest struct {
+	FilterType int64    `json:"filter_type"`
+	StartTime  int64    `json:"starttime"`
+	EndTime    int64    `json:"endtime"`
+	UserIDList []string `json:"useridlist"`
+}
+
+// GetHardwareDataResponse 获取设备打卡数据响应
+type GetHardwareDataResponse struct {
+	util.CommonError
+	CheckinData []HardwareCheckinData `json:"checkindata"`
+}
+
+// HardwareCheckinData 设备打卡数据
+type HardwareCheckinData struct {
+	UserID      string `json:"userid"`
+	CheckinTime int64  `json:"checkin_time"`
+	DeviceSn    string `json:"device_sn"`
+	DeviceName  string `json:"device_name"`
+}
+
+// GetHardwareData 获取设备打卡数据
+// see https://developer.work.weixin.qq.com/document/path/94126
+func (r *Client) GetHardwareData(req *GetHardwareDataRequest) (*GetHardwareDataResponse, error) {
+	var (
+		accessToken string
+		err         error
+	)
+	if accessToken, err = r.GetAccessToken(); err != nil {
+		return nil, err
+	}
+	var response []byte
+	if response, err = util.PostJSON(fmt.Sprintf(getHardwareDataURL, accessToken), req); err != nil {
+		return nil, err
+	}
+	result := &GetHardwareDataResponse{}
+	err = util.DecodeWithError(response, result, "GetHardwareData")
+	return result, err
+}

work/config/config.go

@@ -8,7 +8,7 @@ import (
 // Config for 企业微信
 type Config struct {
 	CorpID        string `json:"corp_id"`     // corp_id
-	CorpSecret    string `json:"corp_secret"` // corp_secret,如果需要获取会话存档实例，当前参数请填写聊天内容存档的Secret，可以在企业微信管理端--管理工具--聊天内容存档查看
+	CorpSecret    string `json:"corp_secret"` // corp_secret，如果需要获取会话存档实例，当前参数请填写聊天内容存档的 Secret，可以在企业微信管理端--管理工具--聊天内容存档查看
 	AgentID       string `json:"agent_id"`    // agent_id
 	Cache         cache.Cache
 	RasPrivateKey string // 消息加密私钥，可以在企业微信管理端--管理工具--消息加密公钥查看对用公钥，私钥一般由自己保存

work/externalcontact/callback.go

@@ -38,8 +38,6 @@ func (r *Client) GetCallbackMessage(encryptedMsg []byte) (msg EventCallbackMessa
 	if err != nil {
 		return
 	}
-	if err = xml.Unmarshal(bData, &msg); err != nil {
+	err = xml.Unmarshal(bData, &msg)
-		return
-	}
 	return
 }

work/externalcontact/contact_way.go

@@ -102,10 +102,8 @@ func (r *Client) AddContactWay(req *AddContactWayRequest) (*AddContactWayRespons
 		return nil, err
 	}
 	result := &AddContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "AddContactWay"); err != nil {
+	err = util.DecodeWithError(response, result, "AddContactWay")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -153,10 +151,8 @@ func (r *Client) GetContactWay(req *GetContactWayRequest) (*GetContactWayRespons
 		return nil, err
 	}
 	result := &GetContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "GetContactWay"); err != nil {
+	err = util.DecodeWithError(response, result, "GetContactWay")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -195,10 +191,8 @@ func (r *Client) UpdateContactWay(req *UpdateContactWayRequest) (*UpdateContactW
 		return nil, err
 	}
 	result := &UpdateContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "UpdateContactWay"); err != nil {
+	err = util.DecodeWithError(response, result, "UpdateContactWay")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -236,10 +230,8 @@ func (r *Client) ListContactWay(req *ListContactWayRequest) (*ListContactWayResp
 		return nil, err
 	}
 	result := &ListContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "ListContactWay"); err != nil {
+	err = util.DecodeWithError(response, result, "ListContactWay")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -268,8 +260,6 @@ func (r *Client) DelContactWay(req *DelContactWayRequest) (*DelContactWayRespons
 		return nil, err
 	}
 	result := &DelContactWayResponse{}
-	if err = util.DecodeWithError(response, result, "DelContactWay"); err != nil {
+	err = util.DecodeWithError(response, result, "DelContactWay")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/externalcontact/customer_acquisition.go

@@ -54,10 +54,8 @@ func (r *Client) ListLink(req *ListLinkRequest) (*ListLinkResponse, error) {
 		return nil, err
 	}
 	result := &ListLinkResponse{}
-	if err = util.DecodeWithError(response, result, "ListLink"); err != nil {
+	err = util.DecodeWithError(response, result, "ListLink")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -102,10 +100,8 @@ func (r *Client) GetCustomerAcquisition(req *GetCustomerAcquisitionRequest) (*Ge
 		return nil, err
 	}
 	result := &GetCustomerAcquisitionResponse{}
-	if err = util.DecodeWithError(response, result, "GetCustomerAcquisition"); err != nil {
+	err = util.DecodeWithError(response, result, "GetCustomerAcquisition")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -137,10 +133,8 @@ func (r *Client) CreateCustomerAcquisitionLink(req *CreateCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &CreateCustomerAcquisitionLinkResponse{}
-	if err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink"); err != nil {
+	err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -172,10 +166,8 @@ func (r *Client) UpdateCustomerAcquisitionLink(req *UpdateCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &UpdateCustomerAcquisitionLinkResponse{}
-	if err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink"); err != nil {
+	err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -204,10 +196,8 @@ func (r *Client) DeleteCustomerAcquisitionLink(req *DeleteCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &DeleteCustomerAcquisitionLinkResponse{}
-	if err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink"); err != nil {
+	err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -247,10 +237,8 @@ func (r *Client) GetCustomerInfoWithCustomerAcquisitionLink(req *GetCustomerInfo
 		return nil, err
 	}
 	result := &GetCustomerInfoWithCustomerAcquisitionLinkResponse{}
-	if err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink"); err != nil {
+	err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -279,14 +267,12 @@ func (r *Client) CustomerAcquisitionQuota() (*CustomerAcquisitionQuotaResponse,
 		return nil, err
 	}
 	var response []byte
-	if response, err = util.HTTPGet((fmt.Sprintf(customerAcquisitionQuotaURL, accessToken))); err != nil {
+	if response, err = util.HTTPGet(fmt.Sprintf(customerAcquisitionQuotaURL, accessToken)); err != nil {
 		return nil, err
 	}
 	result := &CustomerAcquisitionQuotaResponse{}
-	if err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota"); err != nil {
+	err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -319,8 +305,6 @@ func (r *Client) CustomerAcquisitionStatistic(req *CustomerAcquisitionStatisticR
 		return nil, err
 	}
 	result := &CustomerAcquisitionStatisticResponse{}
-	if err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic"); err != nil {
+	err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/externalcontact/external_user.go

@@ -50,10 +50,7 @@ func (r *Client) GetExternalUserList(userID string) ([]string, error) {
 	}
 	var result ExternalUserListResponse
 	err = util.DecodeWithError(response, &result, "GetExternalUserList")
-	if err != nil {
+	return result.ExternalUserID, err
-		return nil, err
-	}
-	return result.ExternalUserID, nil
 }
 
 // ExternalUserDetailResponse 外部联系人详情响应
@@ -75,7 +72,7 @@ type ExternalUser struct {
 	Position        string           `json:"position"`
 	CorpName        string           `json:"corp_name"`
 	CorpFullName    string           `json:"corp_full_name"`
-	ExternalProfile string `json:"external_profile"`
+	ExternalProfile *ExternalProfile `json:"external_profile,omitempty"`
 }
 
 // FollowUser 跟进用户（指企业内部用户）
@@ -104,7 +101,47 @@ type Tag struct {
 // WechatChannel 视频号添加的场景
 type WechatChannel struct {
 	NickName string `json:"nickname"`
-	Source   string `json:"source"`
+	Source   int    `json:"source"`
+}
+
+// ExternalProfile 外部联系人的自定义展示信息，可以有多个字段和多种类型，包括文本，网页和小程序
+type ExternalProfile struct {
+	ExternalCorpName string         `json:"external_corp_name"`
+	WechatChannels   WechatChannels `json:"wechat_channels"`
+	ExternalAttr     []ExternalAttr `json:"external_attr"`
+}
+
+// WechatChannels 视频号属性。须从企业绑定到企业微信的视频号中选择，可在“我的企业”页中查看绑定的视频号
+type WechatChannels struct {
+	Nickname string `json:"nickname"`
+	Status   int    `json:"status"`
+}
+
+// ExternalAttr 属性列表，目前支持文本、网页、小程序三种类型
+type ExternalAttr struct {
+	Type        int          `json:"type"`
+	Name        string       `json:"name"`
+	Text        *Text        `json:"text,omitempty"`
+	Web         *Web         `json:"web,omitempty"`
+	MiniProgram *MiniProgram `json:"miniprogram,omitempty"`
+}
+
+// Text 文本
+type Text struct {
+	Value string `json:"value"`
+}
+
+// Web 网页
+type Web struct {
+	URL   string `json:"url"`
+	Title string `json:"title"`
+}
+
+// MiniProgram 小程序
+type MiniProgram struct {
+	AppID    string `json:"appid"`
+	Pagepath string `json:"pagepath"`
+	Title    string `json:"title"`
 }
 
 // GetExternalUserDetail 获取外部联系人详情
@@ -125,10 +162,7 @@ func (r *Client) GetExternalUserDetail(externalUserID string, nextCursor ...stri
 	}
 	result := &ExternalUserDetailResponse{}
 	err = util.DecodeWithError(response, result, "get_external_user_detail")
-	if err != nil {
+	return result, err
-		return nil, err
-	}
-	return result, nil
 }
 
 // BatchGetExternalUserDetailsRequest 批量获取外部联系人详情请求
@@ -196,10 +230,7 @@ func (r *Client) BatchGetExternalUserDetails(request BatchGetExternalUserDetails
 	}
 	var result ExternalUserDetailListResponse
 	err = util.DecodeWithError(response, &result, "BatchGetExternalUserDetails")
-	if err != nil {
+	return result.ExternalContactList, err
-		return nil, err
-	}
-	return result.ExternalContactList, nil
 }
 
 // UpdateUserRemarkRequest 修改客户备注信息请求体
@@ -265,10 +296,8 @@ func (r *Client) ListCustomerStrategy(req *ListCustomerStrategyRequest) (*ListCu
 		return nil, err
 	}
 	result := &ListCustomerStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "ListCustomerStrategy"); err != nil {
+	err = util.DecodeWithError(response, result, "ListCustomerStrategy")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetCustomerStrategyRequest 获取规则组详情请求
@@ -332,10 +361,8 @@ func (r *Client) GetCustomerStrategy(req *GetCustomerStrategyRequest) (*GetCusto
 		return nil, err
 	}
 	result := &GetCustomerStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "GetCustomerStrategy"); err != nil {
+	err = util.DecodeWithError(response, result, "GetCustomerStrategy")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetRangeCustomerStrategyRequest 获取规则组管理范围请求
@@ -374,10 +401,8 @@ func (r *Client) GetRangeCustomerStrategy(req *GetRangeCustomerStrategyRequest)
 		return nil, err
 	}
 	result := &GetRangeCustomerStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "GetRangeCustomerStrategy"); err != nil {
+	err = util.DecodeWithError(response, result, "GetRangeCustomerStrategy")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // CreateCustomerStrategyRequest 创建新的规则组请求
@@ -410,10 +435,8 @@ func (r *Client) CreateCustomerStrategy(req *CreateCustomerStrategyRequest) (*Cr
 		return nil, err
 	}
 	result := &CreateCustomerStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "CreateCustomerStrategy"); err != nil {
+	err = util.DecodeWithError(response, result, "CreateCustomerStrategy")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // EditCustomerStrategyRequest 编辑规则组及其管理范围请求

work/externalcontact/follow_user.go

@@ -31,8 +31,5 @@ func (r *Client) GetFollowUserList() ([]string, error) {
 	}
 	var result followerUserResponse
 	err = util.DecodeWithError(response, &result, "GetFollowUserList")
-	if err != nil {
+	return result.FollowUser, err
-		return nil, err
-	}
-	return result.FollowUser, nil
 }

work/externalcontact/groupchat.go

@@ -44,10 +44,8 @@ func (r *Client) GetGroupChatList(req *GroupChatListRequest) (*GroupChatListResp
 		return nil, err
 	}
 	result := &GroupChatListResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupChatList"); err != nil {
+	err = util.DecodeWithError(response, result, "GetGroupChatList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -85,6 +83,7 @@ type (
 		Notice        string            `json:"notice"`         //群公告
 		MemberList    []GroupChatMember `json:"member_list"`    //群成员列表
 		AdminList     []GroupChatAdmin  `json:"admin_list"`     //群管理员列表
+		MemberVersion string            `json:"member_version"` //当前群成员版本号。可以配合客户群变更事件减少主动调用本接口的次数
 	}
 	//GroupChatDetailResponse 客户群详情 返回值
 	GroupChatDetailResponse struct {
@@ -106,10 +105,8 @@ func (r *Client) GetGroupChatDetail(req *GroupChatDetailRequest) (*GroupChatDeta
 		return nil, err
 	}
 	result := &GroupChatDetailResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
+	err = util.DecodeWithError(response, result, "GetGroupChatDetail")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -137,8 +134,6 @@ func (r *Client) OpengIDToChatID(req *OpengIDToChatIDRequest) (*OpengIDToChatIDR
 		return nil, err
 	}
 	result := &OpengIDToChatIDResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
+	err = util.DecodeWithError(response, result, "GetGroupChatDetail")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/externalcontact/join_way.go

@@ -12,7 +12,7 @@ const groupChatURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/groupc
 type (
 	// AddJoinWayRequest 添加群配置请求参数
 	AddJoinWayRequest struct {
-		Scene          int      `json:"scene"`            // 必填 1 - 群的小程序插件,2 - 群的二维码插件
+		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 字符
@@ -44,10 +44,8 @@ func (r *Client) AddJoinWay(req *AddJoinWayRequest) (*AddJoinWayResponse, error)
 		return nil, err
 	}
 	result := &AddJoinWayResponse{}
-	if err = util.DecodeWithError(response, result, "AddJoinWay"); err != nil {
+	err = util.DecodeWithError(response, result, "AddJoinWay")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 type (
@@ -91,16 +89,14 @@ func (r *Client) GetJoinWay(req *JoinWayConfigRequest) (*GetJoinWayResponse, err
 		return nil, err
 	}
 	result := &GetJoinWayResponse{}
-	if err = util.DecodeWithError(response, result, "GetJoinWay"); err != nil {
+	err = util.DecodeWithError(response, result, "GetJoinWay")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // UpdateJoinWayRequest 更新群配置的请求参数
 type UpdateJoinWayRequest struct {
 	ConfigID       string   `json:"config_id"`
-	Scene          int      `json:"scene"`            // 必填 1 - 群的小程序插件,2 - 群的二维码插件
+	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 字符

work/externalcontact/moment.go

@@ -112,10 +112,8 @@ func (r *Client) AddMomentTask(req *AddMomentTaskRequest) (*AddMomentTaskRespons
 		return nil, err
 	}
 	result := &AddMomentTaskResponse{}
-	if err = util.DecodeWithError(response, result, "AddMomentTask"); err != nil {
+	err = util.DecodeWithError(response, result, "AddMomentTask")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetMomentTaskResultResponse 获取任务创建结果响应
@@ -161,10 +159,8 @@ func (r *Client) GetMomentTaskResult(jobID string) (*GetMomentTaskResultResponse
 		return nil, err
 	}
 	result := &GetMomentTaskResultResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentTaskResult"); err != nil {
+	err = util.DecodeWithError(response, result, "GetMomentTaskResult")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // CancelMomentTaskRequest 停止发表企业朋友圈请求
@@ -264,10 +260,8 @@ func (r *Client) GetMomentList(req *GetMomentListRequest) (*GetMomentListRespons
 		return nil, err
 	}
 	result := &GetMomentListResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentList"); err != nil {
+	err = util.DecodeWithError(response, result, "GetMomentList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetMomentTaskRequest 获取客户朋友圈企业发表的列表请求
@@ -305,10 +299,8 @@ func (r *Client) GetMomentTask(req *GetMomentTaskRequest) (*GetMomentTaskRespons
 		return nil, err
 	}
 	result := &GetMomentTaskResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentTask"); err != nil {
+	err = util.DecodeWithError(response, result, "GetMomentTask")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetMomentCustomerListRequest 获取客户朋友圈发表时选择的可见范围请求
@@ -347,10 +339,8 @@ func (r *Client) GetMomentCustomerList(req *GetMomentCustomerListRequest) (*GetM
 		return nil, err
 	}
 	result := &GetMomentCustomerListResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentCustomerList"); err != nil {
+	err = util.DecodeWithError(response, result, "GetMomentCustomerList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetMomentSendResultRequest 获取客户朋友圈发表后的可见客户列表请求
@@ -388,10 +378,8 @@ func (r *Client) GetMomentSendResult(req *GetMomentSendResultRequest) (*GetMomen
 		return nil, err
 	}
 	result := &GetMomentSendResultResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentSendResult"); err != nil {
+	err = util.DecodeWithError(response, result, "GetMomentSendResult")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetMomentCommentsRequest 获取客户朋友圈的互动数据请求
@@ -436,10 +424,8 @@ func (r *Client) GetMomentComments(req *GetMomentCommentsRequest) (*GetMomentCom
 		return nil, err
 	}
 	result := &GetMomentCommentsResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentComments"); err != nil {
+	err = util.DecodeWithError(response, result, "GetMomentComments")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // ListMomentStrategyRequest 获取规则组列表请求
@@ -475,10 +461,8 @@ func (r *Client) ListMomentStrategy(req *ListMomentStrategyRequest) (*ListMoment
 		return nil, err
 	}
 	result := &ListMomentStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "ListMomentStrategy"); err != nil {
+	err = util.DecodeWithError(response, result, "ListMomentStrategy")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetMomentStrategyRequest 获取规则组详情请求
@@ -524,10 +508,8 @@ func (r *Client) GetMomentStrategy(req *GetMomentStrategyRequest) (*GetMomentStr
 		return nil, err
 	}
 	result := &GetMomentStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "GetMomentStrategy"); err != nil {
+	err = util.DecodeWithError(response, result, "GetMomentStrategy")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetRangeMomentStrategyRequest 获取规则组管理范围请求
@@ -566,10 +548,8 @@ func (r *Client) GetRangeMomentStrategy(req *GetRangeMomentStrategyRequest) (*Ge
 		return nil, err
 	}
 	result := &GetRangeMomentStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "GetRangeMomentStrategy"); err != nil {
+	err = util.DecodeWithError(response, result, "GetRangeMomentStrategy")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // CreateMomentStrategyRequest 创建新的规则组请求
@@ -602,10 +582,8 @@ func (r *Client) CreateMomentStrategy(req *CreateMomentStrategyRequest) (*Create
 		return nil, err
 	}
 	result := &CreateMomentStrategyResponse{}
-	if err = util.DecodeWithError(response, result, "CreateMomentStrategy"); err != nil {
+	err = util.DecodeWithError(response, result, "CreateMomentStrategy")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // EditMomentStrategyRequest 编辑规则组及其管理范围请求

work/externalcontact/msg.go

@@ -38,8 +38,23 @@ type AddMsgTemplateRequest struct {
 	Sender         string        `json:"sender,omitempty"`
 	Text           MsgText       `json:"text"`
 	Attachments    []*Attachment `json:"attachments"`
+	AllowSelect    bool          `json:"allow_select,omitempty"`
+	ChatIDList     []string      `json:"chat_id_list,omitempty"`
+	TagFilter      TagFilter     `json:"tag_filter,omitempty"`
 }
 
+type (
+	// TagFilter 标签过滤
+	TagFilter struct {
+		GroupList []TagGroupList `json:"group_list"`
+	}
+
+	// TagGroupList 标签组
+	TagGroupList struct {
+		TagList []string `json:"tag_list"`
+	}
+)
+
 // MsgText 文本消息
 type MsgText struct {
 	Content string `json:"content"`
@@ -106,10 +121,8 @@ func (r *Client) AddMsgTemplate(req *AddMsgTemplateRequest) (*AddMsgTemplateResp
 		return nil, err
 	}
 	result := &AddMsgTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "AddMsgTemplate"); err != nil {
+	err = util.DecodeWithError(response, result, "AddMsgTemplate")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetGroupMsgListV2Request 获取群发记录列表请求
@@ -155,10 +168,8 @@ func (r *Client) GetGroupMsgListV2(req *GetGroupMsgListV2Request) (*GetGroupMsgL
 		return nil, err
 	}
 	result := &GetGroupMsgListV2Response{}
-	if err = util.DecodeWithError(response, result, "GetGroupMsgListV2"); err != nil {
+	err = util.DecodeWithError(response, result, "GetGroupMsgListV2")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetGroupMsgTaskRequest 获取群发成员发送任务列表请求
@@ -197,10 +208,8 @@ func (r *Client) GetGroupMsgTask(req *GetGroupMsgTaskRequest) (*GetGroupMsgTaskR
 		return nil, err
 	}
 	result := &GetGroupMsgTaskResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupMsgTask"); err != nil {
+	err = util.DecodeWithError(response, result, "GetGroupMsgTask")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetGroupMsgSendResultRequest 获取企业群发成员执行结果请求
@@ -242,10 +251,8 @@ func (r *Client) GetGroupMsgSendResult(req *GetGroupMsgSendResultRequest) (*GetG
 		return nil, err
 	}
 	result := &GetGroupMsgSendResultResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupMsgSendResult"); err != nil {
+	err = util.DecodeWithError(response, result, "GetGroupMsgSendResult")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // SendWelcomeMsgRequest 发送新客户欢迎语请求
@@ -275,22 +282,19 @@ func (r *Client) SendWelcomeMsg(req *SendWelcomeMsgRequest) error {
 		return err
 	}
 	result := &SendWelcomeMsgResponse{}
-	if err = util.DecodeWithError(response, result, "SendWelcomeMsg"); err != nil {
+	return util.DecodeWithError(response, result, "SendWelcomeMsg")
-		return err
-	}
-	return nil
 }
 
 // AddGroupWelcomeTemplateRequest 添加入群欢迎语素材请求
 type AddGroupWelcomeTemplateRequest struct {
 	Text        MsgText                `json:"text"`
-	Image       AttachmentImg         `json:"image"`
+	Image       *AttachmentImg         `json:"image,omitempty"`
-	Link        AttachmentLink        `json:"link"`
+	Link        *AttachmentLink        `json:"link,omitempty"`
-	MiniProgram AttachmentMiniProgram `json:"miniprogram"`
+	MiniProgram *AttachmentMiniProgram `json:"miniprogram,omitempty"`
-	File        AttachmentFile        `json:"file"`
+	File        *AttachmentFile        `json:"file,omitempty"`
-	Video       AttachmentVideo       `json:"video"`
+	Video       *AttachmentVideo       `json:"video,omitempty"`
-	AgentID     int                   `json:"agentid"`
+	AgentID     int                    `json:"agentid,omitempty"`
-	Notify      int                   `json:"notify"`
+	Notify      int                    `json:"notify,omitempty"`
 }
 
 // AddGroupWelcomeTemplateResponse 添加入群欢迎语素材响应
@@ -314,21 +318,19 @@ func (r *Client) AddGroupWelcomeTemplate(req *AddGroupWelcomeTemplateRequest) (*
 		return nil, err
 	}
 	result := &AddGroupWelcomeTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "AddGroupWelcomeTemplate"); err != nil {
+	err = util.DecodeWithError(response, result, "AddGroupWelcomeTemplate")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // EditGroupWelcomeTemplateRequest 编辑入群欢迎语素材请求
 type EditGroupWelcomeTemplateRequest struct {
 	TemplateID  string                 `json:"template_id"`
 	Text        MsgText                `json:"text"`
-	Image       AttachmentImg         `json:"image"`
+	Image       *AttachmentImg         `json:"image"`
-	Link        AttachmentLink        `json:"link"`
+	Link        *AttachmentLink        `json:"link"`
-	MiniProgram AttachmentMiniProgram `json:"miniprogram"`
+	MiniProgram *AttachmentMiniProgram `json:"miniprogram"`
-	File        AttachmentFile        `json:"file"`
+	File        *AttachmentFile        `json:"file"`
-	Video       AttachmentVideo       `json:"video"`
+	Video       *AttachmentVideo       `json:"video"`
 	AgentID     int                    `json:"agentid"`
 }
 
@@ -352,10 +354,7 @@ func (r *Client) EditGroupWelcomeTemplate(req *EditGroupWelcomeTemplateRequest)
 		return err
 	}
 	result := &EditGroupWelcomeTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "EditGroupWelcomeTemplate"); err != nil {
+	return util.DecodeWithError(response, result, "EditGroupWelcomeTemplate")
-		return err
-	}
-	return nil
 }
 
 // GetGroupWelcomeTemplateRequest 获取入群欢迎语素材请求
@@ -367,11 +366,11 @@ type GetGroupWelcomeTemplateRequest struct {
 type GetGroupWelcomeTemplateResponse struct {
 	util.CommonError
 	Text        MsgText               `json:"text"`
-	Image       AttachmentImg         `json:"image"`
+	Image       AttachmentImg         `json:"image,omitempty"`
-	Link        AttachmentLink        `json:"link"`
+	Link        AttachmentLink        `json:"link,omitempty"`
-	MiniProgram AttachmentMiniProgram `json:"miniprogram"`
+	MiniProgram AttachmentMiniProgram `json:"miniprogram,omitempty"`
-	File        AttachmentFile        `json:"file"`
+	File        AttachmentFile        `json:"file,omitempty"`
-	Video       AttachmentVideo       `json:"video"`
+	Video       AttachmentVideo       `json:"video,omitempty"`
 }
 
 // GetGroupWelcomeTemplate 获取入群欢迎语素材
@@ -389,10 +388,8 @@ func (r *Client) GetGroupWelcomeTemplate(req *GetGroupWelcomeTemplateRequest) (*
 		return nil, err
 	}
 	result := &GetGroupWelcomeTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "GetGroupWelcomeTemplate"); err != nil {
+	err = util.DecodeWithError(response, result, "GetGroupWelcomeTemplate")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // DelGroupWelcomeTemplateRequest 删除入群欢迎语素材请求
@@ -421,10 +418,7 @@ func (r *Client) DelGroupWelcomeTemplate(req *DelGroupWelcomeTemplateRequest) er
 		return err
 	}
 	result := &DelGroupWelcomeTemplateResponse{}
-	if err = util.DecodeWithError(response, result, "DelGroupWelcomeTemplate"); err != nil {
+	return util.DecodeWithError(response, result, "DelGroupWelcomeTemplate")
-		return err
-	}
-	return nil
 }
 
 // RemindGroupMsgSendRequest 提醒成员群发请求

work/externalcontact/statistic.go

@@ -60,10 +60,7 @@ func (r *Client) GetUserBehaviorData(req *GetUserBehaviorRequest) ([]BehaviorDat
 	}
 	var result GetUserBehaviorResponse
 	err = util.DecodeWithError(response, &result, "GetUserBehaviorData")
-	if err != nil {
+	return result.BehaviorData, err
-		return nil, err
-	}
-	return result.BehaviorData, nil
 }
 
 type (
@@ -126,10 +123,7 @@ func (r *Client) GetGroupChatStat(req *GetGroupChatStatRequest) (*GetGroupChatSt
 	}
 	result := &GetGroupChatStatResponse{}
 	err = util.DecodeWithError(response, result, "GetGroupChatStat")
-	if err != nil {
+	return result, err
-		return nil, err
-	}
-	return result, nil
 }
 
 type (
@@ -169,8 +163,5 @@ func (r *Client) GetGroupChatStatByDay(req *GetGroupChatStatByDayRequest) ([]Get
 	}
 	var result GetGroupChatStatByDayResponse
 	err = util.DecodeWithError(response, &result, "GetGroupChatStatByDay")
-	if err != nil {
+	return result.Items, err
-		return nil, err
-	}
-	return result.Items, nil
 }

work/externalcontact/tag.go

@@ -77,10 +77,7 @@ func (r *Client) GetCropTagList(req GetCropTagRequest) ([]TagGroup, error) {
 	}
 	var result GetCropTagListResponse
 	err = util.DecodeWithError(response, &result, "GetCropTagList")
-	if err != nil {
+	return result.TagGroup, err
-		return nil, err
-	}
-	return result.TagGroup, nil
 }
 
 // AddCropTagRequest 添加企业标签请求
@@ -123,10 +120,7 @@ func (r *Client) AddCropTag(req AddCropTagRequest) (*TagGroup, error) {
 	}
 	var result AddCropTagResponse
 	err = util.DecodeWithError(response, &result, "AddCropTag")
-	if err != nil {
+	return &result.TagGroup, err
-		return nil, err
-	}
-	return &result.TagGroup, nil
 }
 
 // EditCropTagRequest 编辑客户企业标签请求
@@ -256,10 +250,8 @@ func (r *Client) GetStrategyTagList(req *GetStrategyTagListRequest) (*GetStrateg
 		return nil, err
 	}
 	result := &GetStrategyTagListResponse{}
-	if err = util.DecodeWithError(response, result, "GetStrategyTagList"); err != nil {
+	err = util.DecodeWithError(response, result, "GetStrategyTagList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // AddStrategyTagRequest 为指定规则组创建企业客户标签请求
@@ -315,10 +307,8 @@ func (r *Client) AddStrategyTag(req *AddStrategyTagRequest) (*AddStrategyTagResp
 		return nil, err
 	}
 	result := &AddStrategyTagResponse{}
-	if err = util.DecodeWithError(response, result, "AddStrategyTag"); err != nil {
+	err = util.DecodeWithError(response, result, "AddStrategyTag")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // EditStrategyTagRequest 编辑指定规则组下的企业客户标签请求

work/externalcontact/transfer.go

@@ -58,10 +58,8 @@ func (r *Client) TransferCustomer(req *TransferCustomerRequest) (*TransferCustom
 		return nil, err
 	}
 	result := &TransferCustomerResponse{}
-	if err = util.DecodeWithError(response, result, "TransferCustomer"); err != nil {
+	err = util.DecodeWithError(response, result, "TransferCustomer")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // TransferResultRequest 查询客户接替状态请求
@@ -100,10 +98,8 @@ func (r *Client) TransferResult(req *TransferResultRequest) (*TransferResultResp
 		return nil, err
 	}
 	result := &TransferResultResponse{}
-	if err = util.DecodeWithError(response, result, "TransferResult"); err != nil {
+	err = util.DecodeWithError(response, result, "TransferResult")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GroupChatOnJobTransferRequest 分配在职成员的客户群请求
@@ -140,10 +136,8 @@ func (r *Client) GroupChatOnJobTransfer(req *GroupChatOnJobTransferRequest) (*Gr
 		return nil, err
 	}
 	result := &GroupChatOnJobTransferResponse{}
-	if err = util.DecodeWithError(response, result, "GroupChatOnJobTransfer"); err != nil {
+	err = util.DecodeWithError(response, result, "GroupChatOnJobTransfer")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetUnassignedListRequest 获取待分配的离职成员列表请求
@@ -182,10 +176,8 @@ func (r *Client) GetUnassignedList(req *GetUnassignedListRequest) (*GetUnassigne
 		return nil, err
 	}
 	result := &GetUnassignedListResponse{}
-	if err = util.DecodeWithError(response, result, "GetUnassignedList"); err != nil {
+	err = util.DecodeWithError(response, result, "GetUnassignedList")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // ResignedTransferCustomerRequest 分配离职成员的客户请求
@@ -216,10 +208,8 @@ func (r *Client) ResignedTransferCustomer(req *ResignedTransferCustomerRequest)
 		return nil, err
 	}
 	result := &ResignedTransferCustomerResponse{}
-	if err = util.DecodeWithError(response, result, "ResignedTransferCustomer"); err != nil {
+	err = util.DecodeWithError(response, result, "ResignedTransferCustomer")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // ResignedTransferResultRequest 查询离职客户接替状态请求
@@ -251,10 +241,8 @@ func (r *Client) ResignedTransferResult(req *ResignedTransferResultRequest) (*Re
 		return nil, err
 	}
 	result := &ResignedTransferResultResponse{}
-	if err = util.DecodeWithError(response, result, "ResignedTransferResult"); err != nil {
+	err = util.DecodeWithError(response, result, "ResignedTransferResult")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GroupChatTransferRequest 分配离职成员的客户群请求
@@ -284,8 +272,6 @@ func (r *Client) GroupChatTransfer(req *GroupChatTransferRequest) (*GroupChatTra
 		return nil, err
 	}
 	result := &GroupChatTransferResponse{}
-	if err = util.DecodeWithError(response, result, "GroupChatTransfer"); err != nil {
+	err = util.DecodeWithError(response, result, "GroupChatTransfer")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/invoice/invoice.go

@@ -86,10 +86,8 @@ func (r *Client) GetInvoiceInfo(req *GetInvoiceInfoRequest) (*GetInvoiceInfoResp
 		return nil, err
 	}
 	result := &GetInvoiceInfoResponse{}
-	if err = util.DecodeWithError(response, result, "GetInvoiceInfo"); err != nil {
+	err = util.DecodeWithError(response, result, "GetInvoiceInfo")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // UpdateInvoiceStatusRequest 更新发票状态请求
@@ -184,8 +182,6 @@ func (r *Client) GetInvoiceInfoBatch(req *GetInvoiceInfoBatchRequest) (*GetInvoi
 		return nil, err
 	}
 	result := &GetInvoiceInfoBatchResponse{}
-	if err = util.DecodeWithError(response, result, "GetInvoiceInfoBatch"); err != nil {
+	err = util.DecodeWithError(response, result, "GetInvoiceInfoBatch")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/kf/account.go

@@ -22,8 +22,8 @@ const (
 
 // AccountAddOptions 添加客服账号请求参数
 type AccountAddOptions struct {
-	Name    string `json:"name"`     // 客服帐号名称, 不多于16个字符
+	Name    string `json:"name"`     // 客服帐号名称，不多于 16 个字符
-	MediaID string `json:"media_id"` // 客服头像临时素材。可以调用上传临时素材接口获取, 不多于128个字节
+	MediaID string `json:"media_id"` // 客服头像临时素材。可以调用上传临时素材接口获取，不多于 128 个字节
 }
 
 // AccountAddSchema 添加客服账号响应内容
@@ -82,8 +82,8 @@ func (r *Client) AccountDel(options AccountDelOptions) (info util.CommonError, e
 // AccountUpdateOptions 修改客服账号请求参数
 type AccountUpdateOptions struct {
 	OpenKFID string `json:"open_kfid"` // 客服帐号 ID, 不多于 64 字节
-	Name     string `json:"name"`      // 客服帐号名称, 不多于16个字符
+	Name     string `json:"name"`      // 客服帐号名称，不多于 16 个字符
-	MediaID  string `json:"media_id"`  // 客服头像临时素材。可以调用上传临时素材接口获取, 不多于128个字节
+	MediaID  string `json:"media_id"`  // 客服头像临时素材。可以调用上传临时素材接口获取，不多于 128 个字节
 }
 
 // AccountUpdate 修复客服账号
@@ -148,7 +148,7 @@ func (r *Client) AccountList() (info AccountListSchema, err error) {
 // 3.返回的客服链接，不能修改或复制参数到其他链接使用。否则进入会话事件参数校验不通过，导致无法回调。
 type AddContactWayOptions struct {
 	OpenKFID string `json:"open_kfid"` // 客服帐号 ID, 不多于 64 字节
-	Scene    string `json:"scene"`     // 场景值，字符串类型，由开发者自定义, 不多于32字节, 字符串取值范围(正则表达式)：[0-9a-zA-Z_-]*
+	Scene    string `json:"scene"`     // 场景值，字符串类型，由开发者自定义，不多于 32 字节，字符串取值范围 (正则表达式)：[0-9a-zA-Z_-]*
 }
 
 // AddContactWaySchema 获取客服账号链接响应内容

work/kf/callback.go

@@ -92,8 +92,6 @@ func (r *Client) GetCallbackMessage(encryptedMsg []byte) (msg CallbackMessage, e
 	if err != nil {
 		return msg, NewSDKErr(40016)
 	}
-	if err = xml.Unmarshal(bData, &msg); err != nil {
+	err = xml.Unmarshal(bData, &msg)
-		return msg, err
-	}
 	return msg, err
 }

work/kf/customer.go

@@ -22,7 +22,7 @@ type CustomerSchema struct {
 	NickName       string `json:"nickname"`        // 微信昵称
 	Avatar         string `json:"avatar"`          // 微信头像。第三方不可获取
 	Gender         int    `json:"gender"`          // 性别
-	UnionID        string `json:"unionid"`         // unionid，需要绑定微信开发者帐号才能获取到，查看绑定方法: https://open.work.weixin.qq.com/kf/doc/92512/93143/94769#%E5%A6%82%E4%BD%95%E8%8E%B7%E5%8F%96%E5%BE%AE%E4%BF%A1%E5%AE%A2%E6%88%B7%E7%9A%84unionid
+	UnionID        string `json:"unionid"`         // unionid，需要绑定微信开发者帐号才能获取到，查看绑定方法：https://open.work.weixin.qq.com/kf/doc/92512/93143/94769#%E5%A6%82%E4%BD%95%E8%8E%B7%E5%8F%96%E5%BE%AE%E4%BF%A1%E5%AE%A2%E6%88%B7%E7%9A%84unionid
 }
 
 // CustomerBatchGetSchema 获取客户基本信息响应内容

work/kf/error.go

@@ -28,7 +28,7 @@ const (
 	// SDKDecryptMSGFailed 错误码：40016
 	SDKDecryptMSGFailed Error = "消息解密失败"
 	// SDKMediaIDExceedMinLength 错误码：40058
-	SDKMediaIDExceedMinLength Error = "不合法的参数, 请参照具体 API 接口说明进行传参"
+	SDKMediaIDExceedMinLength Error = "不合法的参数，请参照具体 API 接口说明进行传参"
 	// SDKContentContainsSensitiveInformation 错误码：40201
 	SDKContentContainsSensitiveInformation Error = "当前客服账号由于涉及敏感信息，已被封禁，请联系企业微信客服处理"
 	// SDKAccessTokenMissing 错误码：41001

work/kf/sendmsg.go

@@ -15,7 +15,7 @@ const (
 // SendMsgSchema 发送消息响应内容
 type SendMsgSchema struct {
 	util.CommonError
-	MsgID string `json:"msgid"` // 消息ID。如果请求参数指定了msgid，则原样返回，否则系统自动生成并返回。不多于32字节, 字符串取值范围(正则表达式)：[0-9a-zA-Z_-]*
+	MsgID string `json:"msgid"` // 消息 ID。如果请求参数指定了 msgid，则原样返回，否则系统自动生成并返回。不多于 32 字节，字符串取值范围 (正则表达式)：[0-9a-zA-Z_-]*
 }
 
 // SendMsg 发送消息

work/kf/sendmsg/message.go

@@ -83,35 +83,35 @@ type Menu struct {
 	MsgMenu struct {
 		HeadContent string        `json:"head_content"` // 消息内容，不多于 1024 字节
 		List        []interface{} `json:"list"`         // 菜单项配置，不能多余 10 个
-		TailContent string        `json:"tail_content"` // 结束文本, 不多于1024字
+		TailContent string        `json:"tail_content"` // 结束文本，不多于 1024 字
 	} `json:"msgmenu"`
 }
 
 // MenuClick 回复菜单
 type MenuClick struct {
-	Type  string `json:"type"` // 菜单类型: click 回复菜单
+	Type  string `json:"type"` // 菜单类型：click 回复菜单
 	Click struct {
-		ID      string `json:"id"`      // 菜单ID, 不少于1字节, 不多于64字节
+		ID      string `json:"id"`      // 菜单 ID, 不少于 1 字节，不多于 64 字节
-		Content string `json:"content"` // 菜单显示内容, 不少于1字节, 不多于128字节
+		Content string `json:"content"` // 菜单显示内容，不少于 1 字节，不多于 128 字节
 	} `json:"click"`
 }
 
 // MenuView 超链接菜单
 type MenuView struct {
-	Type string `json:"type"` // 菜单类型: view 超链接菜单
+	Type string `json:"type"` // 菜单类型：view 超链接菜单
 	View struct {
-		URL     string `json:"url"`     // 点击后跳转的链接, 不少于1字节, 不多于2048字节
+		URL     string `json:"url"`     // 点击后跳转的链接，不少于 1 字节，不多于 2048 字节
-		Content string `json:"content"` // 菜单显示内容, 不少于1字节, 不多于1024字节
+		Content string `json:"content"` // 菜单显示内容，不少于 1 字节，不多于 1024 字节
 	} `json:"view"`
 }
 
 // MenuMiniProgram 小程序菜单
 type MenuMiniProgram struct {
-	Type        string `json:"type"` // 菜单类型: miniprogram 小程序菜单
+	Type        string `json:"type"` // 菜单类型：miniprogram 小程序菜单
 	MiniProgram struct {
-		AppID    string `json:"appid"`    // 小程序appid, 不少于1字节, 不多于32字节
+		AppID    string `json:"appid"`    // 小程序 appid, 不少于 1 字节，不多于 32 字节
-		PagePath string `json:"pagepath"` // 点击后进入的小程序页面, 不少于1字节, 不多于1024字节
+		PagePath string `json:"pagepath"` // 点击后进入的小程序页面，不少于 1 字节，不多于 1024 字节
-		Content  string `json:"content"`  // 菜单显示内容, 不少于1字节, 不多于1024字节
+		Content  string `json:"content"`  // 菜单显示内容，不少于 1 字节，不多于 1024 字节
 	} `json:"miniprogram"`
 }
 
@@ -120,8 +120,8 @@ type Location struct {
 	Message
 	MsgType  string `json:"msgtype"` // 消息类型，此时固定为：location
 	Location struct {
-		Latitude  float32 `json:"latitude"`  // 纬度, 浮点数，范围为90 ~ -90
+		Latitude  float32 `json:"latitude"`  // 纬度，浮点数，范围为 90 ~ -90
-		Longitude float32 `json:"longitude"` // 经度, 浮点数，范围为180 ~ -180
+		Longitude float32 `json:"longitude"` // 经度，浮点数，范围为 180 ~ -180
 		Name      string  `json:"name"`      // 位置名
 		Address   string  `json:"address"`   // 地址详情说明
 	} `json:"location"`

work/kf/sendmsgonevent.go

@@ -15,7 +15,7 @@ const (
 // SendMsgOnEventSchema 发送事件响应消息
 type SendMsgOnEventSchema struct {
 	util.CommonError
-	MsgID string `json:"msgid"` // 消息ID。如果请求参数指定了msgid，则原样返回，否则系统自动生成并返回。不多于32字节, 字符串取值范围(正则表达式)：[0-9a-zA-Z_-]*
+	MsgID string `json:"msgid"` // 消息 ID。如果请求参数指定了 msgid，则原样返回，否则系统自动生成并返回。不多于 32 字节，字符串取值范围 (正则表达式)：[0-9a-zA-Z_-]*
 }
 
 // SendMsgOnEvent 发送事件响应消息

work/kf/sendmsgonevent/message.go

@@ -22,34 +22,34 @@ type Menu struct {
 	MsgMenu struct {
 		HeadContent string        `json:"head_content"` // 消息内容，不多于 1024 字节
 		List        []interface{} `json:"list"`         // 菜单项配置，不能多余 10 个
-		TailContent string        `json:"tail_content"` // 结束文本, 不多于1024字
+		TailContent string        `json:"tail_content"` // 结束文本，不多于 1024 字
 	} `json:"msgmenu"`
 }
 
 // MenuClick 回复菜单
 type MenuClick struct {
-	Type  string `json:"type"` // 菜单类型: click 回复菜单
+	Type  string `json:"type"` // 菜单类型：click 回复菜单
 	Click struct {
-		ID      string `json:"id"`      // 菜单ID, 不少于1字节, 不多于64字节
+		ID      string `json:"id"`      // 菜单 ID, 不少于 1 字节，不多于 64 字节
-		Content string `json:"content"` // 菜单显示内容, 不少于1字节, 不多于128字节
+		Content string `json:"content"` // 菜单显示内容，不少于 1 字节，不多于 128 字节
 	} `json:"click"`
 }
 
 // MenuView 超链接菜单
 type MenuView struct {
-	Type string `json:"type"` // 菜单类型: view 超链接菜单
+	Type string `json:"type"` // 菜单类型：view 超链接菜单
 	View struct {
-		URL     string `json:"url"`     // 点击后跳转的链接, 不少于1字节, 不多于2048字节
+		URL     string `json:"url"`     // 点击后跳转的链接，不少于 1 字节，不多于 2048 字节
-		Content string `json:"content"` // 菜单显示内容, 不少于1字节, 不多于1024字节
+		Content string `json:"content"` // 菜单显示内容，不少于 1 字节，不多于 1024 字节
 	} `json:"view"`
 }
 
 // MenuMiniProgram 小程序菜单
 type MenuMiniProgram struct {
-	Type        string `json:"type"` // 菜单类型: miniprogram 小程序菜单
+	Type        string `json:"type"` // 菜单类型：miniprogram 小程序菜单
 	MiniProgram struct {
-		AppID    string `json:"appid"`    // 小程序appid, 不少于1字节, 不多于32字节
+		AppID    string `json:"appid"`    // 小程序 appid, 不少于 1 字节，不多于 32 字节
-		PagePath string `json:"pagepath"` // 点击后进入的小程序页面, 不少于1字节, 不多于1024字节
+		PagePath string `json:"pagepath"` // 点击后进入的小程序页面，不少于 1 字节，不多于 1024 字节
-		Content  string `json:"content"`  // 菜单显示内容, 不少于1字节, 不多于1024字节
+		Content  string `json:"content"`  // 菜单显示内容，不少于 1 字节，不多于 1024 字节
 	} `json:"miniprogram"`
 }

work/kf/servicer.go

@@ -80,7 +80,7 @@ type ReceptionistListSchema struct {
 	util.CommonError
 	ReceptionistList []struct {
 		UserID string `json:"userid"` // 接待人员的 userid。第三方应用获取到的为密文 userid，即 open_userid
-		Status int    `json:"status"` // 接待人员的接待状态。0:接待中,1:停止接待。第三方应用需具有“管理帐号、分配会话和收发消息”权限才可获取
+		Status int    `json:"status"` // 接待人员的接待状态。0:接待中，1:停止接待。第三方应用需具有“管理帐号、分配会话和收发消息”权限才可获取
 	} `json:"servicer_list"`
 }
 

work/kf/statistic.go

@@ -59,10 +59,8 @@ func (r *Client) GetCorpStatistic(req *GetCorpStatisticRequest) (*GetCorpStatist
 		return nil, err
 	}
 	result := &GetCorpStatisticResponse{}
-	if err = util.DecodeWithError(response, result, "GetCorpStatistic"); err != nil {
+	err = util.DecodeWithError(response, result, "GetCorpStatistic")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetServicerStatisticRequest 获取「客户数据统计」接待人员明细数据请求
@@ -120,8 +118,6 @@ func (r *Client) GetServicerStatistic(req *GetServicerStatisticRequest) (*GetSer
 		return nil, err
 	}
 	result := &GetServicerStatisticResponse{}
-	if err = util.DecodeWithError(response, result, "GetServicerStatistic"); err != nil {
+	err = util.DecodeWithError(response, result, "GetServicerStatistic")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/kf/syncmsg.go

@@ -16,8 +16,8 @@ const (
 
 // SyncMsgOptions 获取消息查询参数
 type SyncMsgOptions struct {
-	Cursor      string `json:"cursor"`                 // 上一次调用时返回的next_cursor，第一次拉取可以不填, 不多于64字节
+	Cursor      string `json:"cursor"`                 // 上一次调用时返回的 next_cursor，第一次拉取可以不填，不多于 64 字节
-	Token       string `json:"token"`                  // 回调事件返回的token字段，10分钟内有效；可不填，如果不填接口有严格的频率限制, 不多于128字节
+	Token       string `json:"token"`                  // 回调事件返回的 token 字段，10 分钟内有效；可不填，如果不填接口有严格的频率限制，不多于 128 字节
 	Limit       uint   `json:"limit"`                  // 期望请求的数据量，默认值和最大值都为 1000, 注意：可能会出现返回条数少于 limit 的情况，需结合返回的 has_more 字段判断是否继续请求。
 	VoiceFormat uint   `json:"voice_format,omitempty"` // 语音消息类型，0-Amr 1-Silk，默认 0。可通过该参数控制返回的语音格式，开发者可按需选择自己程序支持的一种格式
 	OpenKfID    string `json:"open_kfid,omitempty"`    // 指定拉取某个客服帐号的消息，否则默认返回有权限的客服帐号的消息。当客服帐号较多，建议按 open_kfid 来拉取以获取更好的性能。

work/material/media.go

@@ -52,10 +52,8 @@ func (r *Client) UploadImg(filename string) (*UploadImgResponse, error) {
 		return nil, err
 	}
 	result := &UploadImgResponse{}
-	if err = util.DecodeWithError(response, result, "UploadImg"); err != nil {
+	err = util.DecodeWithError(response, result, "UploadImg")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // UploadTempFile 上传临时素材
@@ -74,10 +72,8 @@ func (r *Client) UploadTempFile(filename string, mediaType string) (*UploadTempF
 		return nil, err
 	}
 	result := &UploadTempFileResponse{}
-	if err = util.DecodeWithError(response, result, "UploadTempFile"); err != nil {
+	err = util.DecodeWithError(response, result, "UploadTempFile")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // UploadAttachment 上传附件资源
@@ -97,8 +93,6 @@ func (r *Client) UploadAttachment(filename string, mediaType string, attachmentT
 		return nil, err
 	}
 	result := &UploadAttachmentResponse{}
-	if err = util.DecodeWithError(response, result, "UploadAttachment"); err != nil {
+	err = util.DecodeWithError(response, result, "UploadAttachment")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/message/client.go

@@ -1,4 +1,4 @@
-// Package message 消息推送,实现企业微信消息推送相关接口：https://developer.work.weixin.qq.com/document/path/90235
+// Package message 消息推送，实现企业微信消息推送相关接口：https://developer.work.weixin.qq.com/document/path/90235
 package message
 
 import (

work/message/message.go

@@ -99,11 +99,9 @@ func (r *Client) Send(apiName string, request interface{}) (*SendResponse, error
 	}
 	// 按照结构体解析返回值
 	result := &SendResponse{}
-	if err = util.DecodeWithError(response, result, apiName); err != nil {
+	err = util.DecodeWithError(response, result, apiName)
-		return nil, err
-	}
 	// 返回数据
-	return result, nil
+	return result, err
 }
 
 // SendText 发送文本消息

work/msgaudit/chat.go

@@ -19,7 +19,7 @@ type ChatData struct {
 	MsgID            string `json:"msgid,omitempty"`              // 消息 id，消息的唯一标识，企业可以使用此字段进行消息去重。
 	PublickeyVer     uint32 `json:"publickey_ver,omitempty"`      // 加密此条消息使用的公钥版本号。
 	EncryptRandomKey string `json:"encrypt_random_key,omitempty"` // 使用 publickey_ver 指定版本的公钥进行非对称加密后 base64 加密的内容，需要业务方先 base64 decode 处理后，再使用指定版本的私钥进行解密，得出内容。
-	EncryptChatMsg   string `json:"encrypt_chat_msg,omitempty"`   // 消息密文。需要业务方使用将encrypt_random_key解密得到的内容，与encrypt_chat_msg，传入sdk接口DecryptData,得到消息明文。
+	EncryptChatMsg   string `json:"encrypt_chat_msg,omitempty"`   // 消息密文。需要业务方使用将 encrypt_random_key 解密得到的内容，与 encrypt_chat_msg，传入 sdk 接口 DecryptData，得到消息明文。
 }
 
 // ChatMessage 会话存档消息

work/msgaudit/client_linux.go

@@ -76,7 +76,7 @@ func (s *Client) Free() {
 * @param [in]  proxy           使用代理的请求，需要传入代理的链接。如：socks5://10.0.0.1:8081 或者 http://10.0.0.1:8081
 * @param [in]  passwd          代理账号密码，需要传入代理的账号密码。如 user_name:passwd_123
 * @param [in]  timeout         超时时间，单位秒
-* @return chatDatas       返回本次拉取消息的数据，slice结构体.内容包括errcode/errmsg，以及每条消息内容。示例如下：
+* @return chatDatas       返回本次拉取消息的数据，slice 结构体。内容包括 errcode/errmsg，以及每条消息内容。示例如下：
 
 {"errcode":0,"errmsg":"ok","chatdata":[{"seq":196,"msgid":"CAQQ2fbb4QUY0On2rYSAgAMgip/yzgs=","publickey_ver":3,"encrypt_random_key":"ftJ+uz3n/z1DsxlkwxNgE+mL38H42/KCvN8T60gbbtPD+Rta1hKTuQPzUzO6Hzne97MgKs7FfdDxDck/v8cDT6gUVjA2tZ/M7euSD0L66opJ/IUeBtpAtvgVSD5qhlaQjvfKJc/zPMGNK2xCLFYqwmQBZXbNT7uA69Fflm512nZKW/piK2RKdYJhRyvQnA1ISxK097sp9WlEgDg250fM5tgwMjujdzr7ehK6gtVBUFldNSJS7ndtIf6aSBfaLktZgwHZ57ONewWq8GJe7WwQf1hwcDbCh7YMG8nsweEwhDfUz+u8rz9an+0lgrYMZFRHnmzjgmLwrR7B/32Qxqd79A==","encrypt_chat_msg":"898WSfGMnIeytTsea7Rc0WsOocs0bIAerF6de0v2cFwqo9uOxrW9wYe5rCjCHHH5bDrNvLxBE/xOoFfcwOTYX0HQxTJaH0ES9OHDZ61p8gcbfGdJKnq2UU4tAEgGb8H+Q9n8syRXIjaI3KuVCqGIi4QGHFmxWenPFfjF/vRuPd0EpzUNwmqfUxLBWLpGhv+dLnqiEOBW41Zdc0OO0St6E+JeIeHlRZAR+E13Isv9eS09xNbF0qQXWIyNUi+ucLr5VuZnPGXBrSfvwX8f0QebTwpy1tT2zvQiMM2MBugKH6NuMzzuvEsXeD+6+3VRqL"}]}
 */
@@ -122,7 +122,7 @@ func (s *Client) GetChatData(seq uint64, limit uint64, proxy string, passwd stri
 * @param [in]  proxy           使用代理的请求，需要传入代理的链接。如：socks5://10.0.0.1:8081 或者 http://10.0.0.1:8081
 * @param [in]  passwd          代理账号密码，需要传入代理的账号密码。如 user_name:passwd_123
 * @param [in]  timeout         超时时间，单位秒
-* @return chatDatas       返回本次拉取消息的数据，slice结构体.内容包括errcode/errmsg，以及每条消息内容。示例如下：
+* @return chatDatas       返回本次拉取消息的数据，slice 结构体。内容包括 errcode/errmsg，以及每条消息内容。示例如下：
 
 {"errcode":0,"errmsg":"ok","chatdata":[{"seq":196,"msgid":"CAQQ2fbb4QUY0On2rYSAgAMgip/yzgs=","publickey_ver":3,"encrypt_random_key":"ftJ+uz3n/z1DsxlkwxNgE+mL38H42/KCvN8T60gbbtPD+Rta1hKTuQPzUzO6Hzne97MgKs7FfdDxDck/v8cDT6gUVjA2tZ/M7euSD0L66opJ/IUeBtpAtvgVSD5qhlaQjvfKJc/zPMGNK2xCLFYqwmQBZXbNT7uA69Fflm512nZKW/piK2RKdYJhRyvQnA1ISxK097sp9WlEgDg250fM5tgwMjujdzr7ehK6gtVBUFldNSJS7ndtIf6aSBfaLktZgwHZ57ONewWq8GJe7WwQf1hwcDbCh7YMG8nsweEwhDfUz+u8rz9an+0lgrYMZFRHnmzjgmLwrR7B/32Qxqd79A==","encrypt_chat_msg":"898WSfGMnIeytTsea7Rc0WsOocs0bIAerF6de0v2cFwqo9uOxrW9wYe5rCjCHHH5bDrNvLxBE/xOoFfcwOTYX0HQxTJaH0ES9OHDZ61p8gcbfGdJKnq2UU4tAEgGb8H+Q9n8syRXIjaI3KuVCqGIi4QGHFmxWenPFfjF/vRuPd0EpzUNwmqfUxLBWLpGhv+dLnqiEOBW41Zdc0OO0St6E+JeIeHlRZAR+E13Isv9eS09xNbF0qQXWIyNUi+ucLr5VuZnPGXBrSfvwX8f0QebTwpy1tT2zvQiMM2MBugKH6NuMzzuvEsXeD+6+3VRqL"}]}
 */
@@ -149,16 +149,13 @@ func (s *Client) GetRawChatData(seq uint64, limit uint64, proxy string, passwd s
 
 	var data ChatDataResponse
 	err := json.Unmarshal(buf, &data)
-	if err != nil {
+	return data, err
-		return ChatDataResponse{}, err
-	}
-	return data, nil
 }
 
-// DecryptData 解析密文.企业微信自有解密内容
+// DecryptData 解析密文。企业微信自有解密内容
 /**
-* @brief 解析密文.企业微信自有解密内容
+* @brief 解析密文。企业微信自有解密内容
-* @param [in]  encrypt_key, getchatdata返回的encrypt_random_key,使用企业自持对应版本秘钥RSA解密后的内容
+* @param [in]  encrypt_key, getchatdata 返回的 encrypt_random_key，使用企业自持对应版本秘钥 RSA 解密后的内容
 * @param [in]  encrypt_msg, getchatdata 返回的 encrypt_chat_msg
 * @param [out] msg, 解密的消息明文
 * @return 返回是否调用成功
@@ -222,7 +219,7 @@ func (s *Client) DecryptData(encryptRandomKey string, encryptMsg string) (msg Ch
  * @param [in]  passwd			代理账号密码，需要传入代理的账号密码。如 user_name:passwd_123
  * @param [in]  indexbuf		媒体消息分片拉取，需要填入每次拉取的索引信息。首次不需要填写，默认拉取 512k，后续每次调用只需要将上次调用返回的 outindexbuf 填入即可。
  * @param [in]  timeout			超时时间，单位秒
- * @param [out] media_data		返回本次拉取的媒体数据.MediaData结构体.内容包括data(数据内容)/outindexbuf(下次索引)/is_finish(拉取完成标记)
+ * @param [out] media_data		返回本次拉取的媒体数据.MediaData 结构体。内容包括 data(数据内容)/outindexbuf(下次索引)/is_finish(拉取完成标记)
 
  *
  * @return 返回是否调用成功

work/oauth/oauth.go

@@ -123,10 +123,8 @@ func (ctr *Oauth) GetUserInfo(code string) (*GetUserInfoResponse, error) {
 		return nil, err
 	}
 	result := &GetUserInfoResponse{}
-	if err = util.DecodeWithError(response, result, "GetUserInfo"); err != nil {
+	err = util.DecodeWithError(response, result, "GetUserInfo")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }
 
 // GetUserDetailRequest 获取访问用户敏感信息请求
@@ -162,8 +160,6 @@ func (ctr *Oauth) GetUserDetail(req *GetUserDetailRequest) (*GetUserDetailRespon
 		return nil, err
 	}
 	result := &GetUserDetailResponse{}
-	if err = util.DecodeWithError(response, result, "GetUserDetail"); err != nil {
+	err = util.DecodeWithError(response, result, "GetUserDetail")
-		return nil, err
+	return result, err
-	}
-	return result, nil
 }

work/robot/send_option.go

@@ -9,7 +9,7 @@ type WebhookSendResponse struct {
 
 // WebhookSendTextOption 机器人发送文本消息请求参数
 type WebhookSendTextOption struct {
-	MsgType string `json:"msgtype"` // 消息类型,此时固定为text
+	MsgType string `json:"msgtype"` // 消息类型，此时固定为 text
 	Text    struct {
 		Content             string   `json:"content"`               // 文本内容，最长不超过 2048 个字节，必须是 utf8 编码
 		MentionedList       []string `json:"mentioned_list"`        // userid 的列表，提醒群中的指定成员 (@某个成员)，@all 表示提醒所有人，如果开发者获取不到 userid，可以使用 mentioned_mobile_list
@@ -20,7 +20,7 @@ type WebhookSendTextOption struct {
 // WebhookSendMarkdownOption 机器人发送 markdown 消息请求参数
 // 支持语法参考 https://developer.work.weixin.qq.com/document/path/91770
 type WebhookSendMarkdownOption struct {
-	MsgType  string `json:"msgtype"` // 消息类型,此时固定为markdown
+	MsgType  string `json:"msgtype"` // 消息类型，此时固定为 markdown
 	Markdown struct {
 		Content string `json:"content"` // markdown 内容，最长不超过 4096 个字节，必须是 utf8 编码
 	} `json:"markdown"` // markdown 消息内容
@@ -28,7 +28,7 @@ type WebhookSendMarkdownOption struct {
 
 // WebhookSendImageOption 机器人发送图片消息请求参数
 type WebhookSendImageOption struct {
-	MsgType string `json:"msgtype"` // 消息类型,此时固定为image
+	MsgType string `json:"msgtype"` // 消息类型，此时固定为 image
 	Image   struct {
 		Base64 string `json:"base64"` // 图片内容的 base64 编码
 		MD5    string `json:"md5"`    // 图片内容（base64 编码前）的 md5 值
@@ -37,7 +37,7 @@ type WebhookSendImageOption struct {
 
 // WebhookSendNewsOption 机器人发送图文消息请求参数
 type WebhookSendNewsOption struct {
-	MsgType string `json:"msgtype"` // 消息类型,此时固定为news
+	MsgType string `json:"msgtype"` // 消息类型，此时固定为 news
 	News    struct {
 		Articles []struct {
 			Title       string `json:"title"`       // 标题，不超过 128 个字节，超过会自动截断