fix #417: CouponFeed0 CouponFeed1 CouponFeed2字段映射失败 (#427)

This reverts commit 4433fc18a6.

.github/ISSUE_TEMPLATE/bug.md

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

.github/ISSUE_TEMPLATE/feature.md

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

.github/ISSUE_TEMPLATE/question.md

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

.github/workflows/go.yml

@@ -7,44 +7,38 @@ on:
     branches: [ master,release-* ]
 
 jobs:
+  golangci:
+    strategy:
+      matrix:
+        go-version: [1.15.x]
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.31
   build:
-    name: Build
+    name: Test
     runs-on: ubuntu-latest
     services:
       redis:
         image: redis
         ports:
-        - 6379:6379 
+        - 6379:6379
         options: --entrypoint redis-server
       memcached:
         image: memcached
         ports:
           - 11211:11211
     steps:
-
+      - uses: actions/checkout@v2
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
           go-version: ^1.13
         id: go
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-          if [ -f Gopkg.toml ]; then
-              curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-              dep ensure
-          fi
-
-      - name: Lint Go Code
-        run: |
-          export PATH=$PATH:$(go env GOPATH)/bin # temporary fix. See https://github.com/actions/setup-go/issues/14
-          go get -u golang.org/x/lint/golint
-          go vet ./...
-          golint -set_exit_status $(go list ./...)
-
       - name: Test
         run: go test -v -race ./...

.gitignore

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

.golangci.yml

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

.travis.yml

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

README.md

@@ -1,12 +1,21 @@
 # WeChat SDK for Go
