add CommonToken and MiniProgramMixMessage (#323)

Co-authored-by: huangxiang <huangxiang@didichuxing.com>

.github/workflows/go.yml

@@ -28,23 +28,13 @@ jobs:
           go-version: ^1.13
         id: go
 
-      - name: Check out code into the Go module directory
+      - uses: actions/checkout@v2
-        uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v1
+        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.26
 
-      - 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 ./...

.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:"

README.md

@@ -4,7 +4,7 @@
 [![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，简单、易用。
->当前版本为2.0版本
+>当前版本为v2版本
 
 
 ## 文档 && 例子
@@ -13,6 +13,9 @@
 [Wechat SDK 2.0 例子](https://github.com/gowechat/example)
 
 ## 快速开始
+```
+import github.com/silenceper/wechat/v2
+```
 
 以下是一个微信公众号处理消息接收以及回复的例子：
 
@@ -63,8 +66,6 @@ server.Send()
 - 提交issue，描述需要贡献的内容
 - 完成更改后，提交PR
 
-感谢以下成员贡献.
-<a href="https://github.com/silenceper/wechat/graphs/contributors"><img src="https://opencollective.com/gowechat/contributors.svg?width=890&button=false" /></a>
 ## 公众号
 ![img](https://silenceper.oss-cn-beijing.aliyuncs.com/qrcode/search_study_program.png)
 

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

@@ -95,10 +95,7 @@ func (r *Redis) IsExist(key string) bool {
 
 	a, _ := conn.Do("EXISTS", key)
 	i := a.(int64)
-	if i > 0 {
+	return i > 0
-		return true
-	}
-	return false
 }
 
 //Delete 删除

credential/default_js_ticket.go

@@ -68,6 +68,9 @@ 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

miniprogram/config/config.go

@@ -1,3 +1,4 @@
+//Package config 小程序config配置
 package config
 
 import (

miniprogram/encryptor/encryptor.go

@@ -22,7 +22,6 @@ func NewEncryptor(context *context.Context) *Encryptor {
 	return basic
 }
 
-
 var (
 	// ErrAppIDNotMatch appid不匹配
 	ErrAppIDNotMatch = errors.New("app id not match")
@@ -36,19 +35,19 @@ var (
 
 // PlainData 用户信息/手机号信息
 type PlainData struct {
-	OpenID    string `json:"openId"`
+	OpenID          string `json:"openId"`
-	UnionID   string `json:"unionId"`
+	UnionID         string `json:"unionId"`
-	NickName  string `json:"nickName"`
+	NickName        string `json:"nickName"`
-	Gender    int    `json:"gender"`
+	Gender          int    `json:"gender"`
-	City      string `json:"city"`
+	City            string `json:"city"`
-	Province  string `json:"province"`
+	Province        string `json:"province"`
-	Country   string `json:"country"`
+	Country         string `json:"country"`
-	AvatarURL string `json:"avatarUrl"`
+	AvatarURL       string `json:"avatarUrl"`
-	Language  string `json:"language"`
+	Language        string `json:"language"`
 	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"`

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

@@ -7,6 +7,7 @@ import (
 	"github.com/silenceper/wechat/v2/miniprogram/config"
 	"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"
@@ -66,3 +67,8 @@ func (miniProgram *MiniProgram) GetTcb() *tcb.Tcb {
 func (miniProgram *MiniProgram) GetSubscribe() *subscribe.Subscribe {
 	return subscribe.NewSubscribe(miniProgram.ctx)
 }
+
+// GetCustomerMessage 客服消息接口
+func (miniProgram *MiniProgram) GetCustomerMessage() *message.Manager {
+	return message.NewCustomerMessageManager(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
 	}
-
+	err = fmt.Errorf("fetchCode error : unknown response content type - %v", contentType)
-	return
+	return nil, err
 }
 
 // CreateWXAQRCode 获取小程序二维码，适用于需要的码数量较少的业务场景

miniprogram/subscribe/subscribe.go

@@ -11,6 +11,10 @@ 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"
 )
 
 // Subscribe 订阅消息
@@ -38,6 +42,21 @@ type DataItem struct {
 	Value string `json:"value"`
 }
 
+//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
@@ -47,6 +66,28 @@ func (s *Subscribe) Send(msg *Message) (err error) {
 	}
 	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
+}

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
 }

officialaccount/broadcast/broadcast.go

@@ -8,9 +8,9 @@ import (
 )
 
 const (
-	sendURLByTag = "https://api.weixin.qq.com/cgi-bin/message/mass/sendall"
+	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"
+	deleteSendURL   = "https://api.weixin.qq.com/cgi-bin/message/mass/delete"
 )
 
 //MsgType 发送消息类型
@@ -69,17 +69,17 @@ type sendRequest struct {
 	//发送图片
 	Images *Image `json:"images,omitempty"`
 	//发送卡券
-	WxCard map[string]interface{} `json:"wxcard,omitempty"`
+	WxCard            map[string]interface{} `json:"wxcard,omitempty"`
-	MsgType           MsgType `json:"msgtype"`
+	MsgType           MsgType                `json:"msgtype"`
-	SendIgnoreReprint int32   `json:"send_ignore_reprint,omitempty"`
+	SendIgnoreReprint int32                  `json:"send_ignore_reprint,omitempty"`
 }
 
 //Image 发送图片
-type Image struct{
+type Image struct {
-	MediaIDs []string `json:"media_ids"`
+	MediaIDs           []string `json:"media_ids"`
-	Recommend string `json:"recommend"`
+	Recommend          string   `json:"recommend"`
-	NeedOpenComment int32 `json:"need_open_comment"`
+	NeedOpenComment    int32    `json:"need_open_comment"`
-	OnlyFansCanComment int32 `json:"only_fans_can_comment"`
+	OnlyFansCanComment int32    `json:"only_fans_can_comment"`
 }
 
 //SendText 群发文本
@@ -92,13 +92,13 @@ func (broadcast *Broadcast) SendText(user *User, content string) (*Result, error
 		return nil, err
 	}
 	req := &sendRequest{
-		ToUser: nil,
+		ToUser:  nil,
 		MsgType: MsgTypeText,
 	}
-	req.Text=map[string]interface{}{
+	req.Text = map[string]interface{}{
-		"content":content,
+		"content": content,
 	}
-	req,sendURL:=broadcast.chooseTagOrOpenID(user,req)
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
 	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
 	data, err := util.PostJSON(url, req)
 	if err != nil {
@@ -110,22 +110,22 @@ func (broadcast *Broadcast) SendText(user *User, content string) (*Result, error
 }
 
 //SendNews 发送图文
-func (broadcast *Broadcast) SendNews(user *User, mediaID string,ignoreReprint bool) (*Result, error) {
+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,
+		ToUser:  nil,
 		MsgType: MsgTypeNews,
 	}
-	if ignoreReprint{
+	if ignoreReprint {
-		req.SendIgnoreReprint=1
+		req.SendIgnoreReprint = 1
 	}
-	req.Mpnews=map[string]interface{}{
+	req.Mpnews = map[string]interface{}{
-		"media_id":mediaID,
+		"media_id": mediaID,
 	}
-	req,sendURL:=broadcast.chooseTagOrOpenID(user,req)
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
 	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
 	data, err := util.PostJSON(url, req)
 	if err != nil {
@@ -136,7 +136,6 @@ func (broadcast *Broadcast) SendNews(user *User, mediaID string,ignoreReprint bo
 	return res, err
 }
 
-
 //SendVoice 发送语音
 func (broadcast *Broadcast) SendVoice(user *User, mediaID string) (*Result, error) {
 	ak, err := broadcast.GetAccessToken()
@@ -144,13 +143,13 @@ func (broadcast *Broadcast) SendVoice(user *User, mediaID string) (*Result, erro
 		return nil, err
 	}
 	req := &sendRequest{
-		ToUser: nil,
+		ToUser:  nil,
 		MsgType: MsgTypeVoice,
 	}
-	req.Voice=map[string]interface{}{
+	req.Voice = map[string]interface{}{
-		"media_id":mediaID,
+		"media_id": mediaID,
 	}
-	req,sendURL:=broadcast.chooseTagOrOpenID(user,req)
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
 	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
 	data, err := util.PostJSON(url, req)
 	if err != nil {
@@ -168,11 +167,11 @@ func (broadcast *Broadcast) SendImage(user *User, images *Image) (*Result, error
 		return nil, err
 	}
 	req := &sendRequest{
-		ToUser: nil,
+		ToUser:  nil,
 		MsgType: MsgTypeImage,
 	}
-	req.Images=images
+	req.Images = images
-	req,sendURL:=broadcast.chooseTagOrOpenID(user,req)
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
 	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
 	data, err := util.PostJSON(url, req)
 	if err != nil {
@@ -183,23 +182,22 @@ func (broadcast *Broadcast) SendImage(user *User, images *Image) (*Result, error
 	return res, err
 }
 
-
 //SendVideo 发送视频
-func (broadcast *Broadcast) SendVideo(user *User, mediaID string,title,description string) (*Result, error) {
+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,
+		ToUser:  nil,
 		MsgType: MsgTypeVideo,
 	}
-	req.Voice=map[string]interface{}{
+	req.Voice = map[string]interface{}{
-		"media_id":mediaID,
+		"media_id":    mediaID,
-		"title":title,
+		"title":       title,
-		"description":description,
+		"description": description,
 	}
-	req,sendURL:=broadcast.chooseTagOrOpenID(user,req)
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
 	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
 	data, err := util.PostJSON(url, req)
 	if err != nil {
@@ -210,7 +208,6 @@ func (broadcast *Broadcast) SendVideo(user *User, mediaID string,title,descripti
 	return res, err
 }
 
-
 //SendWxCard 发送卡券
 func (broadcast *Broadcast) SendWxCard(user *User, cardID string) (*Result, error) {
 	ak, err := broadcast.GetAccessToken()
@@ -218,13 +215,13 @@ func (broadcast *Broadcast) SendWxCard(user *User, cardID string) (*Result, erro
 		return nil, err
 	}
 	req := &sendRequest{
-		ToUser: nil,
+		ToUser:  nil,
 		MsgType: MsgTypeWxCard,
 	}
-	req.WxCard=map[string]interface{}{
+	req.WxCard = map[string]interface{}{
-		"card_id":cardID,
+		"card_id": cardID,
 	}
-	req,sendURL:=broadcast.chooseTagOrOpenID(user,req)
+	req, sendURL := broadcast.chooseTagOrOpenID(user, req)
 	url := fmt.Sprintf("%s?access_token=%s", sendURL, ak)
 	data, err := util.PostJSON(url, req)
 	if err != nil {
@@ -234,11 +231,12 @@ func (broadcast *Broadcast) SendWxCard(user *User, cardID string) (*Result, erro
 	err = util.DecodeWithError(data, res, "SendWxCard")
 	return res, err
 }
+
 //Delete 删除群发消息
-func (broadcast *Broadcast) Delete(msgID int64 ,articleIDx int64) error {
+func (broadcast *Broadcast) Delete(msgID int64, articleIDx int64) error {
 	ak, err := broadcast.GetAccessToken()
 	if err != nil {
-		return  err
+		return err
 	}
 	req := map[string]interface{}{
 		"msg_id":      msgID,
@@ -247,33 +245,32 @@ func (broadcast *Broadcast) Delete(msgID int64 ,articleIDx int64) error {
 	url := fmt.Sprintf("%s?access_token=%s", deleteSendURL, ak)
 	data, err := util.PostJSON(url, req)
 	if err != nil {
-		return  err
+		return err
 	}
 	return util.DecodeWithCommonError(data, "Delete")
 }
 
-
 //TODO 发送预览，群发消息状态，发送速度
 
-func (broadcast *Broadcast) chooseTagOrOpenID(user *User,req *sendRequest)(ret *sendRequest,url string){
+func (broadcast *Broadcast) chooseTagOrOpenID(user *User, req *sendRequest) (ret *sendRequest, url string) {
-	sendURL:=""
+	sendURL := ""
 	if user == nil {
-		req.Filter=map[string]interface{}{
+		req.Filter = map[string]interface{}{
-			"is_to_all":true,
+			"is_to_all": true,
 		}
-		sendURL=sendURLByTag
+		sendURL = sendURLByTag
 	} else {
 		if user.TagID != 0 {
-			req.Filter=map[string]interface{}{
+			req.Filter = map[string]interface{}{
-				"is_to_all":false,
+				"is_to_all": false,
-				"tag_id":user.TagID,
+				"tag_id":    user.TagID,
 			}
-			sendURL=sendURLByTag
+			sendURL = sendURLByTag
 		}
 		if len(user.OpenID) != 0 {
 			req.ToUser = user.OpenID
-			sendURL=sendURLByOpenID
+			sendURL = sendURLByOpenID
 		}
 	}
-	return req,sendURL
+	return req, sendURL
-}
+}

officialaccount/datacube/broadcast.go

@@ -2,6 +2,7 @@ package datacube
 
 import (
 	"fmt"
+
 	"github.com/silenceper/wechat/v2/util"
 )
 

officialaccount/datacube/interface.go

@@ -2,6 +2,7 @@ package datacube
 
 import (
 	"fmt"
+
 	"github.com/silenceper/wechat/v2/util"
 )
 

officialaccount/datacube/message.go

@@ -2,6 +2,7 @@ package datacube
 
 import (
 	"fmt"
+
 	"github.com/silenceper/wechat/v2/util"
 )
 

officialaccount/datacube/publisher.go

@@ -1,11 +1,11 @@
 package datacube
 
 import (
-	"encoding/json"
 	"fmt"
-	"github.com/silenceper/wechat/v2/util"
 	"net/url"
 	"strconv"
+
+	"github.com/silenceper/wechat/v2/util"
 )
 
 //AdSlot 广告位类型
@@ -55,9 +55,8 @@ type BaseResp struct {
 //ResPublisherAdPos 公众号分广告位数据响应
 type ResPublisherAdPos struct {
 	util.CommonError
-	BaseResp
 
-	Base     BaseResp        `json:"base_resp"`
+	BaseResp BaseResp        `json:"base_resp"`
 	List     []ResAdPosList  `json:"list"`
 	Summary  ResAdPosSummary `json:"summary"`
 	TotalNum int             `json:"total_num"`
@@ -91,9 +90,8 @@ type ResAdPosSummary struct {
 //ResPublisherCps 公众号返佣商品数据响应
 type ResPublisherCps struct {
 	util.CommonError
-	BaseResp
 
-	Base     BaseResp      `json:"base_resp"`
+	BaseResp BaseResp      `json:"base_resp"`
 	List     []ResCpsList  `json:"list"`
 	Summary  ResCpsSummary `json:"summary"`
 	TotalNum int           `json:"total_num"`
@@ -125,9 +123,8 @@ type ResCpsSummary struct {
 //ResPublisherSettlement 公众号结算收入数据及结算主体信息响应
 type ResPublisherSettlement struct {
 	util.CommonError
-	BaseResp
 
-	Base              BaseResp         `json:"base_resp"`
+	BaseResp          BaseResp         `json:"base_resp"`
 	Body              string           `json:"body"`
 	PenaltyAll        int              `json:"penalty_all"`
 	RevenueAll        int64            `json:"revenue_all"`
@@ -208,25 +205,15 @@ func (cube *DataCube) GetPublisherAdPosGeneral(startDate, endDate string, page,
 		return
 	}
 
-	err = json.Unmarshal(response, &resPublisherAdPos)
+	err = util.DecodeWithError(response, &resPublisherAdPos, "GetPublisherAdPosGeneral")
 	if err != nil {
 		return
 	}
 
-	if resPublisherAdPos.CommonError.ErrCode != 0 {
-		err = fmt.Errorf("GetPublisherAdPosGeneral Error , errcode=%d , errmsg=%s", resPublisherAdPos.CommonError.ErrCode, resPublisherAdPos.CommonError.ErrMsg)
-		return
-	}
-
 	if resPublisherAdPos.BaseResp.Ret != 0 {
 		err = fmt.Errorf("GetPublisherAdPosGeneral Error , errcode=%d , errmsg=%s", resPublisherAdPos.BaseResp.Ret, resPublisherAdPos.BaseResp.ErrMsg)
 		return
 	}
-
-	if resPublisherAdPos.Base.Ret != 0 {
-		err = fmt.Errorf("GetPublisherAdPosGeneral Error , errcode=%d , errmsg=%s", resPublisherAdPos.Base.Ret, resPublisherAdPos.Base.ErrMsg)
-		return
-	}
 	return
 }
 
@@ -245,26 +232,15 @@ func (cube *DataCube) GetPublisherCpsGeneral(startDate, endDate string, page, pa
 		return
 	}
 
-	err = json.Unmarshal(response, &resPublisherCps)
+	err = util.DecodeWithError(response, &resPublisherCps, "GetPublisherCpsGeneral")
 	if err != nil {
 		return
 	}
 
-	if resPublisherCps.CommonError.ErrCode != 0 {
-		err = fmt.Errorf("GetPublisherCpsGeneral Error , errcode=%d , errmsg=%s", resPublisherCps.CommonError.ErrCode, resPublisherCps.CommonError.ErrMsg)
-		return
-	}
-
 	if resPublisherCps.BaseResp.Ret != 0 {
 		err = fmt.Errorf("GetPublisherCpsGeneral Error , errcode=%d , errmsg=%s", resPublisherCps.BaseResp.Ret, resPublisherCps.BaseResp.ErrMsg)
 		return
 	}
-
-	if resPublisherCps.Base.Ret != 0 {
-		err = fmt.Errorf("GetPublisherCpsGeneral Error , errcode=%d , errmsg=%s", resPublisherCps.Base.Ret, resPublisherCps.Base.ErrMsg)
-		return
-	}
-
 	return
 }
 
@@ -283,24 +259,14 @@ func (cube *DataCube) GetPublisherSettlement(startDate, endDate string, page, pa
 		return
 	}
 
-	err = json.Unmarshal(response, &resPublisherSettlement)
+	err = util.DecodeWithError(response, &resPublisherSettlement, "GetPublisherSettlement")
 	if err != nil {
 		return
 	}
 
-	if resPublisherSettlement.CommonError.ErrCode != 0 {
-		err = fmt.Errorf("GetPublisherSettlement Error , errcode=%d , errmsg=%s", resPublisherSettlement.CommonError.ErrCode, resPublisherSettlement.CommonError.ErrMsg)
-		return
-	}
-
 	if resPublisherSettlement.BaseResp.Ret != 0 {
 		err = fmt.Errorf("GetPublisherSettlement Error , errcode=%d , errmsg=%s", resPublisherSettlement.BaseResp.Ret, resPublisherSettlement.BaseResp.ErrMsg)
 		return
 	}
-
-	if resPublisherSettlement.Base.Ret != 0 {
-		err = fmt.Errorf("GetPublisherSettlement Error , errcode=%d , errmsg=%s", resPublisherSettlement.Base.Ret, resPublisherSettlement.Base.ErrMsg)
-		return
-	}
 	return
 }

officialaccount/datacube/user.go

@@ -2,6 +2,7 @@ package datacube
 
 import (
 	"fmt"
+
 	"github.com/silenceper/wechat/v2/util"
 )
 

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

@@ -52,7 +52,7 @@ func (js *Js) GetConfig(uri string) (config *Config, err error) {
 	}
 
 	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)
 

officialaccount/material/material.go

@@ -10,10 +10,12 @@ import (
 )
 
 const (
-	addNewsURL     = "https://api.weixin.qq.com/cgi-bin/material/add_news"
+	addNewsURL          = "https://api.weixin.qq.com/cgi-bin/material/add_news"
-	addMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/add_material"
+	updateNewsURL       = "https://api.weixin.qq.com/cgi-bin/material/update_news"
-	delMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/del_material"
+	addMaterialURL      = "https://api.weixin.qq.com/cgi-bin/material/add_material"
-	getMaterialURL = "https://api.weixin.qq.com/cgi-bin/material/get_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"
 )
 
@@ -30,6 +32,7 @@ const (
 	//PermanentMaterialTypeNews 永久素材图文类型（news）
 	PermanentMaterialTypeNews PermanentMaterialType = "news"
 )
+
 //Material 素材管理
 type Material struct {
 	*context.Context
@@ -120,6 +123,32 @@ func (material *Material) AddNews(articles []*Article) (mediaID string, err erro
 	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
@@ -240,6 +269,7 @@ func (material *Material) DeleteMaterial(mediaID string) error {
 
 //ArticleList 永久素材列表
 type ArticleList struct {
+	util.CommonError
 	TotalCount int64             `json:"total_count"`
 	ItemCount  int64             `json:"item_count"`
 	Item       []ArticleListItem `json:"item"`
@@ -293,3 +323,29 @@ func (material *Material) BatchGetMaterial(permanentMaterialType PermanentMateri
 	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/menu.go

@@ -102,12 +102,12 @@ type ButtonNew struct {
 
 //MatchRule 个性化菜单规则
 type MatchRule struct {
-	GroupID            string  `json:"group_id,omitempty"`
+	GroupID            string `json:"group_id,omitempty"`
-	Sex                string  `json:"sex,omitempty"`
+	Sex                string `json:"sex,omitempty"`
 	Country            string `json:"country,omitempty"`
 	Province           string `json:"province,omitempty"`
 	City               string `json:"city,omitempty"`
-	ClientPlatformType string  `json:"client_platform_type,omitempty"`
+	ClientPlatformType string `json:"client_platform_type,omitempty"`
 	Language           string `json:"language,omitempty"`
 }
 
@@ -138,7 +138,6 @@ func (menu *Menu) SetMenu(buttons []*Button) error {
 	return util.DecodeWithCommonError(response, "SetMenu")
 }
 
-
 //SetMenuByJSON 设置按钮
 func (menu *Menu) SetMenuByJSON(jsonInfo string) error {
 	accessToken, err := menu.GetAccessToken()
@@ -216,7 +215,6 @@ 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()

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 表示坐标消息[限接收]

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 模板消息
@@ -59,7 +60,9 @@ func (tpl *Template) Send(msg *TemplateMessage) (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 *TemplateMessage) (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

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

officialaccount/officialaccount.go

@@ -1,9 +1,10 @@
 package officialaccount
 
 import (
-	"github.com/silenceper/wechat/v2/officialaccount/datacube"
 	"net/http"
 
+	"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"
@@ -92,6 +93,11 @@ 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)

officialaccount/server/server.go

@@ -199,7 +199,7 @@ 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
 	}
 
@@ -213,7 +213,7 @@ func (srv *Server) buildResponse(reply *message.Reply) (err error) {
 	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

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

@@ -52,6 +52,8 @@ type Info struct {
 
 // OpenidList 用户列表
 type OpenidList struct {
+	util.CommonError
+
 	Total int `json:"total"`
 	Count int `json:"count"`
 	Data  struct {
@@ -124,13 +126,14 @@ func (user *User) ListUserOpenIDs(nextOpenid ...string) (*OpenidList, error) {
 		return nil, err
 	}
 
-	userlist := new(OpenidList)
+	userlist := OpenidList{}
-	err = json.Unmarshal(response, userlist)
+
+	err = util.DecodeWithError(response, &userlist, "ListUserOpenIDs")
 	if err != nil {
 		return nil, err
 	}
 
-	return userlist, nil
+	return &userlist, nil
 }
 
 // ListAllUserOpenIDs 返回所有用户OpenID列表

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,10 +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"
+	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"
+	//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"
+	//getuthorizerListURL = "POST https://api.weixin.qq.com/cgi-bin/component/api_get_authorizer_list?component_access_token=%s"
 )
 
 // ComponentAccessToken 第三方平台
@@ -86,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"`
@@ -128,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/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) *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, 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

@@ -5,6 +5,8 @@ import (
 	"github.com/silenceper/wechat/v2/officialaccount"
 	offConfig "github.com/silenceper/wechat/v2/officialaccount/config"
 	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 实例化
@@ -29,6 +30,16 @@ func NewOfficialAccount(opCtx *opContext.Context, appID string) *OfficialAccount
 	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())
+}
+
 //DefaultAuthrAccessToken 默认获取授权ak的方法
 type DefaultAuthrAccessToken struct {
 	opCtx *opContext.Context

pay/pay.go

@@ -4,6 +4,7 @@ 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"
 )
 
 //Pay 微信支付相关API
@@ -25,3 +26,8 @@ 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)
+}

util/crypto.go

@@ -65,7 +65,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)
 	}

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
+//GetCurrTS return current timestamps
-func GetCurrTs() int64 {
+func GetCurrTS() int64 {
 	return time.Now().Unix()
 }

wechat.go

@@ -16,7 +16,6 @@ import (
 )
 
 func init() {
-
 	// Log as JSON instead of the default ASCII formatter.
 	log.SetFormatter(&log.TextFormatter{})
 
@@ -26,7 +25,6 @@ func init() {
 
 	// Only log the warning severity or above.
 	log.SetLevel(log.DebugLevel)
-
 }
 
 // Wechat struct