feat: add order setter relation

.github/FUNDING.yml

@@ -1,8 +1,8 @@
 # These are supported funding model platforms
 
-github: # silenceper
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
-open_collective: gowechat
+open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry

.github/ISSUE_TEMPLATE/bug.md

@@ -1,6 +1,6 @@
 ---
-name: 报告 Bug
-about: 反馈 BUG 信息
+name: 报告Bug
+about: 反馈BUG信息
 title: "[BUG]"
 labels: bug
 assignees: ''
@@ -18,4 +18,4 @@ assignees: ''
 
 
 **使用的版本**
- - SDK 版本：[比如 v0.0.0]
+ - SDK版本: [比如 v0.0.0]

.github/ISSUE_TEMPLATE/feature.md

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

.github/ISSUE_TEMPLATE/question.md

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

.github/workflows/ai-dev.yaml

@@ -1,38 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened, assigned]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
-      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
-      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@beta
-        env:
-          ANTHROPIC_BASE_URL: "${{ secrets.ANTHROPIC_BASE_URL }}"
-        with:
-          model: "${{ secrets.ANTHROPIC_MODEL }}"
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}

.github/workflows/go.yml

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

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+name: goreleaser
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@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 }}

.goreleaser.yml

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

README.md

@@ -1,13 +1,12 @@
 # WeChat SDK for Go
 
