优化小程序解密 (#262 )

添加菜单-支持json方式 (#261 )
实现批量获取素材 (#260 )
2026-02-05 13:12:26 +08:00 · 2020-05-30 08:08:03 +08:00 · 2020-05-30 07:39:24 +08:00 · 2020-05-30 06:58:15 +08:00 · 2020-05-29 23:17:04 +08:00 · 2020-05-26 21:51:42 +08:00
34 changed files with 871 additions and 392 deletions
--- a/.travis.yml
+++ b/.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 ./...)
--- a/README.md
+++ b/README.md
@@ -1,10 +1,11 @@
 # 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)
+[![godoc](https://img.shields.io/badge/godoc-reference-informational)](https://pkg.go.dev/github.com/silenceper/wechat/v2?tab=doc)

 使用Golang开发的微信SDK，简单、易用。

+> 当前版本状态：alpha，部分API可能会做出调整。

 ## 快速开始

@@ -44,9 +45,10 @@ server.Send()

 ```

-## 文档
+## 文档 && 例子
 [Wechat SDK 2.0 文档](http://silenceper.com/wechat)

+[Wechat SDK 2.0 例子](https://github.com/gowechat/example)

 ## 目录说明
 - officialaccount: 微信公众号API
@@ -61,6 +63,8 @@ server.Send()
 - 提交issue，描述需要贡献的内容
 - 完成更改后，提交PR

+## 公众号
+![img](https://silenceper.oss-cn-beijing.aliyuncs.com/qrcode/search_study_program.png)

 ## License

--- a/cache/memcache_test.go
+++ b/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)
 }
--- a/cache/redis.go
+++ b/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 实例化
--- a/cache/redis_test.go
+++ b/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

--- a/credential/access_token.go
+++ b/credential/access_token.go
@@ -0,0 +1,6 @@
+package credential
+
+//AccessTokenHandle AccessToken 接口
+type AccessTokenHandle interface {
+	GetAccessToken() (accessToken string, err error)
+}
--- a/credential/default_access_token.go
+++ b/credential/default_access_token.go
@@ -0,0 +1,99 @@
+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"
+	//CacheKeyOfficialAccountPrefix 微信公众号cache key前缀
+	CacheKeyOfficialAccountPrefix = "gowechat_officialaccount_"
+	//CacheKeyMiniProgramPrefix 小程序cache key前缀
+	CacheKeyMiniProgramPrefix = "gowechat_miniprogram_"
+)
+
+//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(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
+}
+
+//GetTokenFromServer 强制从微信服务器获取token
+func GetTokenFromServer(appID, appSecret string) (resAccessToken ResAccessToken, err error) {
+	url := fmt.Sprintf("%s?grant_type=client_credential&appid=%s&secret=%s", accessTokenURL, appID, appSecret)
+	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
+	}
+	return
+}
--- a/credential/default_access_token_test.go
+++ b/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")
+}
--- a/credential/default_js_ticket.go
+++ b/credential/default_js_ticket.go
@@ -0,0 +1,80 @@
+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)
+	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
+}
--- a/credential/js_ticket.go
+++ b/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)
+}
--- a/go.mod
+++ b/go.mod
@@ -8,5 +8,7 @@ require (
 	github.com/gomodule/redigo v1.8.1
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cast v1.3.1
+	github.com/stretchr/testify v1.5.1
 	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
+	gopkg.in/h2non/gock.v1 v1.0.15
 )
--- a/go.sum
+++ b/go.sum
@@ -4,14 +4,20 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
 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/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
+github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -29,5 +35,7 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 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/h2non/gock.v1 v1.0.15 h1:SzLqcIlb/fDfg7UvukMpNcWsu7sI5tWwL+KCATZqks0=
+gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/miniprogram/basic/basic.go
+++ b/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
-}
--- a/miniprogram/context/access_token.go
+++ b/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
-}
--- a/miniprogram/context/context.go
+++ b/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
 }
--- a/miniprogram/encryptor/encryptor.go
+++ b/miniprogram/encryptor/encryptor.go
@@ -1,4 +1,4 @@
-package basic
+package encryptor

 import (
 	"crypto/aes"
@@ -6,8 +6,23 @@ 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,8 +34,8 @@ var (
 	ErrInvalidPKCS7Padding = errors.New("invalid padding on input")
 )

-// UserInfo 用户信息
-type UserInfo struct {
+// PlainData 用户信息/手机号信息
+type PlainData struct {
 	OpenID    string `json:"openId"`
 	UnionID   string `json:"unionId"`
 	NickName  string `json:"nickName"`
@@ -30,18 +45,10 @@ type UserInfo struct {
 	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 {
 	PhoneNumber     string `json:"phoneNumber"`
 	PurePhoneNumber string `json:"purePhoneNumber"`
 	CountryCode     string `json:"countryCode"`
-	Watermark       struct {
+	Watermark struct {
 		Timestamp int64  `json:"timestamp"`
 		AppID     string `json:"appid"`
 	} `json:"watermark"`
@@ -96,35 +103,18 @@ func getCipherText(sessionKey, encryptedData, iv string) ([]byte, error) {
 }

 // Decrypt 解密数据
-func (basic *Basic) Decrypt(sessionKey, encryptedData, iv string) (*UserInfo, error) {
+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
 }
--- a/miniprogram/miniprogram.go
+++ b/miniprogram/miniprogram.go
@@ -1,11 +1,10 @@
 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/encryptor"
 	"github.com/silenceper/wechat/v2/miniprogram/config"
 	"github.com/silenceper/wechat/v2/miniprogram/context"
 	"github.com/silenceper/wechat/v2/miniprogram/qrcode"
@@ -19,24 +18,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 登录/用户信息相关接口
--- a/officialaccount/basic/basic.go
+++ b/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")
+}
--- a/officialaccount/broadcast/broadcast.go
+++ b/officialaccount/broadcast/broadcast.go
@@ -0,0 +1,279 @@
+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"
+)
+
+//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
+}
+
+//NewBroadcast new
+func NewBroadcast(ctx *context.Context) *Broadcast {
+	return &Broadcast{ctx}
+}
+
+//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"`
+}
+
+//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")
+}
+
+
+//TODO 发送预览，群发消息状态，发送速度
+
+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 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
+}
--- a/officialaccount/context/access_token.go
+++ b/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
-}
--- a/officialaccount/context/context.go
+++ b/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
 }
