From 223ffb8fe37ede066ba6fc8c18e0bd1ab57accc3 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Fri, 15 Dec 2023 14:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/CallBackController.php | 37 +++++++++------------------
 extend/Wechat/WechatPay.php           |  2 +-
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php
index 251dd8d..10a06cf 100644
--- a/app/Controller/CallBackController.php
+++ b/app/Controller/CallBackController.php
@@ -77,14 +77,12 @@ class CallBackController extends AbstractController
             $app = $WechatPay->createApp();
             $server = $app->getServer();
 
-            $message = $server->getRequestMessage();
+            // 获取解密消息
+            $message = $server->getDecryptedMessage();
             if (empty($message)) {
                 return $this->response->withStatus(500)->withBody(new SwooleStream(strval(json_encode(['code' => 'ERROR', 'message' => "问诊微信支付回调数据为空"], JSON_UNESCAPED_UNICODE))));
             }
 
-            // 验证推送消息签名
-            $app->getValidator()->validate($app->getRequest());
-
             Log::getInstance()->info("问诊微信支付回调数据：" . json_encode($message->toArray(), JSON_UNESCAPED_UNICODE));
 
             if (empty($message['out_trade_no'])) {
@@ -245,15 +243,13 @@ class CallBackController extends AbstractController
             $app = $WechatPay->createApp();
             $server = $app->getServer();
 
-            $message = $server->getRequestMessage();
+            // 获取解密消息
+            $message = $server->getDecryptedMessage();
             if (empty($message)) {
                 Db::rollBack();
                 return $this->response->withStatus(500)->withBody(new SwooleStream(strval(json_encode(['code' => 'ERROR', 'message' => "回调数据为空"], JSON_UNESCAPED_UNICODE))));
             }
 
-            // 验证推送消息签名
-            $app->getValidator()->validate($app->getRequest());
-
             Log::getInstance("CallBackController-wxPayInquiryRefundCallBack")->info("微信退款回调数据：" . json_encode($message->toArray(), JSON_UNESCAPED_UNICODE));
 
             if (empty($message['out_trade_no'])) {
@@ -392,15 +388,12 @@ class CallBackController extends AbstractController
             $app = $WechatPay->createApp();
             $server = $app->getServer();
 
-            $message = $server->getRequestMessage();
-
+            // 获取解密消息
+            $message = $server->getDecryptedMessage();
             if (empty($message)) {
                 return $this->response->withStatus(500)->withBody(new SwooleStream(strval(json_encode(['code' => 'ERROR', 'message' => "药品微信支付回调数据为空"], JSON_UNESCAPED_UNICODE))));
             }
 
-            // 验证推送消息签名
-            $app->getValidator()->validate($app->getRequest());
-
             Log::getInstance()->info("药品微信支付回调数据：" . json_encode($message->toArray(), JSON_UNESCAPED_UNICODE));
 
             if (empty($message['out_trade_no'])) {
@@ -549,15 +542,13 @@ class CallBackController extends AbstractController
             $app = $WechatPay->createApp();
             $server = $app->getServer();
 
-            $message = $server->getRequestMessage();
+            // 获取解密消息
+            $message = $server->getDecryptedMessage();
             if (empty($message)) {
                 Db::rollBack();
                 return $this->response->withStatus(500)->withBody(new SwooleStream(strval(json_encode(['code' => 'ERROR', 'message' => "回调数据为空"], JSON_UNESCAPED_UNICODE))));
             }
 
-            // 验证推送消息签名
-            $app->getValidator()->validate($app->getRequest());
-
             Log::getInstance("CallBackController-wxPayProductRefundCallBack")->info("微信退款回调数据：" . json_encode($message->toArray(), JSON_UNESCAPED_UNICODE));
 
             if (empty($message['out_trade_no'])) {
@@ -1159,14 +1150,12 @@ class CallBackController extends AbstractController
             $app = $WechatPay->createApp();
             $server = $app->getServer();
 
-            $message = $server->getRequestMessage();
+            // 获取解密消息
+            $message = $server->getDecryptedMessage();
             if (empty($message)) {
                 return $this->response->withStatus(500)->withBody(new SwooleStream(strval(json_encode(['code' => 'ERROR', 'message' => "问诊微信支付回调数据为空"], JSON_UNESCAPED_UNICODE))));
             }
 
-            // 验证推送消息签名
-            $app->getValidator()->validate($app->getRequest());
-
             Log::getInstance()->info("检测微信支付回调数据：" . json_encode($message->toArray(), JSON_UNESCAPED_UNICODE));
 
             if (empty($message['out_trade_no'])) {
@@ -1251,15 +1240,13 @@ class CallBackController extends AbstractController
             $app = $WechatPay->createApp();
             $server = $app->getServer();
 
-            $message = $server->getRequestMessage();
+            // 获取解密消息
+            $message = $server->getDecryptedMessage();
             if (empty($message)) {
                 Db::rollBack();
                 return $this->response->withStatus(500)->withBody(new SwooleStream(strval(json_encode(['code' => 'ERROR', 'message' => "回调数据为空"], JSON_UNESCAPED_UNICODE))));
             }
 
-            // 验证推送消息签名
-            $app->getValidator()->validate($app->getRequest());
-
             Log::getInstance()->info("微信退款回调数据：" . json_encode($message->toArray(), JSON_UNESCAPED_UNICODE));
 
             if (empty($message['out_trade_no'])) {
diff --git a/extend/Wechat/WechatPay.php b/extend/Wechat/WechatPay.php
index 897f07d..2c7cd88 100644
--- a/extend/Wechat/WechatPay.php
+++ b/extend/Wechat/WechatPay.php
@@ -114,7 +114,7 @@ class WechatPay
 
         try {
             $app = new Application($config);
-            $request = ApplicationContext::getContainer()->get(RequestInterface::class);
+            $request = \Hyperf\Context\ApplicationContext::getContainer()->get(RequestInterface::class);
             $app->setRequest($request);
             return $app;
         } catch (InvalidArgumentException $e) {