blackteay/WeChatDeveloper
1
0
Fork 0
mirror of https://gitee.com/zoujingli/WeChatDeveloper.git synced 2025-04-05 19:41:44 +08:00
Code Issues Projects Releases Wiki Activity

fix 兼容内存框架

Browse Source 
在不能使用 file_get_contents('php://input') 时，
使用 $GLOBALS['HTTP_RAW_POST_DATA'] 传值。

#I5TXCL
This commit is contained in:
邹景立 2023-05-05 21:26:53 +08:00
parent 685617267f
commit 32382bb75b
7 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WeChat/Contracts/BasicPushEvent.php
View File

@ -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;
}

5
WeChat/Contracts/BasicWePay.php
View File

@ -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;
}

4
WeChat/Contracts/DataArray.php
View File

@ -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)

12
WeChat/Contracts/Tools.php
View File

@ -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'];
}
}
/**
* 根据文件后缀获取文件类型

5
WePay/Refund.php
View File

@ -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失败！');
}

10
WePayV3/Order.php
View File

@ -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(

6
WePayV3/Refund.php
View File

@ -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失败！');
}