From 3bc7af3d44faf59ae8b421ec48bc08456d8d9ef7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Wed, 18 Aug 2021 18:17:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98V3=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                     | 4 ++++
 README.md                                        | 2 +-
 library.go                                       | 2 +-
 service/wechatpayapiv3/app.go                    | 4 ++++
 service/wechatpayapiv3/pay_transactions_jsapi.go | 2 --
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3017f610..b951b484 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.0.23 / 2021-08-18
+
+- 优化微信支付V3版
+
 ## v1.0.22 / 2021-08-18
 
 - 增加微信支付V3版
diff --git a/README.md b/README.md
index b651ae25..83009cd5 100644
--- a/README.md
+++ b/README.md
@@ -11,5 +11,5 @@
 ## Install 安装
 
 ```Importing
-go get -v -u gitee.com/dtapps/go-library@v1.0.22
+go get -v -u gitee.com/dtapps/go-library@v1.0.23
 ```
diff --git a/library.go b/library.go
index d72c7861..68de15be 100644
--- a/library.go
+++ b/library.go
@@ -1,5 +1,5 @@
 package go_library
 
 func Version() string {
-	return "v1.0.22"
+	return "v1.0.23"
 }
diff --git a/service/wechatpayapiv3/app.go b/service/wechatpayapiv3/app.go
index df56d9d6..ffd76bc2 100644
--- a/service/wechatpayapiv3/app.go
+++ b/service/wechatpayapiv3/app.go
@@ -32,6 +32,10 @@ type ErrResp struct {
 
 func (app *App) request(url string, params map[string]interface{}) (resp []byte, result ErrResp, err error) {
 
+	// common params
+	params["appid"] = app.AppId
+	params["mchid"] = app.MchId
+
 	canonicalURL := fmt.Sprintf("%s/%s", WechatPayAPIServer, url)
 	method := "POST"
 	authorization, _ := app.authorization(method, params, canonicalURL)
diff --git a/service/wechatpayapiv3/pay_transactions_jsapi.go b/service/wechatpayapiv3/pay_transactions_jsapi.go
index 5f1737db..b6079611 100644
--- a/service/wechatpayapiv3/pay_transactions_jsapi.go
+++ b/service/wechatpayapiv3/pay_transactions_jsapi.go
@@ -6,8 +6,6 @@ import (
 )
 
 type PayTransactionsJsapi struct {
-	Appid       string                          `json:"appid"`                 //【是】应用ID
-	Mchid       string                          `json:"mchid"`                 //【是】直连商户号
 	Description string                          `json:"description"`           //【是】商品描述
 	OutTradeNo  string                          `json:"out_trade_no"`          //【是】商户订单号
 	TimeExpire  time.Time                       `json:"time_expire,omitempty"` //【否】交易结束时间