-[![Build Status](https://travis-ci.org/silenceper/wechat.svg?branch=release-2.0)](https://travis-ci.org/silenceper/wechat)
+![Go](https://github.com/silenceper/wechat/workflows/Go/badge.svg?branch=release-2.0)
 [![Go Report Card](https://goreportcard.com/badge/github.com/silenceper/wechat)](https://goreportcard.com/report/github.com/silenceper/wechat)
-[![GoDoc](http://godoc.org/github.com/silenceper/wechat?status.svg)](http://godoc.org/github.com/silenceper/wechat)
+[![pkg](https://img.shields.io/badge/dev-reference-007d9c?logo=go&logoColor=white&style=flat)](https://pkg.go.dev/github.com/silenceper/wechat/v2?tab=doc)
 
 使用Golang开发的微信SDK，简单、易用。
+>当前版本为v2版本
 
 
+## 文档 && 例子
+[Wechat SDK 2.0 文档](https://silenceper.com/wechat)
+
+[Wechat SDK 2.0 例子](https://github.com/gowechat/example)
+
 ## 快速开始
+```
+import "github.com/silenceper/wechat/v2"
+```
 
 以下是一个微信公众号处理消息接收以及回复的例子：
 
@@ -26,7 +35,7 @@ officialAccount := wc.GetOfficialAccount(cfg)
 // 传入request和responseWriter
 server := officialAccount.GetServer(req, rw)
 //设置接收消息的处理方法
-server.SetMessageHandler(func(msg message.MixMessage) *message.Reply {
+server.SetMessageHandler(func(msg *message.MixMessage) *message.Reply {
 
     //回复消息：演示回复用户发送的消息
     text := message.NewText(msg.Content)
@@ -44,23 +53,21 @@ server.Send()
 
 ```
 
-## 文档
-[Wechat SDK 2.0 文档](http://silenceper.com/wechat)
-
-
 ## 目录说明
 - officialaccount: 微信公众号API
 - miniprogram: 小程序API
 - minigame:小游戏API
 - pay:微信支付API
-- opernplatform:开放平台API
+- openplatform:开放平台API
 - work:企业微信
 - aispeech:智能对话
 
-## 如何贡献
+## 贡献
 - 提交issue，描述需要贡献的内容
 - 完成更改后，提交PR
 
+## 公众号
+![img](https://silenceper.oss-cn-beijing.aliyuncs.com/qrcode/search_study_program.png)
 
 ## License
 

cache/cache.go

@@ -2,7 +2,7 @@ package cache
 
 import "time"
 
-//Cache interface
+// Cache interface
 type Cache interface {
 	Get(key string) interface{}
 	Set(key string, val interface{}, timeout time.Duration) error

cache/memcache.go

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

cache/memcache_test.go

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

cache/memory.go

@@ -62,13 +62,13 @@ func (mem *Memory) Set(key string, val interface{}, timeout time.Duration) (err
 
 //Delete delete value in memcache.
 func (mem *Memory) Delete(key string) error {
-	return mem.deleteKey(key)
+	mem.deleteKey(key)
+	return nil
 }
 
 // deleteKey
-func (mem *Memory) deleteKey(key string) error {
+func (mem *Memory) deleteKey(key string) {
 	mem.Lock()
 	defer mem.Unlock()
 	delete(mem.data, key)
-	return nil
 }

cache/redis.go

@@ -19,7 +19,7 @@ type RedisOpts struct {
 	Database    int    `yml:"database" json:"database"`
 	MaxIdle     int    `yml:"max_idle" json:"max_idle"`
 	MaxActive   int    `yml:"max_active" json:"max_active"`
-	IdleTimeout int32  `yml:"idle_timeout" json:"idle_timeout"` //second
+	IdleTimeout int    `yml:"idle_timeout" json:"idle_timeout"` //second
 }
 
 //NewRedis 实例化
@@ -45,6 +45,11 @@ func NewRedis(opts *RedisOpts) *Redis {
 	return &Redis{pool}
 }
 
+//SetRedisPool 设置redis连接池
+func (r *Redis) SetRedisPool(pool *redis.Pool) {
+	r.conn = pool
+}
+
 //SetConn 设置conn
 func (r *Redis) SetConn(conn *redis.Pool) {
 	r.conn = conn
@@ -90,10 +95,7 @@ func (r *Redis) IsExist(key string) bool {
 
 	a, _ := conn.Do("EXISTS", key)
 	i := a.(int64)
-	if i > 0 {
-		return true
-	}
-	return false
+	return i > 0
 }
 
 //Delete 删除

cache/redis_test.go

@@ -10,6 +10,7 @@ func TestRedis(t *testing.T) {
 		Host: "127.0.0.1:6379",
 	}
 	redis := NewRedis(opts)
+	redis.SetConn(redis.conn)
 	var err error
 	timeoutDuration := 1 * time.Second
 

credential/access_token.go

@@ -0,0 +1,6 @@
+package credential
+
+//AccessTokenHandle AccessToken 接口
+type AccessTokenHandle interface {
+	GetAccessToken() (accessToken string, err error)
+}

credential/default_access_token.go

@@ -0,0 +1,153 @@
+package credential
+
+import (
+	"encoding/json"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/silenceper/wechat/v2/cache"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	//AccessTokenURL 获取access_token的接口
+	accessTokenURL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"
+	//AccessTokenURL 企业微信获取access_token的接口
+	workAccessTokenURL = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid=%s&corpsecret=%s"
+	//CacheKeyOfficialAccountPrefix 微信公众号cache key前缀
+	CacheKeyOfficialAccountPrefix = "gowechat_officialaccount_"
+	//CacheKeyMiniProgramPrefix 小程序cache key前缀
+	CacheKeyMiniProgramPrefix = "gowechat_miniprogram_"
+	//CacheKeyWorkPrefix 企业微信cache key前缀
+	CacheKeyWorkPrefix = "gowechat_work_"
+)
+
+//DefaultAccessToken 默认AccessToken 获取
+type DefaultAccessToken struct {
+	appID           string
+	appSecret       string
+	cacheKeyPrefix  string
+	cache           cache.Cache
+	accessTokenLock *sync.Mutex
+}
+
+//NewDefaultAccessToken new DefaultAccessToken
+func NewDefaultAccessToken(appID, appSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenHandle {
+	if cache == nil {
+		panic("cache is ineed")
+	}
+	return &DefaultAccessToken{
+		appID:           appID,
+		appSecret:       appSecret,
+		cache:           cache,
+		cacheKeyPrefix:  cacheKeyPrefix,
+		accessTokenLock: new(sync.Mutex),
+	}
+}
+
+//ResAccessToken struct
+type ResAccessToken struct {
+	util.CommonError
+
+	AccessToken string `json:"access_token"`
+	ExpiresIn   int64  `json:"expires_in"`
+}
+
+//GetAccessToken 获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *DefaultAccessToken) GetAccessToken() (accessToken string, err error) {
+	//加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
+	ak.accessTokenLock.Lock()
+	defer ak.accessTokenLock.Unlock()
+
+	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.appID)
+	val := ak.cache.Get(accessTokenCacheKey)
+	if val != nil {
+		accessToken = val.(string)
+		return
+	}
+
+	//cache失效，从微信服务器获取
+	var resAccessToken ResAccessToken
+	resAccessToken, err = GetTokenFromServer(fmt.Sprintf(accessTokenURL, ak.appID, ak.appSecret))
+	if err != nil {
+		return
+	}
+
+	expires := resAccessToken.ExpiresIn - 1500
+	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
+	if err != nil {
+		return
+	}
+	accessToken = resAccessToken.AccessToken
+	return
+}
+
+//WorkAccessToken 企业微信AccessToken 获取
+type WorkAccessToken struct {
+	CorpID          string
+	CorpSecret      string
+	cacheKeyPrefix  string
+	cache           cache.Cache
+	accessTokenLock *sync.Mutex
+}
+
+//NewWorkAccessToken new WorkAccessToken
+func NewWorkAccessToken(corpID, corpSecret, cacheKeyPrefix string, cache cache.Cache) AccessTokenHandle {
+	if cache == nil {
+		panic("cache the not exist")
+	}
+	return &WorkAccessToken{
+		CorpID:          corpID,
+		CorpSecret:      corpSecret,
+		cache:           cache,
+		cacheKeyPrefix:  cacheKeyPrefix,
+		accessTokenLock: new(sync.Mutex),
+	}
+}
+
+//GetAccessToken 企业微信获取access_token,先从cache中获取，没有则从服务端获取
+func (ak *WorkAccessToken) GetAccessToken() (accessToken string, err error) {
+	//加上lock，是为了防止在并发获取token时，cache刚好失效，导致从微信服务器上获取到不同token
+	ak.accessTokenLock.Lock()
+	defer ak.accessTokenLock.Unlock()
+	accessTokenCacheKey := fmt.Sprintf("%s_access_token_%s", ak.cacheKeyPrefix, ak.CorpID)
+	val := ak.cache.Get(accessTokenCacheKey)
+	if val != nil {
+		accessToken = val.(string)
+		return
+	}
+
+	//cache失效，从微信服务器获取
+	var resAccessToken ResAccessToken
+	resAccessToken, err = GetTokenFromServer(fmt.Sprintf(workAccessTokenURL, ak.CorpID, ak.CorpSecret))
+	if err != nil {
+		return
+	}
+
+	expires := resAccessToken.ExpiresIn - 1500
+	err = ak.cache.Set(accessTokenCacheKey, resAccessToken.AccessToken, time.Duration(expires)*time.Second)
+	if err != nil {
+		return
+	}
+	accessToken = resAccessToken.AccessToken
+	return
+}
+
+//GetTokenFromServer 强制从微信服务器获取token
+func GetTokenFromServer(url string) (resAccessToken ResAccessToken, err error) {
+	var body []byte
+	body, err = util.HTTPGet(url)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(body, &resAccessToken)
+	if err != nil {
+		return
+	}
+	if resAccessToken.ErrCode != 0 {
+		err = fmt.Errorf("get access_token error : errcode=%v , errormsg=%v", resAccessToken.ErrCode, resAccessToken.ErrMsg)
+		return
+	}
+	return
+}

credential/default_access_token_test.go

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

credential/default_js_ticket.go

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

credential/js_ticket.go

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

go.mod

@@ -5,8 +5,14 @@ go 1.14
 require (
 	github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
 	github.com/fatih/structs v1.1.0
-	github.com/gomodule/redigo v1.8.1
-	github.com/sirupsen/logrus v1.6.0
+	github.com/gomodule/redigo v1.8.4
+	github.com/kr/text v0.2.0 // indirect
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cast v1.3.1
-	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
+	github.com/stretchr/testify v1.7.0
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
+	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	gopkg.in/h2non/gock.v1 v1.0.15
 )

go.sum

@@ -1,33 +1,49 @@
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b h1:L/QXpzIa3pOvUGt1D1lA5KjYhPBAN/3iWdP7xeFS9F0=
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/gomodule/redigo v1.8.1 h1:Abmo0bI7Xf0IhdIPc7HZQzZcShdnmxeoVuDDtIQp8N8=
-github.com/gomodule/redigo v1.8.1/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/gomodule/redigo v1.8.4 h1:Z5JUg94HMTR1XpwBaSH4vq3+PNSIykBLxMdglbw10gg=
+github.com/gomodule/redigo v1.8.4/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
+github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2ePZzZTUrRacwib7cNsYQ=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
+golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/h2non/gock.v1 v1.0.15 h1:SzLqcIlb/fDfg7UvukMpNcWsu7sI5tWwL+KCATZqks0=
+gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

miniprogram/analysis/analysis.go

@@ -125,7 +125,7 @@ func (analysis *Analysis) GetAnalysisDailySummary(beginDate, endDate string) (re
 	if err != nil {
 		return
 	}
-	fmt.Println(string(response))
+
 	err = json.Unmarshal(response, &result)
 	if err != nil {
 		return

miniprogram/basic/basic.go

@@ -1,15 +0,0 @@
-package basic
-
-import "github.com/silenceper/wechat/v2/miniprogram/context"
-
-//Basic struct
-type Basic struct {
-	*context.Context
-}
-
-//NewBasic 实例
-func NewBasic(context *context.Context) *Basic {
-	basic := new(Basic)
-	basic.Context = context
-	return basic
-}

miniprogram/config/config.go

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

miniprogram/content/content.go

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

miniprogram/context/access_token.go

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

miniprogram/context/context.go

@@ -1,18 +1,12 @@
 package context
 
 import (
-	"sync"
-
+	"github.com/silenceper/wechat/v2/credential"
 	"github.com/silenceper/wechat/v2/miniprogram/config"
 )
 
 // Context struct
 type Context struct {
 	*config.Config
-
-	//accessTokenLock 读写锁 同一个AppID一个
-	accessTokenLock *sync.RWMutex
-
-	//accessTokenFunc 自定义获取 access token 的方法
-	accessTokenFunc GetAccessTokenFunc
+	credential.AccessTokenHandle
 }

miniprogram/encryptor/encryptor.go

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

miniprogram/message/consts.go

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

miniprogram/message/customer_message.go

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

miniprogram/miniprogram.go

@@ -1,15 +1,18 @@
 package miniprogram
 
 import (
-	"sync"
-
+	"github.com/silenceper/wechat/v2/credential"
 	"github.com/silenceper/wechat/v2/miniprogram/analysis"
 	"github.com/silenceper/wechat/v2/miniprogram/auth"
-	"github.com/silenceper/wechat/v2/miniprogram/basic"
 	"github.com/silenceper/wechat/v2/miniprogram/config"
+	"github.com/silenceper/wechat/v2/miniprogram/content"
 	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/miniprogram/encryptor"
+	"github.com/silenceper/wechat/v2/miniprogram/message"
 	"github.com/silenceper/wechat/v2/miniprogram/qrcode"
+	"github.com/silenceper/wechat/v2/miniprogram/subscribe"
 	"github.com/silenceper/wechat/v2/miniprogram/tcb"
+	"github.com/silenceper/wechat/v2/miniprogram/werun"
 )
 
 //MiniProgram 微信小程序相关API
@@ -19,24 +22,27 @@ type MiniProgram struct {
 
 //NewMiniProgram 实例化小程序API
 func NewMiniProgram(cfg *config.Config) *MiniProgram {
-	if cfg.Cache == nil {
-		panic("cache未设置")
-	}
+	defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyMiniProgramPrefix, cfg.Cache)
 	ctx := &context.Context{
-		Config: cfg,
+		Config:            cfg,
+		AccessTokenHandle: defaultAkHandle,
 	}
-	ctx.SetAccessTokenLock(new(sync.RWMutex))
 	return &MiniProgram{ctx}
 }
 
+//SetAccessTokenHandle 自定义access_token获取方式
+func (miniProgram *MiniProgram) SetAccessTokenHandle(accessTokenHandle credential.AccessTokenHandle) {
+	miniProgram.ctx.AccessTokenHandle = accessTokenHandle
+}
+
 // GetContext get Context
 func (miniProgram *MiniProgram) GetContext() *context.Context {
 	return miniProgram.ctx
 }
 
-// GetBasic  基础接口(小程序加解密)
-func (miniProgram *MiniProgram) GetBasic() *basic.Basic {
-	return basic.NewBasic(miniProgram.ctx)
+// GetEncryptor  小程序加解密
+func (miniProgram *MiniProgram) GetEncryptor() *encryptor.Encryptor {
+	return encryptor.NewEncryptor(miniProgram.ctx)
 }
 
 //GetAuth 登录/用户信息相关接口
@@ -58,3 +64,23 @@ func (miniProgram *MiniProgram) GetQRCode() *qrcode.QRCode {
 func (miniProgram *MiniProgram) GetTcb() *tcb.Tcb {
 	return tcb.NewTcb(miniProgram.ctx)
 }
+
+//GetSubscribe 小程序订阅消息
+func (miniProgram *MiniProgram) GetSubscribe() *subscribe.Subscribe {
+	return subscribe.NewSubscribe(miniProgram.ctx)
+}
+
+// GetCustomerMessage 客服消息接口
+func (miniProgram *MiniProgram) GetCustomerMessage() *message.Manager {
+	return message.NewCustomerMessageManager(miniProgram.ctx)
+}
+
+// GetWeRun 微信运动接口
+func (miniProgram *MiniProgram) GetWeRun() *werun.WeRun {
+	return werun.NewWeRun(miniProgram.ctx)
+}
+
+// GetContentSecurity 内容安全接口
+func (miniProgram *MiniProgram) GetContentSecurity() *content.Content {
+	return content.NewContent(miniProgram.ctx)
+}

miniprogram/qrcode/qrcode.go

@@ -74,15 +74,13 @@ func (qrCode *QRCode) fetchCode(urlStr string, body interface{}) (response []byt
 			err = fmt.Errorf("fetchCode error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
 			return nil, err
 		}
-	} else if contentType == "image/jpeg" {
+	}
+	if contentType == "image/jpeg" {
 		// 返回文件
 		return response, nil
-	} else {
-		err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
-		return nil, err
 	}
-
-	return
+	err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
+	return nil, err
 }
 
 // CreateWXAQRCode 获取小程序二维码，适用于需要的码数量较少的业务场景

miniprogram/subscribe/subscribe.go

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

miniprogram/tcb/README.md

@@ -29,4 +29,4 @@ if err != nil {
 }
 ```
 
-更多使用方法参考[GODOC](https://godoc.org/github.com/silenceper/wechat/v2/tcb)
+更多使用方法参考[PKG.DEV](https://pkg.go.dev/github.com/silenceper/wechat/v2/miniprogram/tcb)

miniprogram/tcb/file.go

@@ -130,5 +130,5 @@ func (tcb *Tcb) BatchDeleteFile(env string, fileIDList []string) (*BatchDeleteFi
 	}
 	batchDeleteFileRes := &BatchDeleteFileRes{}
 	err = util.DecodeWithError(response, batchDeleteFileRes, "BatchDeleteFile")
-	return batchDeleteFileRes, nil
+	return batchDeleteFileRes, err
 }

miniprogram/werun/werun.go

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

officialaccount/basic/basic.go

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

officialaccount/basic/qr.go

@@ -62,6 +62,11 @@ func (basic *Basic) GetQRTicket(tq *Request) (t *Ticket, err error) {
 		return
 	}
 
+	if t.ErrMsg != "" {
+		err = fmt.Errorf("get qr_ticket error : errcode=%v , errormsg=%v", t.ErrCode, t.ErrMsg)
+		return
+	}
+
 	return
 }
 

officialaccount/basic/short_url.go

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

officialaccount/broadcast/broadcast.go

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

officialaccount/config/config.go

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

officialaccount/context/access_token.go

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

officialaccount/context/context.go

@@ -1,31 +1,12 @@
 package context
 
 import (
-	"sync"
-
+	"github.com/silenceper/wechat/v2/credential"
 	"github.com/silenceper/wechat/v2/officialaccount/config"
 )
 
 // Context struct
 type Context struct {
 	*config.Config
-
-	//accessTokenLock 读写锁 同一个AppID一个
-	accessTokenLock *sync.RWMutex
-
-	//jsAPITicket 读写锁 同一个AppID一个
-	jsAPITicketLock *sync.RWMutex
-
-	//accessTokenFunc 自定义获取 access token 的方法
-	accessTokenFunc GetAccessTokenFunc
-}
-
-// SetJsAPITicketLock 设置jsAPITicket的lock
-func (ctx *Context) SetJsAPITicketLock(lock *sync.RWMutex) {
-	ctx.jsAPITicketLock = lock
-}
-
-// GetJsAPITicketLock 获取jsAPITicket 的lock
-func (ctx *Context) GetJsAPITicketLock() *sync.RWMutex {
-	return ctx.jsAPITicketLock
+	credential.AccessTokenHandle
 }

officialaccount/datacube/broadcast.go

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

officialaccount/datacube/datacube.go

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

officialaccount/datacube/interface.go

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

officialaccount/datacube/message.go

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

officialaccount/datacube/publisher.go

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

officialaccount/datacube/user.go

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

officialaccount/device/authorize.go

@@ -1,3 +1,4 @@
+//Package device 设备相关接口
 package device
 
 import (
@@ -41,7 +42,7 @@ type ReqDevice struct {
 	//	ble – 3
 	//	wifi -- 4
 	//	一个设备可以支持多种连接类型，用符号"|"做分割，客户端优先选择靠前的连接方式（优先级按|关系的排序依次降低），举例：
-	//	1：表示设备仅支持andiod classic bluetooth 1|2：表示设备支持andiod 和ios 两种classic bluetooth，但是客户端优先选择andriod classic bluetooth 协议，如果andriod classic bluetooth协议连接失败，再选择ios classic bluetooth协议进行连接
+	//	1：表示设备仅支持andiod classic bluetooth 1|2：表示设备支持android 和ios 两种classic bluetooth，但是客户端优先选择android classic bluetooth 协议，如果android classic bluetooth协议连接失败，再选择ios classic bluetooth协议进行连接
 	//	（注：安卓平台不同时支持BLE和classic类型）
 	ConnectProtocol string `json:"connect_protocol"`
 	//auth及通信的加密key，第三方需要将key烧制在设备上（128bit），格式采用16进制串的方式（长度为32字节），不需要0X前缀，如： 1234567890ABCDEF1234567890ABCDEF
@@ -56,7 +57,7 @@ type ReqDevice struct {
 	// 0：不加密的version
 	// 1：version 1
 	AuthVer string `json:"auth_ver"`
-	// 表示mac地址在厂商广播manufature data里含有mac地址的偏移，取值如下：
+	// 表示mac地址在厂商广播manufacture data里含有mac地址的偏移，取值如下：
 	// -1：在尾部、
 	// -2：表示不包含mac地址 其他：非法偏移
 	ManuMacPos string `json:"manu_mac_pos"`

officialaccount/device/qrcode.go

@@ -60,7 +60,7 @@ func (d *Device) VerifyQRCode(ticket string) (res ResVerifyQRCode, err error) {
 	req := map[string]interface{}{
 		"ticket": ticket,
 	}
-	fmt.Println(req)
+
 	var response []byte
 	if response, err = util.PostJSON(uri, req); err != nil {
 		return

officialaccount/js/js.go

@@ -1,19 +1,17 @@
 package js
 
 import (
-	"encoding/json"
 	"fmt"
-	"time"
 
+	"github.com/silenceper/wechat/v2/credential"
 	"github.com/silenceper/wechat/v2/officialaccount/context"
 	"github.com/silenceper/wechat/v2/util"
 )
 
-const getTicketURL = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=%s&type=jsapi"
-
 // Js struct
 type Js struct {
 	*context.Context
+	credential.JsTicketHandle
 }
 
 // Config 返回给用户jssdk配置信息
@@ -24,33 +22,37 @@ type Config struct {
 	Signature string `json:"signature"`
 }
 
-// resTicket 请求jsapi_tikcet返回结果
-type resTicket struct {
-	util.CommonError
-
-	Ticket    string `json:"ticket"`
-	ExpiresIn int64  `json:"expires_in"`
-}
-
 //NewJs init
 func NewJs(context *context.Context) *Js {
 	js := new(Js)
 	js.Context = context
+	jsTicketHandle := credential.NewDefaultJsTicket(context.AppID, credential.CacheKeyOfficialAccountPrefix, context.Cache)
+	js.SetJsTicketHandle(jsTicketHandle)
 	return js
 }
 
+//SetJsTicketHandle 自定义js ticket取值方式
+func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
+	js.JsTicketHandle = ticketHandle
+}
+
 //GetConfig 获取jssdk需要的配置参数
 //uri 为当前网页地址
 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.GetTicket()
+	ticketStr, err = js.GetTicket(accessToken)
 	if err != nil {
 		return
 	}
 
 	nonceStr := util.RandomStr(16)
-	timestamp := util.GetCurrTs()
+	timestamp := util.GetCurrTS()
 	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
 	sigStr := util.Signature(str)
 
@@ -60,50 +62,3 @@ func (js *Js) GetConfig(uri string) (config *Config, err error) {
 	config.Signature = sigStr
 	return
 }
-
-//GetTicket 获取jsapi_ticket
-func (js *Js) GetTicket() (ticketStr string, err error) {
-	js.GetJsAPITicketLock().Lock()
-	defer js.GetJsAPITicketLock().Unlock()
-
-	//先从cache中取
-	jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", context.CacheKeyPrefix, js.AppID)
-	val := js.Cache.Get(jsAPITicketCacheKey)
-	if val != nil {
-		ticketStr = val.(string)
-		return
-	}
-	var ticket resTicket
-	ticket, err = js.getTicketFromServer()
-	if err != nil {
-		return
-	}
-	ticketStr = ticket.Ticket
-	return
-}
-
-//getTicketFromServer 强制从服务器中获取ticket
-func (js *Js) getTicketFromServer() (ticket resTicket, err error) {
-	var accessToken string
-	accessToken, err = js.GetAccessToken()
-	if err != nil {
-		return
-	}
-
-	var response []byte
-	url := fmt.Sprintf(getTicketURL, accessToken)
-	response, err = util.HTTPGet(url)
-	err = json.Unmarshal(response, &ticket)
-	if err != nil {
-		return
-	}
-	if ticket.ErrCode != 0 {
-		err = fmt.Errorf("getTicket Error : errcode=%d , errmsg=%s", ticket.ErrCode, ticket.ErrMsg)
-		return
-	}
-
-	jsAPITicketCacheKey := fmt.Sprintf("%s_jsapi_ticket_%s", context.CacheKeyPrefix, js.AppID)
-	expires := ticket.ExpiresIn - 1500
-	err = js.Cache.Set(jsAPITicketCacheKey, ticket.Ticket, time.Duration(expires)*time.Second)
-	return
-}

officialaccount/material/material.go

@@ -10,10 +10,27 @@ import (
 )
 
 const (
-	addNewsURL     = "https://api.weixin.qq.com/cgi-bin/material/add_news"
-	addMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/add_material"
-	delMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/del_material"
-	getMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/get_material"
+	addNewsURL          = "https://api.weixin.qq.com/cgi-bin/material/add_news"
+	updateNewsURL       = "https://api.weixin.qq.com/cgi-bin/material/update_news"
+	addMaterialURL      = "https://api.weixin.qq.com/cgi-bin/material/add_material"
+	delMaterialURL      = "https://api.weixin.qq.com/cgi-bin/material/del_material"
+	getMaterialURL      = "https://api.weixin.qq.com/cgi-bin/material/get_material"
+	getMaterialCountURL = "https://api.weixin.qq.com/cgi-bin/material/get_materialcount"
+	batchGetMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/batchget_material"
+)
+
+//PermanentMaterialType 永久素材类型
+type PermanentMaterialType string
+
+const (
+	//PermanentMaterialTypeImage 永久素材图片类型（image）
+	PermanentMaterialTypeImage PermanentMaterialType = "image"
+	//PermanentMaterialTypeVideo 永久素材视频类型（video）
+	PermanentMaterialTypeVideo PermanentMaterialType = "video"
+	//PermanentMaterialTypeVoice 永久素材语音类型 （voice）
+	PermanentMaterialTypeVoice PermanentMaterialType = "voice"
+	//PermanentMaterialTypeNews 永久素材图文类型（news）
+	PermanentMaterialTypeNews PermanentMaterialType = "news"
 )
 
 //Material 素材管理
@@ -55,6 +72,9 @@ func (material *Material) GetNews(id string) ([]*Article, error) {
 	}
 	req.MediaID = id
 	responseBytes, err := util.PostJSON(uri, req)
+	if err != nil {
+		return nil, err
+	}
 
 	var res struct {
 		NewsItem []*Article `json:"news_item"`
@@ -91,15 +111,47 @@ func (material *Material) AddNews(articles []*Article) (mediaID string, err erro
 
 	uri := fmt.Sprintf("%s?access_token=%s", addNewsURL, accessToken)
 	responseBytes, err := util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
 	var res resArticles
 	err = json.Unmarshal(responseBytes, &res)
 	if err != nil {
 		return
 	}
+	if res.ErrCode != 0 {
+		return "", fmt.Errorf("errcode=%d,errmsg=%s", res.ErrCode, res.ErrMsg)
+	}
 	mediaID = res.MediaID
 	return
 }
 
+//reqUpdateArticle 更新永久性图文素材请求信息
+type reqUpdateArticle struct {
+	MediaID  string   `json:"media_id"`
+	Index    int64    `json:"index"`
+	Articles *Article `json:"articles"`
+}
+
+// UpdateNews 更新永久图文素材
+func (material *Material) UpdateNews(article *Article, mediaID string, index int64) (err error) {
+	req := &reqUpdateArticle{mediaID, index, article}
+
+	var accessToken string
+	accessToken, err = material.GetAccessToken()
+	if err != nil {
+		return
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", updateNewsURL, accessToken)
+	var response []byte
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(response, "UpdateNews")
+}
+
 //resAddMaterial 永久性素材上传返回的结果
 type resAddMaterial struct {
 	util.CommonError
@@ -112,6 +164,7 @@ type resAddMaterial struct {
 func (material *Material) AddMaterial(mediaType MediaType, filename string) (mediaID string, url string, err error) {
 	if mediaType == MediaTypeVideo {
 		err = errors.New("永久视频素材上传使用 AddVideo 方法")
+		return
 	}
 	var accessToken string
 	accessToken, err = material.GetAccessToken()
@@ -216,3 +269,86 @@ func (material *Material) DeleteMaterial(mediaID string) error {
 
 	return util.DecodeWithCommonError(response, "DeleteMaterial")
 }
+
+//ArticleList 永久素材列表
+type ArticleList struct {
+	util.CommonError
+	TotalCount int64             `json:"total_count"`
+	ItemCount  int64             `json:"item_count"`
+	Item       []ArticleListItem `json:"item"`
+}
+
+//ArticleListItem 用于ArticleList的item节点
+type ArticleListItem struct {
+	MediaID    string             `json:"media_id"`
+	Content    ArticleListContent `json:"content"`
+	Name       string             `json:"name"`
+	URL        string             `json:"url"`
+	UpdateTime int64              `json:"update_time"`
+}
+
+//ArticleListContent 用于ArticleListItem的content节点
+type ArticleListContent struct {
+	NewsItem   []Article `json:"news_item"`
+	UpdateTime int64     `json:"update_time"`
+	CreateTime int64     `json:"create_time"`
+}
+
+//reqBatchGetMaterial BatchGetMaterial请求参数
+type reqBatchGetMaterial struct {
+	Type   PermanentMaterialType `json:"type"`
+	Count  int64                 `json:"count"`
+	Offset int64                 `json:"offset"`
+}
+
+// BatchGetMaterial 批量获取永久素材
+//reference:https://developers.weixin.qq.com/doc/offiaccount/Asset_Management/Get_materials_list.html
+func (material *Material) BatchGetMaterial(permanentMaterialType PermanentMaterialType, offset, count int64) (list ArticleList, err error) {
+	var accessToken string
+	accessToken, err = material.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", batchGetMaterialURL, accessToken)
+
+	req := reqBatchGetMaterial{
+		Type:   permanentMaterialType,
+		Offset: offset,
+		Count:  count,
+	}
+
+	var response []byte
+	response, err = util.PostJSON(uri, req)
+	if err != nil {
+		return
+	}
+
+	err = util.DecodeWithError(response, &list, "BatchGetMaterial")
+	return
+}
+
+// ResMaterialCount 素材总数
+type ResMaterialCount struct {
+	util.CommonError
+	VoiceCount int64 `json:"voice_count"` // 语音总数量
+	VideoCount int64 `json:"video_count"` // 视频总数量
+	ImageCount int64 `json:"image_count"` // 图片总数量
+	NewsCount  int64 `json:"news_count"`  // 图文总数量
+}
+
+// GetMaterialCount 获取素材总数.
+func (material *Material) GetMaterialCount() (res ResMaterialCount, err error) {
+	var accessToken string
+	accessToken, err = material.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", getMaterialCountURL, accessToken)
+	var response []byte
+	response, err = util.HTTPGet(uri)
+	if err != nil {
+		return
+	}
+	err = util.DecodeWithError(response, &res, "GetMaterialCount")
+	return
+}

officialaccount/material/media.go

@@ -14,11 +14,11 @@ const (
 	//MediaTypeImage 媒体文件:图片
 	MediaTypeImage MediaType = "image"
 	//MediaTypeVoice 媒体文件:声音
-	MediaTypeVoice = "voice"
+	MediaTypeVoice MediaType = "voice"
 	//MediaTypeVideo 媒体文件:视频
-	MediaTypeVideo = "video"
+	MediaTypeVideo MediaType = "video"
 	//MediaTypeThumb 媒体文件:缩略图
-	MediaTypeThumb = "thumb"
+	MediaTypeThumb MediaType = "thumb"
 )
 
 const (
@@ -106,5 +106,4 @@ func (material *Material) ImageUpload(filename string) (url string, err error) {
 	}
 	url = image.URL
 	return
-
 }

officialaccount/menu/button.go

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

officialaccount/menu/button_test.go

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

officialaccount/menu/menu.go

@@ -102,12 +102,12 @@ type ButtonNew struct {
 
 //MatchRule 个性化菜单规则
 type MatchRule struct {
-	GroupID            int32  `json:"group_id,omitempty"`
-	Sex                int32  `json:"sex,omitempty"`
+	GroupID            string `json:"group_id,omitempty"`
+	Sex                string `json:"sex,omitempty"`
 	Country            string `json:"country,omitempty"`
 	Province           string `json:"province,omitempty"`
 	City               string `json:"city,omitempty"`
-	ClientPlatformType int32  `json:"client_platform_type,omitempty"`
+	ClientPlatformType string `json:"client_platform_type,omitempty"`
 	Language           string `json:"language,omitempty"`
 }
 
@@ -138,6 +138,23 @@ func (menu *Menu) SetMenu(buttons []*Button) error {
 	return util.DecodeWithCommonError(response, "SetMenu")
 }
 
+//SetMenuByJSON 设置按钮
+func (menu *Menu) SetMenuByJSON(jsonInfo string) error {
+	accessToken, err := menu.GetAccessToken()
+	if err != nil {
+		return err
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", menuCreateURL, accessToken)
+
+	response, err := util.HTTPPost(uri, jsonInfo)
+	if err != nil {
+		return err
+	}
+
+	return util.DecodeWithCommonError(response, "SetMenuByJSON")
+}
+
 //GetMenu 获取菜单配置
 func (menu *Menu) GetMenu() (resMenu ResMenu, err error) {
 	var accessToken string
@@ -198,6 +215,22 @@ func (menu *Menu) AddConditional(buttons []*Button, matchRule *MatchRule) error
 	return util.DecodeWithCommonError(response, "AddConditional")
 }
 
+//AddConditionalByJSON 添加个性化菜单
+func (menu *Menu) AddConditionalByJSON(jsonInfo string) error {
+	accessToken, err := menu.GetAccessToken()
+	if err != nil {
+		return err
+	}
+
+	uri := fmt.Sprintf("%s?access_token=%s", menuAddConditionalURL, accessToken)
+	response, err := util.HTTPPost(uri, jsonInfo)
+	if err != nil {
+		return err
+	}
+
+	return util.DecodeWithCommonError(response, "AddConditional")
+}
+
 //DeleteConditional 删除个性化菜单
 func (menu *Menu) DeleteConditional(menuID int64) error {
 	accessToken, err := menu.GetAccessToken()

officialaccount/message/customer_message.go

@@ -73,6 +73,20 @@ func NewCustomerVoiceMessage(toUser, mediaID string) *CustomerMessage {
 	}
 }
 
+//NewCustomerMiniprogrampageMessage 小程序卡片消息的构造方法
+func NewCustomerMiniprogrampageMessage(toUser, title, appID, pagePath, thumbMediaID string) *CustomerMessage {
+	return &CustomerMessage{
+		ToUser:  toUser,
+		Msgtype: MsgTypeMiniprogrampage,
+		Miniprogrampage: &MediaMiniprogrampage{
+			Title:        title,
+			AppID:        appID,
+			Pagepath:     pagePath,
+			ThumbMediaID: thumbMediaID,
+		},
+	}
+}
+
 //MediaText 文本消息的文字
 type MediaText struct {
 	Content string `json:"content"`
@@ -134,7 +148,7 @@ type MediaWxcard struct {
 //MediaMiniprogrampage 小程序消息
 type MediaMiniprogrampage struct {
 	Title        string `json:"title"`
-	Appid        string `json:"appid"`
+	AppID        string `json:"appid"`
 	Pagepath     string `json:"pagepath"`
 	ThumbMediaID string `json:"thumb_media_id"`
 }
@@ -147,6 +161,9 @@ func (manager *Manager) Send(msg *CustomerMessage) error {
 	}
 	uri := fmt.Sprintf("%s?access_token=%s", customerSendMessage, accessToken)
 	response, err := util.PostJSON(uri, msg)
+	if err != nil {
+		return err
+	}
 	var result util.CommonError
 	err = json.Unmarshal(response, &result)
 	if err != nil {

officialaccount/message/message.go

@@ -24,6 +24,8 @@ const (
 	MsgTypeVoice = "voice"
 	//MsgTypeVideo 表示视频消息
 	MsgTypeVideo = "video"
+	//MsgTypeMiniprogrampage 表示小程序卡片消息
+	MsgTypeMiniprogrampage = "miniprogrampage"
 	//MsgTypeShortVideo 表示短视频消息[限接收]
 	MsgTypeShortVideo = "shortvideo"
 	//MsgTypeLocation 表示坐标消息[限接收]
@@ -67,6 +69,8 @@ const (
 	EventLocationSelect = "location_select"
 	//EventTemplateSendJobFinish 发送模板消息推送通知
 	EventTemplateSendJobFinish = "TEMPLATESENDJOBFINISH"
+	//EventMassSendJobFinish 群发消息推送通知
+	EventMassSendJobFinish = "MASSSENDJOBFINISH"
 	//EventWxaMediaCheck 异步校验图片/音频是否含有违法违规内容推送事件
 	EventWxaMediaCheck = "wxa_media_check"
 )
@@ -89,20 +93,21 @@ type MixMessage struct {
 	CommonToken
 
 	//基本消息
-	MsgID        int64   `xml:"MsgId"`
-	Content      string  `xml:"Content"`
-	Recognition  string  `xml:"Recognition"`
-	PicURL       string  `xml:"PicUrl"`
-	MediaID      string  `xml:"MediaId"`
-	Format       string  `xml:"Format"`
-	ThumbMediaID string  `xml:"ThumbMediaId"`
-	LocationX    float64 `xml:"Location_X"`
-	LocationY    float64 `xml:"Location_Y"`
-	Scale        float64 `xml:"Scale"`
-	Label        string  `xml:"Label"`
-	Title        string  `xml:"Title"`
-	Description  string  `xml:"Description"`
-	URL          string  `xml:"Url"`
+	MsgID         int64   `xml:"MsgId"` //其他消息推送过来是MsgId
+	TemplateMsgID int64   `xml:"MsgID"` //模板消息推送成功的消息是MsgID
+	Content       string  `xml:"Content"`
+	Recognition   string  `xml:"Recognition"`
+	PicURL        string  `xml:"PicUrl"`
+	MediaID       string  `xml:"MediaId"`
+	Format        string  `xml:"Format"`
+	ThumbMediaID  string  `xml:"ThumbMediaId"`
+	LocationX     float64 `xml:"Location_X"`
+	LocationY     float64 `xml:"Location_Y"`
+	Scale         float64 `xml:"Scale"`
+	Label         string  `xml:"Label"`
+	Title         string  `xml:"Title"`
+	Description   string  `xml:"Description"`
+	URL           string  `xml:"Url"`
 
 	//事件相关
 	Event       EventType `xml:"Event"`
@@ -114,6 +119,10 @@ type MixMessage struct {
 	MenuID      string    `xml:"MenuId"`
 	Status      string    `xml:"Status"`
 	SessionFrom string    `xml:"SessionFrom"`
+	TotalCount  int64     `xml:"TotalCount"`
+	FilterCount int64     `xml:"FilterCount"`
+	SentCount   int64     `xml:"SentCount"`
+	ErrorCount  int64     `xml:"ErrorCount"`
 
 	ScanCodeInfo struct {
 		ScanType   string `xml:"ScanType"`
@@ -222,3 +231,8 @@ func (msg *CommonToken) SetCreateTime(createTime int64) {
 func (msg *CommonToken) SetMsgType(msgType MsgType) {
 	msg.MsgType = msgType
 }
+
+//GetOpenID get the FromUserName value
+func (msg *CommonToken) GetOpenID() string {
+	return string(msg.FromUserName)
+}

officialaccount/message/subscribe.go

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

officialaccount/message/template.go

@@ -10,6 +10,7 @@ import (
 
 const (
 	templateSendURL = "https://api.weixin.qq.com/cgi-bin/message/template/send"
+	templateListURL = "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template"
 )
 
 //Template 模板消息
@@ -24,13 +25,13 @@ func NewTemplate(context *context.Context) *Template {
 	return tpl
 }
 
-//Message 发送的模板消息内容
-type Message struct {
-	ToUser     string               `json:"touser"`          // 必须, 接受者OpenID
-	TemplateID string               `json:"template_id"`     // 必须, 模版ID
-	URL        string               `json:"url,omitempty"`   // 可选, 用户点击后跳转的URL, 该URL必须处于开发者在公众平台网站中设置的域中
-	Color      string               `json:"color,omitempty"` // 可选, 整个消息的颜色, 可以不设置
-	Data       map[string]*DataItem `json:"data"`            // 必须, 模板数据
+//TemplateMessage 发送的模板消息内容
+type TemplateMessage struct {
+	ToUser     string                       `json:"touser"`          // 必须, 接受者OpenID
+	TemplateID string                       `json:"template_id"`     // 必须, 模版ID
+	URL        string                       `json:"url,omitempty"`   // 可选, 用户点击后跳转的URL, 该URL必须处于开发者在公众平台网站中设置的域中
+	Color      string                       `json:"color,omitempty"` // 可选, 整个消息的颜色, 可以不设置
+	Data       map[string]*TemplateDataItem `json:"data"`            // 必须, 模板数据
 
 	MiniProgram struct {
 		AppID    string `json:"appid"`    //所需跳转到的小程序appid（该小程序appid必须与发模板消息的公众号是绑定关联关系）
@@ -38,8 +39,8 @@ type Message struct {
 	} `json:"miniprogram"` //可选,跳转至小程序地址
 }
 
-//DataItem 模版内某个 .DATA 的值
-type DataItem struct {
+//TemplateDataItem 模版内某个 .DATA 的值
+type TemplateDataItem struct {
 	Value string `json:"value"`
 	Color string `json:"color,omitempty"`
 }
@@ -51,7 +52,7 @@ type resTemplateSend struct {
 }
 
 //Send 发送模板消息
-func (tpl *Template) Send(msg *Message) (msgID int64, err error) {
+func (tpl *Template) Send(msg *TemplateMessage) (msgID int64, err error) {
 	var accessToken string
 	accessToken, err = tpl.GetAccessToken()
 	if err != nil {
@@ -59,7 +60,9 @@ func (tpl *Template) Send(msg *Message) (msgID int64, err error) {
 	}
 	uri := fmt.Sprintf("%s?access_token=%s", templateSendURL, accessToken)
 	response, err := util.PostJSON(uri, msg)
-
+	if err != nil {
+		return
+	}
 	var result resTemplateSend
 	err = json.Unmarshal(response, &result)
 	if err != nil {
@@ -72,3 +75,41 @@ func (tpl *Template) Send(msg *Message) (msgID int64, err error) {
 	msgID = result.MsgID
 	return
 }
+
+// TemplateItem 模板消息.
+type TemplateItem struct {
+	TemplateID      string `json:"template_id"`
+	Title           string `json:"title"`
+	PrimaryIndustry string `json:"primary_industry"`
+	DeputyIndustry  string `json:"deputy_industry"`
+	Content         string `json:"content"`
+	Example         string `json:"example"`
+}
+
+type resTemplateList struct {
+	util.CommonError
+
+	TemplateList []*TemplateItem `json:"template_list"`
+}
+
+//List 获取模板列表
+func (tpl *Template) List() (templateList []*TemplateItem, err error) {
+	var accessToken string
+	accessToken, err = tpl.GetAccessToken()
+	if err != nil {
+		return
+	}
+	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")
+	if err != nil {
+		return
+	}
+	templateList = res.TemplateList
+	return
+}

officialaccount/message/transfer_customer.go

@@ -13,11 +13,11 @@ type TransInfo struct {
 }
 
 //NewTransferCustomer 实例化
-func NewTransferCustomer(KfAccount string) *TransferCustomer {
+func NewTransferCustomer(kfAccount string) *TransferCustomer {
 	tc := new(TransferCustomer)
-	if KfAccount != "" {
+	if kfAccount != "" {
 		transInfo := new(TransInfo)
-		transInfo.KfAccount = KfAccount
+		transInfo.KfAccount = kfAccount
 		tc.TransInfo = transInfo
 	}
 	return tc

officialaccount/oauth/oauth.go

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

officialaccount/ocr/ocr.go

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

officialaccount/officialaccount.go

@@ -2,9 +2,14 @@ package officialaccount
 
 import (
 	"net/http"
-	"sync"
 
+	"github.com/silenceper/wechat/v2/officialaccount/ocr"
+
+	"github.com/silenceper/wechat/v2/officialaccount/datacube"
+
+	"github.com/silenceper/wechat/v2/credential"
 	"github.com/silenceper/wechat/v2/officialaccount/basic"
+	"github.com/silenceper/wechat/v2/officialaccount/broadcast"
 	"github.com/silenceper/wechat/v2/officialaccount/config"
 	"github.com/silenceper/wechat/v2/officialaccount/context"
 	"github.com/silenceper/wechat/v2/officialaccount/device"
@@ -24,15 +29,17 @@ type OfficialAccount struct {
 
 //NewOfficialAccount 实例化公众号API
 func NewOfficialAccount(cfg *config.Config) *OfficialAccount {
-	//if cfg.Cache == nil {
-	//	panic("cache未设置")
-	//}
+	defaultAkHandle := credential.NewDefaultAccessToken(cfg.AppID, cfg.AppSecret, credential.CacheKeyOfficialAccountPrefix, cfg.Cache)
 	ctx := &context.Context{
-		Config: cfg,
+		Config:            cfg,
+		AccessTokenHandle: defaultAkHandle,
 	}
-	ctx.SetAccessTokenLock(new(sync.RWMutex))
-	ctx.SetJsAPITicketLock(new(sync.RWMutex))
-	return &OfficialAccount{ctx}
+	return &OfficialAccount{ctx: ctx}
+}
+
+//SetAccessTokenHandle 自定义access_token获取方式
+func (officialAccount *OfficialAccount) SetAccessTokenHandle(accessTokenHandle credential.AccessTokenHandle) {
+	officialAccount.ctx.AccessTokenHandle = accessTokenHandle
 }
 
 // GetContext get Context
@@ -50,7 +57,7 @@ func (officialAccount *OfficialAccount) GetMenu() *menu.Menu {
 	return menu.NewMenu(officialAccount.ctx)
 }
 
-// GetServer 消息管理
+// GetServer 消息管理：接收事件，被动回复消息管理
 func (officialAccount *OfficialAccount) GetServer(req *http.Request, writer http.ResponseWriter) *server.Server {
 	srv := server.NewServer(officialAccount.ctx)
 	srv.Request = req
@@ -88,7 +95,28 @@ func (officialAccount *OfficialAccount) GetTemplate() *message.Template {
 	return message.NewTemplate(officialAccount.ctx)
 }
 
+// GetCustomerMessageManager 客服消息接口
+func (officialAccount *OfficialAccount) GetCustomerMessageManager() *message.Manager {
+	return message.NewMessageManager(officialAccount.ctx)
+}
+
 // GetDevice 获取智能设备的实例
 func (officialAccount *OfficialAccount) GetDevice() *device.Device {
 	return device.NewDevice(officialAccount.ctx)
 }
+
+//GetBroadcast 群发消息
+//TODO 待完善
+func (officialAccount *OfficialAccount) GetBroadcast() *broadcast.Broadcast {
+	return broadcast.NewBroadcast(officialAccount.ctx)
+}
+
+//GetDataCube 数据统计
+func (officialAccount *OfficialAccount) GetDataCube() *datacube.DataCube {
+	return datacube.NewCube(officialAccount.ctx)
+}
+
+//GetOCR OCR接口
+func (officialAccount *OfficialAccount) GetOCR() *ocr.OCR {
+	return ocr.NewOCR(officialAccount.ctx)
+}

officialaccount/server/server.go

@@ -27,12 +27,12 @@ type Server struct {
 
 	openID string
 
-	messageHandler func(message.MixMessage) *message.Reply
+	messageHandler func(*message.MixMessage) *message.Reply
 
-	requestRawXMLMsg  []byte
-	requestMsg        message.MixMessage
-	responseRawXMLMsg []byte
-	responseMsg       interface{}
+	RequestRawXMLMsg  []byte
+	RequestMsg        *message.MixMessage
+	ResponseRawXMLMsg []byte
+	ResponseMsg       interface{}
 
 	isSafeMode bool
 	random     []byte
@@ -71,7 +71,7 @@ func (srv *Server) Serve() error {
 	}
 
 	//debug print request msg
-	log.Debugf("request msg =%s", string(srv.requestRawXMLMsg))
+	log.Debugf("request msg =%s", string(srv.RequestRawXMLMsg))
 
 	return srv.buildResponse(response)
 }
@@ -105,11 +105,11 @@ func (srv *Server) handleRequest() (reply *message.Reply, err error) {
 	if err != nil {
 		return
 	}
-	mixMessage, success := msg.(message.MixMessage)
+	mixMessage, success := msg.(*message.MixMessage)
 	if !success {
 		err = errors.New("消息类型转换失败")
 	}
-	srv.requestMsg = mixMessage
+	srv.RequestMsg = mixMessage
 	reply = srv.messageHandler(mixMessage)
 	return
 }
@@ -155,19 +155,19 @@ func (srv *Server) getMessage() (interface{}, error) {
 		}
 	}
 
-	srv.requestRawXMLMsg = rawXMLMsgBytes
+	srv.RequestRawXMLMsg = rawXMLMsgBytes
 
 	return srv.parseRequestMessage(rawXMLMsgBytes)
 }
 
-func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg message.MixMessage, err error) {
-	msg = message.MixMessage{}
-	err = xml.Unmarshal(rawXMLMsgBytes, &msg)
+func (srv *Server) parseRequestMessage(rawXMLMsgBytes []byte) (msg *message.MixMessage, err error) {
+	msg = &message.MixMessage{}
+	err = xml.Unmarshal(rawXMLMsgBytes, msg)
 	return
 }
 
 //SetMessageHandler 设置用户自定义的回调方法
-func (srv *Server) SetMessageHandler(handler func(message.MixMessage) *message.Reply) {
+func (srv *Server) SetMessageHandler(handler func(*message.MixMessage) *message.Reply) {
 	srv.messageHandler = handler
 }
 
@@ -199,36 +199,36 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
 	value := reflect.ValueOf(msgData)
 	//msgData must be a ptr
 	kind := value.Kind().String()
-	if "ptr" != kind {
+	if kind != "ptr" {
 		return message.ErrUnsupportReply
 	}
 
 	params := make([]reflect.Value, 1)
-	params[0] = reflect.ValueOf(srv.requestMsg.FromUserName)
+	params[0] = reflect.ValueOf(srv.RequestMsg.FromUserName)
 	value.MethodByName("SetToUserName").Call(params)
 
-	params[0] = reflect.ValueOf(srv.requestMsg.ToUserName)
+	params[0] = reflect.ValueOf(srv.RequestMsg.ToUserName)
 	value.MethodByName("SetFromUserName").Call(params)
 
 	params[0] = reflect.ValueOf(msgType)
 	value.MethodByName("SetMsgType").Call(params)
 
-	params[0] = reflect.ValueOf(util.GetCurrTs())
+	params[0] = reflect.ValueOf(util.GetCurrTS())
 	value.MethodByName("SetCreateTime").Call(params)
 
-	srv.responseMsg = msgData
-	srv.responseRawXMLMsg, err = xml.Marshal(msgData)
+	srv.ResponseMsg = msgData
+	srv.ResponseRawXMLMsg, err = xml.Marshal(msgData)
 	return
 }
 
 //Send 将自定义的消息发送
 func (srv *Server) Send() (err error) {
-	replyMsg := srv.responseMsg
+	replyMsg := srv.ResponseMsg
 	log.Debugf("response msg =%+v", replyMsg)
 	if srv.isSafeMode {
 		//安全模式下对消息进行加密
 		var encryptedMsg []byte
-		encryptedMsg, err = util.EncryptMsg(srv.random, srv.responseRawXMLMsg, srv.AppID, srv.EncodingAESKey)
+		encryptedMsg, err = util.EncryptMsg(srv.random, srv.ResponseRawXMLMsg, srv.AppID, srv.EncodingAESKey)
 		if err != nil {
 			return
 		}

officialaccount/user/migrate.go

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

officialaccount/user/tag.go

@@ -0,0 +1,241 @@
+package user
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	tagCreateURL         = "https://api.weixin.qq.com/cgi-bin/tags/create?access_token=%s"
+	tagGetURL            = "https://api.weixin.qq.com/cgi-bin/tags/get?access_token=%s"
+	tagUpdateURL         = "https://api.weixin.qq.com/cgi-bin/tags/update?access_token=%s"
+	tagDeleteURL         = "https://api.weixin.qq.com/cgi-bin/tags/delete?access_token=%s"
+	tagUserListURL       = "https://api.weixin.qq.com/cgi-bin/user/tag/get?access_token=%s"
+	tagBatchtaggingURL   = "https://api.weixin.qq.com/cgi-bin/tags/members/batchtagging?access_token=%s"
+	tagBatchuntaggingURL = "https://api.weixin.qq.com/cgi-bin/tags/members/batchuntagging?access_token=%s"
+	tagUserTidListURL    = "https://api.weixin.qq.com/cgi-bin/tags/getidlist?access_token=%s"
+)
+
+//TagInfo 标签信息
+type TagInfo struct {
+	ID    int32  `json:"id"`
+	Name  string `json:"name"`
+	Count int64  `json:"count"`
+}
+
+// TagOpenIDList 标签用户列表
+type TagOpenIDList struct {
+	Count int `json:"count"`
+	Data  struct {
+		OpenIDs []string `json:"openid"`
+	} `json:"data"`
+	NextOpenID string `json:"next_openid"`
+}
+
+//CreateTag 创建标签
+func (user *User) CreateTag(tagName string) (tagInfo *TagInfo, err error) {
+	var accessToken string
+	accessToken, err = user.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf(tagCreateURL, accessToken)
+	var response []byte
+	var request struct {
+		Tag struct {
+			Name string `json:"name"`
+		} `json:"tag"`
+	}
+	request.Tag.Name = tagName
+	response, err = util.PostJSON(uri, &request)
+	if err != nil {
+		return
+	}
+	var result struct {
+		util.CommonError
+		Tag *TagInfo `json:"tag"`
+	}
+	err = json.Unmarshal(response, &result)
+	if err != nil {
+		return
+	}
+	if result.ErrCode != 0 {
+		err = fmt.Errorf("CreateTag Error , errcode=%d , errmsg=%s", result.ErrCode, result.ErrMsg)
+		return
+	}
+	return result.Tag, nil
+}
+
+//DeleteTag  删除标签
+func (user *User) DeleteTag(tagID int32) (err error) {
+	accessToken, err := user.GetAccessToken()
+	if err != nil {
+		return
+	}
+	url := fmt.Sprintf(tagDeleteURL, accessToken)
+	var request struct {
+		Tag struct {
+			ID int32 `json:"id"`
+		} `json:"tag"`
+	}
+	request.Tag.ID = tagID
+	resp, err := util.PostJSON(url, &request)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(resp, "DeleteTag")
+}
+
+//UpdateTag  编辑标签
+func (user *User) UpdateTag(tagID int32, tagName string) (err error) {
+	accessToken, err := user.GetAccessToken()
+	if err != nil {
+		return
+	}
+	url := fmt.Sprintf(tagUpdateURL, accessToken)
+	var request struct {
+		Tag struct {
+			ID   int32  `json:"id"`
+			Name string `json:"name"`
+		} `json:"tag"`
+	}
+	request.Tag.ID = tagID
+	request.Tag.Name = tagName
+	resp, err := util.PostJSON(url, &request)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(resp, "UpdateTag")
+}
+
+//GetTag 获取公众号已创建的标签
+func (user *User) GetTag() (tags []*TagInfo, err error) {
+	accessToken, err := user.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	url := fmt.Sprintf(tagGetURL, accessToken)
+	response, err := util.HTTPGet(url)
+	if err != nil {
+		return
+	}
+	var result struct {
+		util.CommonError
+		Tags []*TagInfo `json:"tags"`
+	}
+	err = json.Unmarshal(response, &result)
+	if err != nil {
+		return
+	}
+	return result.Tags, nil
+}
+
+//OpenIDListByTag 获取标签下粉丝列表
+func (user *User) OpenIDListByTag(tagID int32, nextOpenID ...string) (userList *TagOpenIDList, err error) {
+	accessToken, err := user.GetAccessToken()
+	if err != nil {
+		return nil, err
+	}
+	url := fmt.Sprintf(tagUserListURL, accessToken)
+	var request = struct {
+		ID     int32  `json:"tagid"`
+		OpenID string `json:"next_openid"`
+	}{
+		ID: tagID,
+	}
+	if len(nextOpenID) > 0 {
+		request.OpenID = nextOpenID[0]
+	}
+	response, err := util.PostJSON(url, &request)
+	if err != nil {
+		return nil, err
+	}
+	userList = new(TagOpenIDList)
+	err = json.Unmarshal(response, &userList)
+	if err != nil {
+		return
+	}
+	return
+}
+
+//BatchTag 批量为用户打标签
+func (user *User) BatchTag(openIDList []string, tagID int32) (err error) {
+	accessToken, err := user.GetAccessToken()
+	if err != nil {
+		return
+	}
+	if len(openIDList) == 0 {
+		return
+	}
+	var request = struct {
+		OpenIDList []string `json:"openid_list"`
+		TagID      int32    `json:"tagid"`
+	}{
+		OpenIDList: openIDList,
+		TagID:      tagID,
+	}
+	url := fmt.Sprintf(tagBatchtaggingURL, accessToken)
+	resp, err := util.PostJSON(url, &request)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(resp, "BatchTag")
+}
+
+//BatchUntag 批量为用户取消标签
+func (user *User) BatchUntag(openIDList []string, tagID int32) (err error) {
+	if len(openIDList) == 0 {
+		return
+	}
+	accessToken, err := user.GetAccessToken()
+	if err != nil {
+		return
+	}
+	url := fmt.Sprintf(tagBatchuntaggingURL, accessToken)
+	var request = struct {
+		OpenIDList []string `json:"openid_list"`
+		TagID      int32    `json:"tagid"`
+	}{
+		OpenIDList: openIDList,
+		TagID:      tagID,
+	}
+	resp, err := util.PostJSON(url, &request)
+	if err != nil {
+		return
+	}
+	return util.DecodeWithCommonError(resp, "BatchUntag")
+}
+
+//UserTidList 获取用户身上的标签列表
+func (user *User) UserTidList(openID string) (tagIDList []int32, err error) {
+	accessToken, err := user.GetAccessToken()
+	if err != nil {
+		return
+	}
+	url := fmt.Sprintf(tagUserTidListURL, accessToken)
+	var request = struct {
+		OpenID string `json:"openid"`
+		TagID  int32  `json:"tagid"`
+	}{
+		OpenID: openID,
+	}
+	resp, err := util.PostJSON(url, &request)
+	if err != nil {
+		return
+	}
+	var result struct {
+		util.CommonError
+		TagIDList []int32 `json:"tagid_list"`
+	}
+	err = json.Unmarshal(resp, &result)
+	if err != nil {
+		return
+	}
+	if result.ErrCode != 0 {
+		err = fmt.Errorf("UserTidList Error , errcode=%d , errmsg=%s", result.ErrCode, result.ErrMsg)
+		return
+	}
+	return result.TagIDList, nil
+}

officialaccount/user/user.go

@@ -44,7 +44,7 @@ type Info struct {
 	UnionID        string  `json:"unionid"`
 	Remark         string  `json:"remark"`
 	GroupID        int32   `json:"groupid"`
-	TagidList      []int32 `json:"tagid_list"`
+	TagIDList      []int32 `json:"tagid_list"`
 	SubscribeScene string  `json:"subscribe_scene"`
 	QrScene        int     `json:"qr_scene"`
 	QrSceneStr     string  `json:"qr_scene_str"`
@@ -52,6 +52,8 @@ type Info struct {
 
 // OpenidList 用户列表
 type OpenidList struct {
+	util.CommonError
+
 	Total int `json:"total"`
 	Count int `json:"count"`
 	Data  struct {
@@ -124,19 +126,20 @@ func (user *User) ListUserOpenIDs(nextOpenid ...string) (*OpenidList, error) {
 		return nil, err
 	}
 
-	userlist := new(OpenidList)
-	err = json.Unmarshal(response, userlist)
+	userlist := OpenidList{}
+
+	err = util.DecodeWithError(response, &userlist, "ListUserOpenIDs")
 	if err != nil {
 		return nil, err
 	}
 
-	return userlist, nil
+	return &userlist, nil
 }
 
 // ListAllUserOpenIDs 返回所有用户OpenID列表
 func (user *User) ListAllUserOpenIDs() ([]string, error) {
 	nextOpenid := ""
-	openids := []string{}
+	openids := make([]string, 0)
 	count := 0
 	for {
 		ul, err := user.ListUserOpenIDs(nextOpenid)

openplatform/README.md

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

openplatform/account/account.go

@@ -0,0 +1,34 @@
+package account
+
+import "github.com/silenceper/wechat/v2/openplatform/context"
+
+//Account 开放平台张哈管理
+//TODO 实现方法
+type Account struct {
+	*context.Context
+}
+
+//NewAccount new
+func NewAccount(ctx *context.Context) *Account {
+	return &Account{ctx}
+}
+
+//Create 创建开放平台帐号并绑定公众号/小程序
+func (account *Account) Create(appID string) (string, error) {
+	return "", nil
+}
+
+//Bind 将公众号/小程序绑定到开放平台帐号下
+func (account *Account) Bind(appID string) error {
+	return nil
+}
+
+//Unbind 将公众号/小程序从开放平台帐号下解绑
+func (account *Account) Unbind(appID string, openAppID string) error {
+	return nil
+}
+
+//Get 获取公众号/小程序所绑定的开放平台帐号
+func (account *Account) Get(appID string) (string, error) {
+	return "", nil
+}

openplatform/context/accessToken.go

@@ -1,8 +1,10 @@
+//Package context 开放平台相关context
 package context
 
 import (
 	"encoding/json"
 	"fmt"
+	"net/url"
 	"time"
 
 	"github.com/silenceper/wechat/v2/util"
@@ -14,7 +16,12 @@ const (
 	queryAuthURL            = "https://api.weixin.qq.com/cgi-bin/component/api_query_auth?component_access_token=%s"
 	refreshTokenURL         = "https://api.weixin.qq.com/cgi-bin/component/api_authorizer_token?component_access_token=%s"
 	getComponentInfoURL     = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_info?component_access_token=%s"
-	getComponentConfigURL   = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
+	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"
+	//TODO 获取授权方选项信息
+	//getComponentConfigURL = "https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_option?component_access_token=%s"
+	//TODO 获取已授权的账号信息
+	//getuthorizerListURL = "POST https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_list?component_access_token=%s"
 )
 
 // ComponentAccessToken 第三方平台
@@ -83,6 +90,24 @@ func (ctx *Context) GetPreCode() (string, error) {
 	return ret.PreCode, nil
 }
 
+// GetComponentLoginPage 获取第三方公众号授权链接(扫码授权)
+func (ctx *Context) GetComponentLoginPage(redirectURI string, authType int, bizAppID string) (string, error) {
+	code, err := ctx.GetPreCode()
+	if err != nil {
+		return "", err
+	}
+	return fmt.Sprintf(componentLoginURL, ctx.AppID, code, url.QueryEscape(redirectURI), authType, bizAppID), nil
+}
+
+// GetBindComponentURL 获取第三方公众号授权链接(链接跳转，适用移动端)
+func (ctx *Context) GetBindComponentURL(redirectURI string, authType int, bizAppID string) (string, error) {
+	code, err := ctx.GetPreCode()
+	if err != nil {
+		return "", err
+	}
+	return fmt.Sprintf(bindComponentURL, authType, ctx.AppID, code, url.QueryEscape(redirectURI), bizAppID), nil
+}
+
 // ID 微信返回接口中各种类型字段
 type ID struct {
 	ID int `json:"id"`
@@ -125,13 +150,17 @@ func (ctx *Context) QueryAuthCode(authCode string) (*AuthBaseInfo, error) {
 	}
 
 	var ret struct {
+		util.CommonError
 		Info *AuthBaseInfo `json:"authorization_info"`
 	}
 
 	if err := json.Unmarshal(body, &ret); err != nil {
 		return nil, err
 	}
-
+	if ret.ErrCode != 0 {
+		err = fmt.Errorf("QueryAuthCode error : errcode=%v , errmsg=%v", ret.ErrCode, ret.ErrMsg)
+		return nil, err
+	}
 	return ret.Info, nil
 }
 

openplatform/miniprogram/basic/basic.go

@@ -48,5 +48,5 @@ func (basic *Basic) GetAccountBasicInfo() (*AccountBasicInfo, error) {
 
 //modify_domain设置服务器域名
 //TODO
-//func (basic *Basic) modifyDomain() {
+//func (encryptor *Basic) modifyDomain() {
 //}

openplatform/officialaccount/js/js.go

@@ -0,0 +1,57 @@
+package js
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/credential"
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	officialJs "github.com/silenceper/wechat/v2/officialaccount/js"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// Js wx jssdk
+type Js struct {
+	*context.Context
+	credential.JsTicketHandle
+}
+
+//NewJs init
+func NewJs(context *context.Context, appID string) *Js {
+	js := new(Js)
+	js.Context = context
+	jsTicketHandle := credential.NewDefaultJsTicket(appID, credential.CacheKeyOfficialAccountPrefix, context.Cache)
+	js.SetJsTicketHandle(jsTicketHandle)
+	return js
+}
+
+//SetJsTicketHandle 自定义js ticket取值方式
+func (js *Js) SetJsTicketHandle(ticketHandle credential.JsTicketHandle) {
+	js.JsTicketHandle = ticketHandle
+}
+
+//GetConfig 第三方平台 - 获取jssdk需要的配置参数
+//uri 为当前网页地址
+func (js *Js) GetConfig(uri, appid string) (config *officialJs.Config, err error) {
+	config = new(officialJs.Config)
+	var accessToken string
+	accessToken, err = js.GetAccessToken()
+	if err != nil {
+		return
+	}
+	var ticketStr string
+	ticketStr, err = js.GetTicket(accessToken)
+	if err != nil {
+		return
+	}
+
+	nonceStr := util.RandomStr(16)
+	timestamp := util.GetCurrTS()
+	str := fmt.Sprintf("jsapi_ticket=%s&noncestr=%s&timestamp=%d&url=%s", ticketStr, nonceStr, timestamp, uri)
+	sigStr := util.Signature(str)
+
+	config.AppID = appid
+	config.NonceStr = nonceStr
+	config.Timestamp = timestamp
+	config.Signature = sigStr
+	return
+}

openplatform/officialaccount/oauth/oauth.go

@@ -0,0 +1,65 @@
+package oauth
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/url"
+
+	"github.com/silenceper/wechat/v2/officialaccount/context"
+	officialOauth "github.com/silenceper/wechat/v2/officialaccount/oauth"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	platformRedirectOauthURL = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=%s&component_appid=%s#wechat_redirect"
+	platformAccessTokenURL   = "https://api.weixin.qq.com/sns/oauth2/component/access_token?appid=%s&code=%s&grant_type=authorization_code&component_appid=%s&component_access_token=%s"
+)
+
+// Oauth 平台代发起oauth2网页授权
+type Oauth struct {
+	*context.Context
+}
+
+// NewOauth 实例化平台代发起oauth2网页授权
+func NewOauth(context *context.Context) *Oauth {
+	auth := new(Oauth)
+	auth.Context = context
+	return auth
+}
+
+//GetRedirectURL 第三方平台 - 获取跳转的url地址
+func (oauth *Oauth) GetRedirectURL(redirectURI, scope, state, appID string) (string, error) {
+	//url encode
+	urlStr := url.QueryEscape(redirectURI)
+	return fmt.Sprintf(platformRedirectOauthURL, appID, urlStr, scope, state, oauth.AppID), nil
+}
+
+//Redirect 第三方平台 - 跳转到网页授权
+func (oauth *Oauth) Redirect(writer http.ResponseWriter, req *http.Request, redirectURI, scope, state, appID string) error {
+	location, err := oauth.GetRedirectURL(redirectURI, scope, state, appID)
+	if err != nil {
+		return err
+	}
+	http.Redirect(writer, req, location, http.StatusFound)
+	return nil
+}
+
+// GetUserAccessToken 第三方平台 - 通过网页授权的code 换取access_token(区别于context中的access_token)
+func (oauth *Oauth) GetUserAccessToken(code, appID, componentAccessToken string) (result officialOauth.ResAccessToken, err error) {
+	urlStr := fmt.Sprintf(platformAccessTokenURL, appID, code, oauth.AppID, componentAccessToken)
+	var response []byte
+	response, err = util.HTTPGet(urlStr)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(response, &result)
+	if err != nil {
+		return
+	}
+	if result.ErrCode != 0 {
+		err = fmt.Errorf("GetUserAccessToken error : errcode=%v , errmsg=%v", result.ErrCode, result.ErrMsg)
+		return
+	}
+	return
+}

openplatform/officialaccount/officialaccount.go

@@ -1,10 +1,12 @@
 package officialaccount
 
 import (
+	"github.com/silenceper/wechat/v2/credential"
 	"github.com/silenceper/wechat/v2/officialaccount"
 	offConfig "github.com/silenceper/wechat/v2/officialaccount/config"
-	offContext "github.com/silenceper/wechat/v2/officialaccount/context"
 	opContext "github.com/silenceper/wechat/v2/openplatform/context"
+	"github.com/silenceper/wechat/v2/openplatform/officialaccount/js"
+	"github.com/silenceper/wechat/v2/openplatform/officialaccount/oauth"
 )
 
 //OfficialAccount 代公众号实现业务
@@ -12,7 +14,6 @@ type OfficialAccount struct {
 	//授权的公众号的appID
 	appID string
 	*officialaccount.OfficialAccount
-	opContext *opContext.Context
 }
 
 //NewOfficialAccount 实例化
@@ -25,9 +26,35 @@ func NewOfficialAccount(opCtx *opContext.Context, appID string) *OfficialAccount
 		Cache:          opCtx.Cache,
 	})
 	//设置获取access_token的函数
-	officialAccount.GetContext().SetGetAccessTokenFunc(func(offCtx *offContext.Context) (accessToken string, err error) {
-		// 获取授权方的access_token
-		return opCtx.GetAuthrAccessToken(appID)
-	})
+	officialAccount.SetAccessTokenHandle(NewDefaultAuthrAccessToken(opCtx, appID))
 	return &OfficialAccount{appID: appID, OfficialAccount: officialAccount}
 }
+
+// PlatformOauth 平台代发起oauth2网页授权
+func (officialAccount *OfficialAccount) PlatformOauth() *oauth.Oauth {
+	return oauth.NewOauth(officialAccount.GetContext())
+}
+
+// PlatformJs 平台代获取js-sdk配置
+func (officialAccount *OfficialAccount) PlatformJs() *js.Js {
+	return js.NewJs(officialAccount.GetContext(), officialAccount.appID)
+}
+
+//DefaultAuthrAccessToken 默认获取授权ak的方法
+type DefaultAuthrAccessToken struct {
+	opCtx *opContext.Context
+	appID string
+}
+
+//NewDefaultAuthrAccessToken New
+func NewDefaultAuthrAccessToken(opCtx *opContext.Context, appID string) credential.AccessTokenHandle {
+	return &DefaultAuthrAccessToken{
+		opCtx: opCtx,
+		appID: appID,
+	}
+}
+
+//GetAccessToken 获取ak
+func (ak *DefaultAuthrAccessToken) GetAccessToken() (string, error) {
+	return ak.opCtx.GetAuthrAccessToken(ak.appID)
+}

openplatform/openplatform.go

@@ -1,6 +1,10 @@
 package openplatform
 
 import (
+	"net/http"
+
+	"github.com/silenceper/wechat/v2/officialaccount/server"
+	"github.com/silenceper/wechat/v2/openplatform/account"
 	"github.com/silenceper/wechat/v2/openplatform/config"
 	"github.com/silenceper/wechat/v2/openplatform/context"
 	"github.com/silenceper/wechat/v2/openplatform/miniprogram"
@@ -23,12 +27,24 @@ func NewOpenPlatform(cfg *config.Config) *OpenPlatform {
 	return &OpenPlatform{ctx}
 }
 
+//GetServer get server
+func (openPlatform *OpenPlatform) GetServer(req *http.Request, writer http.ResponseWriter) *server.Server {
+	off := officialaccount.NewOfficialAccount(openPlatform.Context, "")
+	return off.GetServer(req, writer)
+}
+
 //GetOfficialAccount 公众号代处理
 func (openPlatform *OpenPlatform) GetOfficialAccount(appID string) *officialaccount.OfficialAccount {
 	return officialaccount.NewOfficialAccount(openPlatform.Context, appID)
 }
 
 //GetMiniProgram 小程序代理
-func (openPlatform *OpenPlatform) GetMiniProgram(opCtx *context.Context, appID string) *miniprogram.MiniProgram {
-	return miniprogram.NewMiniProgram(opCtx, appID)
+func (openPlatform *OpenPlatform) GetMiniProgram(appID string) *miniprogram.MiniProgram {
+	return miniprogram.NewMiniProgram(openPlatform.Context, appID)
+}
+
+//GetAccountManager 账号管理
+//TODO
+func (openPlatform *OpenPlatform) GetAccountManager() *account.Account {
+	return account.NewAccount(openPlatform.Context)
 }

pay/config/config.go

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

pay/notify/paid.go

@@ -46,9 +46,9 @@ type PaidResult struct {
 	CouponID0   *string `xml:"coupon_id_0"`
 	CouponID1   *string `xml:"coupon_id_1"`
 	CouponID2   *string `xml:"coupon_id_2"`
-	CouponFeed0 *string `xml:"coupon_fee_0"`
-	CouponFeed1 *string `xml:"coupon_fee_1"`
-	CouponFeed2 *string `xml:"coupon_fee_2"`
+	CouponFee0  *string `xml:"coupon_fee_0"`
+	CouponFee1  *string `xml:"coupon_fee_1"`
+	CouponFee2  *string `xml:"coupon_fee_2"`
 
 	TransactionID *string `xml:"transaction_id"`
 	OutTradeNo    *string `xml:"out_trade_no"`
@@ -85,8 +85,15 @@ func (notify *Notify) PaidVerifySign(notifyRes PaidResult) bool {
 	// STEP3, 在键值对的最后加上key=API_KEY
 	signStrings = signStrings + "key=" + notify.Key
 
-	// STEP4, 进行MD5签名并且将所有字符转为大写.
-	sign := util.MD5Sum(signStrings)
+	// STEP4, 根据SignType计算出签名
+	var signType string
+	if notifyRes.SignType != nil {
+		signType = *notifyRes.SignType
+	}
+	sign, err := util.CalculateSign(signStrings, signType, notify.Key)
+	if err != nil {
+		return false
+	}
 	if sign != *notifyRes.Sign {
 		return false
 	}

pay/notify/refund.go

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

pay/notify/refund_test.go

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

pay/order/pay.go

@@ -1,13 +1,8 @@
 package order
 
 import (
-	"crypto/hmac"
-	"crypto/md5"
-	"crypto/sha256"
-	"encoding/hex"
 	"encoding/xml"
 	"errors"
-	"hash"
 	"strconv"
 	"strings"
 	"time"
@@ -16,9 +11,12 @@ import (
 	"github.com/silenceper/wechat/v2/util"
 )
 
-//https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
+// https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
 var payGateway = "https://api.mch.weixin.qq.com/pay/unifiedorder"
 
+// SUCCESS 表示支付成功
+const SUCCESS = "SUCCESS"
+
 // Order struct extends context
 type Order struct {
 	*config.Config
@@ -30,7 +28,7 @@ func NewOrder(cfg *config.Config) *Order {
 	return &order
 }
 
-// Params was NEEDED when request unifiedorder
+// Params was NEEDED when request Unified order
 // 传入的参数，用于生成 prepay_id 的必需参数
 type Params struct {
 	TotalFee   string
@@ -56,7 +54,7 @@ type Config struct {
 	PaySign   string `json:"paySign"`
 }
 
-// PreOrder 是 unifie order 接口的返回
+// PreOrder 是 Unified order 接口的返回
 type PreOrder struct {
 	ReturnCode string `xml:"return_code"`
 	ReturnMsg  string `xml:"return_msg"`
@@ -68,20 +66,21 @@ type PreOrder struct {
 	TradeType  string `xml:"trade_type,omitempty"`
 	PrePayID   string `xml:"prepay_id,omitempty"`
 	CodeURL    string `xml:"code_url,omitempty"`
+	MWebURL    string `xml:"mweb_url,omitempty"`
 	ErrCode    string `xml:"err_code,omitempty"`
 	ErrCodeDes string `xml:"err_code_des,omitempty"`
 }
 
 // payRequest 接口请求参数
 type payRequest struct {
-	AppID          string `xml:"appid"`
-	MchID          string `xml:"mch_id"`
-	DeviceInfo     string `xml:"device_info,omitempty"`
-	NonceStr       string `xml:"nonce_str"`
-	Sign           string `xml:"sign"`
-	SignType       string `xml:"sign_type,omitempty"`
-	Body           string `xml:"body"`
-	Detail         string `xml:"detail,omitempty"`
+	AppID          string `xml:"appid"`                 // 公众账号ID
+	MchID          string `xml:"mch_id"`                // 商户号
+	DeviceInfo     string `xml:"device_info,omitempty"` // 设备号
+	NonceStr       string `xml:"nonce_str"`             // 随机字符串
+	Sign           string `xml:"sign"`                  // 签名
+	SignType       string `xml:"sign_type,omitempty"`   // 签名类型
+	Body           string `xml:"body"`                  // 商品描述
+	Detail         string `xml:"detail,omitempty"`      // 商品详情
 	Attach         string `xml:"attach,omitempty"`      // 附加数据
 	OutTradeNo     string `xml:"out_trade_no"`          // 商户订单号
 	FeeType        string `xml:"fee_type,omitempty"`    // 标价币种
@@ -93,16 +92,17 @@ type payRequest struct {
 	NotifyURL      string `xml:"notify_url"`            // 通知地址
 	TradeType      string `xml:"trade_type"`            // 交易类型
 	ProductID      string `xml:"product_id,omitempty"`  // 商品ID
-	LimitPay       string `xml:"limit_pay,omitempty"`   //
+	LimitPay       string `xml:"limit_pay,omitempty"`   // 指定支付方式
 	OpenID         string `xml:"openid,omitempty"`      // 用户标识
 	SceneInfo      string `xml:"scene_info,omitempty"`  // 场景信息
+
+	XMLName struct{} `xml:"xml"`
 }
 
 // BridgeConfig get js bridge config
 func (o *Order) BridgeConfig(p *Params) (cfg Config, err error) {
 	var (
 		buffer    strings.Builder
-		h         hash.Hash
 		timestamp = strconv.FormatInt(time.Now().Unix(), 10)
 	)
 	order, err := o.PrePayOrder(p)
@@ -121,14 +121,13 @@ func (o *Order) BridgeConfig(p *Params) (cfg Config, err error) {
 	buffer.WriteString(timestamp)
 	buffer.WriteString("&key=")
 	buffer.WriteString(o.Key)
-	if p.SignType == "MD5" {
-		h = md5.New()
-	} else {
-		h = hmac.New(sha256.New, []byte(o.Key))
+
+	sign, err := util.CalculateSign(buffer.String(), p.SignType, o.Key)
+	if err != nil {
+		return
 	}
-	h.Write([]byte(buffer.String()))
 	// 签名
-	cfg.PaySign = strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
+	cfg.PaySign = sign
 	cfg.NonceStr = order.NonceStr
 	cfg.Timestamp = timestamp
 	cfg.PrePayID = order.PrePayID
@@ -143,13 +142,13 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 	notifyURL := o.NotifyURL
 	// 签名类型
 	if p.SignType == "" {
-		p.SignType = "MD5"
+		p.SignType = util.SignTypeMD5
 	}
 	// 通知地址
 	if p.NotifyURL != "" {
 		notifyURL = p.NotifyURL
 	}
-	param := make(map[string]interface{})
+	param := make(map[string]string)
 	param["appid"] = o.AppID
 	param["body"] = p.Body
 	param["mch_id"] = o.MchID
@@ -165,9 +164,10 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 	param["goods_tag"] = p.GoodsTag
 	param["notify_url"] = notifyURL
 
-	bizKey := "&key=" + o.Key
-	str := util.OrderParam(param, bizKey)
-	sign := util.MD5Sum(str)
+	sign, err := util.ParamSign(param, o.Key)
+	if err != nil {
+		return
+	}
 	request := payRequest{
 		AppID:          o.AppID,
 		MchID:          o.MchID,
@@ -193,16 +193,16 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 	if err != nil {
 		return
 	}
-	if payOrder.ReturnCode == "SUCCESS" {
+	if payOrder.ReturnCode == SUCCESS {
 		// pay success
-		if payOrder.ResultCode == "SUCCESS" {
+		if payOrder.ResultCode == SUCCESS {
 			err = nil
 			return
 		}
 		err = errors.New(payOrder.ErrCode + payOrder.ErrCodeDes)
 		return
 	}
-	err = errors.New("[msg : xmlUnmarshalError] [rawReturn : " + string(rawRet) + "] [params : " + str + "] [sign : " + sign + "]")
+	err = errors.New("[msg : xmlUnmarshalError] [rawReturn : " + string(rawRet) + "] [sign : " + sign + "]")
 	return
 }
 

pay/order/query.go

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

pay/pay.go

@@ -4,6 +4,8 @@ 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/refund"
+	"github.com/silenceper/wechat/v2/pay/transfer"
 )
 
 //Pay 微信支付相关API
@@ -25,3 +27,13 @@ func (pay *Pay) GetOrder() *order.Order {
 func (pay *Pay) GetNotify() *notify.Notify {
 	return notify.NewNotify(pay.cfg)
 }
+
+// GetRefund  退款
+func (pay *Pay) GetRefund() *refund.Refund {
+	return refund.NewRefund(pay.cfg)
+}
+
+// GetTransfer 付款
+func (pay *Pay) GetTransfer() *transfer.Transfer {
+	return transfer.NewTransfer(pay.cfg)
+}

pay/refund/refund.go

@@ -21,32 +21,36 @@ func NewRefund(cfg *config.Config) *Refund {
 	return &refund
 }
 
-//Params 调用参数
+// Params 调用参数
 type Params struct {
 	TransactionID string
 	OutRefundNo   string
+	OutTradeNo    string
 	TotalFee      string
 	RefundFee     string
 	RefundDesc    string
-	RootCa        string //ca证书
+	RootCa        string // ca证书
+	NotifyURL     string
+	SignType      string
 }
 
-//request 接口请求参数
+// request 接口请求参数
 type request struct {
 	AppID         string `xml:"appid"`
 	MchID         string `xml:"mch_id"`
 	NonceStr      string `xml:"nonce_str"`
 	Sign          string `xml:"sign"`
 	SignType      string `xml:"sign_type,omitempty"`
-	TransactionID string `xml:"transaction_id"`
+	TransactionID string `xml:"transaction_id,omitempty"`
+	OutTradeNo    string `xml:"out_trade_no,omitempty"`
 	OutRefundNo   string `xml:"out_refund_no"`
 	TotalFee      string `xml:"total_fee"`
 	RefundFee     string `xml:"refund_fee"`
 	RefundDesc    string `xml:"refund_desc,omitempty"`
-	//NotifyUrl     string `xml:"notify_url,omitempty"`
+	NotifyURL     string `xml:"notify_url,omitempty"`
 }
 
-//Response 接口返回
+// Response 接口返回
 type Response struct {
 	ReturnCode          string `xml:"return_code"`
 	ReturnMsg           string `xml:"return_msg"`
@@ -70,36 +74,35 @@ type Response struct {
 	CashFeeType         string `xml:"cash_fee_type,omitempty"`
 }
 
-//Refund 退款申请
+// Refund 退款申请
 func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
-	nonceStr := util.RandomStr(32)
-	param := make(map[string]interface{})
-	param["appid"] = refund.AppID
-	param["mch_id"] = refund.MchID
-	param["nonce_str"] = nonceStr
-	param["out_refund_no"] = p.OutRefundNo
-	param["refund_desc"] = p.RefundDesc
-	param["refund_fee"] = p.RefundFee
-	param["total_fee"] = p.TotalFee
-	param["sign_type"] = "MD5"
-	param["transaction_id"] = p.TransactionID
+	param := refund.GetSignParam(p)
 
-	bizKey := "&key=" + refund.Key
-	str := util.OrderParam(param, bizKey)
-	sign := util.MD5Sum(str)
-	request := request{
-		AppID:         refund.AppID,
-		MchID:         refund.MchID,
-		NonceStr:      nonceStr,
-		Sign:          sign,
-		SignType:      "MD5",
-		TransactionID: p.TransactionID,
-		OutRefundNo:   p.OutRefundNo,
-		TotalFee:      p.TotalFee,
-		RefundFee:     p.RefundFee,
-		RefundDesc:    p.RefundDesc,
+	sign, err := util.ParamSign(param, refund.Key)
+	if err != nil {
+		return
 	}
-	rawRet, err := util.PostXMLWithTLS(refundGateway, request, p.RootCa, refund.MchID)
+
+	req := request{
+		AppID:       param["appid"],
+		MchID:       param["mch_id"],
+		NonceStr:    param["nonce_str"],
+		Sign:        sign,
+		SignType:    param["sign_type"],
+		OutRefundNo: param["out_refund_no"],
+		TotalFee:    param["total_fee"],
+		RefundFee:   param["refund_fee"],
+		RefundDesc:  param["refund_desc"],
+		NotifyURL:   param["notify_url"],
+	}
+	if p.OutTradeNo != "" {
+		req.OutTradeNo = p.OutTradeNo
+	}
+	if p.TransactionID != "" {
+		req.TransactionID = p.TransactionID
+	}
+
+	rawRet, err := util.PostXMLWithTLS(refundGateway, req, p.RootCa, refund.MchID)
 	if err != nil {
 		return
 	}
@@ -115,7 +118,34 @@ func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
 		err = fmt.Errorf("refund error, errcode=%s,errmsg=%s", rsp.ErrCode, rsp.ErrCodeDes)
 		return
 	}
-	err = fmt.Errorf("[msg : xmlUnmarshalError] [rawReturn : %s] [params : %s] [sign : %s]",
-		string(rawRet), str, sign)
+	err = fmt.Errorf("[msg : xmlUnmarshalError] [rawReturn : %s] [sign : %s]", string(rawRet), sign)
 	return
 }
+
+// GetSignParam 获取签名的参数
+func (refund *Refund) GetSignParam(p *Params) (param map[string]string) {
+	nonceStr := util.RandomStr(32)
+	param = make(map[string]string)
+	param["appid"] = refund.AppID
+	param["mch_id"] = refund.MchID
+	param["nonce_str"] = nonceStr
+	param["out_refund_no"] = p.OutRefundNo
+	param["refund_desc"] = p.RefundDesc
+	param["refund_fee"] = p.RefundFee
+	param["total_fee"] = p.TotalFee
+
+	if p.SignType == "" {
+		param["sign_type"] = util.SignTypeMD5
+	}
+	if p.OutTradeNo != "" {
+		param["out_trade_no"] = p.OutTradeNo
+	}
+	if p.TransactionID != "" {
+		param["transaction_id"] = p.TransactionID
+	}
+	if p.NotifyURL != "" {
+		param["notify_url"] = p.NotifyURL
+	}
+
+	return param
+}

pay/transfer/transfer_wallet.go

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

util/crypto.go

@@ -1,17 +1,27 @@
 package util
 
 import (
-	"bufio"
 	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
+	"crypto/hmac"
 	"crypto/md5"
+	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
+	"errors"
 	"fmt"
+	"hash"
+	"strings"
 )
 
-//EncryptMsg 加密消息
+// 微信签名算法方式
+const (
+	SignTypeMD5        = `MD5`
+	SignTypeHMACSHA256 = `HMAC-SHA256`
+)
+
+// EncryptMsg 加密消息
 func EncryptMsg(random, rawXMLMsg []byte, appID, aesKey string) (encrtptMsg []byte, err error) {
 	defer func() {
 		if e := recover(); e != nil {
@@ -29,7 +39,7 @@ func EncryptMsg(random, rawXMLMsg []byte, appID, aesKey string) (encrtptMsg []by
 	return
 }
 
-//AESEncryptMsg ciphertext = AES_Encrypt[random(16B) + msg_len(4B) + rawXMLMsg + appId]
+// AESEncryptMsg ciphertext = AES_Encrypt[random(16B) + msg_len(4B) + rawXMLMsg + appId]
 //参考：github.com/chanxuehong/wechat.v2
 func AESEncryptMsg(random, rawXMLMsg []byte, appID string, aesKey []byte) (ciphertext []byte) {
 	const (
@@ -56,7 +66,7 @@ func AESEncryptMsg(random, rawXMLMsg []byte, appID string, aesKey []byte) (ciphe
 	}
 
 	// 加密
-	block, err := aes.NewCipher(aesKey[:])
+	block, err := aes.NewCipher(aesKey)
 	if err != nil {
 		panic(err)
 	}
@@ -67,7 +77,7 @@ func AESEncryptMsg(random, rawXMLMsg []byte, appID string, aesKey []byte) (ciphe
 	return
 }
 
-//DecryptMsg 消息解密
+// DecryptMsg 消息解密
 func DecryptMsg(appID, encryptedMsg, aesKey string) (random, rawMsgXMLBytes []byte, err error) {
 	defer func() {
 		if e := recover(); e != nil {
@@ -186,14 +196,137 @@ func decodeNetworkByteOrder(orderBytes []byte) (n uint32) {
 		uint32(orderBytes[3])
 }
 
-// MD5Sum 计算 32 位长度的 MD5 sum
-func MD5Sum(txt string) (sum string) {
-	h := md5.New()
-	buf := bufio.NewWriterSize(h, 128)
-	buf.WriteString(txt)
-	buf.Flush()
-	sign := make([]byte, hex.EncodedLen(h.Size()))
-	hex.Encode(sign, h.Sum(nil))
-	sum = string(bytes.ToUpper(sign))
-	return
+// CalculateSign 计算签名
+func CalculateSign(content, signType, key string) (string, error) {
+	var h hash.Hash
+	if signType == SignTypeHMACSHA256 {
+		h = hmac.New(sha256.New, []byte(key))
+	} else {
+		h = md5.New()
+	}
+
+	if _, err := h.Write([]byte(content)); err != nil {
+		return ``, err
+	}
+	return strings.ToUpper(hex.EncodeToString(h.Sum(nil))), nil
+}
+
+// ParamSign 计算所传参数的签名
+func ParamSign(p map[string]string, key string) (string, error) {
+	bizKey := "&key=" + key
+	str := OrderParam(p, bizKey)
+
+	var signType string
+	switch p["sign_type"] {
+	case SignTypeMD5, SignTypeHMACSHA256:
+		signType = p["sign_type"]
+	case ``:
+		signType = SignTypeMD5
+	default:
+		return ``, errors.New(`invalid sign_type`)
+	}
+
+	return CalculateSign(str, signType, key)
+}
+
+// ECB provides confidentiality by assigning a fixed ciphertext block to each plaintext block.
+// See NIST SP 800-38A, pp 08-09
+// reference: https://codereview.appspot.com/7860047/patch/23001/24001
+type ecb struct {
+	b         cipher.Block
+	blockSize int
+}
+
+func newECB(b cipher.Block) *ecb {
+	return &ecb{
+		b:         b,
+		blockSize: b.BlockSize(),
+	}
+}
+
+// ECBEncryptor -
+type ECBEncryptor ecb
+
+// NewECBEncryptor returns a BlockMode which encrypts in electronic code book mode, using the given Block.
+func NewECBEncryptor(b cipher.Block) cipher.BlockMode {
+	return (*ECBEncryptor)(newECB(b))
+}
+
+// BlockSize implement BlockMode.BlockSize
+func (x *ECBEncryptor) BlockSize() int {
+	return x.blockSize
+}
+
+// CryptBlocks implement BlockMode.CryptBlocks
+func (x *ECBEncryptor) CryptBlocks(dst, src []byte) {
+	if len(src)%x.blockSize != 0 {
+		panic("crypto/cipher: input not full blocks")
+	}
+	if len(dst) < len(src) {
+		panic("crypto/cipher: output smaller than input")
+	}
+	for len(src) > 0 {
+		x.b.Encrypt(dst, src[:x.blockSize])
+		src = src[x.blockSize:]
+		dst = dst[x.blockSize:]
+	}
+}
+
+// ECBDecryptor -
+type ECBDecryptor ecb
+
+// NewECBDecryptor returns a BlockMode which decrypts in electronic code book mode, using the given Block.
+func NewECBDecryptor(b cipher.Block) cipher.BlockMode {
+	return (*ECBDecryptor)(newECB(b))
+}
+
+// BlockSize implement BlockMode.BlockSize
+func (x *ECBDecryptor) BlockSize() int {
+	return x.blockSize
+}
+
+// CryptBlocks implement BlockMode.CryptBlocks
+func (x *ECBDecryptor) CryptBlocks(dst, src []byte) {
+	if len(src)%x.blockSize != 0 {
+		panic("crypto/cipher: input not full blocks")
+	}
+	if len(dst) < len(src) {
+		panic("crypto/cipher: output smaller than input")
+	}
+	for len(src) > 0 {
+		x.b.Decrypt(dst, src[:x.blockSize])
+		src = src[x.blockSize:]
+		dst = dst[x.blockSize:]
+	}
+}
+
+// AesECBDecrypt will decrypt data with PKCS5Padding
+func AesECBDecrypt(ciphertext []byte, aesKey []byte) ([]byte, error) {
+	if len(ciphertext) < aes.BlockSize {
+		return nil, errors.New("ciphertext too short")
+	}
+	// ECB mode always works in whole blocks.
+	if len(ciphertext)%aes.BlockSize != 0 {
+		return nil, errors.New("ciphertext is not a multiple of the block size")
+	}
+	block, err := aes.NewCipher(aesKey)
+	if err != nil {
+		return nil, err
+	}
+	NewECBDecryptor(block).CryptBlocks(ciphertext, ciphertext)
+	return PKCS5UnPadding(ciphertext), nil
+}
+
+// PKCS5Padding -
+func PKCS5Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padText := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padText...)
+}
+
+// PKCS5UnPadding -
+func PKCS5UnPadding(origData []byte) []byte {
+	length := len(origData)
+	unPadding := int(origData[length-1])
+	return origData[:(length - unPadding)]
 }

util/http.go

@@ -48,15 +48,14 @@ func HTTPPost(uri string, data string) ([]byte, error) {
 
 //PostJSON post json 数据请求
 func PostJSON(uri string, obj interface{}) ([]byte, error) {
-	jsonData, err := json.Marshal(obj)
+	jsonBuf := new(bytes.Buffer)
+	enc := json.NewEncoder(jsonBuf)
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(obj)
 	if err != nil {
 		return nil, err
 	}
-	jsonData = bytes.Replace(jsonData, []byte("\\u003c"), []byte("<"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u003e"), []byte(">"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u0026"), []byte("&"), -1)
-	body := bytes.NewBuffer(jsonData)
-	response, err := http.Post(uri, "application/json;charset=utf-8", body)
+	response, err := http.Post(uri, "application/json;charset=utf-8", jsonBuf)
 	if err != nil {
 		return nil, err
 	}
@@ -70,17 +69,15 @@ func PostJSON(uri string, obj interface{}) ([]byte, error) {
 
 // PostJSONWithRespContentType post json数据请求，且返回数据类型
 func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, error) {
-	jsonData, err := json.Marshal(obj)
+	jsonBuf := new(bytes.Buffer)
+	enc := json.NewEncoder(jsonBuf)
+	enc.SetEscapeHTML(false)
+	err := enc.Encode(obj)
 	if err != nil {
 		return nil, "", err
 	}
 
-	jsonData = bytes.Replace(jsonData, []byte("\\u003c"), []byte("<"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u003e"), []byte(">"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u0026"), []byte("&"), -1)
-
-	body := bytes.NewBuffer(jsonData)
-	response, err := http.Post(uri, "application/json;charset=utf-8", body)
+	response, err := http.Post(uri, "application/json;charset=utf-8", jsonBuf)
 	if err != nil {
 		return nil, "", err
 	}

util/param.go

@@ -3,65 +3,31 @@ package util
 import (
 	"bytes"
 	"sort"
-	"strconv"
 )
 
 // OrderParam order params
-func OrderParam(source interface{}, bizKey string) (returnStr string) {
-	switch v := source.(type) {
-	case map[string]string:
-		keys := make([]string, 0, len(v))
-		for k := range v {
-			if k == "sign" {
-				continue
-			}
-			keys = append(keys, k)
+func OrderParam(p map[string]string, bizKey string) (returnStr string) {
+	keys := make([]string, 0, len(p))
+	for k := range p {
+		if k == "sign" {
+			continue
 		}
-		sort.Strings(keys)
-		var buf bytes.Buffer
-		for _, k := range keys {
-			if v[k] == "" {
-				continue
-			}
-			if buf.Len() > 0 {
-				buf.WriteByte('&')
-			}
-			buf.WriteString(k)
-			buf.WriteByte('=')
-			buf.WriteString(v[k])
-		}
-		buf.WriteString(bizKey)
-		returnStr = buf.String()
-	case map[string]interface{}:
-		keys := make([]string, 0, len(v))
-		for k := range v {
-			if k == "sign" {
-				continue
-			}
-			keys = append(keys, k)
-		}
-		sort.Strings(keys)
-		var buf bytes.Buffer
-		for _, k := range keys {
-			if v[k] == "" {
-				continue
-			}
-			if buf.Len() > 0 {
-				buf.WriteByte('&')
-			}
-			buf.WriteString(k)
-			buf.WriteByte('=')
-			switch vv := v[k].(type) {
-			case string:
-				buf.WriteString(vv)
-			case int:
-				buf.WriteString(strconv.FormatInt(int64(vv), 10))
-			default:
-				panic("params type not supported")
-			}
-		}
-		buf.WriteString(bizKey)
-		returnStr = buf.String()
+		keys = append(keys, k)
 	}
+	sort.Strings(keys)
+	var buf bytes.Buffer
+	for _, k := range keys {
+		if p[k] == "" {
+			continue
+		}
+		if buf.Len() > 0 {
+			buf.WriteByte('&')
+		}
+		buf.WriteString(k)
+		buf.WriteByte('=')
+		buf.WriteString(p[k])
+	}
+	buf.WriteString(bizKey)
+	returnStr = buf.String()
 	return
 }

util/rsa.go

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

util/signature.go

@@ -12,7 +12,7 @@ func Signature(params ...string) string {
 	sort.Strings(params)
 	h := sha1.New()
 	for _, s := range params {
-		io.WriteString(h, s)
+		_, _ = io.WriteString(h, s)
 	}
 	return fmt.Sprintf("%x", h.Sum(nil))
 }

util/time.go

@@ -2,7 +2,7 @@ package util
 
 import "time"
 
-//GetCurrTs return current timestamps
-func GetCurrTs() int64 {
+//GetCurrTS return current timestamps
+func GetCurrTS() int64 {
 	return time.Now().Unix()
 }

util/util.go

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

util/util_test.go

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

wechat.go

@@ -12,11 +12,12 @@ 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/work"
+	workConfig "github.com/silenceper/wechat/v2/work/config"
 	log "github.com/sirupsen/logrus"
 )
 
 func init() {
-
 	// Log as JSON instead of the default ASCII formatter.
 	log.SetFormatter(&log.TextFormatter{})
 
@@ -26,7 +27,6 @@ func init() {
 
 	// Only log the warning severity or above.
 	log.SetLevel(log.DebugLevel)
-
 }
 
 // Wechat struct
@@ -69,3 +69,8 @@ func (wc *Wechat) GetPay(cfg *payConfig.Config) *pay.Pay {
 func (wc *Wechat) GetOpenPlatform(cfg *openConfig.Config) *openplatform.OpenPlatform {
 	return openplatform.NewOpenPlatform(cfg)
 }
+
+// GetWork 获取企业微信的实例
+func (wc *Wechat) GetWork(cfg *workConfig.Config) *work.Work {
+	return work.NewWork(cfg)
+}

work/config/config.go

@@ -0,0 +1,15 @@
+// Package config 企业微信config配置
+package config
+
+import (
+	"github.com/silenceper/wechat/v2/cache"
+)
+
+// Config 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 // 消息加密私钥，可以在企业微信管理端--管理工具--消息加密公钥查看对用公钥，私钥一般由自己保存
+}

work/context/context.go

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

work/msgaudit/README.md

@@ -0,0 +1,95 @@
+企业微信会话存档SDK（基于企业微信C版官方SDK封装），暂时只支持在`linux`环境下使用当前SDK。
+
+### 官方文档地址
+https://open.work.weixin.qq.com/api/doc/90000/90135/91774
+
+### 使用方式
+
+1、安装 go module
+> go get -u github.com/silenceper/wechat/v2
+
+2、从 `github.com/silenceper/wechat/v2/work/msgaudit/lib` 文件夹下复制 `libWeWorkFinanceSdk_C.so` 动态库文件到系统动态链接库默认文件夹下，或者复制到任意文件夹并在当前文件夹下执行 `export LD_LIBRARY_PATH=$(pwd)`命令设置动态链接库检索地址后即可正常使用
+
+### Example
+
+```go
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"github.com/silenceper/wechat/v2"
+	"github.com/silenceper/wechat/v2/work/msgaudit"
+	"github.com/silenceper/wechat/v2/work/config"
+	"io/ioutil"
+	"os"
+	"path"
+)
+
+func main() {
+	//初始化客户端
+	wechatClient := wechat.NewWechat()
+	
+	workClient := wechatClient.NewWork(&config.Config{
+		CorpID:        "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+		CorpSecret:    "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+		RasPrivateKey: "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+	})
+	
+	client, err := workClient.GetMsgAudit()
+	if err != nil {
+		fmt.Printf("SDK 初始化失败：%v \n", err)
+		return
+	}
+
+	//同步消息
+	chatDataList, err := client.GetChatData(0, 100, "", "", 3)
+	if err != nil {
+		fmt.Printf("消息同步失败：%v \n", err)
+		return
+	}
+
+	for _, chatData := range chatDataList {
+		//消息解密
+		chatInfo, err := client.DecryptData(chatData.EncryptRandomKey, chatData.EncryptChatMsg)
+		if err != nil {
+			fmt.Printf("消息解密失败：%v \n", err)
+			return
+		}
+
+		if chatInfo.Type == "image" {
+			image, _ := chatInfo.GetImageMessage()
+			sdkfileid := image.Image.SdkFileId
+
+			isFinish := false
+			buffer := bytes.Buffer{}
+			for !isFinish {
+				//获取媒体数据
+				mediaData, err := client.GetMediaData("", sdkfileid, "", "", 5)
+				if err != nil {
+					fmt.Printf("媒体数据拉取失败：%v \n", err)
+					return
+				}
+				buffer.Write(mediaData.Data)
+				if mediaData.IsFinish {
+					isFinish = mediaData.IsFinish
+				}
+			}
+			filePath, _ := os.Getwd()
+			filePath = path.Join(filePath, "test.png")
+			err := ioutil.WriteFile(filePath, buffer.Bytes(), 0666)
+			if err != nil {
+				fmt.Printf("文件存储失败：%v \n", err)
+				return
+			}
+			break
+		}
+	}
+	
+	//释放SDK实例
+	client.Free()
+}
+
+
+
+```

work/msgaudit/chat.go

@@ -0,0 +1,207 @@
+package msgaudit
+
+import "encoding/json"
+
+// ChatDataResponse 会话存档消息响应数据
+type ChatDataResponse struct {
+	Error
+	ChatDataList []ChatData `json:"chatdata,omitempty"`
+}
+
+// IsError 判断是否正确响应
+func (c ChatDataResponse) IsError() bool {
+	return c.ErrCode != 0
+}
+
+// ChatData 会话存档原始数据
+type ChatData struct {
+	Seq              uint64 `json:"seq,omitempty"`                // 消息的seq值，标识消息的序号。再次拉取需要带上上次回包中最大的seq。Uint64类型，范围0-pow(2,64)-1
+	MsgID            string `json:"msgid,omitempty"`              // 消息id，消息的唯一标识，企业可以使用此字段进行消息去重。
+	PublickeyVer     uint32 `json:"publickey_ver,omitempty"`      // 加密此条消息使用的公钥版本号。
+	EncryptRandomKey string `json:"encrypt_random_key,omitempty"` // 使用publickey_ver指定版本的公钥进行非对称加密后base64加密的内容，需要业务方先base64 decode处理后，再使用指定版本的私钥进行解密，得出内容。
+	EncryptChatMsg   string `json:"encrypt_chat_msg,omitempty"`   // 消息密文。需要业务方使用将encrypt_random_key解密得到的内容，与encrypt_chat_msg，传入sdk接口DecryptData,得到消息明文。
+}
+
+// ChatMessage 会话存档消息
+type ChatMessage struct {
+	ID         string   // 消息id，消息的唯一标识，企业可以使用此字段进行消息去重。
+	From       string   // 消息发送方id。同一企业内容为userid，非相同企业为external_userid。消息如果是机器人发出，也为external_userid。
+	ToList     []string // 消息接收方列表，可能是多个，同一个企业内容为userid，非相同企业为external_userid。
+	Action     string   // 消息动作，目前有send(发送消息)/recall(撤回消息)/switch(切换企业日志)三种类型。
+	Type       string   // 消息类型
+	originData []byte   // 原始消息对象
+}
+
+// GetOriginMessage 获取消息原始数据
+func (c ChatMessage) GetOriginMessage() (msg map[string]interface{}, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetTextMessage 获取文本消息
+func (c ChatMessage) GetTextMessage() (msg TextMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetImageMessage 获取图片消息
+func (c ChatMessage) GetImageMessage() (msg ImageMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetRevokeMessage 获取撤回消息
+func (c ChatMessage) GetRevokeMessage() (msg RevokeMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetAgreeMessage 获取同意会话聊天内容
+func (c ChatMessage) GetAgreeMessage() (msg AgreeMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetVoiceMessage 获取语音消息
+func (c ChatMessage) GetVoiceMessage() (msg VoiceMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetVideoMessage 获取视频消息
+func (c ChatMessage) GetVideoMessage() (msg VideoMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetCardMessage 获取名片消息
+func (c ChatMessage) GetCardMessage() (msg CardMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetLocationMessage 获取位置消息
+func (c ChatMessage) GetLocationMessage() (msg LocationMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetEmotionMessage 获取表情消息
+func (c ChatMessage) GetEmotionMessage() (msg EmotionMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetFileMessage 获取文件消息
+func (c ChatMessage) GetFileMessage() (msg FileMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetLinkMessage 获取链接消息
+func (c ChatMessage) GetLinkMessage() (msg LinkMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetWeappMessage 获取小程序消息
+func (c ChatMessage) GetWeappMessage() (msg WeappMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetChatRecordMessage 获取会话记录消息
+func (c ChatMessage) GetChatRecordMessage() (msg ChatRecordMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetTodoMessage 获取待办消息
+func (c ChatMessage) GetTodoMessage() (msg TodoMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetVoteMessage 获取投票消息
+func (c ChatMessage) GetVoteMessage() (msg VoteMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetCollectMessage 获取填表消息
+func (c ChatMessage) GetCollectMessage() (msg CollectMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetRedpacketMessage 获取红包消息
+func (c ChatMessage) GetRedpacketMessage() (msg RedpacketMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetMeetingMessage 获取会议邀请消息
+func (c ChatMessage) GetMeetingMessage() (msg MeetingMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetDocMessage 获取在线文档消息
+func (c ChatMessage) GetDocMessage() (msg DocMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetMarkdownMessage 获取MarkDown格式消息
+func (c ChatMessage) GetMarkdownMessage() (msg MarkdownMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetNewsMessage 获取图文消息
+func (c ChatMessage) GetNewsMessage() (msg NewsMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetCalendarMessage 获取日程消息
+func (c ChatMessage) GetCalendarMessage() (msg CalendarMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetMixedMessage 获取混合消息
+func (c ChatMessage) GetMixedMessage() (msg MixedMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetMeetingVoiceCallMessage 获取音频存档消息
+func (c ChatMessage) GetMeetingVoiceCallMessage() (msg MeetingVoiceCallMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetVoipDocShareMessage 获取音频共享消息
+func (c ChatMessage) GetVoipDocShareMessage() (msg VoipDocShareMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetExternalRedPacketMessage 获取互通红包消息
+func (c ChatMessage) GetExternalRedPacketMessage() (msg ExternalRedPacketMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetSphFeedMessage 获取视频号消息
+func (c ChatMessage) GetSphFeedMessage() (msg SphFeedMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}
+
+// GetSwitchMessage 获取切换企业日志
+func (c ChatMessage) GetSwitchMessage() (msg SwitchMessage, err error) {
+	err = json.Unmarshal(c.originData, &msg)
+	return msg, err
+}

work/msgaudit/client.go

@@ -0,0 +1,260 @@
+package msgaudit
+
+// #cgo LDFLAGS: -L${SRCDIR}/lib -lWeWorkFinanceSdk_C
+// #cgo CFLAGS: -I ./lib/
+// #include <stdlib.h>
+// #include "WeWorkFinanceSdk_C.h"
+import "C"
+import (
+	"encoding/json"
+	"github.com/silenceper/wechat/v2/util"
+	"github.com/silenceper/wechat/v2/work/config"
+	"unsafe"
+)
+
+// Client 会话存档
+type Client struct {
+	ptr        *C.WeWorkFinanceSdk_t
+	privateKey string
+}
+
+// NewClient 初始会话会话存档实例
+/**
+* 初始化函数
+* Return值=0表示该API调用成功
+*
+* @param [in]  sdk			NewSdk返回的sdk指针
+* @param [in]  corpid       调用企业的企业id，例如：wwd08c8exxxx5ab44d，可以在企业微信管理端--我的企业--企业信息查看
+* @param [in]  secret		 聊天内容存档的Secret，可以在企业微信管理端--管理工具--聊天内容存档查看
+* @param [in]  privateKey    消息加密私钥，可以在企业微信管理端--管理工具--消息加密公钥查看对用公钥，私钥一般由自己保存
+*
+*
+* @return 返回是否初始化成功
+*      0   - 成功
+*      !=0 - 失败
+ */
+func NewClient(cfg *config.Config) (*Client, error) {
+	ptr := C.NewSdk()
+	corpIDC := C.CString(cfg.CorpID)
+	corpSecretC := C.CString(cfg.CorpSecret)
+	defer func() {
+		C.free(unsafe.Pointer(corpIDC))
+		C.free(unsafe.Pointer(corpSecretC))
+	}()
+	retC := C.Init(ptr, corpIDC, corpSecretC)
+	ret := int(retC)
+	if ret != 0 {
+		return nil, NewSDKErr(ret)
+	}
+	return &Client{
+		ptr:        ptr,
+		privateKey: cfg.RasPrivateKey,
+	}, nil
+}
+
+// Free 释放SDK实例是可调用该方法释放内存
+func (s *Client) Free() {
+	if s.ptr == nil {
+		return
+	}
+	C.DestroySdk(s.ptr)
+	s.ptr = nil
+}
+
+// GetChatData 拉取聊天记录函数
+/**
+* 拉取聊天记录函数
+*
+*
+* @param [in]  seq             从指定的seq开始拉取消息，注意的是返回的消息从seq+1开始返回，seq为之前接口返回的最大seq值。首次使用请使用seq:0
+* @param [in]  limit           一次拉取的消息条数，最大值1000条，超过1000条会返回错误
+* @param [in]  proxy           使用代理的请求，需要传入代理的链接。如：socks5://10.0.0.1:8081 或者 http://10.0.0.1:8081
+* @param [in]  passwd          代理账号密码，需要传入代理的账号密码。如 user_name:passwd_123
+* @param [in]  timeout         超时时间，单位秒
+* @return chatDatas       返回本次拉取消息的数据，slice结构体.内容包括errcode/errmsg，以及每条消息内容。示例如下：
+
+{"errcode":0,"errmsg":"ok","chatdata":[{"seq":196,"msgid":"CAQQ2fbb4QUY0On2rYSAgAMgip/yzgs=","publickey_ver":3,"encrypt_random_key":"ftJ+uz3n/z1DsxlkwxNgE+mL38H42/KCvN8T60gbbtPD+Rta1hKTuQPzUzO6Hzne97MgKs7FfdDxDck/v8cDT6gUVjA2tZ/M7euSD0L66opJ/IUeBtpAtvgVSD5qhlaQjvfKJc/zPMGNK2xCLFYqwmQBZXbNT7uA69Fflm512nZKW/piK2RKdYJhRyvQnA1ISxK097sp9WlEgDg250fM5tgwMjujdzr7ehK6gtVBUFldNSJS7ndtIf6aSBfaLktZgwHZ57ONewWq8GJe7WwQf1hwcDbCh7YMG8nsweEwhDfUz+u8rz9an+0lgrYMZFRHnmzjgmLwrR7B/32Qxqd79A==","encrypt_chat_msg":"898WSfGMnIeytTsea7Rc0WsOocs0bIAerF6de0v2cFwqo9uOxrW9wYe5rCjCHHH5bDrNvLxBE/xOoFfcwOTYX0HQxTJaH0ES9OHDZ61p8gcbfGdJKnq2UU4tAEgGb8H+Q9n8syRXIjaI3KuVCqGIi4QGHFmxWenPFfjF/vRuPd0EpzUNwmqfUxLBWLpGhv+dLnqiEOBW41Zdc0OO0St6E+JeIeHlRZAR+E13Isv9eS09xNbF0qQXWIyNUi+ucLr5VuZnPGXBrSfvwX8f0QebTwpy1tT2zvQiMM2MBugKH6NuMzzuvEsXeD+6+3VRqL"}]}
+*/
+func (s *Client) GetChatData(seq uint64, limit uint64, proxy string, passwd string, timeout int) ([]ChatData, error) {
+	proxyC := C.CString(proxy)
+	passwdC := C.CString(passwd)
+	chatSlice := C.NewSlice()
+	defer func() {
+		C.free(unsafe.Pointer(proxyC))
+		C.free(unsafe.Pointer(passwdC))
+		C.FreeSlice(chatSlice)
+	}()
+
+	if s.ptr == nil {
+		return nil, NewSDKErr(10002)
+	}
+
+	retC := C.GetChatData(s.ptr, C.ulonglong(seq), C.uint(limit), proxyC, passwdC, C.int(timeout), chatSlice)
+	ret := int(retC)
+	if ret != 0 {
+		return nil, NewSDKErr(ret)
+	}
+	buf := s.GetContentFromSlice(chatSlice)
+
+	var data ChatDataResponse
+	err := json.Unmarshal(buf, &data)
+	if err != nil {
+		return nil, err
+	}
+	if data.ErrCode != 0 {
+		return nil, data.Error
+	}
+	return data.ChatDataList, nil
+}
+
+// GetRawChatData 拉取聊天记录函数
+/**
+* 拉取聊天记录函数
+*
+*
+* @param [in]  seq             从指定的seq开始拉取消息，注意的是返回的消息从seq+1开始返回，seq为之前接口返回的最大seq值。首次使用请使用seq:0
+* @param [in]  limit           一次拉取的消息条数，最大值1000条，超过1000条会返回错误
+* @param [in]  proxy           使用代理的请求，需要传入代理的链接。如：socks5://10.0.0.1:8081 或者 http://10.0.0.1:8081
+* @param [in]  passwd          代理账号密码，需要传入代理的账号密码。如 user_name:passwd_123
+* @param [in]  timeout         超时时间，单位秒
+* @return chatDatas       返回本次拉取消息的数据，slice结构体.内容包括errcode/errmsg，以及每条消息内容。示例如下：
+
+{"errcode":0,"errmsg":"ok","chatdata":[{"seq":196,"msgid":"CAQQ2fbb4QUY0On2rYSAgAMgip/yzgs=","publickey_ver":3,"encrypt_random_key":"ftJ+uz3n/z1DsxlkwxNgE+mL38H42/KCvN8T60gbbtPD+Rta1hKTuQPzUzO6Hzne97MgKs7FfdDxDck/v8cDT6gUVjA2tZ/M7euSD0L66opJ/IUeBtpAtvgVSD5qhlaQjvfKJc/zPMGNK2xCLFYqwmQBZXbNT7uA69Fflm512nZKW/piK2RKdYJhRyvQnA1ISxK097sp9WlEgDg250fM5tgwMjujdzr7ehK6gtVBUFldNSJS7ndtIf6aSBfaLktZgwHZ57ONewWq8GJe7WwQf1hwcDbCh7YMG8nsweEwhDfUz+u8rz9an+0lgrYMZFRHnmzjgmLwrR7B/32Qxqd79A==","encrypt_chat_msg":"898WSfGMnIeytTsea7Rc0WsOocs0bIAerF6de0v2cFwqo9uOxrW9wYe5rCjCHHH5bDrNvLxBE/xOoFfcwOTYX0HQxTJaH0ES9OHDZ61p8gcbfGdJKnq2UU4tAEgGb8H+Q9n8syRXIjaI3KuVCqGIi4QGHFmxWenPFfjF/vRuPd0EpzUNwmqfUxLBWLpGhv+dLnqiEOBW41Zdc0OO0St6E+JeIeHlRZAR+E13Isv9eS09xNbF0qQXWIyNUi+ucLr5VuZnPGXBrSfvwX8f0QebTwpy1tT2zvQiMM2MBugKH6NuMzzuvEsXeD+6+3VRqL"}]}
+*/
+func (s *Client) GetRawChatData(seq uint64, limit uint64, proxy string, passwd string, timeout int) (ChatDataResponse, error) {
+	proxyC := C.CString(proxy)
+	passwdC := C.CString(passwd)
+	chatSlice := C.NewSlice()
+	defer func() {
+		C.free(unsafe.Pointer(proxyC))
+		C.free(unsafe.Pointer(passwdC))
+		C.FreeSlice(chatSlice)
+	}()
+
+	if s.ptr == nil {
+		return ChatDataResponse{}, NewSDKErr(10002)
+	}
+
+	retC := C.GetChatData(s.ptr, C.ulonglong(seq), C.uint(limit), proxyC, passwdC, C.int(timeout), chatSlice)
+	ret := int(retC)
+	if ret != 0 {
+		return ChatDataResponse{}, NewSDKErr(ret)
+	}
+	buf := s.GetContentFromSlice(chatSlice)
+
+	var data ChatDataResponse
+	err := json.Unmarshal(buf, &data)
+	if err != nil {
+		return ChatDataResponse{}, err
+	}
+	return data, nil
+}
+
+// DecryptData 解析密文.企业微信自有解密内容
+/**
+* @brief 解析密文.企业微信自有解密内容
+* @param [in]  encrypt_key, getchatdata返回的encrypt_random_key,使用企业自持对应版本秘钥RSA解密后的内容
+* @param [in]  encrypt_msg, getchatdata返回的encrypt_chat_msg
+* @param [out] msg, 解密的消息明文
+* @return 返回是否调用成功
+*      0   - 成功
+*      !=0 - 失败
+ */
+func (s *Client) DecryptData(encryptRandomKey string, encryptMsg string) (msg ChatMessage, err error) {
+	encryptKey, err := util.RSADecryptBase64(s.privateKey, encryptRandomKey)
+	if err != nil {
+		return msg, err
+	}
+	encryptKeyC := C.CString(string(encryptKey))
+	encryptMsgC := C.CString(encryptMsg)
+	msgSlice := C.NewSlice()
+	defer func() {
+		C.free(unsafe.Pointer(encryptKeyC))
+		C.free(unsafe.Pointer(encryptMsgC))
+		C.FreeSlice(msgSlice)
+	}()
+
+	retC := C.DecryptData(encryptKeyC, encryptMsgC, msgSlice)
+	ret := int(retC)
+	if ret != 0 {
+		return msg, NewSDKErr(ret)
+	}
+	buf := s.GetContentFromSlice(msgSlice)
+
+	// handle illegal escape character in text
+	for i := 0; i < len(buf); {
+		if buf[i] < 0x20 {
+			buf = append(buf[:i], buf[i+1:]...)
+			continue
+		}
+		i++
+	}
+
+	var baseMessage BaseMessage
+	err = json.Unmarshal(buf, &baseMessage)
+	if err != nil {
+		return msg, err
+	}
+
+	msg.ID = baseMessage.MsgID
+	msg.From = baseMessage.From
+	msg.ToList = baseMessage.ToList
+	msg.Action = baseMessage.Action
+	msg.Type = baseMessage.MsgType
+	msg.originData = buf
+	return msg, err
+}
+
+// GetMediaData 拉取媒体消息函数
+/**
+ * 拉取媒体消息函数
+ * Return值=0表示该API调用成功
+ *
+ *
+ * @param [in]  sdk				NewSdk返回的sdk指针
+ * @param [in]  sdkFileid		从GetChatData返回的聊天消息中，媒体消息包括的sdkfileid
+ * @param [in]  proxy			使用代理的请求，需要传入代理的链接。如：socks5://10.0.0.1:8081 或者 http://10.0.0.1:8081
+ * @param [in]  passwd			代理账号密码，需要传入代理的账号密码。如 user_name:passwd_123
+ * @param [in]  indexbuf		媒体消息分片拉取，需要填入每次拉取的索引信息。首次不需要填写，默认拉取512k，后续每次调用只需要将上次调用返回的outindexbuf填入即可。
+ * @param [in]  timeout			超时时间，单位秒
+ * @param [out] media_data		返回本次拉取的媒体数据.MediaData结构体.内容包括data(数据内容)/outindexbuf(下次索引)/is_finish(拉取完成标记)
+
+ *
+ * @return 返回是否调用成功
+ *      0   - 成功
+ *      !=0 - 失败
+ */
+func (s *Client) GetMediaData(indexBuf string, sdkFileID string, proxy string, passwd string, timeout int) (*MediaData, error) {
+	indexBufC := C.CString(indexBuf)
+	sdkFileIDC := C.CString(sdkFileID)
+	proxyC := C.CString(proxy)
+	passwdC := C.CString(passwd)
+	mediaDataC := C.NewMediaData()
+	defer func() {
+		C.free(unsafe.Pointer(indexBufC))
+		C.free(unsafe.Pointer(sdkFileIDC))
+		C.free(unsafe.Pointer(proxyC))
+		C.free(unsafe.Pointer(passwdC))
+		C.FreeMediaData(mediaDataC)
+	}()
+
+	if s.ptr == nil {
+		return nil, NewSDKErr(10002)
+	}
+
+	retC := C.GetMediaData(s.ptr, indexBufC, sdkFileIDC, proxyC, passwdC, C.int(timeout), mediaDataC)
+	ret := int(retC)
+	if ret != 0 {
+		return nil, NewSDKErr(ret)
+	}
+	return &MediaData{
+		OutIndexBuf: C.GoString(C.GetOutIndexBuf(mediaDataC)),
+		Data:        C.GoBytes(unsafe.Pointer(C.GetData(mediaDataC)), C.GetDataLen(mediaDataC)),
+		IsFinish:    int(C.IsMediaDataFinish(mediaDataC)) == 1,
+	}, nil
+}
+
+// GetContentFromSlice 从切片内获取内容
+func (s *Client) GetContentFromSlice(slice *C.struct_Slice_t) []byte {
+	return C.GoBytes(unsafe.Pointer(C.GetContentFromSlice(slice)), C.GetSliceLen(slice))
+}