From 3afe499e70b03383405b38e6417cb2b314ac0de7 Mon Sep 17 00:00:00 2001 From: silenceper Date: Mon, 30 Aug 2021 18:39:41 +0800 Subject: [PATCH] update release-2.0 (#454) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * merge branch release-2.0 to v2 (#450) * feat: add/delete subscribe template (#449) * feat: 添加 SDKApiNotOpen 错误信息 (#448) * 添加微信客服SDK * polish:优化签名函数 * polish：优化注释内容 * polish:复用已有的Token以及CommonError,移除无用的输出 * polish:复用已有的消息加解密 * fix:修复错误信息被覆盖的问题 * polish:go fmt 文件 * polish:客服链接支持自定义参数并更新注释文档内容 * feat:支持微信客服回调请求的校验和消息的解析，复用原有的Signature和DecryptMsg方法 * feat:对外暴露SDKApiForbidden等错误 可以通过调用升级服务相关接口然后根据该错误判断微信客服配置来源 * feat:添加无效的open_kfid错误信息 * fix: 添加SDKApiNotOpen 错误信息 目前主要用于判断客户是否关闭了API授权，如果客户关闭了API功能导致服务异常，则可以引导用户执行相应的操作重新开启改功能 Co-authored-by: Afeyer Co-authored-by: ZmJ Co-authored-by: Afeyer <1500527791@qq.com> Co-authored-by: Afeyer * Update go.yml (#452) * 修正字段问题 (#451) fix #443 * fix linux build failed when cgo disable (#453) Co-authored-by: ZmJ Co-authored-by: Afeyer <1500527791@qq.com> Co-authored-by: Afeyer --- .github/workflows/go.yml | 4 ++-- pay/notify/refund.go | 2 +- work/msgaudit/client_unsupport.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 68e3ed2..b0af55a 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -2,9 +2,9 @@ name: Go on: push: - branches: [ master,release-* ] + branches: [ master,release-*,v2 ] pull_request: - branches: [ master,release-* ] + branches: [ master,release-*,v2 ] jobs: golangci: diff --git a/pay/notify/refund.go b/pay/notify/refund.go index af04ca4..f31d57b 100644 --- a/pay/notify/refund.go +++ b/pay/notify/refund.go @@ -35,7 +35,7 @@ type RefundedReqInfo struct { SettlementRefundFee *int `xml:"settlement_refund_fee"` RefundStatus *string `xml:"refund_status"` SuccessTime *string `xml:"success_time"` - RefundRecvAccount *string `xml:"refund_recv_account"` + RefundRecvAccount *string `xml:"refund_recv_accout"` RefundAccount *string `xml:"refund_account"` RefundRequestSource *string `xml:"refund_request_source"` } diff --git a/work/msgaudit/client_unsupport.go b/work/msgaudit/client_unsupport.go index 1c31af0..d256d55 100644 --- a/work/msgaudit/client_unsupport.go +++ b/work/msgaudit/client_unsupport.go @@ -1,4 +1,4 @@ -// +build !linux +// +build !linux linux,!cgo //Package msgaudit for unsupport platform package msgaudit @@ -15,5 +15,5 @@ type Client struct { // NewClient new func NewClient(cfg *config.Config) (*Client, error) { - return nil, fmt.Errorf("会话存档功能目前只支持Linux平台运行") + return nil, fmt.Errorf("会话存档功能目前只支持Linux平台运行，并且打开设置CGO_ENABLED=1") }