fix:修复微信回调signType为空的问题 #282 (#283)

Co-authored-by: Avtion <manaitao@heywoods.cn>

README.md

@@ -1,11 +1,16 @@
 # WeChat SDK for Go
 ![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](https://img.shields.io/badge/godoc-reference-informational)](https://pkg.go.dev/github.com/silenceper/wechat/v2?tab=doc)
+[![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版本
 
-> 当前版本状态：alpha，部分API可能会做出调整。
+
+## 文档 && 例子
+[Wechat SDK 2.0 文档](http://silenceper.com/wechat)
+
+[Wechat SDK 2.0 例子](https://github.com/gowechat/example)
 
 ## 快速开始
 
@@ -45,11 +50,6 @@ server.Send()
 
 ```
 
-## 文档 && 例子
-[Wechat SDK 2.0 文档](http://silenceper.com/wechat)
-
-[Wechat SDK 2.0 例子](https://github.com/gowechat/example)
-
 ## 目录说明
 - officialaccount: 微信公众号API
 - miniprogram: 小程序API
@@ -59,10 +59,12 @@ server.Send()
 - work:企业微信
 - aispeech:智能对话
 
-## 如何贡献
+## 贡献
 - 提交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/redis.go

@@ -45,6 +45,11 @@ func NewRedis(opts *RedisOpts) *Redis {
 	return &Redis{pool}
 }
 
+//SetRedisPool 设置redis连接池
+func (r *Redis) SetRedisPool(pool *redis.Pool) {
+	r.conn = pool
+}
+
 //SetConn 设置conn
 func (r *Redis) SetConn(conn *redis.Pool) {
 	r.conn = conn

go.sum

@@ -14,6 +14,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJ
 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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -21,6 +22,7 @@ github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw=

miniprogram/analysis/analysis.go

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

miniprogram/miniprogram.go

@@ -4,10 +4,11 @@ import (
 	"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/encryptor"
 	"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/qrcode"
+	"github.com/silenceper/wechat/v2/miniprogram/subscribe"
 	"github.com/silenceper/wechat/v2/miniprogram/tcb"
 )
 
@@ -60,3 +61,8 @@ func (miniProgram *MiniProgram) GetQRCode() *qrcode.QRCode {
 func (miniProgram *MiniProgram) GetTcb() *tcb.Tcb {
 	return tcb.NewTcb(miniProgram.ctx)
 }
+
+//GetSubscribe 小程序订阅消息
+func (miniProgram *MiniProgram) GetSubscribe() *subscribe.Subscribe {
+	return subscribe.NewSubscribe(miniProgram.ctx)
+}

miniprogram/subscribe/subscribe.go

@@ -0,0 +1,52 @@
+package subscribe
+
+import (
+	"fmt"
+
+	"github.com/silenceper/wechat/v2/miniprogram/context"
+	"github.com/silenceper/wechat/v2/util"
+)
+
+const (
+	//发送订阅消息
+	//https://developers.weixin.qq.com/miniprogram/dev/api-backend/open-api/subscribe-message/subscribeMessage.send.html
+	subscribeSendURL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send"
+)
+
+// Subscribe 订阅消息
+type Subscribe struct {
+	*context.Context
+}
+
+// NewSubscribe 实例化
+func NewSubscribe(ctx *context.Context) *Subscribe {
+	return &Subscribe{Context: ctx}
+}
+
+// Message 订阅消息请求参数
+type Message struct {
+	ToUser           string               `json:"touser"`            //必选，接收者（用户）的 openid
+	TemplateID       string               `json:"template_id"`       //必选，所需下发的订阅模板id
+	Page             string               `json:"page"`              //可选，点击模板卡片后的跳转页面，仅限本小程序内的页面。支持带参数,（示例index?foo=bar）。该字段不填则模板无跳转。
+	Data             map[string]*DataItem `json:"data"`              //必选, 模板内容
+	MiniprogramState string               `json:"miniprogram_state"` //可选，跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
+	Lang             string               `json:"lang"`              //入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN
+}
+
+//DataItem 模版内某个 .DATA 的值
+type DataItem struct {
+	Value string `json:"value"`
+}
+
+// Send 发送订阅消息
+func (s *Subscribe) Send(msg *Message) (err error) {
+	var accessToken string
+	accessToken, err = s.GetAccessToken()
+	if err != nil {
+		return
+	}
+	uri := fmt.Sprintf("%s?access_token=%s", subscribeSendURL, accessToken)
+	response, err := util.PostJSON(uri, msg)
+
+	return util.DecodeWithCommonError(response, "Send")
+}

miniprogram/tcb/README.md

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

officialaccount/datacube/broadcast.go

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

officialaccount/datacube/datacube.go

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

officialaccount/datacube/interface.go

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

officialaccount/datacube/message.go

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

officialaccount/datacube/publisher.go

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

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

officialaccount/device/qrcode.go

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

officialaccount/menu/menu.go

@@ -102,12 +102,12 @@ type ButtonNew struct {
 
 //MatchRule 个性化菜单规则
 type MatchRule struct {
-	GroupID            int32  `json:"group_id,omitempty"`
+	GroupID            string  `json:"group_id,omitempty"`
-	Sex                int32  `json:"sex,omitempty"`
+	Sex                string  `json:"sex,omitempty"`
 	Country            string `json:"country,omitempty"`
 	Province           string `json:"province,omitempty"`
 	City               string `json:"city,omitempty"`
-	ClientPlatformType int32  `json:"client_platform_type,omitempty"`
+	ClientPlatformType string  `json:"client_platform_type,omitempty"`
 	Language           string `json:"language,omitempty"`
 }
 

officialaccount/message/message.go

@@ -89,20 +89,21 @@ type MixMessage struct {
 	CommonToken
 
 	//基本消息
-	MsgID        int64   `xml:"MsgId"`
+	MsgID         int64   `xml:"MsgId"` //其他消息推送过来是MsgId
-	Content      string  `xml:"Content"`
+	TemplateMsgID int64   `xml:"MsgID"` //模板消息推送成功的消息是MsgID
-	Recognition  string  `xml:"Recognition"`
+	Content       string  `xml:"Content"`
-	PicURL       string  `xml:"PicUrl"`
+	Recognition   string  `xml:"Recognition"`
-	MediaID      string  `xml:"MediaId"`
+	PicURL        string  `xml:"PicUrl"`
-	Format       string  `xml:"Format"`
+	MediaID       string  `xml:"MediaId"`
-	ThumbMediaID string  `xml:"ThumbMediaId"`
+	Format        string  `xml:"Format"`
-	LocationX    float64 `xml:"Location_X"`
+	ThumbMediaID  string  `xml:"ThumbMediaId"`
-	LocationY    float64 `xml:"Location_Y"`
+	LocationX     float64 `xml:"Location_X"`
-	Scale        float64 `xml:"Scale"`
+	LocationY     float64 `xml:"Location_Y"`
-	Label        string  `xml:"Label"`
+	Scale         float64 `xml:"Scale"`
-	Title        string  `xml:"Title"`
+	Label         string  `xml:"Label"`
-	Description  string  `xml:"Description"`
+	Title         string  `xml:"Title"`
-	URL          string  `xml:"Url"`
+	Description   string  `xml:"Description"`
+	URL           string  `xml:"Url"`
 
 	//事件相关
 	Event       EventType `xml:"Event"`

officialaccount/officialaccount.go

@@ -1,6 +1,7 @@
 package officialaccount
 
 import (
+	"github.com/silenceper/wechat/v2/officialaccount/datacube"
 	"net/http"
 
 	"github.com/silenceper/wechat/v2/credential"
@@ -101,3 +102,8 @@ func (officialAccount *OfficialAccount) GetDevice() *device.Device {
 func (officialAccount *OfficialAccount) GetBroadcast() *broadcast.Broadcast {
 	return broadcast.NewBroadcast(officialAccount.ctx)
 }
+
+//GetDataCube 数据统计
+func (officialAccount *OfficialAccount) GetDataCube() *datacube.DataCube {
+	return datacube.NewCube(officialAccount.ctx)
+}

openplatform/README.md

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

openplatform/openplatform.go

@@ -1,6 +1,9 @@
 package openplatform
 
 import (
+	"net/http"
+
+	"github.com/silenceper/wechat/v2/officialaccount/server"
 	"github.com/silenceper/wechat/v2/openplatform/account"
 	"github.com/silenceper/wechat/v2/openplatform/config"
 	"github.com/silenceper/wechat/v2/openplatform/context"
@@ -24,6 +27,12 @@ func NewOpenPlatform(cfg *config.Config) *OpenPlatform {
 	return &OpenPlatform{ctx}
 }
 
+//GetServer get server
+func (openPlatform *OpenPlatform) GetServer(req *http.Request, writer http.ResponseWriter) *server.Server {
+	off := officialaccount.NewOfficialAccount(openPlatform.Context, "")
+	return off.GetServer(req, writer)
+}
+
 //GetOfficialAccount 公众号代处理
 func (openPlatform *OpenPlatform) GetOfficialAccount(appID string) *officialaccount.OfficialAccount {
 	return officialaccount.NewOfficialAccount(openPlatform.Context, appID)

pay/notify/paid.go

@@ -85,8 +85,15 @@ func (notify *Notify) PaidVerifySign(notifyRes PaidResult) bool {
 	// STEP3, 在键值对的最后加上key=API_KEY
 	signStrings = signStrings + "key=" + notify.Key
 
-	// STEP4, 进行MD5签名并且将所有字符转为大写.
+	// STEP4, 根据SignType计算出签名
-	sign := util.MD5Sum(signStrings)
+	var signType string
+	if notifyRes.SignType != nil {
+		signType = *notifyRes.SignType
+	}
+	sign, err := util.CalculateSign(signStrings, signType, notify.Key)
+	if err != nil {
+		return false
+	}
 	if sign != *notifyRes.Sign {
 		return false
 	}

pay/order/pay.go

@@ -1,13 +1,8 @@
 package order
 
 import (
-	"crypto/hmac"
-	"crypto/md5"
-	"crypto/sha256"
-	"encoding/hex"
 	"encoding/xml"
 	"errors"
-	"hash"
 	"strconv"
 	"strings"
 	"time"
@@ -96,13 +91,14 @@ type payRequest struct {
 	LimitPay       string `xml:"limit_pay,omitempty"`   //
 	OpenID         string `xml:"openid,omitempty"`      // 用户标识
 	SceneInfo      string `xml:"scene_info,omitempty"`  // 场景信息
+
+	XMLName struct{} `xml:"xml"`
 }
 
 // BridgeConfig get js bridge config
 func (o *Order) BridgeConfig(p *Params) (cfg Config, err error) {
 	var (
 		buffer    strings.Builder
-		h         hash.Hash
 		timestamp = strconv.FormatInt(time.Now().Unix(), 10)
 	)
 	order, err := o.PrePayOrder(p)
@@ -121,14 +117,13 @@ func (o *Order) BridgeConfig(p *Params) (cfg Config, err error) {
 	buffer.WriteString(timestamp)
 	buffer.WriteString("&key=")
 	buffer.WriteString(o.Key)
-	if p.SignType == "MD5" {
+
-		h = md5.New()
+	sign, err := util.CalculateSign(buffer.String(), p.SignType, o.Key)
-	} else {
+	if err != nil {
-		h = hmac.New(sha256.New, []byte(o.Key))
+		return
 	}
-	h.Write([]byte(buffer.String()))
 	// 签名
-	cfg.PaySign = strings.ToUpper(hex.EncodeToString(h.Sum(nil)))
+	cfg.PaySign = sign
 	cfg.NonceStr = order.NonceStr
 	cfg.Timestamp = timestamp
 	cfg.PrePayID = order.PrePayID
@@ -143,13 +138,13 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 	notifyURL := o.NotifyURL
 	// 签名类型
 	if p.SignType == "" {
-		p.SignType = "MD5"
+		p.SignType = util.SignTypeMD5
 	}
 	// 通知地址
 	if p.NotifyURL != "" {
 		notifyURL = p.NotifyURL
 	}
-	param := make(map[string]interface{})
+	param := make(map[string]string)
 	param["appid"] = o.AppID
 	param["body"] = p.Body
 	param["mch_id"] = o.MchID
@@ -165,9 +160,10 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 	param["goods_tag"] = p.GoodsTag
 	param["notify_url"] = notifyURL
 
-	bizKey := "&key=" + o.Key
+	sign, err := util.ParamSign(param, o.Key)
-	str := util.OrderParam(param, bizKey)
+	if err != nil {
-	sign := util.MD5Sum(str)
+		return
+	}
 	request := payRequest{
 		AppID:          o.AppID,
 		MchID:          o.MchID,
@@ -202,7 +198,7 @@ func (o *Order) PrePayOrder(p *Params) (payOrder PreOrder, err error) {
 		err = errors.New(payOrder.ErrCode + payOrder.ErrCodeDes)
 		return
 	}
-	err = errors.New("[msg : xmlUnmarshalError] [rawReturn : " + string(rawRet) + "] [params : " + str + "] [sign : " + sign + "]")
+	err = errors.New("[msg : xmlUnmarshalError] [rawReturn : " + string(rawRet) + "] [sign : " + sign + "]")
 	return
 }
 

pay/refund/refund.go

@@ -73,7 +73,7 @@ type Response struct {
 //Refund 退款申请
 func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
 	nonceStr := util.RandomStr(32)
-	param := make(map[string]interface{})
+	param := make(map[string]string)
 	param["appid"] = refund.AppID
 	param["mch_id"] = refund.MchID
 	param["nonce_str"] = nonceStr
@@ -81,18 +81,20 @@ func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
 	param["refund_desc"] = p.RefundDesc
 	param["refund_fee"] = p.RefundFee
 	param["total_fee"] = p.TotalFee
-	param["sign_type"] = "MD5"
+	param["sign_type"] = util.SignTypeMD5
 	param["transaction_id"] = p.TransactionID
 
-	bizKey := "&key=" + refund.Key
+	sign, err := util.ParamSign(param, refund.Key)
-	str := util.OrderParam(param, bizKey)
+	if err != nil {
-	sign := util.MD5Sum(str)
+		return
+	}
+
 	request := request{
 		AppID:         refund.AppID,
 		MchID:         refund.MchID,
 		NonceStr:      nonceStr,
 		Sign:          sign,
-		SignType:      "MD5",
+		SignType:      util.SignTypeMD5,
 		TransactionID: p.TransactionID,
 		OutRefundNo:   p.OutRefundNo,
 		TotalFee:      p.TotalFee,
@@ -115,7 +117,6 @@ func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
 		err = fmt.Errorf("refund error, errcode=%s,errmsg=%s", rsp.ErrCode, rsp.ErrCodeDes)
 		return
 	}
-	err = fmt.Errorf("[msg : xmlUnmarshalError] [rawReturn : %s] [params : %s] [sign : %s]",
+	err = fmt.Errorf("[msg : xmlUnmarshalError] [rawReturn : %s] [sign : %s]", string(rawRet), sign)
-		string(rawRet), str, sign)
 	return
 }

util/crypto.go

@@ -1,14 +1,23 @@
 package util
 
 import (
-	"bufio"
-	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
+	"crypto/hmac"
 	"crypto/md5"
+	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"
+	"errors"
 	"fmt"
+	"hash"
+	"strings"
+)
+
+// 微信签名算法方式
+const (
+	SignTypeMD5        = `MD5`
+	SignTypeHMACSHA256 = `HMAC-SHA256`
 )
 
 //EncryptMsg 加密消息
@@ -186,14 +195,35 @@ func decodeNetworkByteOrder(orderBytes []byte) (n uint32) {
 		uint32(orderBytes[3])
 }
 
-// MD5Sum 计算 32 位长度的 MD5 sum
+// CalculateSign 计算签名
-func MD5Sum(txt string) (sum string) {
+func CalculateSign(content, signType, key string) (string, error) {
-	h := md5.New()
+	var h hash.Hash
-	buf := bufio.NewWriterSize(h, 128)
+	if signType == SignTypeHMACSHA256 {
-	buf.WriteString(txt)
+		h = hmac.New(sha256.New, []byte(key))
-	buf.Flush()
+	} else {
-	sign := make([]byte, hex.EncodedLen(h.Size()))
+		h = md5.New()
-	hex.Encode(sign, h.Sum(nil))
+	}
-	sum = string(bytes.ToUpper(sign))
+
-	return
+	if _, err := h.Write([]byte(content)); err != nil {
+		return ``, err
+	}
+	return strings.ToUpper(hex.EncodeToString(h.Sum(nil))), nil
+}
+
+// ParamSign 计算所传参数的签名
+func ParamSign(p map[string]string, key string) (string, error) {
+	bizKey := "&key=" + key
+	str := OrderParam(p, bizKey)
+
+	var signType string
+	switch p["sign_type"] {
+	case SignTypeMD5, SignTypeHMACSHA256:
+		signType = p["sign_type"]
+	case ``:
+		signType = SignTypeMD5
+	default:
+		return ``, errors.New(`invalid sign_type`)
+	}
+
+	return CalculateSign(str, signType, key)
 }

util/param.go

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