--- a/officialaccount/js/js.go
+++ b/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,27 +22,31 @@ 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
 	}
@@ -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
-}
--- a/officialaccount/material/material.go
+++ b/officialaccount/material/material.go
@@ -14,8 +14,22 @@ const (
 	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"
+	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 素材管理
 type Material struct {
 	*context.Context
@@ -55,6 +69,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,6 +108,9 @@ 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 {
@@ -112,6 +132,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 +237,59 @@ func (material *Material) DeleteMaterial(mediaID string) error {

 	return util.DecodeWithCommonError(response, "DeleteMaterial")
 }
+
+//ArticleList 永久素材列表
+type ArticleList struct {
+	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
+}
--- a/officialaccount/menu/menu.go
+++ b/officialaccount/menu/menu.go
@@ -138,6 +138,24 @@ 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.PostJSON(uri, jsonInfo)
+	if err != nil {
+		return err
+	}
+
+	return util.DecodeWithCommonError(response, "SetMenu")
+}
+
 //GetMenu 获取菜单配置
 func (menu *Menu) GetMenu() (resMenu ResMenu, err error) {
 	var accessToken string
@@ -198,6 +216,23 @@ 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.PostJSON(uri, jsonInfo)
+	if err != nil {
+		return err
+	}
+
+	return util.DecodeWithCommonError(response, "AddConditional")
+}
+
 //DeleteConditional 删除个性化菜单
 func (menu *Menu) DeleteConditional(menuID int64) error {
 	accessToken, err := menu.GetAccessToken()
--- a/officialaccount/message/template.go
+++ b/officialaccount/message/template.go
@@ -24,13 +24,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 +38,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 +51,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 {
--- a/officialaccount/message/transfer_customer.go
+++ b/officialaccount/message/transfer_customer.go
--- a/officialaccount/officialaccount.go
+++ b/officialaccount/officialaccount.go
@@ -2,9 +2,10 @@ package officialaccount

 import (
 	"net/http"
-	"sync"

+	"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 +25,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 +53,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
@@ -92,3 +95,9 @@ func (officialAccount *OfficialAccount) GetTemplate() *message.Template {
 func (officialAccount *OfficialAccount) GetDevice() *device.Device {
 	return device.NewDevice(officialAccount.ctx)
 }
+
+//GetBroadcast 群发消息
+//TODO 待完善
+func (officialAccount *OfficialAccount) GetBroadcast() *broadcast.Broadcast {
+	return broadcast.NewBroadcast(officialAccount.ctx)
+}
--- a/officialaccount/server/server.go
+++ b/officialaccount/server/server.go
@@ -29,10 +29,10 @@ type Server struct {

 	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)
 }
@@ -109,7 +109,7 @@ func (srv *Server) handleRequest() (reply *message.Reply, err error) {
 	if !success {
 		err = errors.New("消息类型转换失败")
 	}
-	srv.requestMsg = mixMessage
+	srv.RequestMsg = mixMessage
 	reply = srv.messageHandler(mixMessage)
 	return
 }
@@ -155,7 +155,7 @@ func (srv *Server) getMessage() (interface{}, error) {
 		}
 	}

-	srv.requestRawXMLMsg = rawXMLMsgBytes
+	srv.RequestRawXMLMsg = rawXMLMsgBytes

 	return srv.parseRequestMessage(rawXMLMsgBytes)
 }
@@ -204,10 +204,10 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
 	}

 	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)
@@ -216,19 +216,19 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
 	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
 		}
