Merge pull request #531 from ArtisanCloud/develop

Develop
ArtisanCloud · Aug 23, 2024 · e49dcc0 · e49dcc0
2 parents d212ccb + 6c6cacc
commit e49dcc0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/src/kernel/accessToken.go b/src/kernel/accessToken.go
@@ -14,7 +14,6 @@ import (
 	contract2 "github.com/ArtisanCloud/PowerLibs/v3/logger/contract"
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/contract"
-	request2 "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/request"
 	response2 "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/response"
 )
 
@@ -356,16 +355,23 @@ func (accessToken *AccessToken) OverrideGetMiddlewareOfLog() {
 		return contract3.RequestMiddleware(func(handle contract3.RequestHandle) contract3.RequestHandle {
 			return func(request *http.Request) (response *http.Response, err error) {
 
-				// 前置中间件
-				request2.LogRequest(logger, request)
+				//config := (*client.App).GetConfig()
+				//http_debug := config.GetBool("http_debug", false)
+				//// 前置中间件
+				//if http_debug {
+				//	request2.LogRequest(logger, request)
+				//}
 
 				response, err = handle(request)
 				if err != nil {
 					return response, err
 				}
 
 				// 后置中间件
-				response2.LogResponse(logger, response)
+				//if http_debug {
+				//response2.LogResponse(logger, response)
+				//}
+
 				return
 			}
 		})

diff --git a/src/kernel/baseClient.go b/src/kernel/baseClient.go
@@ -17,8 +17,6 @@ import (
 	"github.com/ArtisanCloud/PowerLibs/v3/object"
 	"github.com/ArtisanCloud/PowerLibs/v3/os"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/power"
-	request2 "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/request"
-	response2 "github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/response"
 	"github.com/ArtisanCloud/PowerWeChat/v3/src/kernel/support"
 )
 
@@ -450,16 +448,22 @@ func (client *BaseClient) OverrideGetMiddlewareOfLog() {
 		return contract.RequestMiddleware(func(handle contract.RequestHandle) contract.RequestHandle {
 			return func(request *http.Request) (response *http.Response, err error) {
 
-				// 前置中间件
-				request2.LogRequest(logger, request)
+				//config := (*client.App).GetConfig()
+				//http_debug := config.GetBool("http_debug", false)
+				//// 前置中间件
+				//if http_debug {
+				//	request2.LogRequest(logger, request)
+				//}
 
 				response, err = handle(request)
 				if err != nil {
 					return response, err
 				}
 
-				// 后置中间件
-				response2.LogResponse(logger, response)
+				//// 后置中间件
+				//if http_debug {
+				//	response2.LogResponse(logger, response)
+				//}
 
 				return
 			}

diff --git a/src/payment/partner/client.go b/src/payment/partner/client.go
@@ -189,7 +189,8 @@ func (comp *Client) Close(ctx context.Context, tradeNo string) (*response2.Respo
 
 	endpoint := comp.Wrap(fmt.Sprintf("/v3/pay/partner/transactions/out-trade-no/%s/close", tradeNo))
 	_, err := comp.PlainRequest(ctx, endpoint, nil, http.MethodPost, &object.HashMap{
-		"mchid": config.GetString("mch_id", ""),
+		"sp_mchid":  config.GetString("mch_id", ""),
+		"sub_mchid": config.GetString("sub_mch_id", ""),
 	}, false, nil, result)
 
 	return result, err