From 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 10 Apr 2024 10:22:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java b/src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java
index 2d1ed80..ee9f72b 100644
--- a/src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java
+++ b/src/main/java/org/springblade/modules/pay/service/impl/WxPayServiceImpl.java
@@ -57,8 +57,8 @@
@Resource
private WxPayConfig wxPayConfig;
- @Resource
- private CloseableHttpClient wxPayClient;
+// @Resource
+// private CloseableHttpClient wxPayClient;
@Resource
private IOrderInfoService orderInfoService;
@@ -145,7 +145,7 @@
httpGet.setHeader("Accept", "application/json");
//完成签名并执行请求
- CloseableHttpResponse response = wxPayClient.execute(httpGet);
+ CloseableHttpResponse response = null;//wxPayClient.execute(httpGet);
try {
String bodyAsString = EntityUtils.toString(response.getEntity());//响应体
@@ -257,7 +257,7 @@
httpPost.setHeader("Accept", "application/json");//设置响应报文格式
//完成签名并执行请求，并完成验签
- CloseableHttpResponse response = wxPayClient.execute(httpPost);
+ CloseableHttpResponse response =null;// wxPayClient.execute(httpPost);
try {
@@ -303,7 +303,7 @@
httpGet.setHeader("Accept", "application/json");
//完成签名并执行请求
- CloseableHttpResponse response = wxPayClient.execute(httpGet);
+ CloseableHttpResponse response = null;//wxPayClient.execute(httpGet);
try {
String bodyAsString = EntityUtils.toString(response.getEntity());
@@ -460,7 +460,7 @@
httpPost.setHeader("Accept", "application/json");
//完成签名并执行请求
- CloseableHttpResponse response = wxPayClient.execute(httpPost);
+ CloseableHttpResponse response = null;//wxPayClient.execute(httpPost);
try {
String bodyAsString = EntityUtils.toString(response.getEntity());//响应体
@@ -582,7 +582,7 @@
httpPost.setHeader("Accept", "application/json");
//完成签名并执行请求
- CloseableHttpResponse response = wxPayClient.execute(httpPost);
+ CloseableHttpResponse response = null;//wxPayClient.execute(httpPost);
try {
int statusCode = response.getStatusLine().getStatusCode();//响应状态码
--
Gitblit v1.9.3