* 公众号菜单管理，增加new相关函数，老的set相关函数，返回btn本身，以便用字面量的方式创建多级菜单，更直观，方便管理 (#365 )

* * 公众号菜单管理，set相关函数，返回btn本身，方便以字面量的方式创建多个菜单，更直观，方便管理 * * golangci-lint fix * * 获取二维码ticket接口没有往上抛接口错误
微信支付 - 退款通知 (#359 )
2026-02-04 21:02:25 +08:00 · 2021-02-07 09:50:53 +08:00 · 2021-02-07 09:49:43 +08:00 · 2021-01-26 14:11:38 +08:00 · 2020-12-31 13:52:13 +08:00 · 2020-11-26 12:25:57 +08:00
18 changed files with 382 additions and 60 deletions
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -7,34 +7,38 @@ on:
    branches: [ master,release-* ]

 jobs:
+  golangci:
+    strategy:
+      matrix:
+        go-version: [1.15.x]
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.31
  build:
-    name: Build
+    name: Test
    runs-on: ubuntu-latest
    services:
      redis:
        image: redis
        ports:
-        - 6379:6379 
+        - 6379:6379
        options: --entrypoint redis-server
      memcached:
        image: memcached
        ports:
          - 11211:11211
    steps:
-
+      - uses: actions/checkout@v2
      - name: Set up Go 1.x
        uses: actions/setup-go@v2
        with:
          go-version: ^1.13
        id: go
-
-      - 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: Test
        run: go test -v -race ./...
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -11,7 +11,7 @@ linters:
    - errcheck
    - funlen
    - goconst
-    - gocritic
+      # - gocritic
    - gocyclo
    - gofmt
    - goimports
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@

 ## 快速开始
 ```
-import github.com/silenceper/wechat/v2
+import "github.com/silenceper/wechat/v2"
 ```

 以下是一个微信公众号处理消息接收以及回复的例子：
@@ -58,7 +58,7 @@ server.Send()
 - miniprogram: 小程序API
 - minigame:小游戏API
 - pay:微信支付API
- opernplatform:开放平台API
+- openplatform:开放平台API
 - work:企业微信
 - aispeech:智能对话

--- a/cache/cache.go
+++ b/cache/cache.go
@@ -2,7 +2,7 @@ package cache

 import "time"

-//Cache interface
+// Cache interface
 type Cache interface {
 	Get(key string) interface{}
 	Set(key string, val interface{}, timeout time.Duration) error
--- a/cache/memcache.go
+++ b/cache/memcache.go
@@ -7,18 +7,18 @@ import (
 	"github.com/bradfitz/gomemcache/memcache"
 )

-//Memcache struct contains *memcache.Client
+// Memcache struct contains *memcache.Client
 type Memcache struct {
 	conn *memcache.Client
 }

-//NewMemcache create new memcache
+// NewMemcache create new memcache
 func NewMemcache(server ...string) *Memcache {
 	mc := memcache.New(server...)
 	return &Memcache{mc}
 }

-//Get return cached value
+// Get return cached value
 func (mem *Memcache) Get(key string) interface{} {
 	var err error
 	var item *memcache.Item
@@ -40,7 +40,7 @@ func (mem *Memcache) IsExist(key string) bool {
 	return true
 }

-//Set cached value with key and expire time.
+// Set cached value with key and expire time.
 func (mem *Memcache) Set(key string, val interface{}, timeout time.Duration) (err error) {
 	var data []byte
 	if data, err = json.Marshal(val); err != nil {
@@ -51,7 +51,7 @@ func (mem *Memcache) Set(key string, val interface{}, timeout time.Duration) (er
 	return mem.conn.Set(item)
 }

-//Delete delete value in memcache.
+// Delete delete value in memcache.
 func (mem *Memcache) Delete(key string) error {
 	return mem.conn.Delete(key)
 }
--- a/miniprogram/config/config.go
+++ b/miniprogram/config/config.go
@@ -1,13 +1,13 @@
-//Package config 小程序config配置
+// Package config 小程序config配置
 package config

 import (
 	"github.com/silenceper/wechat/v2/cache"
 )

-//Config config for 小程序
+// Config config for 小程序
 type Config struct {
-	AppID     string `json:"app_id"`     //appid
-	AppSecret string `json:"app_secret"` //appsecret
+	AppID     string `json:"app_id"`     // appid
+	AppSecret string `json:"app_secret"` // appsecret
 	Cache     cache.Cache
 }
--- a/officialaccount/basic/qr.go
+++ b/officialaccount/basic/qr.go
@@ -62,6 +62,11 @@ func (basic *Basic) GetQRTicket(tq *Request) (t *Ticket, err error) {
 		return
 	}

+	if t.ErrMsg != "" {
+		err = fmt.Errorf("get qr_ticket error : errcode=%v , errormsg=%v", t.ErrCode, t.ErrMsg)
+		return
+	}
+
 	return
 }

--- a/officialaccount/config/config.go
+++ b/officialaccount/config/config.go
@@ -4,7 +4,7 @@ import (
 	"github.com/silenceper/wechat/v2/cache"
 )

-//Config config for 微信公众号
+// Config config for 微信公众号
 type Config struct {
 	AppID          string `json:"app_id"`           //appid
 	AppSecret      string `json:"app_secret"`       //appsecret
--- a/officialaccount/menu/button.go
+++ b/officialaccount/menu/button.go
@@ -13,47 +13,51 @@ type Button struct {
 }

 //SetSubButton 设置二级菜单
-func (btn *Button) SetSubButton(name string, subButtons []*Button) {
+func (btn *Button) SetSubButton(name string, subButtons []*Button) *Button {
 	btn.Name = name
 	btn.SubButtons = subButtons
 	btn.Type = ""
 	btn.Key = ""
 	btn.URL = ""
 	btn.MediaID = ""
+	return btn
 }

 //SetClickButton btn 为click类型
-func (btn *Button) SetClickButton(name, key string) {
+func (btn *Button) SetClickButton(name, key string) *Button {
 	btn.Type = "click"
 	btn.Name = name
 	btn.Key = key
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }

 //SetViewButton view类型
-func (btn *Button) SetViewButton(name, url string) {
+func (btn *Button) SetViewButton(name, url string) *Button {
 	btn.Type = "view"
 	btn.Name = name
 	btn.URL = url
 	btn.Key = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }

-// SetScanCodePushButton 扫码推事件
-func (btn *Button) SetScanCodePushButton(name, key string) {
+//SetScanCodePushButton 扫码推事件
+func (btn *Button) SetScanCodePushButton(name, key string) *Button {
 	btn.Type = "scancode_push"
 	btn.Name = name
 	btn.Key = key
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }

 //SetScanCodeWaitMsgButton 设置 扫码推事件且弹出"消息接收中"提示框
-func (btn *Button) SetScanCodeWaitMsgButton(name, key string) {
+func (btn *Button) SetScanCodeWaitMsgButton(name, key string) *Button {
 	btn.Type = "scancode_waitmsg"
 	btn.Name = name
 	btn.Key = key
@@ -61,10 +65,11 @@ func (btn *Button) SetScanCodeWaitMsgButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }

 //SetPicSysPhotoButton 设置弹出系统拍照发图按钮
-func (btn *Button) SetPicSysPhotoButton(name, key string) {
+func (btn *Button) SetPicSysPhotoButton(name, key string) *Button {
 	btn.Type = "pic_sysphoto"
 	btn.Name = name
 	btn.Key = key
@@ -72,10 +77,11 @@ func (btn *Button) SetPicSysPhotoButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }

 //SetPicPhotoOrAlbumButton 设置弹出拍照或者相册发图类型按钮
-func (btn *Button) SetPicPhotoOrAlbumButton(name, key string) {
+func (btn *Button) SetPicPhotoOrAlbumButton(name, key string) *Button {
 	btn.Type = "pic_photo_or_album"
 	btn.Name = name
 	btn.Key = key
@@ -83,10 +89,11 @@ func (btn *Button) SetPicPhotoOrAlbumButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }

-// SetPicWeixinButton 设置弹出微信相册发图器类型按钮
-func (btn *Button) SetPicWeixinButton(name, key string) {
+//SetPicWeixinButton 设置弹出微信相册发图器类型按钮
+func (btn *Button) SetPicWeixinButton(name, key string) *Button {
 	btn.Type = "pic_weixin"
 	btn.Name = name
 	btn.Key = key
@@ -94,10 +101,11 @@ func (btn *Button) SetPicWeixinButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }

-// SetLocationSelectButton 设置 弹出地理位置选择器 类型按钮
-func (btn *Button) SetLocationSelectButton(name, key string) {
+//SetLocationSelectButton 设置 弹出地理位置选择器 类型按钮
+func (btn *Button) SetLocationSelectButton(name, key string) *Button {
 	btn.Type = "location_select"
 	btn.Name = name
 	btn.Key = key
@@ -105,10 +113,11 @@ func (btn *Button) SetLocationSelectButton(name, key string) {
 	btn.URL = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
 }

 //SetMediaIDButton  设置 下发消息(除文本消息) 类型按钮
-func (btn *Button) SetMediaIDButton(name, mediaID string) {
+func (btn *Button) SetMediaIDButton(name, mediaID string) *Button {
 	btn.Type = "media_id"
 	btn.Name = name
 	btn.MediaID = mediaID
@@ -116,10 +125,11 @@ func (btn *Button) SetMediaIDButton(name, mediaID string) {
 	btn.Key = ""
 	btn.URL = ""
 	btn.SubButtons = nil
+	return btn
 }

 //SetViewLimitedButton  设置 跳转图文消息URL 类型按钮
-func (btn *Button) SetViewLimitedButton(name, mediaID string) {
+func (btn *Button) SetViewLimitedButton(name, mediaID string) *Button {
 	btn.Type = "view_limited"
 	btn.Name = name
 	btn.MediaID = mediaID
@@ -127,10 +137,11 @@ func (btn *Button) SetViewLimitedButton(name, mediaID string) {
 	btn.Key = ""
 	btn.URL = ""
 	btn.SubButtons = nil
+	return btn
 }

 //SetMiniprogramButton  设置 跳转小程序 类型按钮 (公众号后台必须已经关联小程序)
-func (btn *Button) SetMiniprogramButton(name, url, appID, pagePath string) {
+func (btn *Button) SetMiniprogramButton(name, url, appID, pagePath string) *Button {
 	btn.Type = "miniprogram"
 	btn.Name = name
 	btn.URL = url
@@ -140,4 +151,65 @@ func (btn *Button) SetMiniprogramButton(name, url, appID, pagePath string) {
 	btn.Key = ""
 	btn.MediaID = ""
 	btn.SubButtons = nil
+	return btn
+}
+
+//NewSubButton 二级菜单
+func NewSubButton(name string, subButtons []*Button) *Button {
+	return (&Button{}).SetSubButton(name, subButtons)
+}
+
+//NewClickButton btn 为click类型
+func NewClickButton(name, key string) *Button {
+	return (&Button{}).SetClickButton(name, key)
+}
+
+//NewViewButton view类型
+func NewViewButton(name, url string) *Button {
+	return (&Button{}).SetViewButton(name, url)
+}
+
+//NewScanCodePushButton 扫码推事件
+func NewScanCodePushButton(name, key string) *Button {
+	return (&Button{}).SetScanCodePushButton(name, key)
+}
+
+//NewScanCodeWaitMsgButton 扫码推事件且弹出"消息接收中"提示框
+func NewScanCodeWaitMsgButton(name, key string) *Button {
+	return (&Button{}).SetScanCodeWaitMsgButton(name, key)
+}
+
+//NewPicSysPhotoButton 弹出系统拍照发图按钮
+func NewPicSysPhotoButton(name, key string) *Button {
+	return (&Button{}).SetPicSysPhotoButton(name, key)
+}
+
+//NewPicPhotoOrAlbumButton 弹出拍照或者相册发图类型按钮
+func NewPicPhotoOrAlbumButton(name, key string) *Button {
+	return (&Button{}).SetPicPhotoOrAlbumButton(name, key)
+}
+
+//NewPicWeixinButton 弹出微信相册发图器类型按钮
+func NewPicWeixinButton(name, key string) *Button {
+	return (&Button{}).SetPicWeixinButton(name, key)
+}
+
+//NewLocationSelectButton  弹出地理位置选择器 类型按钮
+func NewLocationSelectButton(name, key string) *Button {
+	return (&Button{}).SetLocationSelectButton(name, key)
+}
+
+//NewMediaIDButton  下发消息(除文本消息) 类型按钮
+func NewMediaIDButton(name, mediaID string) *Button {
+	return (&Button{}).SetMediaIDButton(name, mediaID)
+}
+
+//NewViewLimitedButton  跳转图文消息URL 类型按钮
+func NewViewLimitedButton(name, mediaID string) *Button {
+	return (&Button{}).SetViewLimitedButton(name, mediaID)
+}
+
+//NewMiniprogramButton  跳转小程序 类型按钮 (公众号后台必须已经关联小程序)
+func NewMiniprogramButton(name, url, appID, pagePath string) *Button {
+	return (&Button{}).SetMiniprogramButton(name, url, appID, pagePath)
 }
--- a/officialaccount/menu/button_test.go
+++ b/officialaccount/menu/button_test.go
@@ -0,0 +1,28 @@
+package menu
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewButtonFun(t *testing.T) {
+	buttons := []*Button{
+		NewSubButton("1", []*Button{
+			NewViewButton("1.1", "https://baidu.com"),
+			NewViewButton("1.2", "https://baidu.com"),
+			NewViewButton("1.3", "https://baidu.com"),
+		}),
+		NewSubButton("2", []*Button{
+			NewViewButton("2.1", "https://baidu.com"),
+			NewViewButton("2.2", "https://baidu.com"),
+			NewViewButton("2.3", "https://baidu.com"),
+		}),
+		NewViewButton("3", "https://baidu.com"),
+	}
+
+	data, err := json.Marshal(buttons)
+	assert.Nil(t, err)
+	assert.Equal(t, `[{"name":"1","sub_button":[{"type":"view","name":"1.1","url":"https://baidu.com"},{"type":"view","name":"1.2","url":"https://baidu.com"},{"type":"view","name":"1.3","url":"https://baidu.com"}]},{"name":"2","sub_button":[{"type":"view","name":"2.1","url":"https://baidu.com"},{"type":"view","name":"2.2","url":"https://baidu.com"},{"type":"view","name":"2.3","url":"https://baidu.com"}]},{"type":"view","name":"3","url":"https://baidu.com"}]`, string(data))
+}
--- a/officialaccount/menu/menu.go
+++ b/officialaccount/menu/menu.go
@@ -147,12 +147,12 @@ func (menu *Menu) SetMenuByJSON(jsonInfo string) error {

 	uri := fmt.Sprintf("%s?access_token=%s", menuCreateURL, accessToken)

-	response, err := util.PostJSON(uri, jsonInfo)
+	response, err := util.HTTPPost(uri, jsonInfo)
 	if err != nil {
 		return err
 	}

-	return util.DecodeWithCommonError(response, "SetMenu")
+	return util.DecodeWithCommonError(response, "SetMenuByJSON")
 }

 //GetMenu 获取菜单配置
@@ -223,7 +223,7 @@ func (menu *Menu) AddConditionalByJSON(jsonInfo string) error {
 	}

 	uri := fmt.Sprintf("%s?access_token=%s", menuAddConditionalURL, accessToken)
-	response, err := util.PostJSON(uri, jsonInfo)
+	response, err := util.HTTPPost(uri, jsonInfo)
 	if err != nil {
 		return err
 	}
--- a/officialaccount/oauth/oauth.go
+++ b/officialaccount/oauth/oauth.go
@@ -15,7 +15,7 @@ const (
 	webAppRedirectOauthURL = "https://open.weixin.qq.com/connect/qrconnect?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=%s#wechat_redirect"
 	accessTokenURL         = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=%s&secret=%s&code=%s&grant_type=authorization_code"
 	refreshAccessTokenURL  = "https://api.weixin.qq.com/sns/oauth2/refresh_token?appid=%s&grant_type=refresh_token&refresh_token=%s"
-	userInfoURL            = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN"
+	userInfoURL            = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=%s"
 	checkAccessTokenURL    = "https://api.weixin.qq.com/sns/auth?access_token=%s&openid=%s"
 )

@@ -144,8 +144,11 @@ type UserInfo struct {
 }

 //GetUserInfo 如果scope为 snsapi_userinfo 则可以通过此方法获取到用户基本信息
-func (oauth *Oauth) GetUserInfo(accessToken, openID string) (result UserInfo, err error) {
-	urlStr := fmt.Sprintf(userInfoURL, accessToken, openID)
+func (oauth *Oauth) GetUserInfo(accessToken, openID, lang string) (result UserInfo, err error) {
+	if lang == "" {
+		lang = "zh_CN"
+	}
+	urlStr := fmt.Sprintf(userInfoURL, accessToken, openID, lang)
 	var response []byte
 	response, err = util.HTTPGet(urlStr)
 	if err != nil {
--- a/pay/config/config.go
+++ b/pay/config/config.go
@@ -1,6 +1,6 @@
 package config

-//Config config for pay
+// Config config for pay
 type Config struct {
 	AppID     string `json:"app_id"`
 	MchID     string `json:"mch_id"`
--- a/pay/notify/refund.go
+++ b/pay/notify/refund.go
@@ -0,0 +1,77 @@
+package notify
+
+import (
+	"crypto/md5"
+	"encoding/base64"
+	"encoding/hex"
+	"encoding/xml"
+	"errors"
+
+	"github.com/silenceper/wechat/v2/util"
+)
+
+// reference: https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_16&index=10
+
+// RefundedResult 退款回调
+type RefundedResult struct {
+	ReturnCode *string `xml:"return_code"`
+	ReturnMsg  *string `xml:"return_msg"`
+
+	AppID    *string `xml:"appid"`
+	MchID    *string `xml:"mch_id"`
+	NonceStr *string `xml:"nonce_str"`
+	ReqInfo  *string `xml:"req_info"`
+}
+
+// RefundedReqInfo 退款结果（明文）
+type RefundedReqInfo struct {
+	TransactionID       *string `xml:"transaction_id"`
+	OutTradeNO          *string `xml:"out_trade_no"`
+	RefundID            *string `xml:"refund_id"`
+	OutRefundNO         *string `xml:"out_refund_no"`
+	TotalFee            *int    `xml:"total_fee"`
+	SettlementTotalFee  *int    `xml:"settlement_total_fee"`
+	RefundFee           *int    `xml:"refund_fee"`
+	SettlementRefundFee *int    `xml:"settlement_refund_fee"`
+	RefundStatus        *string `xml:"refund_status"`
+	SuccessTime         *string `xml:"success_time"`
+	RefundRecvAccount   *string `xml:"refund_recv_account"`
+	RefundAccount       *string `xml:"refund_account"`
+	RefundRequestSource *string `xml:"refund_request_source"`
+}
+
+// RefundedResp 消息通知返回
+type RefundedResp struct {
+	ReturnCode string `xml:"return_code"`
+	ReturnMsg  string `xml:"return_msg"`
+}
+
+// DecryptReqInfo 对退款结果进行解密
+func (notify *Notify) DecryptReqInfo(result *RefundedResult) (*RefundedReqInfo, error) {
+	var err error
+	if result == nil || result.ReqInfo == nil {
+		return nil, errors.New("empty refunded_result or req_info")
+	}
+
+	base64Decode, err := base64.StdEncoding.DecodeString(*result.ReqInfo)
+	if err != nil {
+		return nil, err
+	}
+
+	hash := md5.New()
+	if _, err = hash.Write([]byte(notify.Key)); err != nil {
+		return nil, err
+	}
+	md5APIKey := hex.EncodeToString(hash.Sum(nil))
+
+	data, err := util.AesECBDecrypt(base64Decode, []byte(md5APIKey))
+	if err != nil {
+		return nil, err
+	}
+
+	res := &RefundedReqInfo{}
+	if err = xml.Unmarshal(data, res); err != nil {
+		return nil, err
+	}
+	return res, nil
+}
--- a/pay/notify/refund_test.go
+++ b/pay/notify/refund_test.go
@@ -0,0 +1,26 @@
+package notify
+
+import (
+	"encoding/xml"
+	"testing"
+
+	"github.com/silenceper/wechat/v2/pay/config"
+)
+
+func TestNotify_DecryptReqInfo(t *testing.T) {
+	// data_source: https://studygolang.com/articles/11811
+	notify := &Notify{Config: &config.Config{Key: "ziR0QKsTUfMOuochC9RfCdmfHECorQAP"}}
+	info := "YYwp8C48th0wnQzTqeI+41pflB26v+smFj9z6h9RPBgxTyZyxc+4YNEz7QEgZNWj/6rIb2MfyWMZmCc41CfjKSssoSZPXxOhUayb6KvNSZ1p6frOX1PDWzhyruXK7ouNND+gDsG4yZ0XXzsL4/pYNwLLba/71QrnkJ/BHcByk4EXnglju5DLup9pJQSnTxjomI9Rxu57m9jg5lLQFxMWXyeASZJNvof0ulnHlWJswS4OxKOkmW7VEyKyLGV6npoOm03Qsx2wkRxLsSa9gPpg4hdaReeUqh1FMbm7aWjyrVYT/MEZWg98p4GomEIYvz34XfDncTezX4bf/ZiSLXt79aE1/YTZrYfymXeCrGjlbe0rg/T2ezJHAC870u2vsVbY1/KcE2A443N+DEnAziXlBQ1AeWq3Rqk/O6/TMM0lomzgctAOiAMg+bh5+Gu1ubA9O3E+vehULydD5qx2o6i3+qA9ORbH415NyRrQdeFq5vmCiRikp5xYptWiGZA0tkoaLKMPQ4ndE5gWHqiBbGPfULZWokI+QjjhhBmwgbd6J0VqpRorwOuzC/BHdkP72DCdNcm7IDUpggnzBIy0+seWIkcHEryKjge3YDHpJeQCqrAH0CgxXHDt1xtbQbST1VqFyuhPhUjDXMXrknrGPN/oE1t0rLRq+78cI+k8xe5E6seeUXQsEe8r3358mpcDYSmXWSXVZxK6er9EF98APqHwcndyEJD2YyCh/mMVhERuX+7kjlRXSiNUWa/Cv/XAKFQuvUYA5ea2eYWtPRHa4DpyuF1SNsaqVKfgqKXZrJHfAgslVpSVqUpX4zkKszHF4kwMZO3M7J1P94Mxa7Tm9mTOJePOoHPXeEB+m9rX6pSfoi3mJDQ5inJ+Vc4gOkg/Wd/lqiy6TTyP/dHDN6/v+AuJx5AXBo/2NDD3fWhHjkqEKIuARr2ClZt9ZRQO4HkXdZo7CN06sGCHk48Tg8PmxnxKcMZm7Aoquv5yMIM2gWSWIRJhwJ8cUpafIHc+GesDlbF6Zbt+/KXkafJAQq2RklEN+WvZ/zFz113EPgWPjp16TwBoziq96MMekvWKY/vdhjol8VFtGH9F61Oy1Xwf6DJtPw=="
+	res, err := notify.DecryptReqInfo(&RefundedResult{ReqInfo: &info})
+	if err != nil {
+		t.Error(err)
+		return
+	}
+
+	bytes, err := xml.Marshal(res)
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	t.Log(string(bytes))
+}
--- a/pay/refund/refund.go
+++ b/pay/refund/refund.go
@@ -29,6 +29,7 @@ type Params struct {
 	RefundFee     string
 	RefundDesc    string
 	RootCa        string //ca证书
+	NotifyURL     string
 }

 //request 接口请求参数
@@ -43,7 +44,7 @@ type request struct {
 	TotalFee      string `xml:"total_fee"`
 	RefundFee     string `xml:"refund_fee"`
 	RefundDesc    string `xml:"refund_desc,omitempty"`
-	//NotifyUrl     string `xml:"notify_url,omitempty"`
+	NotifyURL     string `xml:"notify_url,omitempty"`
 }

 //Response 接口返回
@@ -83,13 +84,16 @@ func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
 	param["total_fee"] = p.TotalFee
 	param["sign_type"] = util.SignTypeMD5
 	param["transaction_id"] = p.TransactionID
+	if p.NotifyURL != "" {
+		param["notify_url"] = p.NotifyURL
+	}

 	sign, err := util.ParamSign(param, refund.Key)
 	if err != nil {
 		return
 	}

-	request := request{
+	req := request{
 		AppID:         refund.AppID,
 		MchID:         refund.MchID,
 		NonceStr:      nonceStr,
@@ -101,7 +105,7 @@ func (refund *Refund) Refund(p *Params) (rsp Response, err error) {
 		RefundFee:     p.RefundFee,
 		RefundDesc:    p.RefundDesc,
 	}
-	rawRet, err := util.PostXMLWithTLS(refundGateway, request, p.RootCa, refund.MchID)
+	rawRet, err := util.PostXMLWithTLS(refundGateway, req, p.RootCa, refund.MchID)
 	if err != nil {
 		return
 	}
--- a/util/crypto.go
+++ b/util/crypto.go
@@ -1,6 +1,7 @@
 package util

 import (
+	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/hmac"
@@ -20,7 +21,7 @@ const (
 	SignTypeHMACSHA256 = `HMAC-SHA256`
 )

-//EncryptMsg 加密消息
+// EncryptMsg 加密消息
 func EncryptMsg(random, rawXMLMsg []byte, appID, aesKey string) (encrtptMsg []byte, err error) {
 	defer func() {
 		if e := recover(); e != nil {
@@ -38,7 +39,7 @@ func EncryptMsg(random, rawXMLMsg []byte, appID, aesKey string) (encrtptMsg []by
 	return
 }

-//AESEncryptMsg ciphertext = AES_Encrypt[random(16B) + msg_len(4B) + rawXMLMsg + appId]
+// AESEncryptMsg ciphertext = AES_Encrypt[random(16B) + msg_len(4B) + rawXMLMsg + appId]
 //参考：github.com/chanxuehong/wechat.v2
 func AESEncryptMsg(random, rawXMLMsg []byte, appID string, aesKey []byte) (ciphertext []byte) {
 	const (
@@ -76,7 +77,7 @@ func AESEncryptMsg(random, rawXMLMsg []byte, appID string, aesKey []byte) (ciphe
 	return
 }

-//DecryptMsg 消息解密
+// DecryptMsg 消息解密
 func DecryptMsg(appID, encryptedMsg, aesKey string) (random, rawMsgXMLBytes []byte, err error) {
 	defer func() {
 		if e := recover(); e != nil {
@@ -227,3 +228,105 @@ func ParamSign(p map[string]string, key string) (string, error) {

 	return CalculateSign(str, signType, key)
 }
+
+// ECB provides confidentiality by assigning a fixed ciphertext block to each plaintext block.
+// See NIST SP 800-38A, pp 08-09
+// reference: https://codereview.appspot.com/7860047/patch/23001/24001
+type ecb struct {
+	b         cipher.Block
+	blockSize int
+}
+
+func newECB(b cipher.Block) *ecb {
+	return &ecb{
+		b:         b,
+		blockSize: b.BlockSize(),
+	}
+}
+
+// ECBEncryptor -
+type ECBEncryptor ecb
+
+// NewECBEncryptor returns a BlockMode which encrypts in electronic code book mode, using the given Block.
+func NewECBEncryptor(b cipher.Block) cipher.BlockMode {
+	return (*ECBEncryptor)(newECB(b))
+}
+
+// BlockSize implement BlockMode.BlockSize
+func (x *ECBEncryptor) BlockSize() int {
+	return x.blockSize
+}
+
+// CryptBlocks implement BlockMode.CryptBlocks
+func (x *ECBEncryptor) CryptBlocks(dst, src []byte) {
+	if len(src)%x.blockSize != 0 {
+		panic("crypto/cipher: input not full blocks")
+	}
+	if len(dst) < len(src) {
+		panic("crypto/cipher: output smaller than input")
+	}
+	for len(src) > 0 {
+		x.b.Encrypt(dst, src[:x.blockSize])
+		src = src[x.blockSize:]
+		dst = dst[x.blockSize:]
+	}
+}
+
+// ECBDecryptor -
+type ECBDecryptor ecb
+
+// NewECBDecryptor returns a BlockMode which decrypts in electronic code book mode, using the given Block.
+func NewECBDecryptor(b cipher.Block) cipher.BlockMode {
+	return (*ECBDecryptor)(newECB(b))
+}
+
+// BlockSize implement BlockMode.BlockSize
+func (x *ECBDecryptor) BlockSize() int {
+	return x.blockSize
+}
+
+// CryptBlocks implement BlockMode.CryptBlocks
+func (x *ECBDecryptor) CryptBlocks(dst, src []byte) {
+	if len(src)%x.blockSize != 0 {
+		panic("crypto/cipher: input not full blocks")
+	}
+	if len(dst) < len(src) {
+		panic("crypto/cipher: output smaller than input")
+	}
+	for len(src) > 0 {
+		x.b.Decrypt(dst, src[:x.blockSize])
+		src = src[x.blockSize:]
+		dst = dst[x.blockSize:]
+	}
+}
+
+// AesECBDecrypt will decrypt data with PKCS5Padding
+func AesECBDecrypt(ciphertext []byte, aesKey []byte) ([]byte, error) {
+	if len(ciphertext) < aes.BlockSize {
+		return nil, errors.New("ciphertext too short")
+	}
+	// ECB mode always works in whole blocks.
+	if len(ciphertext)%aes.BlockSize != 0 {
+		return nil, errors.New("ciphertext is not a multiple of the block size")
+	}
+	block, err := aes.NewCipher(aesKey)
+	if err != nil {
+		return nil, err
+	}
+	NewECBDecryptor(block).CryptBlocks(ciphertext, ciphertext)
+	return PKCS5UnPadding(ciphertext), nil
+}
+
+// PKCS5Padding -
+func PKCS5Padding(ciphertext []byte, blockSize int) []byte {
+	padding := blockSize - len(ciphertext)%blockSize
+	padText := bytes.Repeat([]byte{byte(padding)}, padding)
+	return append(ciphertext, padText...)
+}
+
+// PKCS5UnPadding -
+func PKCS5UnPadding(origData []byte) []byte {
+	length := len(origData)
+	unPadding := int(origData[length-1])
+	return origData[:(length - unPadding)]
+}
--- a/util/http.go
+++ b/util/http.go
@@ -52,9 +52,9 @@ func PostJSON(uri string, obj interface{}) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	jsonData = bytes.Replace(jsonData, []byte("\\u003c"), []byte("<"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u003e"), []byte(">"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u0026"), []byte("&"), -1)
+	jsonData = bytes.ReplaceAll(jsonData, []byte("\\u003c"), []byte("<"))
+	jsonData = bytes.ReplaceAll(jsonData, []byte("\\u003e"), []byte(">"))
+	jsonData = bytes.ReplaceAll(jsonData, []byte("\\u0026"), []byte("&"))
 	body := bytes.NewBuffer(jsonData)
 	response, err := http.Post(uri, "application/json;charset=utf-8", body)
 	if err != nil {
@@ -75,9 +75,9 @@ func PostJSONWithRespContentType(uri string, obj interface{}) ([]byte, string, e
 		return nil, "", err
 	}

-	jsonData = bytes.Replace(jsonData, []byte("\\u003c"), []byte("<"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u003e"), []byte(">"), -1)
-	jsonData = bytes.Replace(jsonData, []byte("\\u0026"), []byte("&"), -1)
+	jsonData = bytes.ReplaceAll(jsonData, []byte("\\u003c"), []byte("<"))
+	jsonData = bytes.ReplaceAll(jsonData, []byte("\\u003e"), []byte(">"))
+	jsonData = bytes.ReplaceAll(jsonData, []byte("\\u0026"), []byte("&"))

 	body := bytes.NewBuffer(jsonData)
 	response, err := http.Post(uri, "application/json;charset=utf-8", body)
Author	SHA1	Message	Date
GargantuaX	e8fb058740	* 公众号菜单管理，增加new相关函数，老的set相关函数，返回btn本身，以便用字面量的方式创建多级菜单，更直观，方便管理 (#365 ) * * 公众号菜单管理，set相关函数，返回btn本身，方便以字面量的方式创建多个菜单，更直观，方便管理 * * golangci-lint fix * * 获取二维码ticket接口没有往上抛接口错误	2021-02-07 09:50:53 +08:00
LouGaZen	d5a67eaf29	微信支付 - 退款通知 (#359 ) * 🆕 发起退款 - 添加notify_url参数 * 🆕 退款通知	2021-02-07 09:49:43 +08:00
mlboy	e5f0d5eab7	Update README.md (#358 ) fix import	2021-01-26 14:11:38 +08:00
silenceper	2eae660002	修复SetMenuByJSON和AddConditionalByJSON报错 (#353 ) * change PostJSON to HTTPPost * change PostJSON to HTTPPost	2020-12-31 13:52:13 +08:00
silenceper	c0da806e03	update golangci (#349 ) * update golangci	2020-11-26 12:25:57 +08:00
Che Kun	185baa5d12	公众号网页授权后获取用户基本信息支持语言入参 #344 (#345 )	2020-11-26 12:09:58 +08:00
qufo	bf42c188cb	Update README.md (#347 ) fix typo	2020-11-21 22:06:01 +08:00