--- a/officialaccount/user/user.go
+++ b/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"`
--- a/openplatform/account/account.go
+++ b/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
+}
--- a/openplatform/context/accessToken.go
+++ b/openplatform/context/accessToken.go
@@ -14,7 +14,10 @@ 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"
+	//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 第三方平台
--- a/openplatform/miniprogram/basic/basic.go
+++ b/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() {
 //}
--- a/openplatform/officialaccount/officialaccount.go
+++ b/openplatform/officialaccount/officialaccount.go
@@ -1,9 +1,9 @@
 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"
 )

@@ -25,9 +25,25 @@ 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}
 }
+
+//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)
+}
--- a/openplatform/openplatform.go
+++ b/openplatform/openplatform.go
@@ -1,6 +1,7 @@
 package openplatform

 import (
+	"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"
@@ -29,6 +30,12 @@ func (openPlatform *OpenPlatform) GetOfficialAccount(appID string) *officialacco
 }

 //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)
 }
Author	SHA1	Message	Date
silenceper	0e23fa3fee	优化小程序解密 (#262 )	2020-05-30 08:08:03 +08:00
silenceper	351cf65621	添加菜单-支持json方式 (#261 )	2020-05-30 07:39:24 +08:00
silenceper	f3e3564178	实现批量获取素材 (#260 )	2020-05-30 06:58:15 +08:00
silenceper	5e8e16444c	群发消息接口 (#259 ) * 添加TODO：待完善接口 * 【模板消息】将message.DataItem改为message.TemplateDataItem * 【群发消息】基本框架 * 群发消息-基本方法 * fix golint * fix:SendWxCard log	2020-05-29 23:17:04 +08:00
silenceper	880ab20a6b	Merge pull request #255 from silenceper/feature-v2 将原始消息内容暴露	2020-05-26 21:51:42 +08:00
silenceper	66369c9541	将原始消息内容暴露	2020-05-26 21:50:17 +08:00
silenceper	58092a21de	testCase:使用gock模拟http接口数据	2020-05-25 23:27:24 +08:00
silenceper	01f83c20d5	Merge pull request #254 from silenceper/feature-v2 将获取AccessToken和jsTicket单独抽象为interface	2020-05-25 22:35:03 +08:00
silenceper	972dec0406	将小程序获取ak的方式也抽象出来	2020-05-25 22:00:51 +08:00
silenceper	b599e93c5b	将获取AccessToken和jsTicket单独抽象为interface	2020-05-25 21:55:42 +08:00
silenceper	f77ee8dd2e	Merge pull request #251 from silenceper/feature-v2 添加版本说明	2020-05-24 22:23:48 +08:00
silenceper	c89d24990c	添加版本说明	2020-05-24 22:23:08 +08:00
silenceper	e6a61a5ec7	Merge pull request #249 from silenceper/feature-v2 fix readme	2020-05-24 21:38:06 +08:00
silenceper	4326efae54	fix readme	2020-05-24 21:37:16 +08:00
silenceper	5d3f4be9a2	Merge pull request #248 from silenceper/feature-v2 添加example链接	2020-05-24 21:35:48 +08:00
silenceper	9b5bb79a72	添加example链接	2020-05-24 21:34:53 +08:00
silenceper	a4a388aef7	Merge pull request #247 from silenceper/feature-v2 新增基础接口	2020-05-24 18:32:13 +08:00
silenceper	7a4230414d	1、新增基础接口-清理接口调用次数 2、fix 多客服消息转发文件名错误	2020-05-24 17:56:10 +08:00
silenceper	239fe1d758	Merge pull request #246 from silenceper/feature-getip 添加获取微信服务器IP接口	2020-05-24 16:27:15 +08:00
silenceper	3f7690cf24	Merge branch 'feature-getip' of https://github.com/silenceper/wechat into feature-getip	2020-05-24 01:43:55 +08:00
silenceper	2e94f61043	解决冲突	2020-05-24 01:43:27 +08:00
silenceper	a3ce22df79	添加获取微信服务器IP接口	2020-05-24 01:41:14 +08:00
silenceper	f9a2c15361	Merge pull request #243 from silenceper/silenceper-patch-2 Delete .travis.yml	2020-05-23 13:30:14 +08:00
silenceper	3360ee7752	Delete .travis.yml	2020-05-23 13:30:04 +08:00
silenceper	9c0cde64e5	Merge pull request #242 from silenceper/silenceper-patch-1 Update README.md	2020-05-23 13:24:14 +08:00
silenceper	748fe17e72	Update README.md	2020-05-23 13:15:08 +08:00