-![Go](https://github.com/silenceper/wechat/actions/workflows/go.yml/badge.svg?branch=v2)
-[![Go Report Card](https://goreportcard.com/badge/github.com/silenceper/wechat/v2)](https://goreportcard.com/report/github.com/silenceper/wechat/v2)
+![Go](https://github.com/silenceper/wechat/workflows/Go/badge.svg?branch=release-2.0)
+[![Go Report Card](https://goreportcard.com/badge/github.com/silenceper/wechat)](https://goreportcard.com/report/github.com/silenceper/wechat)
 [![pkg](https://img.shields.io/badge/dev-reference-007d9c?logo=go&logoColor=white&style=flat)](https://pkg.go.dev/github.com/silenceper/wechat/v2?tab=doc)
-![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/silenceper/wechat?sort=semver)
-![star](https://gitcode.com/silenceper/wechat/star/badge.svg)
-
+![version](https://img.shields.io/badge/version-v2-green)
 
 使用Golang开发的微信SDK，简单、易用。
+> 注意：当前版本为v2版本，v1版本已废弃
 
 ## 文档 && 例子
 
@@ -76,13 +75,7 @@ server.Send()
 - 提交issue，描述需要贡献的内容
 - 完成更改后，提交PR
 
-
-## 感谢以下贡献者
-
-<a href="https://opencollective.com/gowechat"><img src="https://opencollective.com/gowechat/contributors.svg?width=890" /></a>
-
-
-## 作者公众号
+## 公众号
 
 ![img](https://silenceper.oss-cn-beijing.aliyuncs.com/qrcode/search_study_program.png)
 

cache/redis.go

@@ -2,8 +2,6 @@ package cache
 
 import (
 	"context"
-	"crypto/tls"
-	"net"
 	"time"
 
 	"github.com/go-redis/redis/v8"
@@ -17,38 +15,23 @@ type Redis struct {
 
 // RedisOpts redis 连接属性
 type RedisOpts struct {
-	Host        string `json:"host"         yml:"host"`
-	Username    string `json:"username"                        yaml:"username"`
-	Password    string `json:"password"     yml:"password"`
-	Database    int    `json:"database"     yml:"database"`
-	MaxIdle     int    `json:"max_idle"     yml:"max_idle"`
-	MaxActive   int    `json:"max_active"   yml:"max_active"`
-	IdleTimeout int    `json:"idle_timeout" yml:"idle_timeout"` // second
-	UseTLS      bool   `json:"use_tls"      yml:"use_tls"`      // 是否使用TLS
+	Host        string `yml:"host" json:"host"`
+	Password    string `yml:"password" json:"password"`
+	Database    int    `yml:"database" json:"database"`
+	MaxIdle     int    `yml:"max_idle" json:"max_idle"`
+	MaxActive   int    `yml:"max_active" json:"max_active"`
+	IdleTimeout int    `yml:"idle_timeout" json:"idle_timeout"` // second
 }
 
 // NewRedis 实例化
 func NewRedis(ctx context.Context, opts *RedisOpts) *Redis {
-	uniOpt := &redis.UniversalOptions{
+	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,
-	}
-
-	if opts.UseTLS {
-		h, _, err := net.SplitHostPort(opts.Host)
-		if err != nil {
-			h = opts.Host
-		}
-		uniOpt.TLSConfig = &tls.Config{
-			ServerName: h,
-		}
-	}
-
-	conn := redis.NewUniversalClient(uniOpt)
+	})
 	return &Redis{ctx: ctx, conn: conn}
 }
 

credential/access_token.go

@@ -7,16 +7,6 @@ type AccessTokenHandle interface {
 	GetAccessToken() (accessToken string, err error)
 }
 
-// AccessTokenCompatibleHandle 同时实现 AccessTokenHandle 和 AccessTokenContextHandle
-type AccessTokenCompatibleHandle struct {
-	AccessTokenHandle
-}
-
-// GetAccessTokenContext 获取access_token,先从cache中获取，没有则从服务端获取
-func (c AccessTokenCompatibleHandle) GetAccessTokenContext(_ context.Context) (accessToken string, err error) {
-	return c.GetAccessToken()
-}
-
 // AccessTokenContextHandle AccessToken 接口
 type AccessTokenContextHandle interface {
 	AccessTokenHandle

credential/default_access_token.go

@@ -66,11 +66,8 @@ func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
 func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (accessToken string, err error) {
 	// 先从cache中取
 	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.appID)
-
 	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
-		if accessToken = val.(string); accessToken != "" {
-			return
-		}
+		return val.(string), nil
 	}
 
 	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
@@ -79,9 +76,7 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
 
 	// 双检，防止重复从微信服务器获取
 	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
-		if accessToken = val.(string); accessToken != "" {
-			return
-		}
+		return val.(string), nil
 	}
 
 	// cache失效，从微信服务器获取
@@ -90,9 +85,9 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
 		return
 	}
 
-	expires := resAccessToken.ExpiresIn - 1500
-	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
-
+	if err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(resAccessToken.ExpiresIn-1500)*time.Second); err != nil {
+		return
+	}
 	accessToken = resAccessToken.AccessToken
 	return
 }
@@ -101,11 +96,10 @@ func (ak *DefaultAccessToken) GetAccessTokenContext(ctx context.Context) (access
 // 不强制更新access_token,可用于不同环境不同服务而不需要分布式锁以及公用缓存，避免access_token争抢
 // https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-access-token/getStableAccessToken.html
 type StableAccessToken struct {
-	appID           string
-	appSecret       string
-	cacheKeyPrefix  string
-	cache           cache.Cache
-	accessTokenLock *sync.Mutex
+	appID          string
+	appSecret      string
+	cacheKeyPrefix string
+	cache          cache.Cache
 }
 
 // NewStableAccessToken new StableAccessToken
@@ -114,11 +108,10 @@ func NewStableAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.C
 		panic("cache is need")
 	}
 	return &StableAccessToken{
-		appID:           appID,
-		appSecret:       appSecret,
-		cache:           cache,
-		cacheKeyPrefix:  cacheKeyPrefix,
-		accessTokenLock: new(sync.Mutex),
+		appID:          appID,
+		appSecret:      appSecret,
+		cache:          cache,
+		cacheKeyPrefix: cacheKeyPrefix,
 	}
 }
 
@@ -132,20 +125,7 @@ func (ak *StableAccessToken) GetAccessTokenContext(ctx context.Context) (accessT
 	// 先从cache中取
 	accessTokenCacheKey := fmt.Sprintf("%s_stable_access_token_%s", ak.cacheKeyPrefix, ak.appID)
 	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
-		if accessToken = val.(string); accessToken != "" {
-			return
-		}
-	}
-
-	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
-	ak.accessTokenLock.Lock()
-	defer ak.accessTokenLock.Unlock()
-
-	// 双检，防止重复从微信服务器获取
-	if val := ak.cache.Get(accessTokenCacheKey); val != nil {
-		if accessToken = val.(string); accessToken != "" {
-			return
-		}
+		return val.(string), nil
 	}
 
 	// cache失效，从微信服务器获取
@@ -156,7 +136,7 @@ func (ak *StableAccessToken) GetAccessTokenContext(ctx context.Context) (accessT
 	}
 
 	expires := resAccessToken.ExpiresIn - 300
-	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
+	_ = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
 
 	accessToken = resAccessToken.AccessToken
 	return
@@ -189,27 +169,19 @@ func (ak *StableAccessToken) GetAccessTokenDirectly(ctx context.Context, forceRe
 type WorkAccessToken struct {
 	CorpID          string
 	CorpSecret      string
-	AgentID         string // 可选，用于区分不同应用
 	cacheKeyPrefix  string
 	cache           cache.Cache
 	accessTokenLock *sync.Mutex
 }
 
-// NewWorkAccessToken new WorkAccessToken (保持向后兼容)
-func NewWorkAccessToken(corpID, corpSecret, agentID, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
-	// 调用新方法，保持兼容性
-	return NewWorkAccessTokenWithAgentID(corpID, corpSecret, agentID, cacheKeyPrefix, cache)
-}
-
-// NewWorkAccessTokenWithAgentID new WorkAccessToken with agentID
-func NewWorkAccessTokenWithAgentID(corpID, corpSecret, agentID, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
+// NewWorkAccessToken new WorkAccessToken
+func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenContextHandle {
 	if cache == nil {
-		panic("cache is needed")
+		panic("cache the not exist")
 	}
 	return &WorkAccessToken{
 		CorpID:          corpID,
 		CorpSecret:      corpSecret,
-		AgentID:         agentID,
 		cache:           cache,
 		cacheKeyPrefix:  cacheKeyPrefix,
 		accessTokenLock: new(sync.Mutex),
@@ -226,18 +198,7 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
 	// 加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
 	ak.accessTokenLock.Lock()
 	defer ak.accessTokenLock.Unlock()
-
-	// 构建缓存key
-	var accessTokenCacheKey string
-
-	if ak.AgentID != "" {
-		// 如果设置了AgentID，使用新的key格式
-		accessTokenCacheKey = fmt.Sprintf("%s_access_token_%s_%s", ak.cacheKeyPrefix, ak.CorpID, ak.AgentID)
-	} else {
-		// 兼容历史版本的key格式
-		accessTokenCacheKey = fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
-	}
-
+	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
 	val := ak.cache.Get(accessTokenCacheKey)
 	if val != nil {
 		accessToken = val.(string)
@@ -256,7 +217,6 @@ func (ak *WorkAccessToken) GetAccessTokenContext(ctx context.Context) (accessTok
 	if err != nil {
 		return
 	}
-
 	accessToken = resAccessToken.AccessToken
 	return
 }

credential/default_js_ticket.go

@@ -1,7 +1,6 @@
 package credential
 
 import (
-	context2 "context"
 	"encoding/json"
 	"fmt"
 	"sync"
@@ -43,16 +42,6 @@ type ResTicket struct {
 
 // GetTicket 获取jsapi_ticket
 func (js *DefaultJsTicket) GetTicket(accessToken string) (ticketStr string, err error) {
-	return js.GetTicketContext(context2.Background(), accessToken)
-}
-
-// GetTicketFromServer 从服务器中获取ticket
-func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
-	return GetTicketFromServerContext(context2.Background(), accessToken)
-}
-
-// GetTicketContext 获取jsapi_ticket
-func (js *DefaultJsTicket) GetTicketContext(ctx context2.Context, accessToken string) (ticketStr string, err error) {
 	// 先从cache中取
 	jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", js.cacheKeyPrefix, js.appID)
 	if val := js.cache.Get(jsAPITicketCacheKey); val != nil {
@@ -68,7 +57,7 @@ func (js *DefaultJsTicket) GetTicketContext(ctx context2.Context, accessToken st
 	}
 
 	var ticket ResTicket
-	ticket, err = GetTicketFromServerContext(ctx, accessToken)
+	ticket, err = GetTicketFromServer(accessToken)
 	if err != nil {
 		return
 	}
@@ -78,11 +67,11 @@ func (js *DefaultJsTicket) GetTicketContext(ctx context2.Context, accessToken st
 	return
 }
 
-// GetTicketFromServerContext 从服务器中获取ticket
-func GetTicketFromServerContext(ctx context2.Context, accessToken string) (ticket ResTicket, err error) {
+// GetTicketFromServer 从服务器中获取ticket
+func GetTicketFromServer(accessToken string) (ticket ResTicket, err error) {
 	var response []byte
 	url := fmt.Sprintf(getTicketURL, accessToken)
-	response, err = util.HTTPGetContext(ctx, url)
+	response, err = util.HTTPGet(url)
 	if err != nil {
 		return
 	}

credential/default_js_ticket_test.go

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

credential/js_ticket.go

@@ -1,15 +1,7 @@
 package credential
 
-import context2 "context"
-
 // JsTicketHandle js ticket获取
 type JsTicketHandle interface {
 	// GetTicket 获取ticket
 	GetTicket(accessToken string) (ticket string, err error)
 }
-
-// JsTicketContextHandle js ticket获取
-type JsTicketContextHandle interface {
-	JsTicketHandle
-	GetTicketContext(ctx context2.Context, accessToken string) (ticket string, err error)
-}

credential/work_js_ticket.go

@@ -1,118 +0,0 @@
-package credential
-
-import (
-	"encoding/json"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/silenceper/wechat/v2/cache"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-// TicketType ticket类型
-type TicketType int
-
-const (
-	// TicketTypeCorpJs 企业jsapi ticket
-	TicketTypeCorpJs TicketType = iota
-	// TicketTypeAgentJs 应用jsapi ticket
-	TicketTypeAgentJs
-)
-
-// 企业微信相关的 ticket URL
-const (
-	// 企业微信 jsapi ticket
-	getWorkJsTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/get_jsapi_ticket?access_token=%s"
-	// 企业微信应用 jsapi ticket
-	getWorkAgentJsTicketURL = "https://qyapi.weixin.qq.com/cgi-bin/ticket/get?access_token=%s&type=agent_config"
-)
-
-// WorkJsTicket 企业微信js ticket获取
-type WorkJsTicket struct {
-	corpID          string
-	agentID         string
-	cacheKeyPrefix  string
-	cache           cache.Cache
-	jsAPITicketLock *sync.Mutex
-}
-
-// NewWorkJsTicket new WorkJsTicket
-func NewWorkJsTicket(corpID, agentID, cacheKeyPrefix string, cache cache.Cache) *WorkJsTicket {
-	return &WorkJsTicket{
-		corpID:          corpID,
-		agentID:         agentID,
-		cache:           cache,
-		cacheKeyPrefix:  cacheKeyPrefix,
-		jsAPITicketLock: new(sync.Mutex),
-	}
-}
-
-// GetTicket 根据类型获取相应的jsapi_ticket
-func (js *WorkJsTicket) GetTicket(accessToken string, ticketType TicketType) (ticketStr string, err error) {
-	var cacheKey string
-	switch ticketType {
-	case TicketTypeCorpJs:
-		cacheKey = fmt.Sprintf("%s_corp_jsapi_ticket_%s", js.cacheKeyPrefix, js.corpID)
-	case TicketTypeAgentJs:
-		if js.agentID == "" {
-			err = fmt.Errorf("agentID is empty")
-			return
-		}
-		cacheKey = fmt.Sprintf("%s_agent_jsapi_ticket_%s_%s", js.cacheKeyPrefix, js.corpID, js.agentID)
-	default:
-		err = fmt.Errorf("unsupported ticket type: %v", ticketType)
-		return
-	}
-
-	if val := js.cache.Get(cacheKey); val != nil {
-		return val.(string), nil
-	}
-
-	js.jsAPITicketLock.Lock()
-	defer js.jsAPITicketLock.Unlock()
-
-	// 双检，防止重复从微信服务器获取
-	if val := js.cache.Get(cacheKey); val != nil {
-		return val.(string), nil
-	}
-
-	var ticket ResTicket
-	ticket, err = js.getTicketFromServer(accessToken, ticketType)
-	if err != nil {
-		return
-	}
-	expires := ticket.ExpiresIn - 1500
-	err = js.cache.Set(cacheKey, ticket.Ticket, time.Duration(expires)*time.Second)
-	ticketStr = ticket.Ticket
-	return
-}
-
-// getTicketFromServer 从服务器中获取ticket
-func (js *WorkJsTicket) getTicketFromServer(accessToken string, ticketType TicketType) (ticket ResTicket, err error) {
-	var url string
-	switch ticketType {
-	case TicketTypeCorpJs:
-		url = fmt.Sprintf(getWorkJsTicketURL, accessToken)
-	case TicketTypeAgentJs:
-		url = fmt.Sprintf(getWorkAgentJsTicketURL, accessToken)
-	default:
-		err = fmt.Errorf("unsupported ticket type: %v", ticketType)
-		return
-	}
-
-	var response []byte
-	response, err = util.HTTPGet(url)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(response, &ticket)
-	if err != nil {
-		return
-	}
-	if ticket.ErrCode != 0 {
-		err = fmt.Errorf("getTicket Error : errcode=%d , errmsg=%s", ticket.ErrCode, ticket.ErrMsg)
-		return
-	}
-	return
-}

doc/api/work.md

@@ -90,12 +90,10 @@ 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)
 
@@ -118,14 +116,5 @@ 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

domain/openapi/mgnt.go

@@ -2,12 +2,12 @@ package openapi
 
 import "github.com/silenceper/wechat/v2/util"
 
-// GetAPIQuotaParams 查询 API 调用额度参数
+// GetAPIQuotaParams 查询API调用额度参数
 type GetAPIQuotaParams struct {
-	CgiPath string `json:"cgi_path"` // api 的请求地址，例如"/cgi-bin/message/custom/send";不要前缀“https://api.weixin.qq.com” ，也不要漏了"/",否则都会 76003 的报错
+	CgiPath string `json:"cgi_path"` // api的请求地址，例如"/cgi-bin/message/custom/send";不要前缀“https://api.weixin.qq.com” ，也不要漏了"/",否则都会76003的报错
 }
 
-// APIQuota API 调用额度
+// APIQuota API调用额度
 type APIQuota struct {
 	util.CommonError
 	Quota struct {
@@ -17,20 +17,20 @@ type APIQuota struct {
 	} `json:"quota"` // 详情
 }
 
-// GetRidInfoParams 查询 rid 信息参数
+// GetRidInfoParams 查询rid信息参数
 type GetRidInfoParams struct {
-	Rid string `json:"rid"` // 调用接口报错返回的 rid
+	Rid string `json:"rid"` // 调用接口报错返回的rid
 }
 
-// RidInfo rid 信息
+// RidInfo rid信息
 type RidInfo struct {
 	util.CommonError
 	Request struct {
 		InvokeTime   int64  `json:"invoke_time"`   // 发起请求的时间戳
 		CostInMs     int64  `json:"cost_in_ms"`    // 请求毫秒级耗时
-		RequestURL   string `json:"request_url"`   // 请求的 URL 参数
-		RequestBody  string `json:"request_body"`  // post 请求的请求参数
+		RequestURL   string `json:"request_url"`   // 请求的URL参数
+		RequestBody  string `json:"request_body"`  // post请求的请求参数
 		ResponseBody string `json:"response_body"` // 接口请求返回参数
-		ClientIP     string `json:"client_ip"`     // 接口请求的客户端 ip
-	} `json:"request"` // 该 rid 对应的请求详情
+		ClientIP     string `json:"client_ip"`     // 接口请求的客户端ip
+	} `json:"request"` // 该rid对应的请求详情
 }

miniprogram/analysis/analysis.go

@@ -30,8 +30,6 @@ const (
 	getAnalysisVisitDistributionURL = "https://api.weixin.qq.com/datacube/getweanalysisappidvisitdistribution?access_token=%s"
 	// 访问页面
 	getAnalysisVisitPageURL = "https://api.weixin.qq.com/datacube/getweanalysisappidvisitpage?access_token=%s"
-	// 获取小程序性能数据
-	getPerformanceDataURL = "https://api.weixin.qq.com/wxa/business/performance/boot?access_token=%s"
 )
 
 // Analysis analyis 数据分析
@@ -317,67 +315,3 @@ func (analysis *Analysis) GetAnalysisVisitPage(beginDate, endDate string) (resul
 	}
 	return
 }
-
-// GetPerformanceDataRequest 获取小程序性能数据请求
-type GetPerformanceDataRequest struct {
-	Module string                  `json:"module"`
-	Time   PerformanceDataTime     `json:"time"`
-	Params []PerformanceDataParams `json:"params"`
-}
-
-// PerformanceDataTime 获取小程序性能数据开始和结束日期
-type PerformanceDataTime struct {
-	BeginTimestamp int64 `json:"begin_timestamp"`
-	EndTimestamp   int64 `json:"end_timestamp"`
-}
-
-// PerformanceDataParams 获取小程序性能数据查询条件
-type PerformanceDataParams struct {
-	Field string `json:"field"`
-	Value string `json:"value"`
-}
-
-// GetPerformanceDataResponse 获取小程序性能数据响应
-type GetPerformanceDataResponse struct {
-	util.CommonError
-	Body PerformanceDataBody `json:"body"`
-}
-
-// PerformanceDataBody 性能数据
-type PerformanceDataBody struct {
-	Tables []PerformanceDataTable `json:"tables"`
-	Count  int64                  `json:"count"`
-}
-
-// PerformanceDataTable 数据数组
-type PerformanceDataTable struct {
-	ID    string                     `json:"id"`
-	Lines []PerformanceDataTableLine `json:"lines"`
-	Zh    string                     `json:"zh"`
-}
-
-// PerformanceDataTableLine 按时间排列的性能数据
-type PerformanceDataTableLine struct {
-	Fields []PerformanceDataTableLineField `json:"fields"`
-}
-
-// PerformanceDataTableLineField 单天的性能数据
-type PerformanceDataTableLineField struct {
-	RefDate string `json:"refdate"`
-	Value   string `json:"value"`
-}
-
-// GetPerformanceData 获取小程序性能数据
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/data-analysis/others/getPerformanceData.html
-func (analysis *Analysis) GetPerformanceData(req *GetPerformanceDataRequest) (res GetPerformanceDataResponse, err error) {
-	var accessToken string
-	if accessToken, err = analysis.GetAccessToken(); err != nil {
-		return
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(getPerformanceDataURL, accessToken), req); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetPerformanceData")
-	return
-}

miniprogram/auth/auth.go

@@ -10,22 +10,13 @@ import (
 )
 
 const (
-	// code2SessionURL 小程序登录
 	code2SessionURL = "https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code"
-	// checkEncryptedDataURL 检查加密信息
+
 	checkEncryptedDataURL = "https://api.weixin.qq.com/wxa/business/checkencryptedmsg?access_token=%s"
-	// getPhoneNumber 获取手机号
+
 	getPhoneNumber = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s"
-	// checkSessionURL 检验登录态
-	checkSessionURL = "https://api.weixin.qq.com/wxa/checksession?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
-	// resetUserSessionKeyURL 重置登录态
-	resetUserSessionKeyURL = "https://api.weixin.qq.com/wxa/resetusersessionkey?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
-	// getPluginOpenPIDURL 获取插件用户openPID
-	getPluginOpenPIDURL = "https://api.weixin.qq.com/wxa/getpluginopenpid?access_token=%s"
-	// getPaidUnionIDURL 支付后获取 UnionID
-	getPaidUnionIDURL = "https://api.weixin.qq.com/wxa/getpaidunionid"
-	// getUserEncryptKeyURL 获取用户encryptKey
-	getUserEncryptKeyURL = "https://api.weixin.qq.com/wxa/business/getuserencryptkey?access_token=%s&signature=%s&openid=%s&sig_method=hmac_sha256"
+
+	checkSessionURL = "https://api.weixin.qq.com/wxa/checksession?access_token=%s&openid=%s&signature=%s&sig_method=hmac_sha256"
 )
 
 // Auth 登录/用户信息
@@ -44,7 +35,7 @@ type ResCode2Session struct {
 
 	OpenID     string `json:"openid"`      // 用户唯一标识
 	SessionKey string `json:"session_key"` // 会话密钥
-	UnionID    string `json:"unionid"`     // 用户在开放平台的唯一标识符，在满足UnionID下发条件的情况下会返回
+	UnionID    string `json:"unionid"`     // 用户在开放平台的唯一标识符，在满足 UnionID 下发条件的情况下会返回
 }
 
 // RspCheckEncryptedData .
@@ -76,63 +67,27 @@ func (auth *Auth) Code2SessionContext(ctx context2.Context, jsCode string) (resu
 	return
 }
 
-type (
-	// GetPaidUnionIDRequest 支付后获取UnionID请求
-	GetPaidUnionIDRequest struct {
-		OpenID        string `json:"openid"`
-		TransactionID string `json:"transaction_id,omitempty"`
-		MchID         string `json:"mch_id,omitempty"`
-		OutTradeNo    string `json:"out_trade_no,omitempty"`
-	}
-
-	// GetPaidUnionIDResponse 支付后获取UnionID响应
-	GetPaidUnionIDResponse struct {
-		util.CommonError
-		UnionID string `json:"unionid"`
-	}
-)
-
 // GetPaidUnionID 用户支付完成后，获取该用户的 UnionId，无需用户授权
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/basic-info/getPaidUnionid.html
-func (auth *Auth) GetPaidUnionID(req *GetPaidUnionIDRequest) (string, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = auth.GetAccessToken(); err != nil {
-		return "", err
-	}
-	var url string
-	if req.TransactionID != "" {
-		url = fmt.Sprintf("%s?access_token=%s&openid=%s&transaction_id=%s", getPaidUnionIDURL, accessToken, req.OpenID, req.TransactionID)
-	} else {
-		url = fmt.Sprintf("%s?access_token=%s&openid=%s&mch_id=%s&out_trade_no=%s", getPaidUnionIDURL, accessToken, req.OpenID, req.MchID, req.OutTradeNo)
-	}
-	var response []byte
-	if response, err = util.HTTPGet(url); err != nil {
-		return "", err
-	}
-	result := &GetPaidUnionIDResponse{}
-	err = util.DecodeWithError(response, result, "GetPaidUnionID")
-	return result.UnionID, err
+func (auth *Auth) GetPaidUnionID() {
+	// TODO
 }
 
-// CheckEncryptedData .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近3天生成的加密数据
+// CheckEncryptedData .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近 3 天生成的加密数据
 func (auth *Auth) CheckEncryptedData(encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
 	return auth.CheckEncryptedDataContext(context2.Background(), encryptedMsgHash)
 }
 
-// CheckEncryptedDataContext .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近3天生成的加密数据
+// CheckEncryptedDataContext .检查加密信息是否由微信生成（当前只支持手机号加密数据），只能检测最近 3 天生成的加密数据
 func (auth *Auth) CheckEncryptedDataContext(ctx context2.Context, encryptedMsgHash string) (result RspCheckEncryptedData, err error) {
 	var response []byte
 	var (
 		at string
 	)
-	if at, err = auth.GetAccessTokenContext(ctx); err != nil {
+	if at, err = auth.GetAccessToken(); err != nil {
 		return
 	}
 
-	// 由于GetPhoneNumberContext需要传入JSON，所以HTTPPostContext入参改为[]byte
+	// 由于 GetPhoneNumberContext 需要传入 JSON，所以 HTTPPostContext 入参改为 []byte
 	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(checkEncryptedDataURL, at), []byte("encrypted_msg_hash="+encryptedMsgHash), nil); err != nil {
 		return
 	}
@@ -160,148 +115,62 @@ type PhoneInfo struct {
 	} `json:"watermark"` // 数据水印
 }
 
-// GetPhoneNumberContext 小程序通过code获取用户手机号
-func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (*GetPhoneNumberResponse, error) {
-	var response []byte
-	var (
-		at  string
-		err error
-	)
-	if at, err = auth.GetAccessTokenContext(ctx); err != nil {
+// GetPhoneNumberContext 小程序通过 code 获取用户手机号
+func (auth *Auth) GetPhoneNumberContext(ctx context2.Context, code string) (result *GetPhoneNumberResponse, err error) {
+	var accessToken string
+	if accessToken, err = auth.GetAccessToken(); err != nil {
 		return nil, err
 	}
-	body := map[string]interface{}{
-		"code": code,
-	}
 
-	bodyBytes, err := json.Marshal(body)
+	bodyBytes, err := json.Marshal(map[string]interface{}{
+		"code": code,
+	})
 	if err != nil {
 		return nil, err
 	}
 
-	header := map[string]string{"Content-Type": "application/json;charset=utf-8"}
-	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, at), bodyBytes, header); err != nil {
+	var (
+		header   = map[string]string{"Content-Type": "application/json;charset=utf-8"}
+		response []byte
+	)
+
+	if response, err = util.HTTPPostContext(ctx, fmt.Sprintf(getPhoneNumber, accessToken), bodyBytes, header); err != nil {
 		return nil, err
 	}
 
-	var result GetPhoneNumberResponse
 	err = util.DecodeWithError(response, &result, "phonenumber.getPhoneNumber")
-	return &result, err
+	return
 }
 
-// GetPhoneNumber 小程序通过code获取用户手机号
+// GetPhoneNumber 小程序通过 code 获取用户手机号
 func (auth *Auth) GetPhoneNumber(code string) (*GetPhoneNumberResponse, error) {
 	return auth.GetPhoneNumberContext(context2.Background(), code)
 }
 
-// CheckSession 检验登录态
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/checkSessionKey.html
-func (auth *Auth) CheckSession(signature, openID string) error {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = auth.GetAccessToken(); err != nil {
-		return err
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(checkSessionURL, accessToken, signature, openID)); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "CheckSession")
-}
-
-// ResetUserSessionKeyResponse 重置登录态响应
-type ResetUserSessionKeyResponse struct {
-	util.CommonError
-	OpenID     string `json:"openid"`
-	SessionKey string `json:"session_key"`
-}
-
-// ResetUserSessionKey 重置登录态
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-login/ResetUserSessionKey.html
-func (auth *Auth) ResetUserSessionKey(signature, openID string) (*ResetUserSessionKeyResponse, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = auth.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(resetUserSessionKeyURL, accessToken, signature, openID)); err != nil {
-		return nil, err
-	}
-	result := &ResetUserSessionKeyResponse{}
-	err = util.DecodeWithError(response, result, "ResetUserSessionKey")
-	return result, err
-}
-
-type (
-	// GetPluginOpenPIDRequest 获取插件用户openPID请求
-	GetPluginOpenPIDRequest struct {
-		Code string `json:"code"`
-	}
-
-	// GetPluginOpenPIDResponse 获取插件用户openPID响应
-	GetPluginOpenPIDResponse struct {
-		util.CommonError
-		OpenPID string `json:"openpid"`
-	}
-)
-
-// GetPluginOpenPID 获取插件用户openPID
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/basic-info/getPluginOpenPId.html
-func (auth *Auth) GetPluginOpenPID(code string) (string, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = auth.GetAccessToken(); err != nil {
-		return "", err
-	}
-	req := &GetPluginOpenPIDRequest{
-		Code: code,
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(getPluginOpenPIDURL, accessToken), req); err != nil {
-		return "", err
-	}
-	result := &GetPluginOpenPIDResponse{}
-	err = util.DecodeWithError(response, result, "GetPluginOpenPID")
-	return result.OpenPID, err
-}
-
-// GetUserEncryptKeyResponse 获取用户encryptKey响应
-type GetUserEncryptKeyResponse struct {
-	util.CommonError
-	KeyInfoList []KeyInfo `json:"key_info_list"`
-}
-
-// KeyInfo 用户最近三次的加密key
-type KeyInfo struct {
-	EncryptKey string `json:"encrypt_key"`
-	Version    int64  `json:"version"`
-	ExpireIn   int64  `json:"expire_in"`
-	Iv         string `json:"iv"`
-	CreateTime int64  `json:"create_time"`
-}
-
-// GetUserEncryptKey 获取用户encryptKey
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/user-info/internet/getUserEncryptKey.html
-func (auth *Auth) GetUserEncryptKey(signature, openID string) (*GetUserEncryptKeyResponse, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = auth.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(getUserEncryptKeyURL, accessToken, signature, openID)); err != nil {
-		return nil, err
-	}
-	result := &GetUserEncryptKeyResponse{}
-	err = util.DecodeWithError(response, result, "GetUserEncryptKey")
-	return result, err
-}
+// // CheckSession 检验登录态是否过期。
+// func (auth *Auth) CheckSession(sessionKey, openID string) (result *CheckSessionResponse, err error) {
+// 	return auth.CheckSessionContext(context2.Background(), sessionKey, openID)
+// }
+//
+// // CheckSessionContext 检验登录态是否过期。
+// func (auth *Auth) CheckSessionContext(ctx context2.Context, sessionKey, openID string) (result *CheckSessionResponse, err error) {
+// 	var accessToken string
+// 	if accessToken, err = auth.GetAccessToken(); err != nil {
+// 		return nil, err
+// 	}
+// 	var (
+// 		response  []byte
+// 		signature string = sessionKey
+// 	)
+// 	if response, err = util.HTTPGetContext(ctx, fmt.Sprintf(checkSessionURL, accessToken, openID, signature)); err != nil {
+// 		return nil, err
+// 	}
+//
+// 	err = util.DecodeWithError(response, &result, "CheckSessionContext")
+// 	return
+// }
+//
+// // CheckSessionResponse 检验登录态是否过期。
+// type CheckSessionResponse struct {
+// 	util.CommonError
+// }

miniprogram/business/phone_number.go

@@ -1,7 +1,6 @@
 package business
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/util"
@@ -29,18 +28,13 @@ type PhoneInfo struct {
 
 // GetPhoneNumber code换取用户手机号。 每个code只能使用一次，code的有效期为5min
 func (business *Business) GetPhoneNumber(in *GetPhoneNumberRequest) (info PhoneInfo, err error) {
-	return business.GetPhoneNumberWithContext(context.Background(), in)
-}
-
-// GetPhoneNumberWithContext 利用context将code换取用户手机号。 每个code只能使用一次，code的有效期为5min
-func (business *Business) GetPhoneNumberWithContext(ctx context.Context, in *GetPhoneNumberRequest) (info PhoneInfo, err error) {
-	accessToken, err := business.GetAccessTokenContext(ctx)
+	accessToken, err := business.GetAccessToken()
 	if err != nil {
 		return
 	}
 
 	uri := fmt.Sprintf(getPhoneNumberURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, in)
+	response, err := util.PostJSON(uri, in)
 	if err != nil {
 		return
 	}
@@ -51,5 +45,10 @@ func (business *Business) GetPhoneNumberWithContext(ctx context.Context, in *Get
 		PhoneInfo PhoneInfo `json:"phone_info"`
 	}
 	err = util.DecodeWithError(response, &resp, "business.GetPhoneNumber")
-	return resp.PhoneInfo, err
+	if nil != err {
+		return
+	}
+
+	info = resp.PhoneInfo
+	return
 }

miniprogram/config/config.go

@@ -14,5 +14,4 @@ type Config struct {
 	Token          string `json:"token"`            // token
 	EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
 	Cache          cache.Cache
-	UseStableAK    bool // use the stable access_token
 }

miniprogram/context/context.go

@@ -8,5 +8,5 @@ import (
 // Context struct
 type Context struct {
 	*config.Config
-	credential.AccessTokenContextHandle
+	credential.AccessTokenHandle
 }

miniprogram/express/delivery.go

@@ -1,295 +0,0 @@
-package express
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	// 传运单接口，商户使用此接口向微信提供某交易单号对应的运单号。微信后台会跟踪运单的状态变化
-	openMsgTraceWaybillURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/trace_waybill?access_token=%s"
-
-	// 查询运单接口，商户在调用完trace_waybill接口后，可以使用本接口查询到对应运单的详情信息
-	openMsgQueryTraceURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/query_trace?access_token=%s"
-
-	// 更新物流信息，更新物品信息
-	openMsgUpdateWaybillGoodsURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/update_waybill_goods?access_token=%s"
-
-	// 传运单接口，商户使用此接口向微信提供某交易单号对应的运单号。微信后台会跟踪运单的状态变化，在关键物流节点给下单用户推送消息通知
-	openMsgFollowWaybillURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/follow_waybill?access_token=%s"
-
-	// 查运单接口，商户在调用完follow_waybill接口后，可以使用本接口查询到对应运单的详情信息
-	openMsgQueryFollowTraceURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/query_follow_trace?access_token=%s"
-
-	// 更新物品信息接口
-	openMsgUpdateFollowWaybillGoodsURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/update_follow_waybill_goods?access_token=%s"
-
-	// 获取运力id列表
-	openMsgGetDeliveryListURL = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/get_delivery_list?access_token=%s"
-)
-
-// TraceWaybill 传运单
-// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_search.html#_2-%E6%8E%A5%E5%8F%A3%E5%88%97%E8%A1%A8
-func (express *Express) TraceWaybill(ctx context.Context, in *TraceWaybillRequest) (res TraceWaybillResponse, err error) {
-	accessToken, err := express.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(openMsgTraceWaybillURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, in)
-	if err != nil {
-		return
-	}
-
-	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, &res, "TraceWaybill")
-	return
-}
-
-// QueryTrace 查询运单详情信息
-// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_search.html#_2-%E6%8E%A5%E5%8F%A3%E5%88%97%E8%A1%A8
-func (express *Express) QueryTrace(ctx context.Context, in *QueryTraceRequest) (res QueryTraceResponse, err error) {
-	accessToken, err := express.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(openMsgQueryTraceURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, in)
-	if err != nil {
-		return
-	}
-
-	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, &res, "QueryTrace")
-	return
-}
-
-// UpdateWaybillGoods 更新物品信息
-// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_search.html#_2-%E6%8E%A5%E5%8F%A3%E5%88%97%E8%A1%A8
-func (express *Express) UpdateWaybillGoods(ctx context.Context, in *UpdateWaybillGoodsRequest) (err error) {
-	accessToken, err := express.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(openMsgUpdateWaybillGoodsURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, in)
-	if err != nil {
-		return
-	}
-
-	// 使用通用方法返回错误
-	err = util.DecodeWithCommonError(response, "UpdateWaybillGoods")
-	return
-}
-
-// FollowWaybill 传运单
-// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_open_msg.html#_4-1%E3%80%81%E4%BC%A0%E8%BF%90%E5%8D%95%E6%8E%A5%E5%8F%A3-follow-waybill
-func (express *Express) FollowWaybill(ctx context.Context, in *FollowWaybillRequest) (res FollowWaybillResponse, err error) {
-	accessToken, err := express.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(openMsgFollowWaybillURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, in)
-	if err != nil {
-		return
-	}
-
-	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, &res, "FollowWaybill")
-	return
-}
-
-// QueryFollowTrace 查询运单详情信息
-// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_open_msg.html#_4-2%E3%80%81%E6%9F%A5%E8%BF%90%E5%8D%95%E6%8E%A5%E5%8F%A3-query-follow-trace
-func (express *Express) QueryFollowTrace(ctx context.Context, in *QueryFollowTraceRequest) (res QueryFollowTraceResponse, err error) {
-	accessToken, err := express.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(openMsgQueryFollowTraceURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, in)
-	if err != nil {
-		return
-	}
-
-	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, &res, "QueryFollowTrace")
-	return
-}
-
-// UpdateFollowWaybillGoods 更新物品信息
-// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_open_msg.html#_4-3%E3%80%81%E6%9B%B4%E6%96%B0%E7%89%A9%E5%93%81%E4%BF%A1%E6%81%AF%E6%8E%A5%E5%8F%A3-update-follow-waybill-goods
-func (express *Express) UpdateFollowWaybillGoods(ctx context.Context, in *UpdateFollowWaybillGoodsRequest) (err error) {
-	accessToken, err := express.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(openMsgUpdateFollowWaybillGoodsURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, in)
-	if err != nil {
-		return
-	}
-
-	// 使用通用方法返回错误
-	err = util.DecodeWithCommonError(response, "UpdateFollowWaybillGoods")
-	return
-}
-
-// GetDeliveryList 获取运力id列表
-// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/express_open_msg.html#_4-4%E8%8E%B7%E5%8F%96%E8%BF%90%E5%8A%9Bid%E5%88%97%E8%A1%A8get-delivery-list
-func (express *Express) GetDeliveryList(ctx context.Context) (res GetDeliveryListResponse, err error) {
-	accessToken, err := express.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf(openMsgGetDeliveryListURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, map[string]interface{}{})
-	if err != nil {
-		return
-	}
-
-	// 使用通用方法返回错误
-	err = util.DecodeWithError(response, &res, "GetDeliveryList")
-	return
-}
-
-// TraceWaybillRequest 传运单接口请求参数
-type TraceWaybillRequest struct {
-	GoodsInfo       FollowWaybillGoodsInfo `json:"goods_info"`        // 必选，商品信息
-	Openid          string                 `json:"openid"`            // 必选，用户openid
-	SenderPhone     string                 `json:"sender_phone"`      // 寄件人手机号
-	ReceiverPhone   string                 `json:"receiver_phone"`    // 必选，收件人手机号，部分运力需要用户手机号作为查单依据
-	DeliveryID      string                 `json:"delivery_id"`       // 运力id（运单号所属运力公司id）
-	WaybillID       string                 `json:"waybill_id"`        // 必选，运单号
-	TransID         string                 `json:"trans_id"`          // 必选，交易单号（微信支付生成的交易单号，一般以420开头）
-	OrderDetailPath string                 `json:"order_detail_path"` // 订单详情页地址
-
-}
-
-// TraceWaybillResponse 传运单接口返回参数
-type TraceWaybillResponse struct {
-	util.CommonError
-	WaybillToken string `json:"waybill_token"` // 查询id
-}
-
-// QueryTraceRequest 查询运单详情接口请求参数
-type QueryTraceRequest struct {
-	WaybillToken string `json:"waybill_token"` // 必选，查询id
-}
-
-// QueryTraceResponse 查询运单详情接口返回参数
-type QueryTraceResponse struct {
-	util.CommonError
-	WaybillInfo  FlowWaybillInfo         `json:"waybill_info"`  // 运单信息
-	ShopInfo     FollowWaybillShopInfo   `json:"shop_info"`     // 商品信息
-	DeliveryInfo FlowWaybillDeliveryInfo `json:"delivery_info"` // 运力信息
-}
-
-// UpdateWaybillGoodsRequest 更新物品信息接口请求参数
-type UpdateWaybillGoodsRequest struct {
-	WaybillToken string                 `json:"waybill_token"` // 必选，查询id
-	GoodsInfo    FollowWaybillGoodsInfo `json:"goods_info"`    // 必选，商品信息
-}
-
-// FollowWaybillRequest 传运单接口请求参数
-type FollowWaybillRequest struct {
-	GoodsInfo       FollowWaybillGoodsInfo `json:"goods_info"`        // 必选，商品信息
-	Openid          string                 `json:"openid"`            // 必选，用户openid
-	SenderPhone     string                 `json:"sender_phone"`      // 寄件人手机号
-	ReceiverPhone   string                 `json:"receiver_phone"`    // 必选，收件人手机号，部分运力需要用户手机号作为查单依据
-	DeliveryID      string                 `json:"delivery_id"`       // 运力id（运单号所属运力公司id）
-	WaybillID       string                 `json:"waybill_id"`        // 必选，运单号
-	TransID         string                 `json:"trans_id"`          // 必选，交易单号（微信支付生成的交易单号，一般以420开头）
-	OrderDetailPath string                 `json:"order_detail_path"` // 订单详情页地址
-}
-
-// FollowWaybillGoodsInfo 商品信息
-type FollowWaybillGoodsInfo struct {
-	DetailList []FollowWaybillGoodsInfoItem `json:"detail_list"`
-}
-
-// FollowWaybillShopInfo 商品信息
-type FollowWaybillShopInfo struct {
-	GoodsInfo FollowWaybillGoodsInfo `json:"goods_info"` // 商品信息
-}
-
-// FollowWaybillGoodsInfoItem 商品信息详情
-type FollowWaybillGoodsInfoItem struct {
-	GoodsName   string `json:"goods_name"`           // 必选，商品名称(最大长度为utf-8编码下的60个字符）
-	GoodsImgURL string `json:"goods_img_url"`        // 必选，商品图片url
-	GoodsDesc   string `json:"goods_desc,omitempty"` // 商品详情描述，不传默认取“商品名称”值，最多40汉字
-}
-
-// FollowWaybillResponse 传运单接口返回参数
-type FollowWaybillResponse struct {
-	util.CommonError
-	WaybillToken string `json:"waybill_token"` // 查询id
-}
-
-// QueryFollowTraceRequest 查询运单详情信息请求参数
-type QueryFollowTraceRequest struct {
-	WaybillToken string `json:"waybill_token"` // 必选，查询id
-}
-
-// QueryFollowTraceResponse 查询运单详情信息返回参数
-type QueryFollowTraceResponse struct {
-	util.CommonError
-	WaybillInfo  FlowWaybillInfo         `json:"waybill_info"`  // 运单信息
-	ShopInfo     FollowWaybillShopInfo   `json:"shop_info"`     // 商品信息
-	DeliveryInfo FlowWaybillDeliveryInfo `json:"delivery_info"` // 运力信息
-}
-
-// FlowWaybillInfo 运单信息
-type FlowWaybillInfo struct {
-	WaybillID string        `json:"waybill_id"` // 运单号
-	Status    WaybillStatus `json:"status"`     // 运单状态
-}
-
-// UpdateFollowWaybillGoodsRequest 修改运单商品信息请求参数
-type UpdateFollowWaybillGoodsRequest struct {
-	WaybillToken string                 `json:"waybill_token"` // 必选，查询id
-	GoodsInfo    FollowWaybillGoodsInfo `json:"goods_info"`    // 必选，商品信息
-}
-
-// GetDeliveryListResponse 获取运力id列表返回参数
-type GetDeliveryListResponse struct {
-	util.CommonError
-	DeliveryList []FlowWaybillDeliveryInfo `json:"delivery_list"` // 运力公司列表
-	Count        int                       `json:"count"`         // 运力公司个数
-}
-
-// FlowWaybillDeliveryInfo 运力公司信息
-type FlowWaybillDeliveryInfo struct {
-	DeliveryID   string `json:"delivery_id"`   // 运力公司id
-	DeliveryName string `json:"delivery_name"` // 运力公司名称
-}
-
-// WaybillStatus 运单状态
-type WaybillStatus int
-
-const (
-	// WaybillStatusNotExist 运单不存在或者未揽收
-	WaybillStatusNotExist WaybillStatus = iota
-	// WaybillStatusPicked 已揽件
-	WaybillStatusPicked
-	// WaybillStatusTransporting 运输中
-	WaybillStatusTransporting
-	// WaybillStatusDispatching 派件中
-	WaybillStatusDispatching
-	// WaybillStatusSigned 已签收
-	WaybillStatusSigned
-	// WaybillStatusException 异常
-	WaybillStatusException
-	// WaybillStatusSignedByOthers 代签收
-	WaybillStatusSignedByOthers
-)

miniprogram/express/express.go

@@ -1,16 +0,0 @@
-package express
-
-import (
-	"github.com/silenceper/wechat/v2/miniprogram/context"
-)
-
-// Express 微信物流服务
-// https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/express/business/introduction.html
-type Express struct {
-	*context.Context
-}
-
-// NewExpress init
-func NewExpress(ctx *context.Context) *Express {
-	return &Express{ctx}
-}

miniprogram/message/consts.go

@@ -22,9 +22,9 @@ const (
 	MsgTypeMiniProgramPage = "miniprogrampage"
 	// MsgTypeEvent 事件
 	MsgTypeEvent MsgType = "event"
-	// DataTypeXML XML 格式数据
+	// DataTypeXML XML格式数据
 	DataTypeXML = "xml"
-	// DataTypeJSON JSON 格式数据
+	// DataTypeJSON JSON格式数据
 	DataTypeJSON = "json"
 )
 

miniprogram/message/customer_message.go

@@ -28,7 +28,7 @@ type MediaText struct {
 	Content string `json:"content"`
 }
 
-// MediaResource  消息使用的临时素材 id
+// MediaResource  消息使用的临时素材id
 type MediaResource struct {
 	MediaID string `json:"media_id"`
 }
@@ -51,7 +51,7 @@ type MediaLink struct {
 
 // CustomerMessage  客服消息
 type CustomerMessage struct {
-	ToUser          string                `json:"touser"`                    // 接受者 OpenID
+	ToUser          string                `json:"touser"`                    // 接受者OpenID
 	Msgtype         MsgType               `json:"msgtype"`                   // 客服消息类型
 	Text            *MediaText            `json:"text,omitempty"`            // 可选
 	Image           *MediaResource        `json:"image,omitempty"`           // 可选

miniprogram/message/message.go

@@ -9,8 +9,6 @@ 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"
@@ -20,11 +18,11 @@ import (
 type ConfirmReceiveMethod int8
 
 const (
-	// EventTypeTradeManageRemindAccessAPI 提醒接入发货信息管理服务 API
+	// EventTypeTradeManageRemindAccessAPI 提醒接入发货信息管理服务API
 	// 小程序完成账期授权时/小程序产生第一笔交易时/已产生交易但从未发货的小程序，每天一次
 	EventTypeTradeManageRemindAccessAPI EventType = "trade_manage_remind_access_api"
 	// EventTypeTradeManageRemindShipping 提醒需要上传发货信息
-	// 曾经发过货的小程序，订单超过 48 小时未发货时
+	// 曾经发过货的小程序，订单超过48小时未发货时
 	EventTypeTradeManageRemindShipping EventType = "trade_manage_remind_shipping"
 	// EventTypeTradeManageOrderSettlement 订单将要结算或已经结算
 	// 订单完成发货时/订单结算时
@@ -41,27 +39,14 @@ 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 加密方式
+// 暂仅支付Aes加密方式
 type PushReceiver struct {
 	*context.Context
 }
@@ -73,16 +58,16 @@ func NewPushReceiver(ctx *context.Context) *PushReceiver {
 	}
 }
 
-// GetMsg 获取接收到的消息 (如果是加密的返回解密数据)
+// GetMsg 获取接收到的消息(如果是加密的返回解密数据)
 func (receiver *PushReceiver) GetMsg(r *http.Request) (string, []byte, error) {
 	// 判断请求格式
 	var dataType string
 	contentType := r.Header.Get("Content-Type")
 	if strings.HasPrefix(contentType, "text/xml") {
-		// xml 格式
+		// xml格式
 		dataType = DataTypeXML
 	} else {
-		// json 格式
+		// json格式
 		dataType = DataTypeJSON
 	}
 
@@ -123,7 +108,7 @@ func (receiver *PushReceiver) GetMsg(r *http.Request) (string, []byte, error) {
 	return dataType, byteData, err
 }
 
-// GetMsgData 获取接收到的消息 (解密数据)
+// GetMsgData 获取接收到的消息(解密数据)
 func (receiver *PushReceiver) GetMsgData(r *http.Request) (MsgType, EventType, PushData, error) {
 	dataType, decryptMsg, err := receiver.GetMsg(r)
 	if err != nil {
@@ -159,7 +144,7 @@ func (receiver *PushReceiver) GetMsgData(r *http.Request) (MsgType, EventType, P
 func (receiver *PushReceiver) getEvent(dataType string, eventType EventType, decryptMsg []byte) (PushData, error) {
 	switch eventType {
 	case EventTypeTradeManageRemindAccessAPI:
-		// 提醒接入发货信息管理服务 API
+		// 提醒接入发货信息管理服务API
 		var pushData PushDataRemindAccessAPI
 		err := receiver.unmarshal(dataType, decryptMsg, &pushData)
 		return &pushData, err
@@ -203,104 +188,25 @@ 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(dataType string, decryptMsg []byte, pushData interface{}) error {
-	if dataType == DataTypeXML {
+func (receiver *PushReceiver) unmarshal(dateType string, decryptMsg []byte, pushData interface{}) error {
+	if dateType == 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"` // 加密的消息体
 }
 
-// PushData 推送的数据 (已转对应的结构体)
+// PushData 推送的数据(已转对应的结构体)
 type PushData interface{}
 
 // CommonPushData 推送数据通用部分
@@ -310,7 +216,7 @@ type CommonPushData struct {
 	Event        EventType `json:"Event" xml:"Event"`               // 事件类型
 	ToUserName   string    `json:"ToUserName" xml:"ToUserName"`     // 小程序的原始 ID
 	FromUserName string    `json:"FromUserName" xml:"FromUserName"` // 发送方账号（一个 OpenID，此时发送方是系统账号）
-	CreateTime   int64     `json:"CreateTime" xml:"CreateTime"`     // 消息创建时间（整型），时间戳
+	CreateTime   int64     `json:"CreateTime" xml:"CreateTime"`     // 消息创建时间 （整型），时间戳
 }
 
 // MediaCheckAsyncData 媒体内容安全异步审查结果通知
@@ -366,7 +272,7 @@ type PushDataRemindShipping struct {
 	Msg             string `json:"msg" xml:"msg"`                             // 消息文本内容
 }
 
-// PushDataRemindAccessAPI 提醒接入发货信息管理服务 API 信息
+// PushDataRemindAccessAPI 提醒接入发货信息管理服务API信息
 type PushDataRemindAccessAPI struct {
 	CommonPushData
 	Msg string `json:"msg" xml:"msg"` // 消息文本内容
@@ -375,9 +281,9 @@ type PushDataRemindAccessAPI struct {
 // PushDataAddExpressPath 运单轨迹更新信息
 type PushDataAddExpressPath struct {
 	CommonPushData
-	DeliveryID string                          `json:"DeliveryID" xml:"DeliveryID"` // 快递公司 ID
-	WayBillID  string                          `json:"WaybillId" xml:"WaybillId"`   // 运单 ID
-	OrderID    string                          `json:"OrderId" xml:"OrderId"`       // 订单 ID
+	DeliveryID string                          `json:"DeliveryID" xml:"DeliveryID"` // 快递公司ID
+	WayBillID  string                          `json:"WaybillId" xml:"WaybillId"`   // 运单ID
+	OrderID    string                          `json:"OrderId" xml:"OrderId"`       // 订单ID
 	Version    int                             `json:"Version" xml:"Version"`       // 轨迹版本号（整型）
 	Count      int                             `json:"Count" xml:"Count"`           // 轨迹节点数（整型）
 	Actions    []*PushDataAddExpressPathAction `json:"Actions" xml:"Actions"`       // 轨迹节点列表
@@ -398,10 +304,10 @@ type PushDataSecVodUpload struct {
 
 // SecVodUploadEvent 短剧媒资上传完成事件
 type SecVodUploadEvent struct {
-	MediaID       int64  `json:"media_id" xml:"media_id"`             // 媒资 id
+	MediaID       string `json:"media_id" xml:"media_id"`             // 媒资id
 	SourceContext string `json:"source_context" xml:"source_context"` // 透传上传接口中开发者设置的值。
-	ErrCode       int    `json:"errcode" xml:"errcode"`               // 错误码，上传失败时该值非
-	ErrMsg        string `json:"errmsg" xml:"errmsg"`                 // 错误提示
+	Errcode       int    `json:"errcode" xml:"errcode"`               // 错误码，上传失败时该值非
+	Errmsg        string `json:"errmsg" xml:"errmsg"`                 // 错误提示
 }
 
 // PushDataSecVodAudit 短剧媒资审核状态
@@ -412,14 +318,14 @@ type PushDataSecVodAudit struct {
 
 // SecVodAuditEvent 短剧媒资审核状态事件
 type SecVodAuditEvent struct {
-	DramaID       int64            `json:"drama_id" xml:"drama_id"`             // 剧目 id
+	DramaID       string           `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 查询剧集详情得到
+	AuditDetail   DramaAuditDetail `json:"audit_detail" xml:"audit_detail"`     // 剧目审核结果，单独每一集的审核结果可以根据drama_id查询剧集详情得到
 }
 
 // DramaAuditDetail 剧目审核结果
 type DramaAuditDetail struct {
-	Status     int   `json:"status" xml:"status"`           // 审核状态，0 为无效值；1 为审核中；2 为最终失败；3 为审核通过；4 为驳回重填
+	Status     int   `json:"status" xml:"status"`           // 审核状态，0为无效值；1为审核中；2为最终失败；3为审核通过；4为驳回重填
 	CreateTime int64 `json:"create_time" xml:"create_time"` // 提审时间戳
 	AuditTime  int64 `json:"audit_time" xml:"audit_time"`   // 审核时间戳
 }
@@ -427,9 +333,9 @@ type DramaAuditDetail struct {
 // PushDataXpayGoodsDeliverNotify 道具发货推送
 type PushDataXpayGoodsDeliverNotify struct {
 	CommonPushData
-	OpenID        string        `json:"OpenId" xml:"OpenId"`               // 用户 openid
+	OpenID        string        `json:"OpenId" xml:"OpenId"`               // 用户openid
 	OutTradeNo    string        `json:"OutTradeNo" xml:"OutTradeNo"`       // 业务订单号
-	Env           int           `json:"Env" xml:"Env"`                     // ，环境配置 0：现网环境（也叫正式环境）1：沙箱环境
+	Env           int           `json:"Env" xml:"Env"`                     //，环境配置 0：现网环境（也叫正式环境）1：沙箱环境
 	WeChatPayInfo WeChatPayInfo `json:"WeChatPayInfo" xml:"WeChatPayInfo"` // 微信支付信息 非微信支付渠道可能没有
 	GoodsInfo     GoodsInfo     `json:"GoodsInfo" xml:"GoodsInfo"`         // 道具参数信息
 }
@@ -438,14 +344,14 @@ type PushDataXpayGoodsDeliverNotify struct {
 type WeChatPayInfo struct {
 	MchOrderNo    string `json:"MchOrderNo" xml:"MchOrderNo"`       // 微信支付商户单号
 	TransactionID string `json:"TransactionId" xml:"TransactionId"` // 交易单号（微信支付订单号）
-	PaidTime      int64  `json:"PaidTime" xml:"PaidTime"`           // 用户支付时间，Linux 秒级时间戳
+	PaidTime      int64  `json:"PaidTime" xml:"PaidTime"`           // 用户支付时间，Linux秒级时间戳
 }
 
 // GoodsInfo 道具参数信息
 type GoodsInfo struct {
-	ProductID   string `json:"ProductId" xml:"ProductId"`     // 道具 ID
+	ProductID   string `json:"ProductId" xml:"ProductId"`     // 道具ID
 	Quantity    int    `json:"Quantity" xml:"Quantity"`       // 数量
-	OrigPrice   int64  `json:"OrigPrice" xml:"OrigPrice"`     // 物品原始价格（单位：分）
+	OrigPrice   int64  `json:"OrigPrice" xml:"OrigPrice"`     // 物品原始价格 （单位：分）
 	ActualPrice int64  `json:"ActualPrice" xml:"ActualPrice"` // 物品实际支付价格（单位：分）
 	Attach      string `json:"Attach" xml:"Attach"`           // 透传信息
 }
@@ -453,9 +359,9 @@ type GoodsInfo struct {
 // PushDataXpayCoinPayNotify 代币支付推送
 type PushDataXpayCoinPayNotify struct {
 	CommonPushData
-	OpenID        string        `json:"OpenId" xml:"OpenId"`               // 用户 openid
+	OpenID        string        `json:"OpenId" xml:"OpenId"`               // 用户openid
 	OutTradeNo    string        `json:"OutTradeNo" xml:"OutTradeNo"`       // 业务订单号
-	Env           int           `json:"Env" xml:"Env"`                     // ，环境配置 0：现网环境（也叫正式环境）1：沙箱环境
+	Env           int           `json:"Env" xml:"Env"`                     //，环境配置 0：现网环境（也叫正式环境）1：沙箱环境
 	WeChatPayInfo WeChatPayInfo `json:"WeChatPayInfo" xml:"WeChatPayInfo"` // 微信支付信息 非微信支付渠道可能没有
 	CoinInfo      CoinInfo      `json:"CoinInfo" xml:"CoinInfo"`           // 代币参数信息
 }
@@ -463,117 +369,7 @@ type PushDataXpayCoinPayNotify struct {
 // CoinInfo 代币参数信息
 type CoinInfo struct {
 	Quantity    int    `json:"Quantity" xml:"Quantity"`       // 数量
-	OrigPrice   int64  `json:"OrigPrice" xml:"OrigPrice"`     // 物品原始价格（单位：分）
+	OrigPrice   int64  `json:"OrigPrice" xml:"OrigPrice"`     // 物品原始价格 （单位：分）
 	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   string `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

@@ -1,15 +0,0 @@
-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

@@ -1,147 +0,0 @@
-package message
-
-import (
-	"fmt"
-
-	"github.com/silenceper/wechat/v2/miniprogram/context"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	// createActivityIDURL 创建activity_id
-	createActivityIDURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/activityid/create?access_token=%s&unionid=%s&openid=%s"
-	// SendUpdatableMsgURL 修改动态消息
-	setUpdatableMsgURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/updatablemsg/send?access_token=%s"
-	// setChatToolMsgURL 修改小程序聊天工具的动态卡片消息
-	setChatToolMsgURL = "https://api.weixin.qq.com/cgi-bin/message/wxopen/chattoolmsg/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,
-	}
-}
-
-// CreateActivityIDRequest 创建activity_id请求
-type CreateActivityIDRequest struct {
-	UnionID string
-	OpenID  string
-}
-
-// CreateActivityID 创建activity_id
-func (updatableMessage *UpdatableMessage) CreateActivityID() (CreateActivityIDResponse, error) {
-	return updatableMessage.CreateActivityIDWithReq(&CreateActivityIDRequest{})
-}
-
-// CreateActivityIDWithReq 创建activity_id
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/updatable-message/createActivityId.html
-func (updatableMessage *UpdatableMessage) CreateActivityIDWithReq(req *CreateActivityIDRequest) (res CreateActivityIDResponse, err error) {
-	accessToken, err := updatableMessage.GetAccessToken()
-	if err != nil {
-		return
-	}
-	url := fmt.Sprintf(createActivityIDURL, accessToken, req.UnionID, req.OpenID)
-	response, err := util.HTTPGet(url)
-	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"`
-}
-
-// SetChatToolMsgRequest 修改小程序聊天工具的动态卡片消息请求
-type SetChatToolMsgRequest struct {
-	VersionType          int64                `json:"version_type"`
-	TargetState          UpdatableTargetState `json:"target_state"`
-	ActivityID           string               `json:"activity_id"`
-	TemplateID           string               `json:"template_id"`
-	ParticipatorInfoList []ParticipatorInfo   `json:"participator_info_list,omitempty"`
-}
-
-// ParticipatorInfo 更新后的聊天室成员状态
-type ParticipatorInfo struct {
-	State       int    `json:"state"`
-	GroupOpenID string `json:"group_openid"`
-}
-
-// SetChatToolMsg 修改小程序聊天工具的动态卡片消息
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/updatable-message/setChatToolMsg.html
-func (updatableMessage *UpdatableMessage) SetChatToolMsg(req *SetChatToolMsgRequest) error {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = updatableMessage.GetAccessToken(); err != nil {
-		return err
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(setChatToolMsgURL, accessToken), req); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "SetChatToolMsg")
-}

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    int64             `json:"file_size"`    // 媒资文件大小，单位：字节。
+	FileSize    string            `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 GetTas
 	}
 
 	// 使用通用方法返回错误
-	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 Li
 	}
 
 	// 使用通用方法返回错误
-	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 GetM
 	}
 
 	// 使用通用方法返回错误
-	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 GetD
 		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

@@ -10,14 +10,11 @@ import (
 	"github.com/silenceper/wechat/v2/miniprogram/content"
 	"github.com/silenceper/wechat/v2/miniprogram/context"
 	"github.com/silenceper/wechat/v2/miniprogram/encryptor"
-	"github.com/silenceper/wechat/v2/miniprogram/express"
 	"github.com/silenceper/wechat/v2/miniprogram/message"
 	"github.com/silenceper/wechat/v2/miniprogram/minidrama"
-	"github.com/silenceper/wechat/v2/miniprogram/operation"
 	"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"
@@ -36,30 +33,17 @@ type MiniProgram struct {
 
 // NewMiniProgram 实例化小程序 API
 func NewMiniProgram(cfg *config.Config) *MiniProgram {
-	var defaultAkHandle credential.AccessTokenContextHandle
-	const cacheKeyPrefix = credential.CacheKeyMiniProgramPrefix
-	if cfg.UseStableAK {
-		defaultAkHandle = credential.NewStableAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
-	} else {
-		defaultAkHandle = credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
-	}
+	defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyMiniProgramPrefix, cfg.Cache)
 	ctx := &context.Context{
-		Config:                   cfg,
-		AccessTokenContextHandle: defaultAkHandle,
+		Config:            cfg,
+		AccessTokenHandle: defaultAkHandle,
 	}
 	return &MiniProgram{ctx}
 }
 
 // SetAccessTokenHandle 自定义 access_token 获取方式
 func (miniProgram *MiniProgram) SetAccessTokenHandle(accessTokenHandle credential.AccessTokenHandle) {
-	miniProgram.ctx.AccessTokenContextHandle = credential.AccessTokenCompatibleHandle{
-		AccessTokenHandle: accessTokenHandle,
-	}
-}
-
-// SetAccessTokenContextHandle 自定义 access_token 获取方式
-func (miniProgram *MiniProgram) SetAccessTokenContextHandle(accessTokenContextHandle credential.AccessTokenContextHandle) {
-	miniProgram.ctx.AccessTokenContextHandle = accessTokenContextHandle
+	miniProgram.ctx.AccessTokenHandle = accessTokenHandle
 }
 
 // GetContext get Context
@@ -171,23 +155,3 @@ 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)
-}
-
-// GetOperation 小程序运维中心
-func (miniProgram *MiniProgram) GetOperation() *operation.Operation {
-	return operation.NewOperation(miniProgram.ctx)
-}
-
-// GetExpress 微信物流服务
-func (miniProgram *MiniProgram) GetExpress() *express.Express {
-	return express.NewExpress(miniProgram.ctx)
-}

miniprogram/operation/operation.go

@@ -1,456 +0,0 @@
-package operation
-
-import (
-	"fmt"
-
-	"github.com/silenceper/wechat/v2/miniprogram/context"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	// getDomainInfoURL 查询域名配置
-	getDomainInfoURL = "https://api.weixin.qq.com/wxa/getwxadevinfo?access_token=%s"
-	// getPerformanceURL 获取性能数据
-	getPerformanceURL = "https://api.weixin.qq.com/wxaapi/log/get_performance?access_token=%s"
-	// getSceneListURL 获取访问来源
-	getSceneListURL = "https://api.weixin.qq.com/wxaapi/log/get_scene?access_token=%s"
-	// getVersionListURL 获取客户端版本
-	getVersionListURL = "https://api.weixin.qq.com/wxaapi/log/get_client_version?access_token=%s"
-	// realTimeLogSearchURL 查询实时日志
-	realTimeLogSearchURL = "https://api.weixin.qq.com/wxaapi/userlog/userlog_search?%s"
-	// getFeedbackListURL 获取用户反馈列表
-	getFeedbackListURL = "https://api.weixin.qq.com/wxaapi/feedback/list?%s"
-	// getJsErrDetailURL 查询js错误详情
-	getJsErrDetailURL = "https://api.weixin.qq.com/wxaapi/log/jserr_detail?access_token=%s"
-	// getJsErrListURL 查询错误列表
-	getJsErrListURL = "https://api.weixin.qq.com/wxaapi/log/jserr_list?access_token=%s"
-	// getGrayReleasePlanURL 获取分阶段发布详情
-	getGrayReleasePlanURL = "https://api.weixin.qq.com/wxa/getgrayreleaseplan?access_token=%s"
-)
-
-// Operation 运维中心
-type Operation struct {
-	*context.Context
-}
-
-// NewOperation 实例化
-func NewOperation(ctx *context.Context) *Operation {
-	return &Operation{ctx}
-}
-
-// GetDomainInfoRequest 查询域名配置请求
-type GetDomainInfoRequest struct {
-	Action string `json:"action"`
-}
-
-// GetDomainInfoResponse 查询域名配置响应
-type GetDomainInfoResponse struct {
-	util.CommonError
-	RequestDomain   []string `json:"requestdomain"`
-	WsRequestDomain []string `json:"wsrequestdomain"`
-	UploadDomain    []string `json:"uploaddomain"`
-	DownloadDomain  []string `json:"downloaddomain"`
-	UDPDomain       []string `json:"udpdomain"`
-	BizDomain       []string `json:"bizdomain"`
-}
-
-// GetDomainInfo 查询域名配置
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getDomainInfo.html
-func (o *Operation) GetDomainInfo(req *GetDomainInfoRequest) (res GetDomainInfoResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(getDomainInfoURL, accessToken), req); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetDomainInfo")
-	return
-}
-
-// GetPerformanceRequest 获取性能数据请求
-type GetPerformanceRequest struct {
-	CostTimeType     int64  `json:"cost_time_type"`
-	DefaultStartTime int64  `json:"default_start_time"`
-	DefaultEndTime   int64  `json:"default_end_time"`
-	Device           string `json:"device"`
-	IsDownloadCode   string `json:"is_download_code"`
-	Scene            string `json:"scene"`
-	NetworkType      string `json:"networktype"`
-}
-
-// GetPerformanceResponse 获取性能数据响应
-type GetPerformanceResponse struct {
-	util.CommonError
-	DefaultTimeData string `json:"default_time_data"`
-	CompareTimeData string `json:"compare_time_data"`
-}
-
-// PerformanceDefaultTimeData 查询数据
-type PerformanceDefaultTimeData struct {
-	List []DefaultTimeDataItem `json:"list"`
-}
-
-// DefaultTimeDataItem 查询数据
-type DefaultTimeDataItem struct {
-	RefData      string `json:"ref_data"`
-	CostTimeType int64  `json:"cost_time_type"`
-	CostTime     int64  `json:"cost_time"`
-}
-
-// GetPerformance 获取性能数据
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getPerformance.html
-func (o *Operation) GetPerformance(req *GetPerformanceRequest) (res GetPerformanceResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(getPerformanceURL, accessToken), req); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetPerformance")
-	return
-}
-
-// GetSceneListResponse 获取访问来源响应
-type GetSceneListResponse struct {
-	util.CommonError
-	Scene []Scene `json:"scene"`
-}
-
-// Scene 访问来源
-type Scene struct {
-	Name  string `json:"name"`
-	Value string `json:"value"`
-}
-
-// GetSceneList 获取访问来源
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getSceneList.html
-func (o *Operation) GetSceneList() (res GetSceneListResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(getSceneListURL, accessToken)); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetSceneList")
-	return
-}
-
-// GetVersionListResponse 获取客户端版本响应
-type GetVersionListResponse struct {
-	util.CommonError
-	CvList []ClientVersion `json:"cvlist"`
-}
-
-// ClientVersion 客户端版本
-type ClientVersion struct {
-	Type              int64    `json:"type"`
-	ClientVersionList []string `json:"client_version_list"`
-}
-
-// GetVersionList 获取客户端版本
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getVersionList.html
-func (o *Operation) GetVersionList() (res GetVersionListResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(getVersionListURL, accessToken)); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetVersionList")
-	return
-}
-
-// RealTimeLogSearchRequest 查询实时日志请求
-type RealTimeLogSearchRequest struct {
-	Date      string
-	BeginTime int64
-	EndTime   int64
-	Start     int64
-	Limit     int64
-	Level     int64
-	TraceID   string
-	URL       string
-	ID        string
-	FilterMsg string
-}
-
-// RealTimeLogSearchResponse 查询实时日志响应
-type RealTimeLogSearchResponse struct {
-	util.CommonError
-	Data RealTimeLogSearchData `json:"data"`
-}
-
-// RealTimeLogSearchData 日志数据和日志条数总量
-type RealTimeLogSearchData struct {
-	List  []RealTimeLogSearchDataList `json:"list"`
-	Total int64                       `json:"total"`
-}
-
-// RealTimeLogSearchDataList 日志数据列表
-type RealTimeLogSearchDataList struct {
-	Level          int64                          `json:"level"`
-	LibraryVersion string                         `json:"libraryVersion"`
-	ClientVersion  string                         `json:"clientVersion"`
-	ID             string                         `json:"id"`
-	Timestamp      int64                          `json:"timestamp"`
-	Platform       int64                          `json:"platform"`
-	URL            string                         `json:"url"`
-	TraceID        string                         `json:"traceid"`
-	FilterMsg      string                         `json:"filterMsg"`
-	Msg            []RealTimeLogSearchDataListMsg `json:"msg"`
-}
-
-// RealTimeLogSearchDataListMsg 日志内容数组
-type RealTimeLogSearchDataListMsg struct {
-	Time  int64    `json:"time"`
-	Level int64    `json:"level"`
-	Msg   []string `json:"msg"`
-}
-
-// RealTimeLogSearch 查询实时日志
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/realtimelogSearch.html
-func (o *Operation) RealTimeLogSearch(req *RealTimeLogSearchRequest) (res RealTimeLogSearchResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-
-	params := map[string]interface{}{
-		"access_token": accessToken,
-		"date":         req.Date,
-		"begintime":    req.BeginTime,
-		"endtime":      req.EndTime,
-	}
-	if req.Start > 0 {
-		params["start"] = req.Start
-	}
-	if req.Limit > 0 {
-		params["limit"] = req.Limit
-	}
-	if req.TraceID != "" {
-		params["traceId"] = req.TraceID
-	}
-	if req.URL != "" {
-		params["url"] = req.URL
-	}
-	if req.ID != "" {
-		params["id"] = req.ID
-	}
-	if req.FilterMsg != "" {
-		params["filterMsg"] = req.FilterMsg
-	}
-	if req.Level > 0 {
-		params["level"] = req.Level
-	}
-	query := util.Query(params)
-
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(realTimeLogSearchURL, query)); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "RealTimeLogSearch")
-	return
-}
-
-// GetFeedbackListRequest 获取用户反馈列表请求
-type GetFeedbackListRequest struct {
-	Page int64
-	Num  int64
-	Type int64
-}
-
-// GetFeedbackListResponse 获取用户反馈列表响应
-type GetFeedbackListResponse struct {
-	util.CommonError
-	TotalNum int64      `json:"total_num"`
-	List     []Feedback `json:"list"`
-}
-
-// Feedback 反馈列表
-type Feedback struct {
-	RecordID   int64    `json:"record_id"`
-	CreateTime int64    `json:"create_time"`
-	Content    string   `json:"content"`
-	Phone      string   `json:"phone"`
-	OpenID     string   `json:"openid"`
-	Nickname   string   `json:"nickname"`
-	HeadURL    string   `json:"head_url"`
-	Type       int64    `json:"type"`
-	MediaIDS   []string `json:"mediaIds"`
-	SystemInfo string   `json:"systemInfo"`
-}
-
-// GetFeedbackList 获取用户反馈列表
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getFeedback.html
-func (o *Operation) GetFeedbackList(req *GetFeedbackListRequest) (res GetFeedbackListResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-
-	params := map[string]interface{}{
-		"access_token": accessToken,
-		"page":         req.Page,
-		"num":          req.Num,
-	}
-	if req.Type > 0 {
-		params["type"] = req.Type
-	}
-	query := util.Query(params)
-
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(getFeedbackListURL, query)); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetFeedbackList")
-	return
-}
-
-// GetJsErrDetailRequest 查询js错误详情请求
-type GetJsErrDetailRequest struct {
-	StartTime     string `json:"startTime"`
-	EndTime       string `json:"endTime"`
-	ErrorMsgMd5   string `json:"errorMsgMd5"`
-	ErrorStackMd5 string `json:"errorStackMd5"`
-	AppVersion    string `json:"appVersion"`
-	SdkVersion    string `json:"sdkVersion"`
-	OsName        string `json:"osName"`
-	ClientVersion string `json:"clientVersion"`
-	OpenID        string `json:"openid"`
-	Offset        int64  `json:"offset"`
-	Limit         int64  `json:"limit"`
-	Desc          string `json:"desc"`
-}
-
-// GetJsErrDetailResponse 查询js错误详情响应
-type GetJsErrDetailResponse struct {
-	util.CommonError
-	TotalCount int64             `json:"totalCount"`
-	OpenID     string            `json:"openid"`
-	Data       []JsErrDetailData `json:"data"`
-}
-
-// JsErrDetailData 错误列表
-type JsErrDetailData struct {
-	Count         string `json:"Count"`
-	SdkVersion    string `json:"sdkVersion"`
-	ClientVersion string `json:"ClientVersion"`
-	ErrorStackMd5 string `json:"errorStackMd5"`
-	TimeStamp     string `json:"TimeStamp"`
-	AppVersion    string `json:"appVersion"`
-	ErrorMsgMd5   string `json:"errorMsgMd5"`
-	ErrorMsg      string `json:"errorMsg"`
-	ErrorStack    string `json:"errorStack"`
-	Ds            string `json:"Ds"`
-	OsName        string `json:"OsName"`
-	OpenID        string `json:"openId"`
-	PluginVersion string `json:"pluginversion"`
-	AppID         string `json:"appId"`
-	DeviceModel   string `json:"DeviceModel"`
-	Source        string `json:"source"`
-	Route         string `json:"route"`
-	Uin           string `json:"Uin"`
-	Nickname      string `json:"nickname"`
-}
-
-// GetJsErrDetail 查询js错误详情
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getJsErrDetail.html
-func (o *Operation) GetJsErrDetail(req *GetJsErrDetailRequest) (res GetJsErrDetailResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(getJsErrDetailURL, accessToken), req); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetJsErrDetail")
-	return
-}
-
-// GetJsErrListRequest 查询错误列表请求
-type GetJsErrListRequest struct {
-	AppVersion string `json:"appVersion"`
-	ErrType    string `json:"errType"`
-	StartTime  string `json:"startTime"`
-	EndTime    string `json:"endTime"`
-	Keyword    string `json:"keyword"`
-	OpenID     string `json:"openid"`
-	OrderBy    string `json:"orderby"`
-	Desc       string `json:"desc"`
-	Offset     int64  `json:"offset"`
-	Limit      int64  `json:"limit"`
-}
-
-// GetJsErrListResponse 查询错误列表响应
-type GetJsErrListResponse struct {
-	util.CommonError
-	TotalCount int64           `json:"totalCount"`
-	OpenID     string          `json:"openid"`
-	Data       []JsErrListData `json:"data"`
-}
-
-// JsErrListData 错误列表
-type JsErrListData struct {
-	ErrorMsgMd5   string `json:"errorMsgMd5"`
-	ErrorMsg      string `json:"errorMsg"`
-	Uv            int64  `json:"uv"`
-	Pv            int64  `json:"pv"`
-	ErrorStackMd5 string `json:"errorStackMd5"`
-	ErrorStack    string `json:"errorStack"`
-	PvPercent     string `json:"pvPercent"`
-	UvPercent     string `json:"uvPercent"`
-}
-
-// GetJsErrList 查询错误列表
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getJsErrList.html
-func (o *Operation) GetJsErrList(req *GetJsErrListRequest) (res GetJsErrListResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(getJsErrListURL, accessToken), req); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetJsErrList")
-	return
-}
-
-// GetGrayReleasePlanResponse 获取分阶段发布详情响应
-type GetGrayReleasePlanResponse struct {
-	util.CommonError
-	GrayReleasePlan GrayReleasePlanDetail `json:"gray_release_plan"`
-}
-
-// GrayReleasePlanDetail 分阶段发布计划详情
-type GrayReleasePlanDetail struct {
-	Status                  int64 `json:"status"`
-	CreateTimestamp         int64 `json:"create_timestamp"`
-	GrayPercentage          int64 `json:"gray_percentage"`
-	SupportExperiencerFirst bool  `json:"support_experiencer_first"`
-	SupportDebugerFirst     bool  `json:"support_debuger_first"`
-}
-
-// GetGrayReleasePlan 获取分阶段发布详情
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/operation/getGrayReleasePlan.html
-func (o *Operation) GetGrayReleasePlan() (res GetGrayReleasePlanResponse, err error) {
-	var accessToken string
-	if accessToken, err = o.GetAccessToken(); err != nil {
-		return
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(getGrayReleasePlanURL, accessToken)); err != nil {
-		return
-	}
-	err = util.DecodeWithError(response, &res, "GetGrayReleasePlan")
-	return
-}

miniprogram/privacy/privacy.go

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

miniprogram/qrcode/qrcode.go

@@ -54,8 +54,6 @@ type QRCoder struct {
 	IsHyaline bool `json:"is_hyaline,omitempty"`
 	// envVersion 要打开的小程序版本。正式版为 "release"，体验版为 "trial"，开发版为 "develop"
 	EnvVersion string `json:"env_version,omitempty"`
-	// ShowSplashAd 控制通过该小程序码进入小程序是否展示封面广告1、默认为true，展示封面广告2、传入为false时，不展示封面广告
-	ShowSplashAd bool `json:"show_splash_ad,omitempty"`
 }
 
 // fetchCode 请求并返回二维码二进制数据

miniprogram/redpacketcover/redpacketcover.go

@@ -1,59 +0,0 @@
-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

@@ -1,7 +1,6 @@
 package security
 
 import (
-	context2 "context"
 	"fmt"
 	"strconv"
 
@@ -52,7 +51,12 @@ func (security *Security) MediaCheckAsyncV1(in *MediaCheckAsyncV1Request) (trace
 		TraceID string `json:"trace_id"`
 	}
 	err = util.DecodeWithError(response, &res, "MediaCheckAsyncV1")
-	return res.TraceID, err
+	if err != nil {
+		return
+	}
+
+	traceID = res.TraceID
+	return
 }
 
 // MediaCheckAsyncRequest 图片/音频异步校验请求参数
@@ -65,12 +69,7 @@ type MediaCheckAsyncRequest struct {
 
 // MediaCheckAsync 异步校验图片/音频是否含有违法违规内容
 func (security *Security) MediaCheckAsync(in *MediaCheckAsyncRequest) (traceID string, err error) {
-	return security.MediaCheckAsyncContext(context2.Background(), in)
-}
-
-// MediaCheckAsyncContext 异步校验图片/音频是否含有违法违规内容
-func (security *Security) MediaCheckAsyncContext(ctx context2.Context, in *MediaCheckAsyncRequest) (traceID string, err error) {
-	accessToken, err := security.GetAccessTokenContext(ctx)
+	accessToken, err := security.GetAccessToken()
 	if err != nil {
 		return
 	}
@@ -83,7 +82,7 @@ func (security *Security) MediaCheckAsyncContext(ctx context2.Context, in *Media
 	req.Version = 2
 
 	uri := fmt.Sprintf(mediaCheckAsyncURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, req)
+	response, err := util.PostJSON(uri, req)
 	if err != nil {
 		return
 	}
@@ -94,7 +93,12 @@ func (security *Security) MediaCheckAsyncContext(ctx context2.Context, in *Media
 		TraceID string `json:"trace_id"`
 	}
 	err = util.DecodeWithError(response, &res, "MediaCheckAsync")
-	return res.TraceID, err
+	if err != nil {
+		return
+	}
+
+	traceID = res.TraceID
+	return
 }
 
 // ImageCheckV1 校验一张图片是否含有违法违规内容（同步）
@@ -228,12 +232,7 @@ func (security *Security) MsgCheckV1(content string) (res MsgCheckResponse, err
 
 // MsgCheck 检查一段文本是否含有违法违规内容
 func (security *Security) MsgCheck(in *MsgCheckRequest) (res MsgCheckResponse, err error) {
-	return security.MsgCheckContext(context2.Background(), in)
-}
-
-// MsgCheckContext 检查一段文本是否含有违法违规内容
-func (security *Security) MsgCheckContext(ctx context2.Context, in *MsgCheckRequest) (res MsgCheckResponse, err error) {
-	accessToken, err := security.GetAccessTokenContext(ctx)
+	accessToken, err := security.GetAccessToken()
 	if err != nil {
 		return
 	}
@@ -246,7 +245,7 @@ func (security *Security) MsgCheckContext(ctx context2.Context, in *MsgCheckRequ
 	req.Version = 2
 
 	uri := fmt.Sprintf(msgCheckURL, accessToken)
-	response, err := util.PostJSONContext(ctx, uri, req)
+	response, err := util.PostJSON(uri, req)
 	if err != nil {
 		return
 	}

miniprogram/shortlink/shortlink.go

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

miniprogram/subscribe/subscribe.go

@@ -1,7 +1,6 @@
 package subscribe
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/miniprogram/context"
@@ -12,30 +11,22 @@ const (
 	// 发送订阅消息
 	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.send.html
 	subscribeSendURL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send"
+
 	// 获取当前帐号下的个人模板列表
 	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
 	getTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate"
+
 	// 添加订阅模板
 	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.addTemplate.html
 	addTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate"
+
 	// 删除私有模板
 	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.deleteTemplate.html
 	delTemplateURL = "https://api.weixin.qq.com/wxaapi/newtmpl/deltemplate"
+
 	// 统一服务消息
 	// https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/uniform-message/uniformMessage.send.html
 	uniformMessageSend = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send"
-	// getCategoryURL 获取类目
-	getCategoryURL = "https://api.weixin.qq.com/wxaapi/newtmpl/getcategory?access_token=%s"
-	// getPubTemplateKeyWordsByIDURL 获取关键词列表
-	getPubTemplateKeyWordsByIDURL = "https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatekeywords?access_token=%s&tid=%s"
-	// getPubTemplateTitleListURL 获取所属类目下的公共模板
-	getPubTemplateTitleListURL = "https://api.weixin.qq.com/wxaapi/newtmpl/getpubtemplatetitles?access_token=%s&ids=%s&start=%d&limit=%d"
-	// setUserNotifyURL 激活与更新服务卡片
-	setUserNotifyURL = "https://api.weixin.qq.com/wxa/set_user_notify?access_token=%s"
-	// setUserNotifyExtURL 更新服务卡片扩展信息
-	setUserNotifyExtURL = "https://api.weixin.qq.com/wxa/set_user_notifyext?access_token=%s"
-	// getUserNotifyURL 查询服务卡片状态
-	getUserNotifyURL = "https://api.weixin.qq.com/wxa/get_user_notify?access_token=%s"
 )
 
 // Subscribe 订阅消息
@@ -66,18 +57,11 @@ type DataItem struct {
 
 // TemplateItem template item
 type TemplateItem struct {
-	PriTmplID            string             `json:"priTmplId"`
-	Title                string             `json:"title"`
-	Content              string             `json:"content"`
-	Example              string             `json:"example"`
-	Type                 int64              `json:"type"`
-	KeywordEnumValueList []KeywordEnumValue `json:"keywordEnumValueList"`
-}
-
-// KeywordEnumValue 枚举参数值范围
-type KeywordEnumValue struct {
-	EnumValueList []string `json:"enumValueList"`
-	KeywordCode   string   `json:"keywordCode"`
+	PriTmplID string `json:"priTmplId"`
+	Title     string `json:"title"`
+	Content   string `json:"content"`
+	Example   string `json:"example"`
+	Type      int64  `json:"type"`
 }
 
 // TemplateList template list
@@ -86,13 +70,6 @@ type TemplateList struct {
 	Data []TemplateItem `json:"data"`
 }
 
-// resTemplateSend 发送获取 msg id
-type resTemplateSend struct {
-	util.CommonError
-
-	MsgID int64 `json:"msgid"`
-}
-
 // Send 发送订阅消息
 func (s *Subscribe) Send(msg *Message) (err error) {
 	var accessToken string
@@ -108,33 +85,6 @@ func (s *Subscribe) Send(msg *Message) (err error) {
 	return util.DecodeWithCommonError(response, "Send")
 }
 
-// SendGetMsgID 发送订阅消息返回 msgid
-func (s *Subscribe) SendGetMsgID(msg *Message) (msgID int64, err error) {
-	var accessToken string
-	accessToken, err = s.GetAccessToken()
-	if err != nil {
-		return
-	}
-	uri := fmt.Sprintf("%s?access_token=%s", subscribeSendURL, accessToken)
-	response, err := util.PostJSON(uri, msg)
-	if err != nil {
-		return
-	}
-
-	var result resTemplateSend
-	if err = json.Unmarshal(response, &result); err != nil {
-		return
-	}
-	if result.ErrCode != 0 {
-		err = fmt.Errorf("template msg send error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
-		return
-	}
-
-	msgID = result.MsgID
-
-	return
-}
-
 // ListTemplates 获取当前帐号下的个人模板列表
 // https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.getTemplateList.html
 func (s *Subscribe) ListTemplates() (*TemplateList, error) {
@@ -218,7 +168,11 @@ func (s *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (templa
 	}
 	var result resSubscribeAdd
 	err = util.DecodeWithError(response, &result, "AddSubscribe")
-	return result.TemplateID, err
+	if err != nil {
+		return
+	}
+	templateID = result.TemplateID
+	return
 }
 
 // Delete 删除私有模板
@@ -239,200 +193,3 @@ func (s *Subscribe) Delete(templateID string) (err error) {
 	}
 	return util.DecodeWithCommonError(response, "DeleteSubscribe")
 }
-
-// GetCategoryResponse 获取类目响应
-type GetCategoryResponse struct {
-	util.CommonError
-	Data []Category `json:"data"`
-}
-
-// Category 类目
-type Category struct {
-	ID   int64  `json:"id"`
-	Name string `json:"name"`
-}
-
-// GetCategory 获取类目
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/getCategory.html
-func (s *Subscribe) GetCategory() ([]Category, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = s.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(getCategoryURL, accessToken)); err != nil {
-		return nil, err
-	}
-	result := &GetCategoryResponse{}
-	err = util.DecodeWithError(response, result, "GetCategory")
-	return result.Data, err
-}
-
-// GetPubTemplateKeywordsByIDResponse 获取关键词列表响应
-type GetPubTemplateKeywordsByIDResponse struct {
-	util.CommonError
-	Count int64                 `json:"count"`
-	Data  []PubTemplateKeywords `json:"data"`
-}
-
-// PubTemplateKeywords 关键词
-type PubTemplateKeywords struct {
-	KID     int64  `json:"kid"`
-	Name    string `json:"name"`
-	Example string `json:"example"`
-	Rule    string `json:"rule"`
-}
-
-// GetPubTemplateKeywordsByID 获取关键词列表
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/getPubTemplateKeyWordsById.html
-func (s *Subscribe) GetPubTemplateKeywordsByID(tid string) (*GetPubTemplateKeywordsByIDResponse, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = s.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(getPubTemplateKeyWordsByIDURL, accessToken, tid)); err != nil {
-		return nil, err
-	}
-	result := &GetPubTemplateKeywordsByIDResponse{}
-	err = util.DecodeWithError(response, result, "GetPubTemplateKeywordsByID")
-	return result, err
-}
-
-// GetPubTemplateTitleListRequest 获取所属类目下的公共模板请求
-type GetPubTemplateTitleListRequest struct {
-	Start int64
-	Limit int64
-	IDs   string
-}
-
-// GetPubTemplateTitleListResponse 获取所属类目下的公共模板响应
-type GetPubTemplateTitleListResponse struct {
-	util.CommonError
-	Count int64              `json:"count"`
-	Data  []PubTemplateTitle `json:"data"`
-}
-
-// PubTemplateTitle 模板标题
-type PubTemplateTitle struct {
-	Type       int64  `json:"type"`
-	TID        string `json:"tid"`
-	Title      string `json:"title"`
-	CategoryID string `json:"categoryId"`
-}
-
-// GetPubTemplateTitleList 获取所属类目下的公共模板
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/getPubTemplateTitleList.html
-func (s *Subscribe) GetPubTemplateTitleList(req *GetPubTemplateTitleListRequest) (*GetPubTemplateTitleListResponse, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = s.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(getPubTemplateTitleListURL, accessToken, req.IDs, req.Start, req.Limit)); err != nil {
-		return nil, err
-	}
-	result := &GetPubTemplateTitleListResponse{}
-	err = util.DecodeWithError(response, result, "GetPubTemplateTitleList")
-	return result, err
-}
-
-// SetUserNotifyRequest 激活与更新服务卡片请求
-type SetUserNotifyRequest struct {
-	OpenID      string `json:"openid"`
-	NotifyType  int64  `json:"notify_type"`
-	NotifyCode  string `json:"notify_code"`
-	ContentJSON string `json:"content_json"`
-	CheckJSON   string `json:"check_json,omitempty"`
-}
-
-// SetUserNotify 激活与更新服务卡片
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/setUserNotify.html
-func (s *Subscribe) SetUserNotify(req *SetUserNotifyRequest) error {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = s.GetAccessToken(); err != nil {
-		return err
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(setUserNotifyURL, accessToken), req); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "SetUserNotify")
-}
-
-// SetUserNotifyExtRequest 更新服务卡片扩展信息请求
-type SetUserNotifyExtRequest struct {
-	OpenID     string `json:"openid"`
-	NotifyType int64  `json:"notify_type"`
-	NotifyCode string `json:"notify_code"`
-	ExtJSON    string `json:"ext_json"`
-}
-
-// SetUserNotifyExt 更新服务卡片扩展信息
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/setUserNotifyExt.html
-func (s *Subscribe) SetUserNotifyExt(req *SetUserNotifyExtRequest) error {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = s.GetAccessToken(); err != nil {
-		return err
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(setUserNotifyExtURL, accessToken), req); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "SetUserNotifyExt")
-}
-
-// GetUserNotifyRequest 查询服务卡片状态请求
-type GetUserNotifyRequest struct {
-	OpenID     string `json:"openid"`
-	NotifyType int64  `json:"notify_type"`
-	NotifyCode string `json:"notify_code"`
-}
-
-// GetUserNotifyResponse 查询服务卡片状态响应
-type GetUserNotifyResponse struct {
-	util.CommonError
-	NotifyInfo NotifyInfo `json:"notify_info"`
-}
-
-// NotifyInfo 卡片状态
-type NotifyInfo struct {
-	NotifyType     int64  `json:"notify_type"`
-	ContentJSON    string `json:"content_json"`
-	CodeState      int64  `json:"code_state"`
-	CodeExpireTime int64  `json:"code_expire_time"`
-}
-
-// GetUserNotify 查询服务卡片状态
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/mp-message-management/subscribe-message/getUserNotify.html
-func (s *Subscribe) GetUserNotify(req *GetUserNotifyRequest) (*GetUserNotifyResponse, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = s.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(getUserNotifyURL, accessToken), req); err != nil {
-		return nil, err
-	}
-	result := &GetUserNotifyResponse{}
-	err = util.DecodeWithError(response, result, "GetUserNotify")
-	return result, err
-}

miniprogram/urllink/query.go

@@ -6,13 +6,7 @@ import (
 	"github.com/silenceper/wechat/v2/util"
 )
 
-const queryURL = "https://api.weixin.qq.com/wxa/query_urllink?access_token=%s"
-
-// ULQueryRequest 查询加密URLLink请求
-type ULQueryRequest struct {
-	URLLink   string `json:"url_link"`
-	QueryType int    `json:"query_type"`
-}
+const queryURL = "https://api.weixin.qq.com/wxa/query_urllink"
 
 // ULQueryResult 返回的结果
 // https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-link/urllink.query.html 返回值
@@ -34,35 +28,25 @@ type ULQueryResult struct {
 			ResourceAppid string `json:"resource_appid"`
 		} `json:"cloud_base"`
 	} `json:"url_link_info"`
-	VisitOpenid string    `json:"visit_openid"`
-	QuotaInfo   QuotaInfo `json:"quota_info"`
-}
-
-// QuotaInfo quota 配置
-type QuotaInfo struct {
-	RemainVisitQuota int64 `json:"remain_visit_quota"`
+	VisitOpenid string `json:"visit_openid"`
 }
 
 // Query 查询小程序 url_link 配置。
 func (u *URLLink) Query(urlLink string) (*ULQueryResult, error) {
-	return u.QueryWithType(&ULQueryRequest{URLLink: urlLink})
-}
+	accessToken, err := u.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
 
-// QueryWithType 查询加密URLLink
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/qrcode-link/url-link/queryUrlLink.html
-func (u *URLLink) QueryWithType(req *ULQueryRequest) (*ULQueryResult, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = u.GetAccessToken(); err != nil {
+	uri := fmt.Sprintf("%s?access_token=%s", queryURL, accessToken)
+	response, err := util.PostJSON(uri, map[string]string{"url_link": urlLink})
+	if err != nil {
 		return nil, err
 	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(queryURL, accessToken), req); err != nil {
+	var resp ULQueryResult
+	err = util.DecodeWithError(response, &resp, "URLLink.Query")
+	if err != nil {
 		return nil, err
 	}
-	result := &ULQueryResult{}
-	err = util.DecodeWithError(response, result, "URLLink.Query")
-	return result, err
+	return &resp, nil
 }

miniprogram/urllink/urllink.go

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

miniprogram/urlscheme/query.go

@@ -14,8 +14,7 @@ const (
 // https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
 type QueryScheme struct {
 	// 小程序 scheme 码
-	Scheme    string `json:"scheme"`
-	QueryType int    `json:"query_type"`
+	Scheme string `json:"scheme"`
 }
 
 // SchemeInfo scheme 配置
@@ -34,47 +33,38 @@ type SchemeInfo struct {
 	EnvVersion EnvVersion `json:"env_version"`
 }
 
-// QuotaInfo quota 配置
-type QuotaInfo struct {
-	RemainVisitQuota int64 `json:"remain_visit_quota"`
-}
-
-// ResQueryScheme 返回结构体
+// resQueryScheme 返回结构体
 // https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.query.html#参数
-type ResQueryScheme struct {
+type resQueryScheme struct {
 	// 通用错误
-	util.CommonError
+	*util.CommonError
 	// scheme 配置
 	SchemeInfo SchemeInfo `json:"scheme_info"`
 	// 访问该链接的openid，没有用户访问过则为空字符串
-	VisitOpenid string    `json:"visit_openid"`
-	QuotaInfo   QuotaInfo `json:"quota_info"`
+	VisitOpenid string `json:"visit_openid"`
 }
 
 // QueryScheme 查询小程序 scheme 码
 func (u *URLScheme) QueryScheme(querySchemeParams QueryScheme) (schemeInfo SchemeInfo, visitOpenid string, err error) {
-	res, err := u.QuerySchemeWithRes(querySchemeParams)
+	var accessToken string
+	accessToken, err = u.GetAccessToken()
 	if err != nil {
 		return
 	}
-	return res.SchemeInfo, res.VisitOpenid, err
-}
 
-// QuerySchemeWithRes 查询scheme码
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/qrcode-link/url-scheme/queryScheme.html
-func (u *URLScheme) QuerySchemeWithRes(req QueryScheme) (*ResQueryScheme, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = u.GetAccessToken(); err != nil {
-		return nil, err
-	}
+	urlStr := fmt.Sprintf(querySchemeURL, accessToken)
 	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(querySchemeURL, accessToken), req); err != nil {
-		return nil, err
+	response, err = util.PostJSON(urlStr, querySchemeParams)
+	if err != nil {
+		return
 	}
-	result := &ResQueryScheme{}
-	err = util.DecodeWithError(response, result, "QueryScheme")
-	return result, err
+
+	// 使用通用方法返回错误
+	var res resQueryScheme
+	err = util.DecodeWithError(response, &res, "QueryScheme")
+	if err != nil {
+		return
+	}
+
+	return res.SchemeInfo, res.VisitOpenid, nil
 }

miniprogram/urlscheme/urlscheme.go

@@ -17,12 +17,7 @@ func NewURLScheme(ctx *context.Context) *URLScheme {
 	return &URLScheme{Context: ctx}
 }
 
-const (
-	// generateURL 获取加密scheme码
-	generateURL = "https://api.weixin.qq.com/wxa/generatescheme"
-	// generateNFCURL 获取 NFC 的小程序 scheme
-	generateNFCURL = "https://api.weixin.qq.com/wxa/generatenfcscheme?access_token=%s"
-)
+const generateURL = "https://api.weixin.qq.com/wxa/generatescheme"
 
 // TExpireType 失效类型 (指定时间戳/指定间隔)
 type TExpireType int
@@ -55,13 +50,10 @@ type JumpWxa struct {
 // USParams 请求参数
 // https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/url-scheme/urlscheme.generate.html#请求参数
 type USParams struct {
-	JumpWxa        *JumpWxa    `json:"jump_wxa,omitempty"`
-	ExpireType     TExpireType `json:"expire_type,omitempty"`
-	ExpireTime     int64       `json:"expire_time,omitempty"`
-	ExpireInterval int         `json:"expire_interval,omitempty"`
-	IsExpire       bool        `json:"is_expire,omitempty"`
-	ModelID        string      `json:"model_id,omitempty"`
-	Sn             string      `json:"sn,omitempty"`
+	JumpWxa        *JumpWxa    `json:"jump_wxa"`
+	ExpireType     TExpireType `json:"expire_type"`
+	ExpireTime     int64       `json:"expire_time"`
+	ExpireInterval int         `json:"expire_interval"`
 }
 
 // USResult 返回的结果
@@ -86,24 +78,8 @@ func (u *URLScheme) Generate(params *USParams) (string, error) {
 	}
 	var resp USResult
 	err = util.DecodeWithError(response, &resp, "URLScheme.Generate")
-	return resp.OpenLink, err
-}
-
-// GenerateNFC 获取 NFC 的小程序 scheme
-// see https://developers.weixin.qq.com/miniprogram/dev/OpenApiDoc/qrcode-link/url-scheme/generateNFCScheme.html
-func (u *URLScheme) GenerateNFC(params *USParams) (string, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = u.GetAccessToken(); err != nil {
+	if err != nil {
 		return "", err
 	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(generateNFCURL, accessToken), params); err != nil {
-		return "", err
-	}
-	result := &USResult{}
-	err = util.DecodeWithError(response, result, "URLScheme.GenerateNFC")
-	return result.OpenLink, err
+	return resp.OpenLink, nil
 }

miniprogram/virtualpayment/constant.go

@@ -117,6 +117,24 @@ const (
 
 	// queryPublishGoods 查询批量发布道具任务状态
 	queryPublishGoods = "/xpay/query_publish_goods"
+
+	// queryBizBalance 查询商家账户里的可提现余额
+	queryBizBalance = "/xpay/query_biz_balance"
+
+	//  queryTransferAccount 查询广告金充值账户
+	queryTransferAccount = "/xpay/query_transfer_account"
+
+	// queryAdverFunds 查询广告金发放记录
+	queryAdverFunds = "/xpay/query_adver_funds"
+
+	// createFundsBill 充值广告金
+	createFundsBill = "/xpay/create_funds_bill"
+
+	// bindTransferAccount 绑定广告金充值账户
+	bindTransferAccount = "/xpay/bind_transfer_accout"
+
+	// defaultUnifiedOrderURL default unified order url
+	defaultUnifiedOrderURL = "requestVirtualPayment"
 )
 
 const (

miniprogram/virtualpayment/domain.go

@@ -145,6 +145,8 @@ type OrderItem struct {
 	WxOrderID      string      `json:"wx_order_id"`      // 微信内部单号
 	ChannelOrderID string      `json:"channel_order_id"` // 渠道订单号，为用户微信支付详情页面上的商户单号
 	WxPayOrderID   string      `json:"wxpay_order_id"`   // 微信支付交易单号，为用户微信支付详情页面上的交易单号
+	SettTime       int64       `json:"sett_time"`        // 结算时间，unix 秒级时间戳，结算时间的秒级时间戳，大于 0 表示结算成功
+	SettState      uint        `json:"sett_state"`       // 结算状态 0-未开始结算 1-结算中 2-结算成功
 }
 
 // QueryOrderResponse 查询创建的订单（现金单，非代币单）响应参数

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
 }
 
@@ -479,6 +479,7 @@ func (s *VirtualPayment) requestAddress(params URLParams) (url string, err error
 	case queryUserBalance:
 	case currencyPay:
 	case cancelCurrencyPay:
+	case defaultUnifiedOrderURL:
 		if params.PaySign, params.Signature, err = s.PaySignature(params.Path, params.Content); err != nil {
 			return
 		}

officialaccount/basic/short_url.go

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

officialaccount/broadcast/broadcast.go

@@ -79,10 +79,6 @@ 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"`
 	// 发送卡券
@@ -187,13 +183,7 @@ 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.Images = images
 	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
 	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
 	data, err := util.PostJSON(url, req)
@@ -215,7 +205,7 @@ func (broadcast *Broadcast) SendVideo(user *User, mediaID string, title, descrip
 		ToUser:  nil,
 		MsgType: MsgTypeVideo,
 	}
-	req.Mpvideo = map[string]interface{}{
+	req.Voice = map[string]interface{}{
 		"media_id":    mediaID,
 		"title":       title,
 		"description": description,

officialaccount/config/config.go

@@ -11,5 +11,4 @@ type Config struct {
 	Token          string `json:"token"`            // token
 	EncodingAESKey string `json:"encoding_aes_key"` // EncodingAESKey
 	Cache          cache.Cache
-	UseStableAK    bool // use the stable access_token
 }

officialaccount/customerservice/manager.go

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

officialaccount/datacube/publisher.go

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

officialaccount/freepublish/freepublish.go

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

officialaccount/js/js.go

@@ -1,7 +1,6 @@
 package js
 
 import (
-	context2 "context"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/credential"
@@ -40,31 +39,14 @@ func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
 // GetConfig 获取jssdk需要的配置参数
 // uri 为当前网页地址
 func (js *Js) GetConfig(uri string) (config *Config, err error) {
-	return js.GetConfigContext(context2.Background(), uri)
-}
-
-// GetConfigContext  新方法，允许传入上下文，避免协程泄漏
-func (js *Js) GetConfigContext(ctx context2.Context, uri string) (config *Config, err error) {
+	config = new(Config)
 	var accessToken string
-	// 类型断言，如果断言成功，调用安全的 GetAccessTokenContext 方法
-	if ctxHandle, ok := js.Context.AccessTokenHandle.(credential.AccessTokenContextHandle); ok {
-		accessToken, err = ctxHandle.GetAccessTokenContext(ctx)
-	} else {
-		// 如果没有实现 AccessTokenContextHandle 接口，调用旧的 GetAccessToken 方法
-		accessToken, err = js.Context.GetAccessToken()
-	}
+	accessToken, err = js.GetAccessToken()
 	if err != nil {
 		return
 	}
-
 	var ticketStr string
-	// 类型断言 jsTicket
-	if ticketCtxHandle, ok := js.JsTicketHandle.(credential.JsTicketContextHandle); ok {
-		ticketStr, err = ticketCtxHandle.GetTicketContext(ctx, accessToken)
-	} else {
-		// 如果没有实现 JsTicketContextHandle 接口，调用旧的 GetTicket 方法
-		ticketStr, err = js.GetTicket(accessToken)
-	}
+	ticketStr, err = js.GetTicket(accessToken)
 	if err != nil {
 		return
 	}
@@ -74,7 +56,6 @@ func (js *Js) GetConfigContext(ctx context2.Context, uri string) (config *Config
 	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
 	sigStr := util.Signature(str)
 
-	config = new(Config)
 	config.AppID = js.AppID
 	config.NonceStr = nonceStr
 	config.Timestamp = timestamp

officialaccount/material/material.go

@@ -4,9 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
-	"os"
-	"path"
 
 	"github.com/silenceper/wechat/v2/officialaccount/context"
 	"github.com/silenceper/wechat/v2/util"
@@ -163,8 +160,8 @@ type resAddMaterial struct {
 	URL     string `json:"url"`
 }
 
-// AddMaterialFromReader 上传永久性素材（处理视频需要单独上传），从 io.Reader 中读取
-func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath string, reader io.Reader) (mediaID string, url string, err error) {
+// AddMaterial 上传永久性素材（处理视频需要单独上传）
+func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
 	if mediaType == MediaTypeVideo {
 		err = errors.New("永久视频素材上传使用 AddVideo 方法")
 		return
@@ -176,10 +173,8 @@ func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath st
 	}
 
 	uri := fmt.Sprintf("%s?access_token=%s&type=%s", addMaterialURL, accessToken, mediaType)
-	// 获取文件名
-	filename := path.Base(filePath)
 	var response []byte
-	response, err = util.PostFileFromReader("media", filePath, filename, uri, reader)
+	response, err = util.PostFile("media", filename, uri)
 	if err != nil {
 		return
 	}
@@ -197,24 +192,13 @@ func (material *Material) AddMaterialFromReader(mediaType MediaType, filePath st
 	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"`
 }
 
-// AddVideoFromReader 永久视频素材文件上传，从 io.Reader 中读取
-func (material *Material) AddVideoFromReader(filePath, title, introduction string, reader io.Reader) (mediaID string, url string, err error) {
+// AddVideo 永久视频素材文件上传
+func (material *Material) AddVideo(filename, title, introduction string) (mediaID string, url string, err error) {
 	var accessToken string
 	accessToken, err = material.GetAccessToken()
 	if err != nil {
@@ -232,19 +216,16 @@ func (material *Material) AddVideoFromReader(filePath, title, introduction strin
 	if err != nil {
 		return
 	}
-	fileName := path.Base(filePath)
+
 	fields := []util.MultipartFormField{
 		{
-			IsFile:     true,
-			Fieldname:  "media",
-			FilePath:   filePath,
-			Filename:   fileName,
-			FileReader: reader,
+			IsFile:    true,
+			Fieldname: "media",
+			Filename:  filename,
 		},
 		{
 			IsFile:    false,
 			Fieldname: "description",
-			Filename:  fileName,
 			Value:     fieldValue,
 		},
 	}
@@ -269,17 +250,6 @@ func (material *Material) AddVideoFromReader(filePath, title, introduction strin
 	return
 }
 
-// AddVideo 永久视频素材文件上传
-func (material *Material) AddVideo(directory, title, introduction string) (mediaID string, url string, err error) {
-	f, err := os.Open(directory)
-	if err != nil {
-		return "", "", err
-	}
-	defer func() { _ = f.Close() }()
-
-	return material.AddVideoFromReader(directory, title, introduction, f)
-}
-
 type reqDeleteMaterial struct {
 	MediaID string `json:"media_id"`
 }

officialaccount/material/media.go

@@ -3,7 +3,6 @@ package material
 import (
 	"encoding/json"
 	"fmt"
-	"io"
 
 	"github.com/silenceper/wechat/v2/util"
 )
@@ -63,38 +62,6 @@ func (material *Material) MediaUpload(mediaType MediaType, filename string) (med
 	return
 }
 
-// MediaUploadFromReader 临时素材上传
-func (material *Material) MediaUploadFromReader(mediaType MediaType, filename string, reader io.Reader) (media Media, err error) {
-	var accessToken string
-	accessToken, err = material.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	uri := fmt.Sprintf("%s?access_token=%s&type=%s", mediaUploadURL, accessToken, mediaType)
-
-	var byteData []byte
-	byteData, err = io.ReadAll(reader)
-	if err != nil {
-		return
-	}
-
-	var response []byte
-	response, err = util.PostFileByStream("media", filename, uri, byteData)
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(response, &media)
-	if err != nil {
-		return
-	}
-	if media.ErrCode != 0 {
-		err = fmt.Errorf("MediaUpload error : errcode=%v , errmsg=%v", media.ErrCode, media.ErrMsg)
-		return
-	}
-	return
-}
-
 // GetMediaURL 返回临时素材的下载地址供用户自己处理
 // NOTICE: URL 不可公开，因为含access_token 需要立即另存文件
 func (material *Material) GetMediaURL(mediaID string) (mediaURL string, err error) {

officialaccount/message/message.go

@@ -27,15 +27,15 @@ const (
 	MsgTypeVideo MsgType = "video"
 	// MsgTypeMiniprogrampage 表示小程序卡片消息
 	MsgTypeMiniprogrampage MsgType = "miniprogrampage"
-	// MsgTypeShortVideo 表示短视频消息 [限接收]
+	// MsgTypeShortVideo 表示短视频消息[限接收]
 	MsgTypeShortVideo MsgType = "shortvideo"
-	// MsgTypeLocation 表示坐标消息 [限接收]
+	// MsgTypeLocation 表示坐标消息[限接收]
 	MsgTypeLocation MsgType = "location"
-	// MsgTypeLink 表示链接消息 [限接收]
+	// MsgTypeLink 表示链接消息[限接收]
 	MsgTypeLink MsgType = "link"
-	// MsgTypeMusic 表示音乐消息 [限回复]
+	// MsgTypeMusic 表示音乐消息[限回复]
 	MsgTypeMusic MsgType = "music"
-	// MsgTypeNews 表示图文消息 [限回复]
+	// MsgTypeNews 表示图文消息[限回复]
 	MsgTypeNews MsgType = "news"
 	// MsgTypeTransfer 表示消息消息转发到客服
 	MsgTypeTransfer MsgType = "transfer_customer_service"
@@ -91,7 +91,7 @@ const (
 const (
 	// 微信开放平台需要用到
 
-	// InfoTypeVerifyTicket 返回 ticket
+	// InfoTypeVerifyTicket 返回ticket
 	InfoTypeVerifyTicket InfoType = "component_verify_ticket"
 	// InfoTypeAuthorized 授权
 	InfoTypeAuthorized InfoType = "authorized"
@@ -108,8 +108,8 @@ type MixMessage struct {
 	CommonToken
 
 	// 基本消息
-	MsgID         int64   `xml:"MsgId"` // 其他消息推送过来是 MsgId
-	TemplateMsgID int64   `xml:"MsgID"` // 模板消息推送成功的消息是 MsgID
+	MsgID         int64   `xml:"MsgId"` // 其他消息推送过来是MsgId
+	TemplateMsgID int64   `xml:"MsgID"` // 模板消息推送成功的消息是MsgID
 	Content       string  `xml:"Content"`
 	Recognition   string  `xml:"Recognition"`
 	PicURL        string  `xml:"PicUrl"`
@@ -166,17 +166,17 @@ type MixMessage struct {
 
 	// 事件相关：发布能力
 	PublishEventInfo struct {
-		PublishID     int64                     `xml:"publish_id"`     // 发布任务 id
+		PublishID     int64                     `xml:"publish_id"`     // 发布任务id
 		PublishStatus freepublish.PublishStatus `xml:"publish_status"` // 发布状态
-		ArticleID     string                    `xml:"article_id"`     // 当发布状态为 0 时（即成功）时，返回图文的 article_id，可用于“客服消息”场景
+		ArticleID     string                    `xml:"article_id"`     // 当发布状态为0时（即成功）时，返回图文的 article_id，可用于“客服消息”场景
 		ArticleDetail struct {
 			Count uint `xml:"count"` // 文章数量
 			Item  []struct {
 				Index      uint   `xml:"idx"`         // 文章对应的编号
 				ArticleURL string `xml:"article_url"` // 图文的永久链接
 			} `xml:"item"`
-		} `xml:"article_detail"` // 当发布状态为 0 时（即成功）时，返回内容
-		FailIndex []uint `xml:"fail_idx"` // 当发布状态为 2 或 4 时，返回不通过的文章编号，第一篇为 1；其他发布状态则为空
+		} `xml:"article_detail"` // 当发布状态为0时（即成功）时，返回内容
+		FailIndex []uint `xml:"fail_idx"` // 当发布状态为2或4时，返回不通过的文章编号，第一篇为 1；其他发布状态则为空
 	} `xml:"PublishEventInfo"`
 
 	// 第三方平台相关
@@ -222,19 +222,19 @@ type MixMessage struct {
 	TraceID       string `xml:"trace_id"`
 	StatusCode    int    `xml:"status_code"`
 
-	// 小程序名称审核结果事件推送
-	Ret      int32  `xml:"ret"`      // 审核结果 2：失败，3：成功
-	NickName string `xml:"nickname"` // 小程序昵称
+	//小程序名称审核结果事件推送
+	Ret      int32  `xml:"ret"`      //审核结果 2：失败，3：成功
+	NickName string `xml:"nickname"` //小程序昵称
 
 	// 设备相关
 	device.MsgDevice
 
-	// 小程序审核通知
-	SuccTime   int    `xml:"SuccTime"`   // 审核成功时的时间戳
-	FailTime   int    `xml:"FailTime"`   // 审核不通过的时间戳
-	DelayTime  int    `xml:"DelayTime"`  // 审核延后时的时间戳
-	Reason     string `xml:"Reason"`     // 审核不通过的原因
-	ScreenShot string `xml:"ScreenShot"` // 审核不通过的截图示例。用 | 分隔的 media_id 的列表，可通过获取永久素材接口拉取截图内容
+	//小程序审核通知
+	SuccTime   int    `xml:"SuccTime"`   //审核成功时的时间戳
+	FailTime   int    `xml:"FailTime"`   //审核不通过的时间戳
+	DelayTime  int    `xml:"DelayTime"`  //审核延后时的时间戳
+	Reason     string `xml:"Reason"`     //审核不通过的原因
+	ScreenShot string `xml:"ScreenShot"` //审核不通过的截图示例。用 | 分隔的 media_id 的列表，可通过获取永久素材接口拉取截图内容
 }
 
 // SubscribeMsgPopupEvent 订阅通知事件推送的消息体
@@ -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

@@ -90,7 +90,11 @@ func (tpl *Subscribe) List() (templateList []*PrivateSubscribeItem, err error) {
 	}
 	var res resPrivateSubscribeList
 	err = util.DecodeWithError(response, &res, "ListSubscribe")
-	return res.SubscriptionList, err
+	if err != nil {
+		return
+	}
+	templateList = res.SubscriptionList
+	return
 }
 
 type resSubscribeAdd struct {
@@ -119,7 +123,11 @@ func (tpl *Subscribe) Add(ShortID string, kidList []int, sceneDesc string) (temp
 	}
 	var result resSubscribeAdd
 	err = util.DecodeWithError(response, &result, "AddSubscribe")
-	return result.TemplateID, err
+	if err != nil {
+		return
+	}
+	templateID = result.TemplateID
+	return
 }
 
 // Delete 删除私有模板
@@ -167,7 +175,11 @@ func (tpl *Subscribe) GetCategory() (categoryList []*PublicTemplateCategory, err
 	}
 	var result resSubscribeCategoryList
 	err = util.DecodeWithError(response, &result, "GetCategory")
-	return result.CategoryList, err
+	if err != nil {
+		return
+	}
+	categoryList = result.CategoryList
+	return
 }
 
 // PublicTemplateKeyWords 模板中的关键词
@@ -198,7 +210,11 @@ func (tpl *Subscribe) GetPubTplKeyWordsByID(titleID string) (keyWordsList []*Pub
 	}
 	var result resPublicTemplateKeyWordsList
 	err = util.DecodeWithError(response, &result, "GetPublicTemplateKeyWords")
-	return result.KeyWordsList, err
+	if err != nil {
+		return
+	}
+	keyWordsList = result.KeyWordsList
+	return
 }
 
 // PublicTemplateTitle 类目下的公共模板
@@ -230,5 +246,10 @@ func (tpl *Subscribe) GetPublicTemplateTitleList(ids string, start int, limit in
 	}
 	var result resPublicTemplateTitleList
 	err = util.DecodeWithError(response, &result, "GetPublicTemplateTitle")
-	return result.Count, result.TemplateTitleList, err
+	if err != nil {
+		return
+	}
+	count = result.Count
+	templateTitleList = result.TemplateTitleList
+	return
 }

officialaccount/message/template.go

@@ -61,15 +61,15 @@ func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) {
 	if err != nil {
 		return
 	}
-	var (
-		uri      = fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
-		response []byte
-	)
-	if response, err = util.PostJSON(uri, msg); err != nil {
+	uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
 		return
 	}
 	var result resTemplateSend
-	if err = json.Unmarshal(response, &result); err != nil {
+	err = json.Unmarshal(response, &result)
+	if err != nil {
 		return
 	}
 	if result.ErrCode != 0 {
@@ -103,16 +103,19 @@ func (tpl *Template) List() (templateList []*TemplateItem, err error) {
 	if err != nil {
 		return
 	}
-	var (
-		uri      = fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
-		response []byte
-	)
-	if response, err = util.HTTPGet(uri); err != nil {
+	uri := fmt.Sprintf("%s?access_token=%s", templateListURL, accessToken)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
 		return
 	}
 	var res resTemplateList
 	err = util.DecodeWithError(response, &res, "ListTemplate")
-	return res.TemplateList, err
+	if err != nil {
+		return
+	}
+	templateList = res.TemplateList
+	return
 }
 
 type resTemplateAdd struct {
@@ -122,26 +125,29 @@ type resTemplateAdd struct {
 }
 
 // Add 添加模板.
-func (tpl *Template) Add(shortID string, keyNameList []string) (templateID string, err error) {
+func (tpl *Template) Add(shortID string) (templateID string, err error) {
 	var accessToken string
 	accessToken, err = tpl.GetAccessToken()
 	if err != nil {
 		return
 	}
-	var (
-		msg = struct {
-			ShortID     string   `json:"template_id_short"`
-			KeyNameList []string `json:"keyword_name_list"`
-		}{ShortID: shortID, KeyNameList: keyNameList}
-		uri      = fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
-		response []byte
-	)
-	if response, err = util.PostJSON(uri, msg); err != nil {
+	var msg = struct {
+		ShortID string `json:"template_id_short"`
+	}{ShortID: shortID}
+	uri := fmt.Sprintf("%s?access_token=%s", templateAddURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
 		return
 	}
+
 	var result resTemplateAdd
 	err = util.DecodeWithError(response, &result, "AddTemplate")
-	return result.TemplateID, err
+	if err != nil {
+		return
+	}
+	templateID = result.TemplateID
+	return
 }
 
 // Delete 删除私有模板.
@@ -151,14 +157,14 @@ func (tpl *Template) Delete(templateID string) (err error) {
 	if err != nil {
 		return
 	}
-	var (
-		msg = struct {
-			TemplateID string `json:"template_id"`
-		}{TemplateID: templateID}
-		uri      = fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
-		response []byte
-	)
-	if response, err = util.PostJSON(uri, msg); err != nil {
+	var msg = struct {
+		TemplateID string `json:"template_id"`
+	}{TemplateID: templateID}
+
+	uri := fmt.Sprintf("%s?access_token=%s", templateDelURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, msg)
+	if err != nil {
 		return
 	}
 	return util.DecodeWithCommonError(response, "DeleteTemplate")

officialaccount/oauth/oauth.go

@@ -1,7 +1,6 @@
 package oauth
 
 import (
-	ctx2 "context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -74,28 +73,11 @@ 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.HTTPGetContext(ctx, urlStr)
+	response, err = util.HTTPGet(urlStr)
 	if err != nil {
 		return
 	}
@@ -112,14 +94,9 @@ func (oauth *Oauth) GetUserAccessTokenContext(ctx ctx2.Context, code string) (re
 
 // 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.HTTPGetContext(ctx, urlStr)
+	response, err = util.HTTPGet(urlStr)
 	if err != nil {
 		return
 	}
@@ -136,14 +113,9 @@ func (oauth *Oauth) RefreshAccessTokenContext(ctx ctx2.Context, refreshToken str
 
 // 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.HTTPGetContext(ctx, urlStr)
+	response, err = util.HTTPGet(urlStr)
 	if err != nil {
 		return
 	}
@@ -177,17 +149,12 @@ 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.HTTPGetContext(ctx, urlStr)
+	response, err = util.HTTPGet(urlStr)
 	if err != nil {
 		return
 	}

officialaccount/officialaccount.go

@@ -49,13 +49,7 @@ type OfficialAccount struct {
 
 // NewOfficialAccount 实例化公众号API
 func NewOfficialAccount(cfg *config.Config) *OfficialAccount {
-	var defaultAkHandle credential.AccessTokenContextHandle
-	const cacheKeyPrefix = credential.CacheKeyOfficialAccountPrefix
-	if cfg.UseStableAK {
-		defaultAkHandle = credential.NewStableAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
-	} else {
-		defaultAkHandle = credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, cacheKeyPrefix, cfg.Cache)
-	}
+	defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyOfficialAccountPrefix, cfg.Cache)
 	ctx := &context.Context{
 		Config:            cfg,
 		AccessTokenHandle: defaultAkHandle,

officialaccount/server/server.go

@@ -73,7 +73,7 @@ func (srv *Server) Serve() error {
 	if err != nil {
 		return err
 	}
-	// 非安全模式下，请求处理方法返回为 nil 则直接回复 success 给微信服务器
+	// 非安全模式下，请求处理方法返回为nil则直接回复success给微信服务器
 	if response == nil && !srv.isSafeMode {
 		srv.String("success")
 		return nil
@@ -198,7 +198,7 @@ func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg *message.MixM
 	if err != nil {
 		return
 	}
-	// nonstandard json, 目前小程序订阅消息返回数据格式不标准，订阅消息模板单个 List 返回是对象，多个 List 返回是数组。
+	// nonstandard json, 目前小程序订阅消息返回数据格式不标准，订阅消息模板单个List返回是对象，多个List返回是数组。
 	if msg.MsgType == message.MsgTypeEvent {
 		listData := gjson.Get(string(rawXMLMsgBytes), "List")
 		if listData.IsObject() {
@@ -284,7 +284,7 @@ func (srv *Server) Send() (err error) {
 		if err != nil {
 			return
 		}
-		// TODO 如果获取不到 timestamp nonce 则自己生成
+		// TODO 如果获取不到timestamp nonce 则自己生成
 		timestamp := srv.timestamp
 		timestampStr := strconv.FormatInt(timestamp, 10)
 		msgSignature := util.Signature(srv.Token, timestampStr, srv.nonce, string(encryptedMsg))

officialaccount/user/migrate.go

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

openplatform/account/account.go

@@ -2,7 +2,7 @@ package account
 
 import "github.com/silenceper/wechat/v2/openplatform/context"
 
-// Account 开放平台帐号管理
+// Account 开放平台张哈管理
 // TODO 实现方法
 type Account struct {
 	*context.Context

openplatform/context/accessToken.go

@@ -20,7 +20,6 @@ const (
 	getComponentInfoURL     = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s"
 	componentLoginURL       = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=%d&biz_appid=%s"
 	bindComponentURL        = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
-	bindComponentURLV2      = "https://open.weixin.qq.com/wxaopen/safe/bindcomponent?action=bindcomponent&auth_type=%d&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&biz_appid=%s#wechat_redirect"
 	// TODO 获取授权方选项信息
 	// getComponentConfigURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
 	// TODO 获取已授权的账号信息
@@ -101,8 +100,11 @@ func (ctx *Context) GetPreCodeContext(stdCtx context.Context) (string, error) {
 	var ret struct {
 		PreCode string `json:"pre_auth_code"`
 	}
-	err = json.Unmarshal(body, &ret)
-	return ret.PreCode, err
+	if err := json.Unmarshal(body, &ret); err != nil {
+		return "", err
+	}
+
+	return ret.PreCode, nil
 }
 
 // GetPreCode 获取预授权码
@@ -138,20 +140,6 @@ func (ctx *Context) GetBindComponentURL(redirectURI string, authType int, bizApp
 	return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
 }
 
-// GetBindComponentURLV2Context 获取新版本第三方公众号授权链接(链接跳转，适用移动端)
-func (ctx *Context) GetBindComponentURLV2Context(stdCtx context.Context, redirectURI string, authType int, bizAppID string) (string, error) {
-	code, err := ctx.GetPreCodeContext(stdCtx)
-	if err != nil {
-		return "", err
-	}
-	return fmt.Sprintf(bindComponentURLV2, authType, ctx.AppID, code, url.QueryEscape(redirectURI), bizAppID), nil
-}
-
-// GetBindComponentURLV2 获取新版本第三方公众号授权链接(链接跳转，适用移动端)
-func (ctx *Context) GetBindComponentURLV2(redirectURI string, authType int, bizAppID string) (string, error) {
-	return ctx.GetBindComponentURLContext(context.Background(), redirectURI, authType, bizAppID)
-}
-
 // ID 微信返回接口中各种类型字段
 type ID struct {
 	ID int `json:"id"`
@@ -240,10 +228,6 @@ func (ctx *Context) RefreshAuthrTokenContext(stdCtx context.Context, appid, refr
 	if err := cache.SetContext(stdCtx, ctx.Cache, authrTokenKey, ret.AccessToken, time.Second*time.Duration(ret.ExpiresIn-30)); err != nil {
 		return nil, err
 	}
-	refreshTokenKey := "authorizer_refresh_token_" + appid
-	if err := cache.SetContext(stdCtx, ctx.Cache, refreshTokenKey, ret.RefreshToken, 10*365*24*60*60*time.Second); err != nil {
-		return nil, err
-	}
 	return ret, nil
 }
 
@@ -257,18 +241,8 @@ func (ctx *Context) GetAuthrAccessTokenContext(stdCtx context.Context, appid str
 	authrTokenKey := "authorizer_access_token_" + appid
 	val := cache.GetContext(stdCtx, ctx.Cache, authrTokenKey)
 	if val == nil {
-		refreshTokenKey := "authorizer_refresh_token_" + appid
-		val := cache.GetContext(stdCtx, ctx.Cache, refreshTokenKey)
-		if val == nil {
-			return "", fmt.Errorf("cannot get authorizer %s refresh token", appid)
-		}
-		token, err := ctx.RefreshAuthrTokenContext(stdCtx, appid, val.(string))
-		if err != nil {
-			return "", err
-		}
-		return token.AccessToken, nil
+		return "", fmt.Errorf("cannot get authorizer %s access token", appid)
 	}
-
 	return val.(string), nil
 }
 

openplatform/miniprogram/basic/basic.go

@@ -9,12 +9,6 @@ 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 基础信息设置
@@ -57,181 +51,3 @@ 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/miniprogram.go

@@ -1,7 +1,6 @@
 package miniprogram
 
 import (
-	originalContext "context"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/credential"
@@ -38,22 +37,6 @@ func (miniProgram *MiniProgram) GetAccessToken() (string, error) {
 	return akRes.AccessToken, nil
 }
 
-// GetAccessTokenContext 利用ctx获取ak
-func (miniProgram *MiniProgram) GetAccessTokenContext(ctx originalContext.Context) (string, error) {
-	ak, akErr := miniProgram.openContext.GetAuthrAccessTokenContext(ctx, miniProgram.AppID)
-	if akErr == nil {
-		return ak, nil
-	}
-	if miniProgram.authorizerRefreshToken == "" {
-		return "", fmt.Errorf("please set the authorizer_refresh_token first")
-	}
-	akRes, akResErr := miniProgram.GetComponent().RefreshAuthrTokenContext(ctx, miniProgram.AppID, miniProgram.authorizerRefreshToken)
-	if akResErr != nil {
-		return "", akResErr
-	}
-	return akRes.AccessToken, nil
-}
-
 // SetAuthorizerRefreshToken 设置代执操作业务授权账号authorizer_refresh_token
 func (miniProgram *MiniProgram) SetAuthorizerRefreshToken(authorizerRefreshToken string) *MiniProgram {
 	miniProgram.authorizerRefreshToken = authorizerRefreshToken
@@ -85,7 +68,7 @@ func (miniProgram *MiniProgram) GetBasic() *basic.Basic {
 // GetURLLink 小程序URL Link接口 调用前需确认已调用 SetAuthorizerRefreshToken 避免由于缓存中 authorizer_access_token 过期执行中断
 func (miniProgram *MiniProgram) GetURLLink() *urllink.URLLink {
 	return urllink.NewURLLink(&miniContext.Context{
-		AccessTokenContextHandle: miniProgram,
+		AccessTokenHandle: miniProgram,
 	})
 }
 

openplatform/officialaccount/js/js.go

@@ -1,7 +1,6 @@
 package js
 
 import (
-	context2 "context"
 	"fmt"
 
 	"github.com/silenceper/wechat/v2/credential"
@@ -33,31 +32,14 @@ func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
 // GetConfig 第三方平台 - 获取jssdk需要的配置参数
 // uri 为当前网页地址
 func (js *Js) GetConfig(uri, appid string) (config *officialJs.Config, err error) {
-	return js.GetConfigContext(context2.Background(), uri, appid)
-}
-
-// GetConfigContext 新方法，允许传入上下文，避免协程泄漏
-func (js *Js) GetConfigContext(ctx context2.Context, uri, appid string) (config *officialJs.Config, err error) {
+	config = new(officialJs.Config)
 	var accessToken string
-	// 类型断言，如果断言成功，调用安全的 GetAccessTokenContext 方法
-	if ctxHandle, ok := js.Context.AccessTokenHandle.(credential.AccessTokenContextHandle); ok {
-		accessToken, err = ctxHandle.GetAccessTokenContext(ctx)
-	} else {
-		// 如果没有实现 AccessTokenContextHandle 接口，调用旧的 GetAccessToken 方法
-		accessToken, err = js.Context.GetAccessToken()
-	}
+	accessToken, err = js.GetAccessToken()
 	if err != nil {
 		return
 	}
-
 	var ticketStr string
-	// 类型断言 jsTicket
-	if ticketCtxHandle, ok := js.JsTicketHandle.(credential.JsTicketContextHandle); ok {
-		ticketStr, err = ticketCtxHandle.GetTicketContext(ctx, accessToken)
-	} else {
-		// 如果没有实现 JsTicketContextHandle 接口，调用旧的 GetTicket 方法
-		ticketStr, err = js.GetTicket(accessToken)
-	}
+	ticketStr, err = js.GetTicket(accessToken)
 	if err != nil {
 		return
 	}
@@ -67,7 +49,6 @@ func (js *Js) GetConfigContext(ctx context2.Context, uri, appid string) (config
 	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
 	sigStr := util.Signature(str)
 
-	config = new(officialJs.Config)
 	config.AppID = appid
 	config.NonceStr = nonceStr
 	config.Timestamp = timestamp

openplatform/officialaccount/js/js_test.go

@@ -1,147 +0,0 @@
-// 验证 js.GetConfigContext 是否能正确传递上下文到 HTTP 请求，确保上下文正确传播，防止在获取 JSSDK 配置时发生协程泄露。
-package js
-
-import (
-	"bytes"
-	context2 "context"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"testing"
-
-	"github.com/silenceper/wechat/v2/cache"
-	"github.com/silenceper/wechat/v2/credential"
-	"github.com/silenceper/wechat/v2/officialaccount/config"
-	"github.com/silenceper/wechat/v2/officialaccount/context"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-// mockAccessTokenHandle 模拟 AccessTokenHandle
-type mockAccessTokenHandle struct{}
-
-func (m *mockAccessTokenHandle) GetAccessToken() (string, error) {
-	return "mock-access-token", nil
-}
-
-func (m *mockAccessTokenHandle) GetAccessTokenContext(_ context2.Context) (string, error) {
-	return "mock-access-token", nil
-}
-
-// contextCheckingRoundTripper 自定义 RoundTripper 用于检查 context
-type contextCheckingRoundTripper struct {
-	originalCtx context2.Context
-	t           *testing.T
-	key         interface{}
-	expectedVal interface{}
-}
-
-func (rt *contextCheckingRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	// 获取请求中的 context
-	reqCtx := req.Context()
-
-	// 打印 context 比较结果
-	rt.t.Logf("比较上下文的内存地址:\n")
-	if reqCtx == rt.originalCtx {
-		rt.t.Logf("上下文具有相同的内存地址。原始上下文: %p, 请求上下文: %p\n", rt.originalCtx, reqCtx)
-	} else {
-		rt.t.Logf("上下文具有不同的内存地址。原始上下文: %p, 请求上下文: %p\n", rt.originalCtx, reqCtx)
-	}
-
-	// 检查 context 中的键值对
-	if rt.key != nil {
-		value := reqCtx.Value(rt.key)
-		rt.t.Logf("检查请求上下文中的键 %v:\n", rt.key)
-		if value != rt.expectedVal {
-			rt.t.Errorf("上下文键 %v 的值不匹配: 预期 %v, 实际 %v\n", rt.key, rt.expectedVal, value)
-		} else {
-			rt.t.Logf("上下文键 %v 的值匹配: 预期 %v, 实际 %v\n", rt.key, rt.expectedVal, value)
-		}
-	}
-
-	// 检查上下文是否已取消
-	select {
-	case <-reqCtx.Done():
-		return nil, reqCtx.Err() // 返回上下文取消错误
-	default:
-		// 返回模拟的 HTTP 响应，包含有效的 JSON
-		responseBody := `{"ticket":"mock-ticket","expires_in":7200}`
-		response := &http.Response{
-			Status:        "200 OK",
-			StatusCode:    http.StatusOK,
-			Proto:         "HTTP/1.1",
-			ProtoMajor:    1,
-			ProtoMinor:    1,
-			Body:          io.NopCloser(bytes.NewReader([]byte(responseBody))),
-			ContentLength: int64(len(responseBody)),
-			Header:        make(http.Header),
-		}
-		response.Header.Set("Content-Type", "application/json")
-		return response, nil
-	}
-}
-
-// contextKey 定义自定义上下文键类型，避免使用内置 string 类型
-type contextKey string
-
-// setupJsInstance 初始化 Js 实例和 HTTP 客户端
-func setupJsInstance(t *testing.T, ctx context2.Context, key, val interface{}) (*Js, func()) {
-	cfg := &config.Config{
-		AppID:     "test-app-id",
-		AppSecret: "test-app-secret",
-		Cache:     cache.NewMemory(),
-	}
-	cacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", credential.CacheKeyOfficialAccountPrefix, cfg.AppID)
-	if err := cfg.Cache.Delete(cacheKey); err != nil {
-		t.Fatalf("清除缓存失败: %v", err)
-	}
-	t.Log("清除 jsapi_ticket 的缓存:", cacheKey)
-
-	ctxHandle := &context.Context{Config: cfg, AccessTokenHandle: &mockAccessTokenHandle{}}
-	jsInstance := NewJs(ctxHandle, cfg.AppID)
-	jsInstance.SetJsTicketHandle(credential.NewDefaultJsTicket(cfg.AppID, credential.CacheKeyOfficialAccountPrefix, cfg.Cache))
-
-	originalClient := util.DefaultHTTPClient
-	util.DefaultHTTPClient = &http.Client{
-		Transport: &contextCheckingRoundTripper{originalCtx: ctx, t: t, key: key, expectedVal: val},
-	}
-	return jsInstance, func() { util.DefaultHTTPClient = originalClient }
-}
-
-// TestGetConfigContext 测试GetConfigContext的上下文传递和取消行为。
-func TestGetConfigContext(t *testing.T) {
-	t.Run("ContextPassing", func(t *testing.T) {
-		ctxKey := contextKey("testKey111") // 使用自定义类型 contextKey
-		ctxValue := "testValue222"
-		ctx := context2.WithValue(context2.Background(), ctxKey, ctxValue)
-		t.Logf("创建的测试上下文: %p, 添加的键值对: %v=%v\n", ctx, ctxKey, ctxValue)
-
-		jsInstance, cleanup := setupJsInstance(t, ctx, ctxKey, ctxValue)
-		defer cleanup()
-		t.Log("调用 GetConfigContext")
-		config2, err := jsInstance.GetConfigContext(ctx, "https://www.baidu.com", "test-app-id")
-		if err != nil {
-			t.Fatalf("GetConfigContext 失败: %v", err)
-		}
-		if config2.AppID != "test-app-id" {
-			t.Errorf("预期 AppID 为 %s，实际为 %s", "test-app-id", config2.AppID)
-		}
-	})
-
-	t.Run("ContextCancellation", func(t *testing.T) {
-		ctx, cancel := context2.WithCancel(context2.Background())
-		defer cancel()
-
-		jsInstance, cleanup := setupJsInstance(t, ctx, nil, nil)
-		defer cleanup()
-
-		cancel()
-		t.Log("调用 GetConfigContext（已取消上下文）")
-		_, err := jsInstance.GetConfigContext(ctx, "https://www.baidu.com", "test-app-id")
-		if err == nil {
-			t.Error("预期上下文取消错误，但 GetConfigContext 未返回错误")
-		} else if !errors.Is(err, context2.Canceled) {
-			t.Errorf("预期错误为 context.Canceled，实际为: %v", err)
-		}
-	})
-}

pay/pay.go

@@ -4,7 +4,6 @@ import (
 	"github.com/silenceper/wechat/v2/pay/config"
 	"github.com/silenceper/wechat/v2/pay/notify"
 	"github.com/silenceper/wechat/v2/pay/order"
-	"github.com/silenceper/wechat/v2/pay/redpacket"
 	"github.com/silenceper/wechat/v2/pay/refund"
 	"github.com/silenceper/wechat/v2/pay/transfer"
 )
@@ -38,8 +37,3 @@ func (pay *Pay) GetRefund() *refund.Refund {
 func (pay *Pay) GetTransfer() *transfer.Transfer {
 	return transfer.NewTransfer(pay.cfg)
 }
-
-// GetRedpacket 红包
-func (pay *Pay) GetRedpacket() *redpacket.Redpacket {
-	return redpacket.NewRedpacket(pay.cfg)
-}

pay/redpacket/redpacket.go

@@ -1,131 +0,0 @@
-package redpacket
-
-import (
-	"encoding/xml"
-	"fmt"
-	"strconv"
-
-	"github.com/silenceper/wechat/v2/pay/config"
-	"github.com/silenceper/wechat/v2/util"
-)
-
-// redpacketGateway 发放红包接口
-// https://pay.weixin.qq.com/wiki/doc/api/tools/cash_coupon.php?chapter=13_4&index=3
-var redpacketGateway = "https://api.mch.weixin.qq.com/mmpaymkttransfers/sendredpack"
-
-// Redpacket struct extends context
-type Redpacket struct {
-	*config.Config
-}
-
-// NewRedpacket return an instance of Redpacket package
-func NewRedpacket(cfg *config.Config) *Redpacket {
-	return &Redpacket{cfg}
-}
-
-// Params 调用参数
-type Params struct {
-	MchBillno   string // 商户订单号
-	SendName    string // 商户名称
-	ReOpenID    string
-	TotalAmount int
-	TotalNum    int
-	Wishing     string
-	ClientIP    string
-	ActName     string
-	Remark      string
-
-	RootCa string // ca证书
-}
-
-// request 接口请求参数
-type request struct {
-	NonceStr    string `xml:"nonce_str"`
-	Sign        string `xml:"sign"`
-	MchID       string `xml:"mch_id"`
-	MchBillno   string `xml:"mch_billno"`
-	Wxappid     string `xml:"wxappid"`
-	SendName    string `xml:"send_name"`
-	ReOpenID    string `xml:"re_openid"`
-	TotalAmount int    `xml:"total_amount"`
-	TotalNum    int    `xml:"total_num"`
-	Wishing     string `xml:"wishing"`
-	ClientIP    string `xml:"client_ip"`
-	ActName     string `xml:"act_name"`
-	Remark      string `xml:"remark"`
-}
-
-// Response 接口返回
-type Response struct {
-	ReturnCode  string `xml:"return_code"`
-	ReturnMsg   string `xml:"return_msg"`
-	ResultCode  string `xml:"result_code,omitempty"`
-	ErrCode     string `xml:"err_code,omitempty"`
-	ErrCodeDes  string `xml:"err_code_des,omitempty"`
-	MchBillno   string `xml:"mch_billno,omitempty"`
-	MchID       string `xml:"mch_id,omitempty"`
-	Wxappid     string `xml:"wxappid"`
-	ReOpenID    string `xml:"re_openid"`
-	TotalAmount int    `xml:"total_amount"`
-	SendListid  string `xml:"send_listid"`
-}
-
-// SendRedpacket 发放红包
-func (redpacket *Redpacket) SendRedpacket(p *Params) (rsp *Response, err error) {
-	nonceStr := util.RandomStr(32)
-	param := make(map[string]string)
-
-	param["nonce_str"] = nonceStr
-	param["mch_id"] = redpacket.MchID
-	param["wxappid"] = redpacket.AppID
-	param["mch_billno"] = p.MchBillno
-	param["send_name"] = p.SendName
-	param["re_openid"] = p.ReOpenID
-	param["total_amount"] = strconv.Itoa(p.TotalAmount)
-	param["total_num"] = strconv.Itoa(p.TotalNum)
-	param["wishing"] = p.Wishing
-	param["client_ip"] = p.ClientIP
-	param["act_name"] = p.ActName
-	param["remark"] = p.Remark
-	//param["scene_id"] = "PRODUCT_2"
-
-	sign, err := util.ParamSign(param, redpacket.Key)
-	if err != nil {
-		return
-	}
-
-	req := request{
-		NonceStr:    nonceStr,
-		Sign:        sign,
-		MchID:       redpacket.MchID,
-		Wxappid:     redpacket.AppID,
-		MchBillno:   p.MchBillno,
-		SendName:    p.SendName,
-		ReOpenID:    p.ReOpenID,
-		TotalAmount: p.TotalAmount,
-		TotalNum:    p.TotalNum,
-		Wishing:     p.Wishing,
-		ClientIP:    p.ClientIP,
-		ActName:     p.ActName,
-		Remark:      p.Remark,
-	}
-
-	rawRet, err := util.PostXMLWithTLS(redpacketGateway, req, p.RootCa, redpacket.MchID)
-	if err != nil {
-		return
-	}
-	err = xml.Unmarshal(rawRet, &rsp)
-	if err != nil {
-		return
-	}
-	if rsp.ReturnCode == "SUCCESS" {
-		if rsp.ResultCode == "SUCCESS" {
-			err = nil
-			return
-		}
-		err = fmt.Errorf("send redpacket error, errcode=%s,errmsg=%s", rsp.ErrCode, rsp.ErrCodeDes)
-		return
-	}
-	err = fmt.Errorf("[msg : xmlUnmarshalError] [rawReturn : %s] [sign : %s]", string(rawRet), sign)
-	return
-}

util/error.go

@@ -68,18 +68,3 @@ func DecodeWithError(response []byte, obj interface{}, apiName string) error {
 	}
 	return nil
 }
-
-// HandleFileResponse 通用处理微信等接口返回：有时 JSON 错误，有时文件内容
-func HandleFileResponse(response []byte, apiName string) ([]byte, error) {
-	var commErr CommonError
-	if err := json.Unmarshal(response, &commErr); err == nil {
-		// 能解析成 JSON，判断是否为错误
-		if commErr.ErrCode != 0 {
-			commErr.apiName = apiName
-			return nil, &commErr
-		}
-		// 能解析成 JSON 且没错误码，极少情况（比如微信返回的业务数据是 JSON 但无 errcode 字段），可根据需要调整
-	}
-	// 不能解析成 JSON，或没错误码，直接返回原始内容
-	return response, nil
-}

util/http.go

@@ -17,19 +17,6 @@ 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)
@@ -37,14 +24,11 @@ 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 := DefaultHTTPClient.Do(request)
+	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return nil, err
 	}
@@ -63,9 +47,6 @@ 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 {
@@ -76,7 +57,7 @@ func HTTPPostContext(ctx context.Context, uri string, data []byte, header map[st
 		request.Header.Set(key, value)
 	}
 
-	response, err := DefaultHTTPClient.Do(request)
+	response, err := http.DefaultClient.Do(request)
 	if err != nil {
 		return nil, err
 	}
@@ -90,9 +71,6 @@ 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)
@@ -105,7 +83,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 := DefaultHTTPClient.Do(req)
+	response, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -132,7 +110,7 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
 		return nil, "", err
 	}
 
-	response, err := DefaultHTTPClient.Post(uri, "application/json;charset=utf-8", jsonBuf)
+	response, err := http.Post(uri, "application/json;charset=utf-8", jsonBuf)
 	if err != nil {
 		return nil, "", err
 	}
@@ -146,41 +124,13 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
 	return responseData, contentType, err
 }
 
-// PostFileByStream 上传文件
-func PostFileByStream(fieldName, fileName, uri string, byteData []byte) ([]byte, error) {
-	fields := []MultipartFormField{
-		{
-			IsFile:    false,
-			Fieldname: fieldName,
-			Filename:  fileName,
-			Value:     byteData,
-		},
-	}
-	return PostMultipartForm(fields, uri)
-}
-
 // PostFile 上传文件
-func PostFile(fieldName, filePath, uri string) ([]byte, error) {
+func PostFile(fieldName, filename, uri string) ([]byte, error) {
 	fields := []MultipartFormField{
 		{
 			IsFile:    true,
 			Fieldname: fieldName,
-			FilePath:  filePath,
-			Filename:  filePath,
-		},
-	}
-	return PostMultipartForm(fields, uri)
-}
-
-// PostFileFromReader 上传文件，从 io.Reader 中读取
-func PostFileFromReader(filedName, filePath, fileName, uri string, reader io.Reader) ([]byte, error) {
-	fields := []MultipartFormField{
-		{
-			IsFile:     true,
-			Fieldname:  filedName,
-			FilePath:   filePath,
-			Filename:   fileName,
-			FileReader: reader,
+			Filename:  filename,
 		},
 	}
 	return PostMultipartForm(fields, uri)
@@ -188,19 +138,14 @@ func PostFileFromReader(filedName, filePath, fileName, uri string, reader io.Rea
 
 // MultipartFormField 保存文件或其他字段信息
 type MultipartFormField struct {
-	IsFile     bool
-	Fieldname  string
-	Value      []byte
-	FilePath   string
-	Filename   string
-	FileReader io.Reader
+	IsFile    bool
+	Fieldname string
+	Value     []byte
+	Filename  string
 }
 
 // PostMultipartForm 上传文件或其他多个字段
 func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte, err error) {
-	if uriModifier != nil {
-		uri = uriModifier(uri)
-	}
 	bodyBuf := &bytes.Buffer{}
 	bodyWriter := multipart.NewWriter(bodyBuf)
 
@@ -212,24 +157,18 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 				return
 			}
 
-			if field.FileReader == nil {
-				fh, e := os.Open(field.FilePath)
-				if e != nil {
-					err = fmt.Errorf("error opening file , err=%v", e)
-					return
-				}
-				_, err = io.Copy(fileWriter, fh)
-				_ = fh.Close()
-				if err != nil {
-					return
-				}
-			} else {
-				if _, err = io.Copy(fileWriter, field.FileReader); err != nil {
-					return
-				}
+			fh, e := os.Open(field.Filename)
+			if e != nil {
+				err = fmt.Errorf("error opening file , err=%v", e)
+				return
+			}
+			defer fh.Close()
+
+			if _, err = io.Copy(fileWriter, fh); err != nil {
+				return
 			}
 		} else {
-			partWriter, e := bodyWriter.CreateFormFile(field.Fieldname, field.Filename)
+			partWriter, e := bodyWriter.CreateFormField(field.Fieldname)
 			if e != nil {
 				err = e
 				return
@@ -244,14 +183,14 @@ func PostMultipartForm(fields []MultipartFormField, uri string) (respBody []byte
 	contentType := bodyWriter.FormDataContentType()
 	bodyWriter.Close()
 
-	resp, e := DefaultHTTPClient.Post(uri, contentType, bodyBuf)
+	resp, e := http.Post(uri, contentType, bodyBuf)
 	if e != nil {
 		err = e
 		return
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("http code error : uri=%v , statusCode=%v", uri, resp.StatusCode)
+		return nil, err
 	}
 	respBody, err = io.ReadAll(resp.Body)
 	return
@@ -259,16 +198,13 @@ 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 := DefaultHTTPClient.Post(uri, "application/xml;charset=utf-8", body)
+	response, err := http.Post(uri, "application/xml;charset=utf-8", body)
 	if err != nil {
 		return nil, err
 	}
@@ -291,17 +227,11 @@ func httpWithTLS(rootCa, key string) (*http.Client, error) {
 	config := &tls.Config{
 		Certificates: []tls.Certificate{cert},
 	}
-
-	var baseTransport http.RoundTripper
-	if DefaultHTTPClient.Transport != nil {
-		baseTransport = DefaultHTTPClient.Transport
-	} else {
-		baseTransport = http.DefaultTransport
+	tr := &http.Transport{
+		TLSClientConfig:    config,
+		DisableCompression: true,
 	}
-	trans := baseTransport.(*http.Transport).Clone()
-	trans.TLSClientConfig = config
-	trans.DisableCompression = true
-	client = &http.Client{Transport: trans}
+	client = &http.Client{Transport: tr}
 	return client, nil
 }
 
@@ -329,9 +259,6 @@ 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

wechat.go

@@ -1,7 +1,6 @@
 package wechat
 
 import (
-	"net/http"
 	"os"
 
 	log "github.com/sirupsen/logrus"
@@ -15,7 +14,6 @@ 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"
 )
@@ -83,8 +81,3 @@ 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

@@ -9,17 +9,10 @@ import (
 const (
 	// departmentCreateURL 创建部门
 	departmentCreateURL = "https://qyapi.weixin.qq.com/cgi-bin/department/create?access_token=%s"
-	// departmentUpdateURL 更新部门
-	departmentUpdateURL = "https://qyapi.weixin.qq.com/cgi-bin/department/update?access_token=%s"
-	// departmentDeleteURL 删除部门
-	departmentDeleteURL = "https://qyapi.weixin.qq.com/cgi-bin/department/delete?access_token=%s&id=%d"
 	// departmentSimpleListURL 获取子部门ID列表
 	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 获取单个部门详情
-	departmentGetURL = "https://qyapi.weixin.qq.com/cgi-bin/department/get?access_token=%s&id=%d"
+	departmentListURL = "https://qyapi.weixin.qq.com/cgi-bin/department/list?access_token=%s"
 )
 
 type (
@@ -63,11 +56,6 @@ type (
 		ParentID         int      `json:"parentid"`          // 父部门id。根部门为1
 		Order            int      `json:"order"`             // 在父部门中的次序值。order值大的排序靠前
 	}
-	// DepartmentGetResponse 获取单个部门详情
-	DepartmentGetResponse struct {
-		util.CommonError
-		Department Department `json:"department"`
-	}
 )
 
 // DepartmentCreate 创建部门
@@ -85,51 +73,10 @@ func (r *Client) DepartmentCreate(req *DepartmentCreateRequest) (*DepartmentCrea
 		return nil, err
 	}
 	result := &DepartmentCreateResponse{}
-	err = util.DecodeWithError(response, result, "DepartmentCreate")
-	return result, err
-}
-
-// DepartmentUpdateRequest 更新部门请求
-type DepartmentUpdateRequest struct {
-	ID       int    `json:"id"`
-	Name     string `json:"name,omitempty"`
-	NameEn   string `json:"name_en,omitempty"`
-	ParentID int    `json:"parentid,omitempty"`
-	Order    int    `json:"order,omitempty"`
-}
-
-// DepartmentUpdate 更新部门
-// see https://developer.work.weixin.qq.com/document/path/90206
-func (r *Client) DepartmentUpdate(req *DepartmentUpdateRequest) error {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = r.GetAccessToken(); err != nil {
-		return err
+	if err = util.DecodeWithError(response, result, "DepartmentCreate"); err != nil {
+		return nil, err
 	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(departmentUpdateURL, accessToken), req); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "DepartmentUpdate")
-}
-
-// DepartmentDelete 删除部门
-// @see https://developer.work.weixin.qq.com/document/path/90207
-func (r *Client) DepartmentDelete(departmentID int) error {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = r.GetAccessToken(); err != nil {
-		return err
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(departmentDeleteURL, accessToken, departmentID)); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "DepartmentDelete")
+	return result, nil
 }
 
 // DepartmentSimpleList 获取子部门ID列表
@@ -147,63 +94,30 @@ func (r *Client) DepartmentSimpleList(departmentID int) ([]*DepartmentID, error)
 		return nil, err
 	}
 	result := &DepartmentSimpleListResponse{}
-	err = util.DecodeWithError(response, result, "DepartmentSimpleList")
-	return result.DepartmentID, err
+	if err = util.DecodeWithError(response, result, "DepartmentSimpleList"); err != nil {
+		return nil, 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(formatURL)
+	response, err := util.HTTPGet(fmt.Sprintf(departmentListURL, accessToken))
 	if err != nil {
 		return nil, err
 	}
 	// 按照结构体解析返回值
 	result := &DepartmentListResponse{}
-	err = util.DecodeWithError(response, result, "DepartmentList")
+	if err = util.DecodeWithError(response, result, "DepartmentList"); err != nil {
+		return nil, err
+	}
 	// 返回数据
 	return result.Department, err
 }
-
-// DepartmentGet 获取单个部门详情
-// see https://developer.work.weixin.qq.com/document/path/95351
-func (r *Client) DepartmentGet(departmentID int) (*Department, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = r.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.HTTPGet(fmt.Sprintf(departmentGetURL, accessToken, departmentID)); err != nil {
-		return nil, err
-	}
-	result := &DepartmentGetResponse{}
-	err = util.DecodeWithError(response, result, "DepartmentGet")
-	return &result.Department, err
-}

work/addresslist/linkedcorp.go

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

work/addresslist/tag.go

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

work/addresslist/user.go

@@ -12,8 +12,6 @@ const (
 	userSimpleListURL = "https://qyapi.weixin.qq.com/cgi-bin/user/simplelist"
 	// userCreateURL 创建成员
 	userCreateURL = "https://qyapi.weixin.qq.com/cgi-bin/user/create?access_token=%s"
-	// userUpdateURL 更新成员
-	userUpdateURL = "https://qyapi.weixin.qq.com/cgi-bin/user/update?access_token=%s"
 	// userGetURL 读取成员
 	userGetURL = "https://qyapi.weixin.qq.com/cgi-bin/user/get"
 	// userDeleteURL 删除成员
@@ -63,7 +61,10 @@ func (r *Client) UserSimpleList(departmentID int) ([]*UserList, error) {
 	}
 	result := &UserSimpleListResponse{}
 	err = util.DecodeWithError(response, result, "UserSimpleList")
-	return result.UserList, err
+	if err != nil {
+		return nil, err
+	}
+	return result.UserList, nil
 }
 
 type (
@@ -152,54 +153,10 @@ func (r *Client) UserCreate(req *UserCreateRequest) (*UserCreateResponse, error)
 		return nil, err
 	}
 	result := &UserCreateResponse{}
-	err = util.DecodeWithError(response, result, "UserCreate")
-	return result, err
-}
-
-// UserUpdateRequest 更新成员请求
-type UserUpdateRequest struct {
-	UserID         string   `json:"userid"`
-	NewUserID      string   `json:"new_userid"`
-	Name           string   `json:"name"`
-	Alias          string   `json:"alias"`
-	Mobile         string   `json:"mobile"`
-	Department     []int    `json:"department"`
-	Order          []int    `json:"order"`
-	Position       string   `json:"position"`
-	Gender         int      `json:"gender"`
-	Email          string   `json:"email"`
-	BizMail        string   `json:"biz_mail"`
-	BizMailAlias   string   `json:"biz_mail_alias"`
-	IsLeaderInDept []int    `json:"is_leader_in_dept"`
-	DirectLeader   []string `json:"direct_leader"`
-	Enable         int      `json:"enable"`
-	AvatarMediaid  string   `json:"avatar_mediaid"`
-	Telephone      string   `json:"telephone"`
-	Address        string   `json:"address"`
-	MainDepartment int      `json:"main_department"`
-	Extattr        struct {
-		Attrs []ExtraAttr `json:"attrs"`
-	} `json:"extattr"`
-	ToInvite         bool            `json:"to_invite"`
-	ExternalPosition string          `json:"external_position"`
-	ExternalProfile  ExternalProfile `json:"external_profile"`
-}
-
-// UserUpdate 更新成员
-// see https://developer.work.weixin.qq.com/document/path/90197
-func (r *Client) UserUpdate(req *UserUpdateRequest) error {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = r.GetAccessToken(); err != nil {
-		return err
+	if err = util.DecodeWithError(response, result, "UserCreate"); err != nil {
+		return nil, err
 	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(userUpdateURL, accessToken), req); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "UserUpdate")
+	return result, nil
 }
 
 // UserGetResponse 获取部门成员响应
@@ -264,7 +221,7 @@ type UserGetResponse struct {
 	} `json:"external_profile"` // 成员对外属性，字段详情见对外属性；代开发自建应用需要管理员授权才返回；第三方仅通讯录应用可获取；对于非第三方创建的成员，第三方通讯录应用也不可获取；上游企业不可获取下游企业成员该字段
 }
 
-// UserGet 读取成员
+// UserGet 获取部门成员
 // @see https://developer.work.weixin.qq.com/document/path/90196
 func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
 	var (
@@ -280,15 +237,18 @@ func (r *Client) UserGet(UserID string) (*UserGetResponse, error) {
 		strings.Join([]string{
 			userGetURL,
 			util.Query(map[string]interface{}{
-				"access_token": accessToken,
-				"userid":       UserID,
+				"access_token":  accessToken,
+				"department_id": UserID,
 			}),
 		}, "?")); err != nil {
 		return nil, err
 	}
 	result := &UserGetResponse{}
 	err = util.DecodeWithError(response, result, "UserGet")
-	return result, err
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -319,8 +279,10 @@ func (r *Client) UserDelete(userID string) (*UserDeleteResponse, error) {
 		return nil, err
 	}
 	result := &UserDeleteResponse{}
-	err = util.DecodeWithError(response, result, "UserDelete")
-	return result, err
+	if err = util.DecodeWithError(response, result, "UserDelete"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 // UserListIDRequest 获取成员ID列表请求
@@ -362,8 +324,10 @@ func (r *Client) UserListID(req *UserListIDRequest) (*UserListIDResponse, error)
 		return nil, err
 	}
 	result := &UserListIDResponse{}
-	err = util.DecodeWithError(response, result, "UserListID")
-	return result, err
+	if err = util.DecodeWithError(response, result, "UserListID"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -402,8 +366,10 @@ func (r *Client) ConvertToOpenID(userID string) (string, error) {
 		return "", err
 	}
 	result := &convertToOpenIDResponse{}
-	err = util.DecodeWithError(response, result, "ConvertToOpenID")
-	return result.OpenID, err
+	if err = util.DecodeWithError(response, result, "ConvertToOpenID"); err != nil {
+		return "", err
+	}
+	return result.OpenID, nil
 }
 
 type (
@@ -442,6 +408,8 @@ func (r *Client) ConvertToUserID(openID string) (string, error) {
 		return "", err
 	}
 	result := &convertToUserIDResponse{}
-	err = util.DecodeWithError(response, result, "ConvertToUserID")
-	return result.UserID, err
+	if err = util.DecodeWithError(response, result, "ConvertToUserID"); err != nil {
+		return "", err
+	}
+	return result.UserID, nil
 }

work/appchat/appchat.go

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

work/checkin/checkin.go

@@ -1,428 +0,0 @@
-package checkin
-
-import (
-	"fmt"
-
-	"github.com/silenceper/wechat/v2/util"
-)
-
-const (
-	// setScheduleListURL 为打卡人员排班
-	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"
-	// addRecordURL 添加打卡记录
-	addRecordURL = "https://qyapi.weixin.qq.com/cgi-bin/checkin/add_checkin_record?access_token=%s"
-)
-
-// SetScheduleListRequest 为打卡人员排班请求
-type SetScheduleListRequest struct {
-	GroupID   int64                 `json:"groupid"`
-	Items     []SetScheduleListItem `json:"items"`
-	YearMonth int64                 `json:"yearmonth"`
-}
-
-// SetScheduleListItem 排班表信息
-type SetScheduleListItem struct {
-	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 err
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(setScheduleListURL, accessToken), req); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "SetScheduleList")
-}
-
-// 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"`
-	CheckinMethodType      int64                        `json:"checkin_method_type,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")
-}
-
-// AddRecordRequest 添加打卡记录请求
-type AddRecordRequest struct {
-	Records []Record `json:"records"`
-}
-
-// Record 打卡记录
-type Record struct {
-	UserID         string   `json:"userid"`
-	CheckinTime    int64    `json:"checkin_time"`
-	LocationTitle  string   `json:"location_title"`
-	LocationDetail string   `json:"location_detail"`
-	MediaIDS       []string `json:"mediaids"`
-	Notes          string   `json:"notes"`
-	DeviceType     int      `json:"device_type"`
-	Lat            int64    `json:"lat"`
-	Lng            int64    `json:"lng"`
-	DeviceDetail   string   `json:"device_detail"`
-	WifiName       string   `json:"wifiname"`
-	WifiMac        string   `json:"wifimac"`
-}
-
-// AddRecord 添加打卡记录
-// see https://developer.work.weixin.qq.com/document/path/99647
-func (r *Client) AddRecord(req *AddRecordRequest) 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(addRecordURL, accessToken), req); err != nil {
-		return err
-	}
-	return util.DecodeWithCommonError(response, "AddRecord")
-}

work/checkin/client.go

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

work/checkin/record.go

@@ -1,682 +0,0 @@
-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"`
-		WorkdayOverAsVacation int64    `json:"workday_over_as_vacation"`
-		WorkdayOverAsMoney    int64    `json:"workday_over_as_money"`
-		RestdayOverAsVacation int64    `json:"restday_over_as_vacation"`
-		RestdayOverAsMoney    int64    `json:"restday_over_as_money"`
-		HolidayOverAsVacation int64    `json:"holiday_over_as_vacation"`
-		HolidayOverAsMoney    int64    `json:"holiday_over_as_money"`
-	}
-)
-
-// 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"`
-		RestDays        int64 `json:"rest_days"`
-	}
-
-	// OverWorkInfo 加班情况
-	OverWorkInfo struct {
-		WorkdayOverSec         int64 `json:"workday_over_sec"`
-		HolidayOverSec         int64 `json:"holidays_over_sec"`
-		RestDayOverSec         int64 `json:"restdays_over_sec"`
-		WorkdaysOverAsVacation int64 `json:"workdays_over_as_vacation"`
-		WorkdaysOverAsMoney    int64 `json:"workdays_over_as_money"`
-		RestdaysOverAsVacation int64 `json:"restdays_over_as_vacation"`
-		RestdaysOverAsMoney    int64 `json:"restdays_over_as_money"`
-		HolidaysOverAsVacation int64 `json:"holidays_over_as_vacation"`
-		HolidaysOverAsMoney    int64 `json:"holidays_over_as_money"`
-	}
-)
-
-// 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"`
-	SpanDayTime            int64              `json:"span_day_time"`
-	StandardWorkDuration   int64              `json:"standard_work_duration"`
-	OpenSpCheckin          bool               `json:"open_sp_checkin"`
-	CheckinMethodType      int64              `json:"checkin_method_type"`
-}
-
-// 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"`
-	OpenSpCheckin          bool                `json:"open_sp_checkin"`
-	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"`
-	SpanDayTime            int64               `json:"span_day_time"`
-	StandardWorkDuration   int64               `json:"standard_work_duration"`
-	OffWorkIntervalTime    int64               `json:"offwork_interval_time"`
-	CheckinMethodType      int64               `json:"checkin_method_type"`
-}
-
-// 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

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

work/externalcontact/callback.go

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

work/externalcontact/contact_way.go

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

work/externalcontact/customer_acquisition.go

@@ -23,8 +23,6 @@ const (
 	customerAcquisitionQuotaURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition_quota?access_token=%s"
 	// customerAcquisitionStatistic 查询链接使用详情
 	customerAcquisitionStatisticURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/statistic?access_token=%s"
-	// customerAcquisitionGetChatInfo 获取成员多次收消息详情
-	customerAcquisitionGetChatInfoURL = "https://qyapi.weixin.qq.com/cgi-bin/externalcontact/customer_acquisition/get_chat_info?access_token=%s"
 )
 
 type (
@@ -56,8 +54,10 @@ func (r *Client) ListLink(req *ListLinkRequest) (*ListLinkResponse, error) {
 		return nil, err
 	}
 	result := &ListLinkResponse{}
-	err = util.DecodeWithError(response, result, "ListLink")
-	return result, err
+	if err = util.DecodeWithError(response, result, "ListLink"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -102,8 +102,10 @@ func (r *Client) GetCustomerAcquisition(req *GetCustomerAcquisitionRequest) (*Ge
 		return nil, err
 	}
 	result := &GetCustomerAcquisitionResponse{}
-	err = util.DecodeWithError(response, result, "GetCustomerAcquisition")
-	return result, err
+	if err = util.DecodeWithError(response, result, "GetCustomerAcquisition"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -135,8 +137,10 @@ func (r *Client) CreateCustomerAcquisitionLink(req *CreateCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &CreateCustomerAcquisitionLinkResponse{}
-	err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink")
-	return result, err
+	if err = util.DecodeWithError(response, result, "CreateCustomerAcquisitionLink"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -168,8 +172,10 @@ func (r *Client) UpdateCustomerAcquisitionLink(req *UpdateCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &UpdateCustomerAcquisitionLinkResponse{}
-	err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink")
-	return result, err
+	if err = util.DecodeWithError(response, result, "UpdateCustomerAcquisitionLink"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -198,8 +204,10 @@ func (r *Client) DeleteCustomerAcquisitionLink(req *DeleteCustomerAcquisitionLin
 		return nil, err
 	}
 	result := &DeleteCustomerAcquisitionLinkResponse{}
-	err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink")
-	return result, err
+	if err = util.DecodeWithError(response, result, "DeleteCustomerAcquisitionLink"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -239,8 +247,10 @@ func (r *Client) GetCustomerInfoWithCustomerAcquisitionLink(req *GetCustomerInfo
 		return nil, err
 	}
 	result := &GetCustomerInfoWithCustomerAcquisitionLinkResponse{}
-	err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink")
-	return result, err
+	if err = util.DecodeWithError(response, result, "GetCustomerInfoWithCustomerAcquisitionLink"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -269,12 +279,14 @@ 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{}
-	err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota")
-	return result, err
+	if err = util.DecodeWithError(response, result, "CustomerAcquisitionQuota"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -307,45 +319,8 @@ func (r *Client) CustomerAcquisitionStatistic(req *CustomerAcquisitionStatisticR
 		return nil, err
 	}
 	result := &CustomerAcquisitionStatisticResponse{}
-	err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic")
-	return result, err
-}
-
-type (
-	// GetChatInfoRequest 获取成员多次收消息详情请求
-	GetChatInfoRequest struct {
-		ChatKey string `json:"chat_key"`
-	}
-	// GetChatInfoResponse 获取成员多次收消息详情响应
-	GetChatInfoResponse struct {
-		util.CommonError
-		UserID         string   `json:"userid"`
-		ExternalUserID string   `json:"external_userid"`
-		ChatInfo       ChatInfo `json:"chat_info"`
-	}
-	// ChatInfo 聊天信息
-	ChatInfo struct {
-		RecvMsgCnt int64  `json:"recv_msg_cnt"` // 成员收到的此客户的消息次数
-		LinkID     string `json:"link_id"`      // 成员添加客户的获客链接id
-		State      string `json:"state"`        // 成员添加客户的state
-	}
-)
-
-// GetChatInfo 获取成员多次收消息详情
-// see https://developer.work.weixin.qq.com/document/path/100130
-func (r *Client) GetChatInfo(req *GetChatInfoRequest) (*GetChatInfoResponse, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = r.GetAccessToken(); err != nil {
+	if err = util.DecodeWithError(response, result, "CustomerAcquisitionStatistic"); err != nil {
 		return nil, err
 	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(customerAcquisitionGetChatInfoURL, accessToken), req); err != nil {
-		return nil, err
-	}
-	result := &GetChatInfoResponse{}
-	err = util.DecodeWithError(response, result, "GetChatInfo")
-	return result, err
+	return result, nil
 }

work/externalcontact/external_user.go

@@ -50,7 +50,10 @@ func (r *Client) GetExternalUserList(userID string) ([]string, error) {
 	}
 	var result ExternalUserListResponse
 	err = util.DecodeWithError(response, &result, "GetExternalUserList")
-	return result.ExternalUserID, err
+	if err != nil {
+		return nil, err
+	}
+	return result.ExternalUserID, nil
 }
 
 // ExternalUserDetailResponse 外部联系人详情响应
@@ -63,16 +66,16 @@ type ExternalUserDetailResponse struct {
 
 // ExternalUser 外部联系人
 type ExternalUser struct {
-	ExternalUserID  string           `json:"external_userid"`
-	Name            string           `json:"name"`
-	Avatar          string           `json:"avatar"`
-	Type            int64            `json:"type"`
-	Gender          int64            `json:"gender"`
-	UnionID         string           `json:"unionid"`
-	Position        string           `json:"position"`
-	CorpName        string           `json:"corp_name"`
-	CorpFullName    string           `json:"corp_full_name"`
-	ExternalProfile *ExternalProfile `json:"external_profile,omitempty"`
+	ExternalUserID  string `json:"external_userid"`
+	Name            string `json:"name"`
+	Avatar          string `json:"avatar"`
+	Type            int64  `json:"type"`
+	Gender          int64  `json:"gender"`
+	UnionID         string `json:"unionid"`
+	Position        string `json:"position"`
+	CorpName        string `json:"corp_name"`
+	CorpFullName    string `json:"corp_full_name"`
+	ExternalProfile string `json:"external_profile"`
 }
 
 // FollowUser 跟进用户（指企业内部用户）
@@ -101,47 +104,7 @@ type Tag struct {
 // WechatChannel 视频号添加的场景
 type WechatChannel struct {
 	NickName string `json:"nickname"`
-	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"`
+	Source   string `json:"source"`
 }
 
 // GetExternalUserDetail 获取外部联系人详情
@@ -162,7 +125,10 @@ func (r *Client) GetExternalUserDetail(externalUserID string, nextCursor ...stri
 	}
 	result := &ExternalUserDetailResponse{}
 	err = util.DecodeWithError(response, result, "get_external_user_detail")
-	return result, err
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 // BatchGetExternalUserDetailsRequest 批量获取外部联系人详情请求
@@ -176,7 +142,6 @@ type BatchGetExternalUserDetailsRequest struct {
 type ExternalUserDetailListResponse struct {
 	util.CommonError
 	ExternalContactList []ExternalUserForBatch `json:"external_contact_list"`
-	NextCursor          string                 `json:"next_cursor"`
 }
 
 // ExternalUserForBatch 批量获取外部联系人客户列表
@@ -215,23 +180,26 @@ type FollowInfo struct {
 
 // BatchGetExternalUserDetails 批量获取外部联系人详情
 // @see https://developer.work.weixin.qq.com/document/path/92994
-func (r *Client) BatchGetExternalUserDetails(request BatchGetExternalUserDetailsRequest) ([]ExternalUserForBatch, string, error) {
+func (r *Client) BatchGetExternalUserDetails(request BatchGetExternalUserDetailsRequest) ([]ExternalUserForBatch, error) {
 	accessToken, err := r.GetAccessToken()
 	if err != nil {
-		return nil, "", err
+		return nil, err
 	}
 	var response []byte
 	jsonData, err := json.Marshal(request)
 	if err != nil {
-		return nil, "", err
+		return nil, err
 	}
 	response, err = util.HTTPPost(fmt.Sprintf("%s?access_token=%v", fetchBatchExternalContactUserDetailURL, accessToken), string(jsonData))
 	if err != nil {
-		return nil, "", err
+		return nil, err
 	}
 	var result ExternalUserDetailListResponse
 	err = util.DecodeWithError(response, &result, "BatchGetExternalUserDetails")
-	return result.ExternalContactList, result.NextCursor, err
+	if err != nil {
+		return nil, err
+	}
+	return result.ExternalContactList, nil
 }
 
 // UpdateUserRemarkRequest 修改客户备注信息请求体
@@ -297,8 +265,10 @@ func (r *Client) ListCustomerStrategy(req *ListCustomerStrategyRequest) (*ListCu
 		return nil, err
 	}
 	result := &ListCustomerStrategyResponse{}
-	err = util.DecodeWithError(response, result, "ListCustomerStrategy")
-	return result, err
+	if err = util.DecodeWithError(response, result, "ListCustomerStrategy"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 // GetCustomerStrategyRequest 获取规则组详情请求
@@ -362,8 +332,10 @@ func (r *Client) GetCustomerStrategy(req *GetCustomerStrategyRequest) (*GetCusto
 		return nil, err
 	}
 	result := &GetCustomerStrategyResponse{}
-	err = util.DecodeWithError(response, result, "GetCustomerStrategy")
-	return result, err
+	if err = util.DecodeWithError(response, result, "GetCustomerStrategy"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 // GetRangeCustomerStrategyRequest 获取规则组管理范围请求
@@ -402,8 +374,10 @@ func (r *Client) GetRangeCustomerStrategy(req *GetRangeCustomerStrategyRequest)
 		return nil, err
 	}
 	result := &GetRangeCustomerStrategyResponse{}
-	err = util.DecodeWithError(response, result, "GetRangeCustomerStrategy")
-	return result, err
+	if err = util.DecodeWithError(response, result, "GetRangeCustomerStrategy"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 // CreateCustomerStrategyRequest 创建新的规则组请求
@@ -436,8 +410,10 @@ func (r *Client) CreateCustomerStrategy(req *CreateCustomerStrategyRequest) (*Cr
 		return nil, err
 	}
 	result := &CreateCustomerStrategyResponse{}
-	err = util.DecodeWithError(response, result, "CreateCustomerStrategy")
-	return result, err
+	if err = util.DecodeWithError(response, result, "CreateCustomerStrategy"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 // EditCustomerStrategyRequest 编辑规则组及其管理范围请求

work/externalcontact/follow_user.go

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

work/externalcontact/groupchat.go

@@ -44,8 +44,10 @@ func (r *Client) GetGroupChatList(req *GroupChatListRequest) (*GroupChatListResp
 		return nil, err
 	}
 	result := &GroupChatListResponse{}
-	err = util.DecodeWithError(response, result, "GetGroupChatList")
-	return result, err
+	if err = util.DecodeWithError(response, result, "GetGroupChatList"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -68,7 +70,6 @@ type (
 		GroupNickname string  `json:"group_nickname"`    //在群里的昵称
 		Name          string  `json:"name"`              //名字。仅当 need_name = 1 时返回 如果是微信用户，则返回其在微信中设置的名字 如果是企业微信联系人，则返回其设置对外展示的别名或实名
 		UnionID       string  `json:"unionid,omitempty"` //外部联系人在微信开放平台的唯一身份标识（微信unionid），通过此字段企业可将外部联系人与公众号/小程序用户关联起来。仅当群成员类型是微信用户（包括企业成员未添加好友），且企业绑定了微信开发者ID有此字段（查看绑定方法）。第三方不可获取，上游企业不可获取下游企业客户的unionid字段
-		State         string  `json:"state,omitempty"`   //如果在配置入群方式时，配置了state参数，那么在获取客户群详情时，通过该方式入群的成员，会额外获取到相应的state参数
 	}
 	//GroupChatAdmin 群管理员
 	GroupChatAdmin struct {
@@ -76,14 +77,13 @@ type (
 	}
 	//GroupChat 客户群详情
 	GroupChat struct {
-		ChatID        string            `json:"chat_id"`        //客户群ID
-		Name          string            `json:"name"`           //群名
-		Owner         string            `json:"owner"`          //群主ID
-		CreateTime    int64             `json:"create_time"`    //群的创建时间
-		Notice        string            `json:"notice"`         //群公告
-		MemberList    []GroupChatMember `json:"member_list"`    //群成员列表
-		AdminList     []GroupChatAdmin  `json:"admin_list"`     //群管理员列表
-		MemberVersion string            `json:"member_version"` //当前群成员版本号。可以配合客户群变更事件减少主动调用本接口的次数
+		ChatID     string            `json:"chat_id"`     //客户群ID
+		Name       string            `json:"name"`        //群名
+		Owner      string            `json:"owner"`       //群主ID
+		CreateTime int64             `json:"create_time"` //群的创建时间
+		Notice     string            `json:"notice"`      //群公告
+		MemberList []GroupChatMember `json:"member_list"` //群成员列表
+		AdminList  []GroupChatAdmin  `json:"admin_list"`  //群管理员列表
 	}
 	//GroupChatDetailResponse 客户群详情 返回值
 	GroupChatDetailResponse struct {
@@ -105,8 +105,10 @@ func (r *Client) GetGroupChatDetail(req *GroupChatDetailRequest) (*GroupChatDeta
 		return nil, err
 	}
 	result := &GroupChatDetailResponse{}
-	err = util.DecodeWithError(response, result, "GetGroupChatDetail")
-	return result, err
+	if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -134,6 +136,8 @@ func (r *Client) OpengIDToChatID(req *OpengIDToChatIDRequest) (*OpengIDToChatIDR
 		return nil, err
 	}
 	result := &OpengIDToChatIDResponse{}
-	err = util.DecodeWithError(response, result, "GetGroupChatDetail")
-	return result, err
+	if err = util.DecodeWithError(response, result, "GetGroupChatDetail"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }

work/externalcontact/join_way.go

@@ -44,8 +44,10 @@ func (r *Client) AddJoinWay(req *AddJoinWayRequest) (*AddJoinWayResponse, error)
 		return nil, err
 	}
 	result := &AddJoinWayResponse{}
-	err = util.DecodeWithError(response, result, "AddJoinWay")
-	return result, err
+	if err = util.DecodeWithError(response, result, "AddJoinWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 type (
@@ -89,8 +91,10 @@ func (r *Client) GetJoinWay(req *JoinWayConfigRequest) (*GetJoinWayResponse, err
 		return nil, err
 	}
 	result := &GetJoinWayResponse{}
-	err = util.DecodeWithError(response, result, "GetJoinWay")
-	return result, err
+	if err = util.DecodeWithError(response, result, "GetJoinWay"); err != nil {
+		return nil, err
+	}
+	return result, nil
 }
 
 // UpdateJoinWayRequest 更新群配置的请求参数

work/externalcontact/moment.go

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

work/externalcontact/msg.go

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

work/externalcontact/statistic.go

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

work/externalcontact/tag.go

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

work/externalcontact/transfer.go

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

work/invoice/invoice.go

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

work/jsapi/jsapi.go

@@ -1,75 +0,0 @@
-package jsapi
-
-import (
-	"fmt"
-
-	"github.com/silenceper/wechat/v2/credential"
-	"github.com/silenceper/wechat/v2/util"
-	"github.com/silenceper/wechat/v2/work/context"
-)
-
-// Js struct
-type Js struct {
-	*context.Context
-	jsTicket *credential.WorkJsTicket
-}
-
-// NewJs init
-func NewJs(context *context.Context) *Js {
-	js := new(Js)
-	js.Context = context
-	js.jsTicket = credential.NewWorkJsTicket(
-		context.Config.CorpID,
-		context.Config.AgentID,
-		credential.CacheKeyWorkPrefix,
-		context.Cache,
-	)
-	return js
-}
-
-// Config 返回给用户使用的配置
-type Config struct {
-	Timestamp int64  `json:"timestamp"`
-	NonceStr  string `json:"nonce_str"`
-	Signature string `json:"signature"`
-}
-
-// GetConfig 获取企业微信JS配置 https://developer.work.weixin.qq.com/document/path/90514
-func (js *Js) GetConfig(uri string) (config *Config, err error) {
-	config = new(Config)
-	var accessToken string
-	accessToken, err = js.GetAccessToken()
-	if err != nil {
-		return
-	}
-	var ticketStr string
-	ticketStr, err = js.jsTicket.GetTicket(accessToken, credential.TicketTypeCorpJs)
-	if err != nil {
-		return
-	}
-	config.NonceStr = util.RandomStr(16)
-	config.Timestamp = util.GetCurrTS()
-	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, config.NonceStr, config.Timestamp, uri)
-	config.Signature = util.Signature(str)
-	return
-}
-
-// GetAgentConfig 获取企业微信应用JS配置 https://developer.work.weixin.qq.com/document/path/94313
-func (js *Js) GetAgentConfig(uri string) (config *Config, err error) {
-	config = new(Config)
-	var accessToken string
-	accessToken, err = js.GetAccessToken()
-	if err != nil {
-		return
-	}
-	var ticketStr string
-	ticketStr, err = js.jsTicket.GetTicket(accessToken, credential.TicketTypeAgentJs)
-	if err != nil {
-		return
-	}
-	config.NonceStr = util.RandomStr(16)
-	config.Timestamp = util.GetCurrTS()
-	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, config.NonceStr, config.Timestamp, uri)
-	config.Signature = util.Signature(str)
-	return
-}

work/kf/account.go

@@ -33,7 +33,6 @@ type AccountAddSchema struct {
 }
 
 // AccountAdd 添加客服账号
-// see https://developer.work.weixin.qq.com/document/path/94662
 func (r *Client) AccountAdd(options AccountAddOptions) (info AccountAddSchema, err error) {
 	var (
 		accessToken string
@@ -60,7 +59,6 @@ type AccountDelOptions struct {
 }
 
 // AccountDel 删除客服账号
-// see https://developer.work.weixin.qq.com/document/path/94663
 func (r *Client) AccountDel(options AccountDelOptions) (info util.CommonError, err error) {
 	var (
 		accessToken string
@@ -88,8 +86,7 @@ type AccountUpdateOptions struct {
 	MediaID  string `json:"media_id"`  // 客服头像临时素材。可以调用上传临时素材接口获取, 不多于128个字节
 }
 
-// AccountUpdate 修改客服账号
-// see https://developer.work.weixin.qq.com/document/path/94664
+// AccountUpdate 修复客服账号
 func (r *Client) AccountUpdate(options AccountUpdateOptions) (info util.CommonError, err error) {
 	var (
 		accessToken string
@@ -112,10 +109,9 @@ func (r *Client) AccountUpdate(options AccountUpdateOptions) (info util.CommonEr
 
 // AccountInfoSchema 客服详情
 type AccountInfoSchema struct {
-	OpenKFID        string `json:"open_kfid"`        // 客服帐号ID
-	Name            string `json:"name"`             // 客服帐号名称
-	Avatar          string `json:"avatar"`           // 客服头像URL
-	ManagePrivilege bool   `json:"manage_privilege"` // 当前调用接口的应用身份，是否有该客服账号的管理权限（编辑客服账号信息、分配会话和收发消息）
+	OpenKFID string `json:"open_kfid"` // 客服帐号ID
+	Name     string `json:"name"`      // 客服帐号名称
+	Avatar   string `json:"avatar"`    // 客服头像URL
 }
 
 // AccountListSchema 获取客服账号列表响应内容
@@ -145,31 +141,6 @@ func (r *Client) AccountList() (info AccountListSchema, err error) {
 	return info, nil
 }
 
-// AccountPagingRequest 分页获取客服账号列表请求
-type AccountPagingRequest struct {
-	Offset int `json:"offset"`
-	Limit  int `json:"limit"`
-}
-
-// AccountPaging 分页获取客服账号列表
-// see https://developer.work.weixin.qq.com/document/path/94661
-func (r *Client) AccountPaging(req *AccountPagingRequest) (*AccountListSchema, error) {
-	var (
-		accessToken string
-		err         error
-	)
-	if accessToken, err = r.ctx.GetAccessToken(); err != nil {
-		return nil, err
-	}
-	var response []byte
-	if response, err = util.PostJSON(fmt.Sprintf(accountListAddr, accessToken), req); err != nil {
-		return nil, err
-	}
-	result := &AccountListSchema{}
-	err = util.DecodeWithError(response, result, "AccountPaging")
-	return result, err
-}
-
 // AddContactWayOptions 获取客服账号链接
 // 1.若scene非空，返回的客服链接开发者可拼接scene_param=SCENE_PARAM参数使用，用户进入会话事件会将SCENE_PARAM原样返回。其中SCENE_PARAM需要urlencode，且长度不能超过128字节。
 // 如 https://work.weixin.qq.com/kf/kfcbf8f8d07ac7215f?enc_scene=ENCGFSDF567DF&scene_param=a%3D1%26b%3D2
@@ -187,7 +158,6 @@ type AddContactWaySchema struct {
 }
 
 // AddContactWay 获取客服账号链接
-// see https://developer.work.weixin.qq.com/document/path/94665
 func (r *Client) AddContactWay(options AddContactWayOptions) (info AddContactWaySchema, err error) {
 	var (
 		accessToken string