From 32382bb75b739a9a873163fb0d85da2545114156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Fri, 5 May 2023 21:26:53 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=BC=E5=AE=B9=E5=86=85=E5=AD=98?= =?UTF-8?q?=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在不能使用 file_get_contents('php://input') 时， 使用 $GLOBALS['HTTP_RAW_POST_DATA'] 传值。 #I5TXCL --- WeChat/Contracts/BasicPushEvent.php | 7 +++---- WeChat/Contracts/BasicWePay.php | 5 +++-- WeChat/Contracts/DataArray.php | 4 ++-- WeChat/Contracts/Tools.php | 12 ++++++++++++ WePay/Refund.php | 5 +++-- WePayV3/Order.php | 10 ++++------ WePayV3/Refund.php | 6 ++++-- 7 files changed, 31 insertions(+), 18 deletions(-) diff --git a/WeChat/Contracts/BasicPushEvent.php b/WeChat/Contracts/BasicPushEvent.php index 54253e6..a0529fe 100644 --- a/WeChat/Contracts/BasicPushEvent.php +++ b/WeChat/Contracts/BasicPushEvent.php @@ -92,7 +92,7 @@ class BasicPushEvent $this->appid = $this->config->get('appid'); // 推送消息处理 if ($_SERVER['REQUEST_METHOD'] == "POST") { - $this->postxml = file_get_contents("php://input"); + $this->postxml = Tools::getRawInput(); $this->encryptType = $this->input->get('encrypt_type'); if ($this->isEncrypt()) { if (empty($options['encodingaeskey'])) { @@ -157,16 +157,15 @@ class BasicPushEvent /** * 验证来自微信服务器 - * @param string $str * @return bool */ - private function checkSignature($str = '') + private function checkSignature() { $nonce = $this->input->get('nonce'); $timestamp = $this->input->get('timestamp'); $msg_signature = $this->input->get('msg_signature'); $signature = empty($msg_signature) ? $this->input->get('signature') : $msg_signature; - $tmpArr = [$this->config->get('token'), $timestamp, $nonce, $str]; + $tmpArr = [$this->config->get('token'), $timestamp, $nonce, '']; sort($tmpArr, SORT_STRING); return sha1(implode($tmpArr)) === $signature; } diff --git a/WeChat/Contracts/BasicWePay.php b/WeChat/Contracts/BasicWePay.php index bc5e40c..a8c8ee2 100644 --- a/WeChat/Contracts/BasicWePay.php +++ b/WeChat/Contracts/BasicWePay.php @@ -92,12 +92,13 @@ class BasicWePay /** * 获取微信支付通知 + * @param string $xml * @return array * @throws \WeChat\Exceptions\InvalidResponseException */ - public function getNotify() + public function getNotify($xml = '') { - $data = Tools::xml2arr(file_get_contents('php://input')); + $data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml); if (isset($data['sign']) && $this->getPaySign($data) === $data['sign']) { return $data; } diff --git a/WeChat/Contracts/DataArray.php b/WeChat/Contracts/DataArray.php index 210efc5..6ddb4ad 100644 --- a/WeChat/Contracts/DataArray.php +++ b/WeChat/Contracts/DataArray.php @@ -53,7 +53,7 @@ class DataArray implements ArrayAccess /** * 获取配置项参数 * @param string|null $offset - * @return array|string|null + * @return array|string|null|mixed */ public function get($offset = null) { @@ -117,7 +117,7 @@ class DataArray implements ArrayAccess /** * 获取配置项参数 * @param string|null $offset - * @return array|string|null + * @return array|string|null|mixed */ #[\ReturnTypeWillChange] public function offsetGet($offset = null) diff --git a/WeChat/Contracts/Tools.php b/WeChat/Contracts/Tools.php index f3e7c9e..7721972 100644 --- a/WeChat/Contracts/Tools.php +++ b/WeChat/Contracts/Tools.php @@ -65,6 +65,18 @@ class Tools return $str; } + /** + * 获取输入对象 + * @return false|mixed|string + */ + public static function getRawInput() + { + if (empty($GLOBALS['HTTP_RAW_POST_DATA'])) { + return file_get_contents('php://input'); + } else { + return $GLOBALS['HTTP_RAW_POST_DATA']; + } + } /** * 根据文件后缀获取文件类型 diff --git a/WePay/Refund.php b/WePay/Refund.php index 0da69a5..f71244e 100644 --- a/WePay/Refund.php +++ b/WePay/Refund.php @@ -57,13 +57,14 @@ class Refund extends BasicWePay /** * 获取退款通知 + * @param string $xml * @return array * @throws \WeChat\Exceptions\InvalidDecryptException * @throws \WeChat\Exceptions\InvalidResponseException */ - public function getNotify() + public function getNotify($xml = '') { - $data = Tools::xml2arr(file_get_contents("php://input")); + $data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml); if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') { throw new InvalidResponseException('获取退款通知XML失败！'); } diff --git a/WePayV3/Order.php b/WePayV3/Order.php index 5981739..9aa5cba 100644 --- a/WePayV3/Order.php +++ b/WePayV3/Order.php @@ -105,18 +105,16 @@ class Order extends BasicWePay /** * 支付通知解析 + * @param array $data * @return array * @throws \WeChat\Exceptions\InvalidDecryptException */ - public function notify(array $parameters = []) + public function notify(array $data = []) { - if (empty($parameters)) { - $body = file_get_contents('php://input'); + if (empty($data)) { + $body = Tools::getRawInput(); $data = json_decode($body, true); - } else { - $data = $parameters; } - if (isset($data['resource'])) { $aes = new DecryptAes($this->config['mch_v3_key']); $data['result'] = $aes->decryptToString( diff --git a/WePayV3/Refund.php b/WePayV3/Refund.php index e4fda93..56f1e43 100644 --- a/WePayV3/Refund.php +++ b/WePayV3/Refund.php @@ -54,13 +54,15 @@ class Refund extends BasicWePay /** * 获取退款通知 + * @param string $xml + * @return array * @return array * @throws \WeChat\Exceptions\InvalidDecryptException * @throws \WeChat\Exceptions\InvalidResponseException */ - public function notify() + public function notify($xml = '') { - $data = Tools::xml2arr(file_get_contents("php://input")); + $data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml); if (!isset($data['return_code']) || $data['return_code'] !== 'SUCCESS') { throw new InvalidResponseException('获取退款通知XML失败！'); }