From 200f14dba9407c14b68125bc0fbf1274567531ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 28 Apr 2023 19:06:35 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E9=85=8D=E7=BD=AE=EF=BC=88=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Contracts/BasicWePay.php | 30 ++++++++++++++++++++++++------
 WePayV3/ProfitSharing.php        |  7 ++++---
 _test/pay-v3-config.php          | 12 +++++++-----
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index 056ddf7..f177e4c 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -65,12 +65,12 @@ abstract class BasicWePay
         if (empty($options['mch_v3_key'])) {
             throw new InvalidArgumentException("Missing Config -- [mch_v3_key]");
         }
-        if (empty($options['cert_private'])) {
-            throw new InvalidArgumentException("Missing Config -- [cert_private]");
-        }
         if (empty($options['cert_public'])) {
             throw new InvalidArgumentException("Missing Config -- [cert_public]");
         }
+        if (empty($options['cert_private'])) {
+            throw new InvalidArgumentException("Missing Config -- [cert_private]");
+        }
 
         if (stripos($options['cert_public'], '-----BEGIN CERTIFICATE-----') === false) {
             if (file_exists($options['cert_public'])) {
@@ -93,11 +93,29 @@ abstract class BasicWePay
         $this->config['mch_v3_key'] = $options['mch_v3_key'];
         $this->config['cert_public'] = $options['cert_public'];
         $this->config['cert_private'] = $options['cert_private'];
-        $this->config['cert_serial'] = openssl_x509_parse($this->config['cert_public'])['serialNumberHex'];
 
-        if (empty($this->config['cert_serial'])) {
-            throw new InvalidArgumentException("Failed to parse certificate public key");
+        if (empty($options['cert_serial'])) {
+            $this->config['cert_serial'] = openssl_x509_parse($this->config['cert_public'], true)['serialNumberHex'];
+        } else {
+            $this->config['cert_serial'] = $options['cert_serial'];
         }
+        if (empty($this->config['cert_serial'])) {
+            throw new InvalidArgumentException('Failed to parse certificate public key');
+        }
+
+        // 服务商参数支持
+//        if (!empty($options['sp_appid'])) {
+//            $this->config['sp_appid'] = $options['sp_appid'];
+//        }
+//        if (!empty($options['sp_mchid'])) {
+//            $this->config['sp_mchid'] = $options['sp_mchid'];
+//        }
+//        if (!empty($options['sub_appid'])) {
+//            $this->config['sub_appid'] = $options['sub_appid'];
+//        }
+//        if (!empty($options['sub_mch_id'])) {
+//            $this->config['sub_mch_id'] = $options['sub_mch_id'];
+//        }
     }
 
     /**
diff --git a/WePayV3/ProfitSharing.php b/WePayV3/ProfitSharing.php
index d452637..889020b 100644
--- a/WePayV3/ProfitSharing.php
+++ b/WePayV3/ProfitSharing.php
@@ -25,8 +25,6 @@ use WePayV3\Contracts\BasicWePay;
  */
 class ProfitSharing extends BasicWePay
 {
-
-
     /**
      * 请求分账
      * @param array $options
@@ -63,9 +61,10 @@ class ProfitSharing extends BasicWePay
     {
         return $this->doRequest('POST', '/v3/profitsharing/orders/unfreeze', json_encode($options, JSON_UNESCAPED_UNICODE), true);
     }
+
     /**
      * 查询剩余待分金额
-     * @param array $transactionId 微信订单号
+     * @param string $transactionId 微信订单号
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
@@ -74,6 +73,7 @@ class ProfitSharing extends BasicWePay
         $pathinfo = "/v3/profitsharing/transactions/{$transactionId}/amounts";
         return $this->doRequest('GET', $pathinfo, '', true);
     }
+
     /**
      * 添加分账接收方
      * @param array $options
@@ -85,6 +85,7 @@ class ProfitSharing extends BasicWePay
         $options['appid'] = $this->config['appid'];
         return $this->doRequest('POST', "/v3/profitsharing/receivers/add", json_encode($options, JSON_UNESCAPED_UNICODE), true);
     }
+
     /**
      * 删除分账接收方
      * @param array $options
diff --git a/_test/pay-v3-config.php b/_test/pay-v3-config.php
index fbad436..5182430 100644
--- a/_test/pay-v3-config.php
+++ b/_test/pay-v3-config.php
@@ -27,14 +27,16 @@ $certPrivate = <<<CERT
 CERT;
 
 return [
-    // 商户绑定的公众号APPID
+    // 可选，公众号APPID
     'appid'        => '',
-    // 微信商户编号ID
+    // 必填，微信商户编号ID
     'mch_id'       => '',
-    // 微信商户V3接口密钥
+    // 必填，微信商户V3接口密钥
     'mch_v3_key'   => '',
-    // 微信商户证书公钥，支持证书内容或文件路径
+    // 可选，微信商户证书序列号，可从公钥中提取
+    'cert_serial'  => '',
+    // 必填，微信商户证书公钥，支持证书内容或文件路径
     'cert_public'  => $certPublic,
-    // 微信商户证书私钥，支持证书内容或文件路径
+    // 必填，微信商户证书私钥，支持证书内容或文件路径
     'cert_private' => $certPrivate,
 ];
\ No newline at end of file

From 53f3dce3dd77e8244f160439c87cd500f99e1df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 28 Apr 2023 19:45:43 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E7=9B=B4=E8=BF=9E=E5=95=86=E6=88=B7=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Contracts/BasicWePay.php | 13 +++--
 WePayV3/Order.php                | 90 ++++++++++++++++++++++++++++++--
 WePayV3/Refund.php               |  2 +-
 3 files changed, 95 insertions(+), 10 deletions(-)

diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index f177e4c..95b5aa9 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -135,24 +135,28 @@ abstract class BasicWePay
      * @param string $method 请求访问
      * @param string $pathinfo 请求路由
      * @param string $jsondata 请求数据
-     * @param bool $verify 是否验证
-     * @return array
+     * @param boolean $verify 是否验证
+     * @param boolean $isjson 返回JSON
+     * @return array|string
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function doRequest($method, $pathinfo, $jsondata = '', $verify = false)
+    public function doRequest($method, $pathinfo, $jsondata = '', $verify = false, $isjson = true)
     {
         list($time, $nonce) = [time(), uniqid() . rand(1000, 9999)];
         $signstr = join("\n", [$method, $pathinfo, $time, $nonce, $jsondata, '']);
+
         // 生成数据签名TOKEN
         $token = sprintf('mchid="%s",nonce_str="%s",timestamp="%d",serial_no="%s",signature="%s"',
             $this->config['mch_id'], $nonce, $time, $this->config['cert_serial'], $this->signBuild($signstr)
         );
+
         list($header, $content) = $this->_doRequestCurl($method, $this->base . $pathinfo, [
             'data' => $jsondata, 'header' => [
                 "Accept: application/json", "Content-Type: application/json",
                 'User-Agent: https://thinkadmin.top', "Authorization: WECHATPAY2-SHA256-RSA2048 {$token}",
             ],
         ]);
+
         if ($verify) {
             $headers = [];
             foreach (explode("\n", $header) as $line) {
@@ -171,7 +175,8 @@ abstract class BasicWePay
                 throw new InvalidResponseException($exception->getMessage(), $exception->getCode());
             }
         }
-        return json_decode($content, true);
+
+        return $isjson ? json_decode($content, true) : $content;
     }
 
     /**
diff --git a/WePayV3/Order.php b/WePayV3/Order.php
index c3d5dbd..02e5439 100644
--- a/WePayV3/Order.php
+++ b/WePayV3/Order.php
@@ -22,7 +22,7 @@ use WePayV3\Contracts\BasicWePay;
 use WePayV3\Contracts\DecryptAes;
 
 /**
- * 订单支付接口
+ * 直连商户 | 订单支付接口
  * Class Order
  * @package WePayV3
  */
@@ -39,6 +39,7 @@ class Order extends BasicWePay
      * @param array $data 支付参数
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @document https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_1.shtml
      */
     public function create($type, $data)
     {
@@ -73,18 +74,32 @@ class Order extends BasicWePay
 
     /**
      * 支付订单查询
-     * @param string $orderNo 订单单号
+     * @param string $tradeNo 订单单号
      * @return array
      * @throws \WeChat\Exceptions\InvalidResponseException
+     * @document https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_2.shtml
      */
-    public function query($orderNo)
+    public function query($tradeNo)
     {
-        $pathinfo = "/v3/pay/transactions/out-trade-no/{$orderNo}";
+        $pathinfo = "/v3/pay/transactions/out-trade-no/{$tradeNo}";
         return $this->doRequest('GET', "{$pathinfo}?mchid={$this->config['mch_id']}", '', true);
     }
 
     /**
-     * 支付通知
+     * 关闭支付订单
+     * @param string $tradeNo 订单单号
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function close($tradeNo)
+    {
+        $data = ['mchid' => $this->config['mch_id']];
+        $path = "/v3/pay/transactions/out-trade-no/{$tradeNo}/close";
+        return $this->doRequest('POST', $path, json_encode($data, JSON_UNESCAPED_UNICODE), true);
+    }
+
+    /**
+     * 支付通知解析
      * @return array
      * @throws \WeChat\Exceptions\InvalidDecryptException
      */
@@ -107,4 +122,69 @@ class Order extends BasicWePay
         }
         return $data;
     }
+
+    /**
+     * 创建退款订单
+     * @param array $data 退款参数
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @document https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_9.shtml
+     */
+    public function createRefund($data)
+    {
+        $path = '/v3/refund/domestic/refunds';
+        return $this->doRequest('POST', $path, json_encode($data, JSON_UNESCAPED_UNICODE), true);
+    }
+
+    /**
+     * 退款订单查询
+     * @param string $refundNo 退款单号
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @document https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_10.shtml
+     */
+    public function queryRefund($refundNo)
+    {
+        $path = "/v3/refund/domestic/refunds/{$refundNo}";
+        return $this->doRequest('GET', $path, '', true);
+    }
+
+    /**
+     * 申请交易账单
+     * @param array|string $params
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @document https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_3_6.shtml
+     */
+    public function tradeBill($params)
+    {
+        $path = '/v3/bill/tradebill?' . is_array($params) ? http_build_query($params) : $params;
+        return $this->doRequest('GET', $path, '', true);
+    }
+
+    /**
+     * 申请资金账单
+     * @param array|string $params
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @document https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_3_7.shtml
+     */
+    public function fundflowBill($params)
+    {
+        $path = '/v3/bill/fundflowbill?' . is_array($params) ? http_build_query($params) : $params;
+        return $this->doRequest('GET', $path, '', true);
+    }
+
+    /**
+     * 下载账单文件
+     * @param string $fileurl
+     * @return string 二进制 Excel 内容
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     * @document https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter7_6_1.shtml
+     */
+    public function downloadBill($fileurl)
+    {
+        $path = strstr($fileurl, '/v3/');
+        return $this->doRequest('GET', $path, '', false, false);
+    }
 }
diff --git a/WePayV3/Refund.php b/WePayV3/Refund.php
index bae2563..eeb80a2 100644
--- a/WePayV3/Refund.php
+++ b/WePayV3/Refund.php
@@ -22,7 +22,7 @@ use WeChat\Exceptions\InvalidResponseException;
 use WePayV3\Contracts\BasicWePay;
 
 /**
- * 订单退款接口
+ * 电商接口 | 订单退款接口
  * Class Refund
  * @package WePayV3
  */

From 8630e29773aae92b1ce98f47f16a7c11be9ea4c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 28 Apr 2023 19:58:55 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E6=97=B6=E7=BC=93=E5=AD=98=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Contracts/BasicWePay.php | 4 ++++
 _test/pay-v3-config.php          | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index 95b5aa9..36a3f9e 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -103,6 +103,10 @@ abstract class BasicWePay
             throw new InvalidArgumentException('Failed to parse certificate public key');
         }
 
+        if (!empty($options['cache_path'])) {
+            Tools::$cache_path = $options['cache_path'];
+        }
+
         // 服务商参数支持
 //        if (!empty($options['sp_appid'])) {
 //            $this->config['sp_appid'] = $options['sp_appid'];
diff --git a/_test/pay-v3-config.php b/_test/pay-v3-config.php
index 5182430..21faedf 100644
--- a/_test/pay-v3-config.php
+++ b/_test/pay-v3-config.php
@@ -39,4 +39,6 @@ return [
     'cert_public'  => $certPublic,
     // 必填，微信商户证书私钥，支持证书内容或文件路径
     'cert_private' => $certPrivate,
+    // 可选，运行时的文件缓存路径
+    'cache_path'   => ''
 ];
\ No newline at end of file

From ac63302119c2f78124df51fc0a188f59296ff29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 28 Apr 2023 20:05:23 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Contracts/BasicWePay.php | 4 ++--
 WePayV3/Order.php                | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index 36a3f9e..41b1528 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -153,8 +153,8 @@ abstract class BasicWePay
         $token = sprintf('mchid="%s",nonce_str="%s",timestamp="%d",serial_no="%s",signature="%s"',
             $this->config['mch_id'], $nonce, $time, $this->config['cert_serial'], $this->signBuild($signstr)
         );
-
-        list($header, $content) = $this->_doRequestCurl($method, $this->base . $pathinfo, [
+        $location = preg_match('|^https?://|', $pathinfo) ? $pathinfo : ($this->base . $pathinfo);
+        list($header, $content) = $this->_doRequestCurl($method, $location, [
             'data' => $jsondata, 'header' => [
                 "Accept: application/json", "Content-Type: application/json",
                 'User-Agent: https://thinkadmin.top', "Authorization: WECHATPAY2-SHA256-RSA2048 {$token}",
diff --git a/WePayV3/Order.php b/WePayV3/Order.php
index 02e5439..e094b76 100644
--- a/WePayV3/Order.php
+++ b/WePayV3/Order.php
@@ -184,7 +184,6 @@ class Order extends BasicWePay
      */
     public function downloadBill($fileurl)
     {
-        $path = strstr($fileurl, '/v3/');
-        return $this->doRequest('GET', $path, '', false, false);
+        return $this->doRequest('GET', $fileurl, '', false, false);
     }
 }

From 1ffa9384295652c823249575f18822a076611cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 28 Apr 2023 20:07:04 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Contracts/BasicWePay.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index 41b1528..719341d 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -153,7 +153,7 @@ abstract class BasicWePay
         $token = sprintf('mchid="%s",nonce_str="%s",timestamp="%d",serial_no="%s",signature="%s"',
             $this->config['mch_id'], $nonce, $time, $this->config['cert_serial'], $this->signBuild($signstr)
         );
-        $location = preg_match('|^https?://|', $pathinfo) ? $pathinfo : ($this->base . $pathinfo);
+        $location = (preg_match('|^https?://|', $pathinfo) ? '' : $this->base) . $pathinfo;
         list($header, $content) = $this->_doRequestCurl($method, $location, [
             'data' => $jsondata, 'header' => [
                 "Accept: application/json", "Content-Type: application/json",

From e9479cb19b7a43d7ff01d738ec829b9e6ac4c53c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 2 May 2023 10:41:47 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E6=A0=87=E8=AF=86=20Refund=20=E8=BF=87?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Refund.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WePayV3/Refund.php b/WePayV3/Refund.php
index eeb80a2..e4fda93 100644
--- a/WePayV3/Refund.php
+++ b/WePayV3/Refund.php
@@ -23,7 +23,8 @@ use WePayV3\Contracts\BasicWePay;
 
 /**
  * 电商接口 | 订单退款接口
- * Class Refund
+ * @deprecated
+ * @class Refund
  * @package WePayV3
  */
 class Refund extends BasicWePay

From 196edc08a2fc371f8108abd3234724acbd5e6205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 2 May 2023 20:56:08 +0800
Subject: [PATCH 07/16] =?UTF-8?q?#I6K2RH=20=E5=A2=9E=E5=8A=A0=20RSA=20?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Contracts/BasicWePay.php | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index 719341d..fc81575 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -18,6 +18,7 @@ namespace WePayV3\Contracts;
 
 use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidArgumentException;
+use WeChat\Exceptions\InvalidDecryptException;
 use WeChat\Exceptions\InvalidResponseException;
 use WePayV3\Cert;
 
@@ -260,4 +261,36 @@ abstract class BasicWePay
             return Tools::setCache($name, base64_encode($content), 7200);
         }
     }
+
+    /**
+     * RSA加密处理
+     * @param string $string
+     * @return string
+     * @throws \WeChat\Exceptions\InvalidDecryptException
+     */
+    protected function rsaEncode($string)
+    {
+        $publicKey = file_get_contents($this->config['cert_public']);
+        if (openssl_public_encrypt($string, $encrypted, $publicKey, OPENSSL_PKCS1_OAEP_PADDING)) {
+            return base64_encode($encrypted);
+        } else {
+            throw new InvalidDecryptException('Rsa Encrypt Error.');
+        }
+    }
+
+    /**
+     * RSA 解密处理
+     * @param string $string
+     * @return string
+     * @throws \WeChat\Exceptions\InvalidDecryptException
+     */
+    protected function rsaDecode($string)
+    {
+        $private = file_get_contents($this->config['cert_private']);
+        if (openssl_private_decrypt(base64_decode($string), $content, $private, OPENSSL_PKCS1_OAEP_PADDING)) {
+            return $content;
+        } else {
+            throw new InvalidDecryptException('Rsa Decrypt Error.');
+        }
+    }
 }
\ No newline at end of file

From dc29ee61a75a975376d7befd292ba77aad386286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 2 May 2023 21:16:50 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=BC=82=E5=B8=B8=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Order.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/WePayV3/Order.php b/WePayV3/Order.php
index e094b76..5981739 100644
--- a/WePayV3/Order.php
+++ b/WePayV3/Order.php
@@ -18,6 +18,7 @@ namespace WePayV3;
 
 use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidArgumentException;
+use WeChat\Exceptions\InvalidResponseException;
 use WePayV3\Contracts\BasicWePay;
 use WePayV3\Contracts\DecryptAes;
 
@@ -54,9 +55,13 @@ class Order extends BasicWePay
         } else {
             // 创建预支付码
             $result = $this->doRequest('POST', $types[$type], json_encode($data, JSON_UNESCAPED_UNICODE), true);
-            if (empty($result['prepay_id'])) return $result;
+            if (empty($result['h5_url']) && empty($result['code_url']) && empty($result['prepay_id'])) {
+                $message = isset($result['code']) ? "[ {$result['code']} ] " : '';
+                $message .= isset($result['message']) ? $result['message'] : json_encode($result, JSON_UNESCAPED_UNICODE);
+                throw new InvalidResponseException($message);
+            }
             // 支付参数签名
-            $time = (string)time();
+            $time = strval(time());
             $appid = $this->config['appid'];
             $prepayId = $result['prepay_id'];
             $nonceStr = Tools::createNoncestr();

From c5ff92f77887c69e2d04a139f5d0c297b951f65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 2 May 2023 21:17:17 +0800
Subject: [PATCH 09/16] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=89=93=E6=AC=BE?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=A7=E4=BA=8E2000=E7=9A=84RSA=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=8A=A0=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Contracts/BasicWePay.php | 7 +++++--
 WePayV3/Transfers.php            | 8 +++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index fc81575..82548f9 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -157,8 +157,11 @@ abstract class BasicWePay
         $location = (preg_match('|^https?://|', $pathinfo) ? '' : $this->base) . $pathinfo;
         list($header, $content) = $this->_doRequestCurl($method, $location, [
             'data' => $jsondata, 'header' => [
-                "Accept: application/json", "Content-Type: application/json",
-                'User-Agent: https://thinkadmin.top', "Authorization: WECHATPAY2-SHA256-RSA2048 {$token}",
+                'Accept: application/json',
+                'Content-Type: application/json',
+                'User-Agent: https://thinkadmin.top',
+                "Authorization: WECHATPAY2-SHA256-RSA2048 {$token}",
+                "Wechatpay-Serial: {$this->config['cert_serial']}"
             ],
         ]);
 
diff --git a/WePayV3/Transfers.php b/WePayV3/Transfers.php
index 30ac5e7..0d75b49 100644
--- a/WePayV3/Transfers.php
+++ b/WePayV3/Transfers.php
@@ -20,7 +20,7 @@ use WePayV3\Contracts\BasicWePay;
 
 /**
  * 普通商户商家转账到零钱
- * Class Transfers
+ * @class Transfers
  * @package WePayV3
  */
 class Transfers extends BasicWePay
@@ -29,10 +29,16 @@ class Transfers extends BasicWePay
      * 发起商家批量转账
      * @param array $body
      * @return array
+     * @throws \WeChat\Exceptions\InvalidDecryptException
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
     public function batchs($body)
     {
+        if (isset($body['transfer_detail_list']) && is_array($body['transfer_detail_list'])) {
+            foreach ($body['transfer_detail_list'] as &$item) if (isset($item['user_name'])) {
+                $item['user_name'] = $this->rsaEncode($item['user_name']);
+            }
+        }
         return $this->doRequest('POST', '/v3/transfer/batches', json_encode($body, JSON_UNESCAPED_UNICODE), true);
     }
 

From 0595f9bcb2ca082b0b3517315d94a3c5a66fff8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 2 May 2023 22:54:26 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AliPay/Transfer.php              | 21 +---------------
 WeChat/Contracts/BasicAliPay.php | 41 +++++++++++++++++++++++++-------
 _test/alipay-app.php             |  2 +-
 readme.md                        | 35 ++++++++++++++++-----------
 4 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/AliPay/Transfer.php b/AliPay/Transfer.php
index 6b30c7d..e6d93b3 100644
--- a/AliPay/Transfer.php
+++ b/AliPay/Transfer.php
@@ -83,24 +83,5 @@ class Transfer extends BasicAliPay
         return $this->getResult($options);
     }
 
-    /**
-     * 新版 设置网关应用公钥证书SN、支付宝根证书SN
-     */
-    protected function setAppCertSnAndRootCertSn()
-    {
-        if (!$this->config->get('app_cert')) {
-            throw new InvalidArgumentException("Missing Config -- [app_cert]");
-        }
-        if (!$this->config->get('root_cert')) {
-            throw new InvalidArgumentException("Missing Config -- [root_cert]");
-        }
-        $this->options->set('app_cert_sn', $this->getCertSN($this->config->get('app_cert')));
-        $this->options->set('alipay_root_cert_sn', $this->getRootCertSN($this->config->get('root_cert')));
-        if (!$this->options->get('app_cert_sn')) {
-            throw new InvalidArgumentException("Missing options -- [app_cert_sn]");
-        }
-        if (!$this->options->get('alipay_root_cert_sn')) {
-            throw new InvalidArgumentException("Missing options -- [alipay_root_cert_sn]");
-        }
-    }
+
 }
\ No newline at end of file
diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index 9613e1e..fc3da04 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -297,10 +297,10 @@ abstract class BasicAliPay
      * @param string $sign
      * @return string
      */
-    public function getCertSN($sign)
+    private function getCertSN($sign)
     {
         // if (file_exists($sign)) $sign = file_get_contents($sign);
-        $ssl = openssl_x509_parse($sign);
+        $ssl = openssl_x509_parse($sign, true);
         return md5($this->_arr2str(array_reverse($ssl['issuer'])) . $ssl['serialNumber']);
     }
 
@@ -309,27 +309,51 @@ abstract class BasicAliPay
      * @param string $sign
      * @return string|null
      */
-    public function getRootCertSN($sign)
+    private function getRootCertSN($sign)
     {
         $sn = null;
-        // if (file_exists($sign)) $sign = file_get_contents($sign);
-        $array = explode("-----END CERTIFICATE-----", $sign);
+        $array = explode('-----END CERTIFICATE-----', $sign);
         for ($i = 0; $i < count($array) - 1; $i++) {
-            $ssl[$i] = openssl_x509_parse($array[$i] . "-----END CERTIFICATE-----");
+            $ssl[$i] = openssl_x509_parse($array[$i] . '-----END CERTIFICATE-----', true);
             if (strpos($ssl[$i]['serialNumber'], '0x') === 0) {
-                $ssl[$i]['serialNumber'] = $this->_hex2dec($ssl[$i]['serialNumber']);
+                $ssl[$i]['serialNumber'] = $this->_hex2dec(isset($ssl[$i]['serialNumberHex']) ? $ssl[$i]['serialNumberHex'] : $ssl[$i]['serialNumber']);
             }
             if ($ssl[$i]['signatureTypeLN'] == "sha1WithRSAEncryption" || $ssl[$i]['signatureTypeLN'] == "sha256WithRSAEncryption") {
                 if ($sn == null) {
                     $sn = md5($this->_arr2str(array_reverse($ssl[$i]['issuer'])) . $ssl[$i]['serialNumber']);
                 } else {
-                    $sn = $sn . "_" . md5($this->_arr2str(array_reverse($ssl[$i]['issuer'])) . $ssl[$i]['serialNumber']);
+                    $sn = $sn . '_' . md5($this->_arr2str(array_reverse($ssl[$i]['issuer'])) . $ssl[$i]['serialNumber']);
                 }
             }
         }
         return $sn;
     }
 
+    /**
+     * 新版 设置网关应用公钥证书SN、支付宝根证书SN
+     */
+    protected function setAppCertSnAndRootCertSn()
+    {
+        if (!$this->config->get('app_cert') && !$this->config->get('app_cert_sn')) {
+            throw new InvalidArgumentException("Missing Config -- [app_cert|app_cert_sn]");
+        }
+        if (!$this->config->get('root_cert') && !$this->config->get('root_cert_sn')) {
+            throw new InvalidArgumentException("Missing Config -- [root_cert|root_cert_sn]");
+        }
+        $appCertSn = $this->config->get('app_cert_sn');
+        $rootCertSn = $this->config->get('root_cert_sn');
+        if (empty($appCertSn)) $appCertSn = $this->getCertSN($this->config->get('app_cert'));
+        if (empty($rootCertSn)) $rootCertSn = $this->getRootCertSN($this->config->get('root_cert'));
+        $this->options->set('app_cert_sn', $appCertSn);
+        $this->options->set('alipay_root_cert_sn', $rootCertSn);
+        if (empty($appCertSn)) {
+            throw new InvalidArgumentException("Missing options -- [app_cert_sn]");
+        }
+        if (empty($rootCertSn)) {
+            throw new InvalidArgumentException("Missing options -- [alipay_root_cert_sn]");
+        }
+    }
+
     /**
      * 新版 数组转字符串
      * @param array $array
@@ -367,5 +391,4 @@ abstract class BasicAliPay
      * @return mixed
      */
     abstract public function apply($options);
-
 }
\ No newline at end of file
diff --git a/_test/alipay-app.php b/_test/alipay-app.php
index 54bcfca..5ecbdd8 100644
--- a/_test/alipay-app.php
+++ b/_test/alipay-app.php
@@ -28,7 +28,7 @@ try {
 
     // 请参考（请求参数）：https://docs.open.alipay.com/api_1/alipay.trade.app.pay
     $result = $pay->apply([
-        'out_trade_no' => time(), // 商户订单号
+        'out_trade_no' => strval(time()), // 商户订单号
         'total_amount' => '1', // 支付金额
         'subject'      => '支付宝订单标题', // 支付订单描述
     ]);
diff --git a/readme.md b/readme.md
index 48216ff..d6994cc 100644
--- a/readme.md
+++ b/readme.md
@@ -199,23 +199,30 @@ try {
 ```php
 $config = [
     // 沙箱模式
-    'debug'       => true,
+    'debug'        => true,
     // 签名类型（RSA|RSA2）
-    'sign_type'   => "RSA2",
-    // 应用ID
-    'appid'       => '2016090900468879',
-    // 支付宝公钥文字内容 (1行填写，特别注意：这里是支付宝公钥，不是应用公钥，最好从开发者中心的网页上去复制)
-    'public_key'  => 'MIIBIjANBgkqhkiG9...',
-    // 支付宝私钥文字内容 (1行填写)
-    'private_key' => 'MIIEvQIBADANBgkqh...',
-    // 应用公钥证书完整内容（新版资金类接口转 app_cert_sn）
-    'app_cert'    => '',
-    // 支付宝根证书完整内容（新版资金类接口转 alipay_root_cert_sn）
-    'root_cert'   => '',
+    'sign_type'    => "RSA2",
+    // 应用APPID
+    'appid'        => '2016090900468879',
+    // 支付宝公钥内容 (需1行填写，特别注意：这里不是应用公钥而是支付宝公钥，通常是上传应用公钥换取支付宝公钥，在网页可以复制)
+    'public_key'   => 'MIIBIjAN...',
+    // 应用私钥的内容 (需1行填写，特别注意：这里的应用私钥通常由支付宝密钥管理工具生成)
+    'private_key'  => 'MIIEpAIB...',
+
+    // 应用公钥的内容（新版资金类接口，生成 app_cert_sn）
+    'app_cert'     => '',
+    // 应用公钥序列号（可选，可从应用公钥的内容，优先取值）
+    'app_cert_sn'  => '',
+
+    // 支付宝根证书的内容（新版资金类接口，生成 alipay_root_cert_sn）
+    'root_cert'    => '',
+    // 支付宝根证书序列号（可选，可从应用公钥的内容，优先取值 ）
+    'root_cert_sn' => '',
+
     // 支付成功通知地址
-    'notify_url'  => '',
+    'notify_url'   => '',
     // 网页支付回跳地址
-    'return_url'  => '',
+    'return_url'   => '',
 ];
 ```
 

From 4d778130641c035f51645c51221f1fb4eb78c471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 2 May 2023 22:56:55 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=AE=9D=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 _test/alipay.php | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/_test/alipay.php b/_test/alipay.php
index c0465d3..5b304ed 100644
--- a/_test/alipay.php
+++ b/_test/alipay.php
@@ -16,21 +16,28 @@
 
 return [
     // 沙箱模式
-    'debug'       => true,
+    'debug'        => true,
     // 签名类型（RSA|RSA2）
-    'sign_type'   => "RSA2",
+    'sign_type'    => "RSA2",
     // 应用ID
-    'appid'       => '2016090900468879',
-    // 应用私钥的内容 (1行填写，特别注意：这里的应用私钥通常由支付宝密钥管理工具生成)
-    'private_key' => 'MIIEpAIBAAKCAQEArr8ymPBh/lQ46y76f3VZW4HGV8tClTHJhhlt7BPmn0F8fSc3alKFCiHXIT01ccy3xTPVgcYX26/vvQBt9cJZqxEWapj4hb8BH6lr5BH5MMQ88eyyPLlYicGzt5S4iXUjuImsUguaCO12SoFmM1eaMYKqrELkg3Apbc+16Ktq+puKAohZeozd80NnDc1ossrZtHU1DkUkEJrBeaC7/D+0H/HBHJzc60EMYpvSGgyKzP/ke6xF4ZGilFSKsdoKgS8u7paVMh2SlSO5AsMoELTTlsFS4eYOgD6ZThkBTZZIcyKHM1Wjq6qDfhU3oTkJDYqnLWdtzoqgnUPNQ8nYpYrdeQIDAQABAoIBAQCKWRmH+Bi9MJT3rfPo4VFjnzUW4PfQAuDX6F4coAzgXQpgU6IN7VMjGHOn/zvG4xtDZ6xL2DefWIVnj2V/QuWXCCpFLuLjkLslBA9FO+2b7GGL76eVZ/Bu8AqG95m6SiGDwovJUSIcm1Qh3Jy7XUnYlOjnBPbCERTbuaz9jmleCmOmh4RnpL0DmzvUffNmEuqJfgnF0h2h6CwYBUyGY8G3zpGAyqY+viVPjKA8catcQTqDRywe3ktXxIbi0JqTAYDpb81Ih4NQeHxGMUWHabwij9UTYdPYBgzwVxjcJF4O1cPGdnYeRXm8Neq6L2HbEPRqe/Jiw4i4AB4V3cVWExPhAoGBANWyjP43kguThkFsQZPfDP5xuXIQJ5W24ZcDIwcFYZ5glh+hddHuWsrCf68VHXsf2epeNdqz57xbdtg84FI8N0HmjTCtfuagxXUMPbX4NqqzPqOu2m0T5/b8HCEDV3zWqfMOt+kHR4NytFxLKLwR0a9kypsfZ2z/X4BYXBi6PiZFAoGBANFWw+AL9hJ2q51ePTcZrE788hPepcsdv3OfJjnspykKighTiFgT+m+Kr/AEa9IU/njz/+tcWJuAwOPKDFVd0zVRcxK2Y5WLfo8fYEt6yhq8oa5OKFwInXXVmCPMn0+qduNmZMTzSqL2kaN0U+AH5Te1vlv7I7yuwHDE9vwknBelAoGAbpPN0V3//G2B8yiJZnLszl0akKM7WIUhhnrhDSkDsmhYRlXOGas03+Z1G6vZbXS11kiZpWmiaB0MCii2CteN4FPki2O7XquigUasSBUAdKP7rcc0z2yVg4BBLfQEuVx65IKhN7vEjYg1O+zIT0kJL7EABfTiF8ytJkSSo1j7/+ECgYEA0NPuKHWmLvsE7cKR7IKG2nEIiHvGBl6RmyS7PHNwucdStUWnML4VSOof4p52dKcOx9gYh1Ci79U8FsB7Fzm2tWygD520r/zs7peNNx6xuIROAZTkPBM4CNFfqO66Sf2yBd0iTzqoTPMNi/JCra0So0WBNT7Ngq8NODG0dQmMUSUCgYANC6Y4JIq24nh27jZjTlsVA+jkv5tFK2aKnfRwOYcNhjVNaMyMz5BbvE07zlr/CgViauEMEJorTs+eNY1TEW7ZOOr2lFgbUnT+h/GLCvgwV00nYBEimfIJ96jfIotOLYB74oJJni9wCaJCuurLNfJ0E1XS/8d+1BkFQ+Q7VSDYpg==',
-    // 支付宝公钥内容 (1行填写，特别注意：这里不是应用公钥而是支付宝公钥，通常是上传应用公钥换取支付宝公钥，在网页可以复制)
-    'public_key'  => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB',
+    'appid'        => '2016090900468879',
+    // 支付宝公钥内容 (需1行填写，特别注意：这里不是应用公钥而是支付宝公钥，通常是上传应用公钥换取支付宝公钥，在网页可以复制)
+    'public_key'   => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB',
+    // 应用私钥的内容 (需1行填写，特别注意：这里的应用私钥通常由支付宝密钥管理工具生成)
+    'private_key'  => 'MIIEpAIBAAKCAQEArr8ymPBh/lQ46y76f3VZW4HGV8tClTHJhhlt7BPmn0F8fSc3alKFCiHXIT01ccy3xTPVgcYX26/vvQBt9cJZqxEWapj4hb8BH6lr5BH5MMQ88eyyPLlYicGzt5S4iXUjuImsUguaCO12SoFmM1eaMYKqrELkg3Apbc+16Ktq+puKAohZeozd80NnDc1ossrZtHU1DkUkEJrBeaC7/D+0H/HBHJzc60EMYpvSGgyKzP/ke6xF4ZGilFSKsdoKgS8u7paVMh2SlSO5AsMoELTTlsFS4eYOgD6ZThkBTZZIcyKHM1Wjq6qDfhU3oTkJDYqnLWdtzoqgnUPNQ8nYpYrdeQIDAQABAoIBAQCKWRmH+Bi9MJT3rfPo4VFjnzUW4PfQAuDX6F4coAzgXQpgU6IN7VMjGHOn/zvG4xtDZ6xL2DefWIVnj2V/QuWXCCpFLuLjkLslBA9FO+2b7GGL76eVZ/Bu8AqG95m6SiGDwovJUSIcm1Qh3Jy7XUnYlOjnBPbCERTbuaz9jmleCmOmh4RnpL0DmzvUffNmEuqJfgnF0h2h6CwYBUyGY8G3zpGAyqY+viVPjKA8catcQTqDRywe3ktXxIbi0JqTAYDpb81Ih4NQeHxGMUWHabwij9UTYdPYBgzwVxjcJF4O1cPGdnYeRXm8Neq6L2HbEPRqe/Jiw4i4AB4V3cVWExPhAoGBANWyjP43kguThkFsQZPfDP5xuXIQJ5W24ZcDIwcFYZ5glh+hddHuWsrCf68VHXsf2epeNdqz57xbdtg84FI8N0HmjTCtfuagxXUMPbX4NqqzPqOu2m0T5/b8HCEDV3zWqfMOt+kHR4NytFxLKLwR0a9kypsfZ2z/X4BYXBi6PiZFAoGBANFWw+AL9hJ2q51ePTcZrE788hPepcsdv3OfJjnspykKighTiFgT+m+Kr/AEa9IU/njz/+tcWJuAwOPKDFVd0zVRcxK2Y5WLfo8fYEt6yhq8oa5OKFwInXXVmCPMn0+qduNmZMTzSqL2kaN0U+AH5Te1vlv7I7yuwHDE9vwknBelAoGAbpPN0V3//G2B8yiJZnLszl0akKM7WIUhhnrhDSkDsmhYRlXOGas03+Z1G6vZbXS11kiZpWmiaB0MCii2CteN4FPki2O7XquigUasSBUAdKP7rcc0z2yVg4BBLfQEuVx65IKhN7vEjYg1O+zIT0kJL7EABfTiF8ytJkSSo1j7/+ECgYEA0NPuKHWmLvsE7cKR7IKG2nEIiHvGBl6RmyS7PHNwucdStUWnML4VSOof4p52dKcOx9gYh1Ci79U8FsB7Fzm2tWygD520r/zs7peNNx6xuIROAZTkPBM4CNFfqO66Sf2yBd0iTzqoTPMNi/JCra0So0WBNT7Ngq8NODG0dQmMUSUCgYANC6Y4JIq24nh27jZjTlsVA+jkv5tFK2aKnfRwOYcNhjVNaMyMz5BbvE07zlr/CgViauEMEJorTs+eNY1TEW7ZOOr2lFgbUnT+h/GLCvgwV00nYBEimfIJ96jfIotOLYB74oJJni9wCaJCuurLNfJ0E1XS/8d+1BkFQ+Q7VSDYpg==',
+
     // 应用公钥的内容（新版资金类接口转 app_cert_sn）
-    'app_cert'    => '',
-    // 支付宝根证书内容（新版资金类接口转 alipay_root_cert_sn）
-    'root_cert'   => '',
+    'app_cert'     => '',
+    // 应用公钥序列号（可选，可从应用公钥的内容，优先取值）
+    'app_cert_sn'  => '',
+
+    // 支付宝根证书的内容（新版资金类接口转 alipay_root_cert_sn）
+    'root_cert'    => '',
+    // 支付宝根证书序列号（可选，可从应用公钥的内容，优先取值 ）
+    'root_cert_sn' => '',
+
     // 支付成功通知地址
-    'notify_url'  => '',
+    'notify_url'   => '',
     // 网页支付回跳地址
-    'return_url'  => '',
+    'return_url'   => '',
 ];
\ No newline at end of file

From c806ba514a4b337f01879c4e0d01cef367f11fea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Tue, 2 May 2023 23:39:44 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicAliPay.php | 38 ++++++++++++++-----------
 _test/alipay.php                 | 49 ++++++++++++++++++++------------
 readme.md                        | 19 ++++---------
 3 files changed, 58 insertions(+), 48 deletions(-)

diff --git a/WeChat/Contracts/BasicAliPay.php b/WeChat/Contracts/BasicAliPay.php
index fc3da04..b1e0880 100644
--- a/WeChat/Contracts/BasicAliPay.php
+++ b/WeChat/Contracts/BasicAliPay.php
@@ -297,9 +297,8 @@ abstract class BasicAliPay
      * @param string $sign
      * @return string
      */
-    private function getCertSN($sign)
+    private function getAppCertSN($sign)
     {
-        // if (file_exists($sign)) $sign = file_get_contents($sign);
         $ssl = openssl_x509_parse($sign, true);
         return md5($this->_arr2str(array_reverse($ssl['issuer'])) . $ssl['serialNumber']);
     }
@@ -334,23 +333,29 @@ abstract class BasicAliPay
      */
     protected function setAppCertSnAndRootCertSn()
     {
-        if (!$this->config->get('app_cert') && !$this->config->get('app_cert_sn')) {
-            throw new InvalidArgumentException("Missing Config -- [app_cert|app_cert_sn]");
+        $appCert = $this->config->get('app_cert');
+        $rootCert = $this->config->get('root_cert');
+        $appCertPath = $this->config->get('app_cert_path');
+        $rootCertPath = $this->config->get('root_cert_path');
+        if (empty($appCert) && !empty($appCertPath) && is_file($appCertPath)) {
+            $appCert = file_get_contents($appCertPath);
         }
-        if (!$this->config->get('root_cert') && !$this->config->get('root_cert_sn')) {
-            throw new InvalidArgumentException("Missing Config -- [root_cert|root_cert_sn]");
+        if (empty($rootCert) && !empty($rootCertPath) && is_file($rootCertPath)) {
+            $rootCert = file_get_contents($rootCertPath);
         }
-        $appCertSn = $this->config->get('app_cert_sn');
-        $rootCertSn = $this->config->get('root_cert_sn');
-        if (empty($appCertSn)) $appCertSn = $this->getCertSN($this->config->get('app_cert'));
-        if (empty($rootCertSn)) $rootCertSn = $this->getRootCertSN($this->config->get('root_cert'));
-        $this->options->set('app_cert_sn', $appCertSn);
-        $this->options->set('alipay_root_cert_sn', $rootCertSn);
-        if (empty($appCertSn)) {
-            throw new InvalidArgumentException("Missing options -- [app_cert_sn]");
+        if (empty($appCert)) {
+            throw new InvalidArgumentException('Missing Config -- [app_cert|app_cert_path]');
         }
-        if (empty($rootCertSn)) {
-            throw new InvalidArgumentException("Missing options -- [alipay_root_cert_sn]");
+        if (empty($rootCert)) {
+            throw new InvalidArgumentException('Missing Config -- [root_cert|root_cert_path]');
+        }
+        $this->options->set('app_cert_sn', $this->getAppCertSN($appCert));
+        $this->options->set('alipay_root_cert_sn', $this->getRootCertSN($rootCert));
+        if (!$this->options->get('app_cert_sn')) {
+            throw new InvalidArgumentException('Missing options -- [app_cert_sn]');
+        }
+        if (!$this->options->get('alipay_root_cert_sn')) {
+            throw new InvalidArgumentException('Missing options -- [alipay_root_cert_sn]');
         }
     }
 
@@ -370,7 +375,6 @@ abstract class BasicAliPay
         return implode(',', $string);
     }
 
-
     /**
      * 新版 0x转高精度数字
      * @param string $hex
diff --git a/_test/alipay.php b/_test/alipay.php
index 5b304ed..4c92920 100644
--- a/_test/alipay.php
+++ b/_test/alipay.php
@@ -14,30 +14,43 @@
 // | github 代码仓库：https://github.com/zoujingli/WeChatDeveloper
 // +----------------------------------------------------------------------
 
+/**
+ * 【 名词解释 】
+ * 应用私钥：用来给应用消息进行签名，请务必要妥善保管，避免遗失或泄露。
+ * 应用公钥：需要提供给支付宝开放平台，平台会对应用发送的消息进行签名验证。
+ * 支付宝公钥：应用收到支付宝发送的同步、异步消息时，使用支付宝公钥验证签名信息。
+ * CSR 文件：CSR 即证书签名请求（Certificate Signing Request），CSR 文件（.csr）是申请证书时所需要的一个数据文件。
+ * 应用公钥证书：在开放平台上传 CSR 文件后可以获取 CA 机构颁发的应用证书文件（.crt），其中包含了组织/公司名称、应用公钥、证书有效期等内容，一般有效期为 5 年。
+ * 支付宝公钥证书：用来验证支付宝消息，包含了支付宝公钥、支付宝公司名称、证书有效期等内容，一般有效期为 5 年。
+ * 支付宝根证书：用来验证支付宝消息，包含了根 CA 名称、根 CA 的公钥、证书有效期等内容。
+ */
+
+/**
+ * 应用公钥证书SN（app_cert_sn）和支付宝根证书SN（alipay_root_cert_sn）的 sn 是指什么？
+ * 使用公钥证书签名方式下， 请求参数中需要携带应用公钥证书SN（app_cert_sn）、支付宝根证书SN（alipay_root_cert_sn），这里的SN是指基于开放平台提供的计算规则，动态计算出来的公钥证书序列号，与X.509证书中内置的序列号（serialNumber）不同。
+ * 具体的计算规则如下：解析X.509证书文件，获取证书签发机构名称（name）以及证书内置序列号（serialNumber）。 将name与serialNumber拼接成字符串，再对该字符串做MD5计算。
+ * 可以参考开放平台SDK源码中的 AlipaySignature.getCertSN 方法实现
+ *
+ * 不直接使用证书文件中内置的序列号原因：开放平台支持开发者上传自己找第三方权威CA签发的证书，而证书文件中内置序列号只能保证同一家签发机构签发的证书不重复
+ */
+
 return [
     // 沙箱模式
-    'debug'        => true,
+    'debug'       => true,
     // 签名类型（RSA|RSA2）
-    'sign_type'    => "RSA2",
+    'sign_type'   => 'RSA2',
     // 应用ID
-    'appid'        => '2016090900468879',
+    'appid'       => '2016090900468879',
     // 支付宝公钥内容 (需1行填写，特别注意：这里不是应用公钥而是支付宝公钥，通常是上传应用公钥换取支付宝公钥，在网页可以复制)
-    'public_key'   => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB',
+    'public_key'  => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtU71NY53UDGY7JNvLYAhsNa+taTF6KthIHJmGgdio9bkqeJGhHk6ttkTKkLqFgwIfgAkHpdKiOv1uZw6gVGZ7TCu5LfHTqKrCd6Uz+N7hxhY+4IwicLgprcV1flXQLmbkJYzFMZqkXGkSgOsR2yXh4LyQZczgk9N456uuzGtRy7MoB4zQy34PLUkkxR6W1B2ftNbLRGXv6tc7p/cmDcrY6K1bSxnGmfRxFSb8lRfhe0V0UM6pKq2SGGSeovrKHN0OLp+Nn5wcULVnFgATXGCENshRlp96piPEBFwneXs19n+sX1jx60FTR7/rME3sW3AHug0fhZ9mSqW4x401WjdnwIDAQAB',
     // 应用私钥的内容 (需1行填写，特别注意：这里的应用私钥通常由支付宝密钥管理工具生成)
-    'private_key'  => 'MIIEpAIBAAKCAQEArr8ymPBh/lQ46y76f3VZW4HGV8tClTHJhhlt7BPmn0F8fSc3alKFCiHXIT01ccy3xTPVgcYX26/vvQBt9cJZqxEWapj4hb8BH6lr5BH5MMQ88eyyPLlYicGzt5S4iXUjuImsUguaCO12SoFmM1eaMYKqrELkg3Apbc+16Ktq+puKAohZeozd80NnDc1ossrZtHU1DkUkEJrBeaC7/D+0H/HBHJzc60EMYpvSGgyKzP/ke6xF4ZGilFSKsdoKgS8u7paVMh2SlSO5AsMoELTTlsFS4eYOgD6ZThkBTZZIcyKHM1Wjq6qDfhU3oTkJDYqnLWdtzoqgnUPNQ8nYpYrdeQIDAQABAoIBAQCKWRmH+Bi9MJT3rfPo4VFjnzUW4PfQAuDX6F4coAzgXQpgU6IN7VMjGHOn/zvG4xtDZ6xL2DefWIVnj2V/QuWXCCpFLuLjkLslBA9FO+2b7GGL76eVZ/Bu8AqG95m6SiGDwovJUSIcm1Qh3Jy7XUnYlOjnBPbCERTbuaz9jmleCmOmh4RnpL0DmzvUffNmEuqJfgnF0h2h6CwYBUyGY8G3zpGAyqY+viVPjKA8catcQTqDRywe3ktXxIbi0JqTAYDpb81Ih4NQeHxGMUWHabwij9UTYdPYBgzwVxjcJF4O1cPGdnYeRXm8Neq6L2HbEPRqe/Jiw4i4AB4V3cVWExPhAoGBANWyjP43kguThkFsQZPfDP5xuXIQJ5W24ZcDIwcFYZ5glh+hddHuWsrCf68VHXsf2epeNdqz57xbdtg84FI8N0HmjTCtfuagxXUMPbX4NqqzPqOu2m0T5/b8HCEDV3zWqfMOt+kHR4NytFxLKLwR0a9kypsfZ2z/X4BYXBi6PiZFAoGBANFWw+AL9hJ2q51ePTcZrE788hPepcsdv3OfJjnspykKighTiFgT+m+Kr/AEa9IU/njz/+tcWJuAwOPKDFVd0zVRcxK2Y5WLfo8fYEt6yhq8oa5OKFwInXXVmCPMn0+qduNmZMTzSqL2kaN0U+AH5Te1vlv7I7yuwHDE9vwknBelAoGAbpPN0V3//G2B8yiJZnLszl0akKM7WIUhhnrhDSkDsmhYRlXOGas03+Z1G6vZbXS11kiZpWmiaB0MCii2CteN4FPki2O7XquigUasSBUAdKP7rcc0z2yVg4BBLfQEuVx65IKhN7vEjYg1O+zIT0kJL7EABfTiF8ytJkSSo1j7/+ECgYEA0NPuKHWmLvsE7cKR7IKG2nEIiHvGBl6RmyS7PHNwucdStUWnML4VSOof4p52dKcOx9gYh1Ci79U8FsB7Fzm2tWygD520r/zs7peNNx6xuIROAZTkPBM4CNFfqO66Sf2yBd0iTzqoTPMNi/JCra0So0WBNT7Ngq8NODG0dQmMUSUCgYANC6Y4JIq24nh27jZjTlsVA+jkv5tFK2aKnfRwOYcNhjVNaMyMz5BbvE07zlr/CgViauEMEJorTs+eNY1TEW7ZOOr2lFgbUnT+h/GLCvgwV00nYBEimfIJ96jfIotOLYB74oJJni9wCaJCuurLNfJ0E1XS/8d+1BkFQ+Q7VSDYpg==',
-
-    // 应用公钥的内容（新版资金类接口转 app_cert_sn）
-    'app_cert'     => '',
-    // 应用公钥序列号（可选，可从应用公钥的内容，优先取值）
-    'app_cert_sn'  => '',
-
-    // 支付宝根证书的内容（新版资金类接口转 alipay_root_cert_sn）
-    'root_cert'    => '',
-    // 支付宝根证书序列号（可选，可从应用公钥的内容，优先取值 ）
-    'root_cert_sn' => '',
-
+    'private_key' => 'MIIEpAIBAAKCAQEArr8ymPBh/lQ46y76f3VZW4HGV8tClTHJhhlt7BPmn0F8fSc3alKFCiHXIT01ccy3xTPVgcYX26/vvQBt9cJZqxEWapj4hb8BH6lr5BH5MMQ88eyyPLlYicGzt5S4iXUjuImsUguaCO12SoFmM1eaMYKqrELkg3Apbc+16Ktq+puKAohZeozd80NnDc1ossrZtHU1DkUkEJrBeaC7/D+0H/HBHJzc60EMYpvSGgyKzP/ke6xF4ZGilFSKsdoKgS8u7paVMh2SlSO5AsMoELTTlsFS4eYOgD6ZThkBTZZIcyKHM1Wjq6qDfhU3oTkJDYqnLWdtzoqgnUPNQ8nYpYrdeQIDAQABAoIBAQCKWRmH+Bi9MJT3rfPo4VFjnzUW4PfQAuDX6F4coAzgXQpgU6IN7VMjGHOn/zvG4xtDZ6xL2DefWIVnj2V/QuWXCCpFLuLjkLslBA9FO+2b7GGL76eVZ/Bu8AqG95m6SiGDwovJUSIcm1Qh3Jy7XUnYlOjnBPbCERTbuaz9jmleCmOmh4RnpL0DmzvUffNmEuqJfgnF0h2h6CwYBUyGY8G3zpGAyqY+viVPjKA8catcQTqDRywe3ktXxIbi0JqTAYDpb81Ih4NQeHxGMUWHabwij9UTYdPYBgzwVxjcJF4O1cPGdnYeRXm8Neq6L2HbEPRqe/Jiw4i4AB4V3cVWExPhAoGBANWyjP43kguThkFsQZPfDP5xuXIQJ5W24ZcDIwcFYZ5glh+hddHuWsrCf68VHXsf2epeNdqz57xbdtg84FI8N0HmjTCtfuagxXUMPbX4NqqzPqOu2m0T5/b8HCEDV3zWqfMOt+kHR4NytFxLKLwR0a9kypsfZ2z/X4BYXBi6PiZFAoGBANFWw+AL9hJ2q51ePTcZrE788hPepcsdv3OfJjnspykKighTiFgT+m+Kr/AEa9IU/njz/+tcWJuAwOPKDFVd0zVRcxK2Y5WLfo8fYEt6yhq8oa5OKFwInXXVmCPMn0+qduNmZMTzSqL2kaN0U+AH5Te1vlv7I7yuwHDE9vwknBelAoGAbpPN0V3//G2B8yiJZnLszl0akKM7WIUhhnrhDSkDsmhYRlXOGas03+Z1G6vZbXS11kiZpWmiaB0MCii2CteN4FPki2O7XquigUasSBUAdKP7rcc0z2yVg4BBLfQEuVx65IKhN7vEjYg1O+zIT0kJL7EABfTiF8ytJkSSo1j7/+ECgYEA0NPuKHWmLvsE7cKR7IKG2nEIiHvGBl6RmyS7PHNwucdStUWnML4VSOof4p52dKcOx9gYh1Ci79U8FsB7Fzm2tWygD520r/zs7peNNx6xuIROAZTkPBM4CNFfqO66Sf2yBd0iTzqoTPMNi/JCra0So0WBNT7Ngq8NODG0dQmMUSUCgYANC6Y4JIq24nh27jZjTlsVA+jkv5tFK2aKnfRwOYcNhjVNaMyMz5BbvE07zlr/CgViauEMEJorTs+eNY1TEW7ZOOr2lFgbUnT+h/GLCvgwV00nYBEimfIJ96jfIotOLYB74oJJni9wCaJCuurLNfJ0E1XS/8d+1BkFQ+Q7VSDYpg==',
+    // 应用公钥的内容（新版资金类接口转 app_cert_sn，如文件 appCertPublicKey_2019051064521003.crt）
+    'app_cert'    => '', // 'app_cert_path' => '',
+    // 支付宝根证书的内容（新版资金类接口转 alipay_root_cert_sn，如文件 alipayRootCert.crt）
+    'root_cert'   => '', // 'root_cert_path' => ''
     // 支付成功通知地址
-    'notify_url'   => '',
+    'notify_url'  => '',
     // 网页支付回跳地址
-    'return_url'   => '',
+    'return_url'  => '',
 ];
\ No newline at end of file
diff --git a/readme.md b/readme.md
index d6994cc..021e44d 100644
--- a/readme.md
+++ b/readme.md
@@ -208,21 +208,14 @@ $config = [
     'public_key'   => 'MIIBIjAN...',
     // 应用私钥的内容 (需1行填写，特别注意：这里的应用私钥通常由支付宝密钥管理工具生成)
     'private_key'  => 'MIIEpAIB...',
-
-    // 应用公钥的内容（新版资金类接口，生成 app_cert_sn）
-    'app_cert'     => '',
-    // 应用公钥序列号（可选，可从应用公钥的内容，优先取值）
-    'app_cert_sn'  => '',
-
-    // 支付宝根证书的内容（新版资金类接口，生成 alipay_root_cert_sn）
-    'root_cert'    => '',
-    // 支付宝根证书序列号（可选，可从应用公钥的内容，优先取值 ）
-    'root_cert_sn' => '',
-
+    // 应用公钥的内容（新版资金类接口转 app_cert_sn，如文件 appCertPublicKey_2019051064521003.crt）
+    'app_cert'    => '', // 'app_cert_path' => '',
+    // 支付宝根证书的内容（新版资金类接口转 alipay_root_cert_sn，如文件 alipayRootCert.crt）
+    'root_cert'   => '', // 'root_cert_path' => ''
     // 支付成功通知地址
-    'notify_url'   => '',
+    'notify_url'  => '',
     // 网页支付回跳地址
-    'return_url'   => '',
+    'return_url'  => '',
 ];
 ```
 

From 685617267f5aa73a4bbcb13303b5e7037d5b8194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 4 May 2023 22:58:15 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=97=A0=20headers?=
 =?UTF-8?q?=20=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Contracts/BasicWePay.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/WePayV3/Contracts/BasicWePay.php b/WePayV3/Contracts/BasicWePay.php
index 82548f9..6010099 100644
--- a/WePayV3/Contracts/BasicWePay.php
+++ b/WePayV3/Contracts/BasicWePay.php
@@ -175,9 +175,12 @@ abstract class BasicWePay
                 }
             }
             try {
+                if (empty($headers)) {
+                    return $isjson ? json_decode($content, true) : $content;
+                }
                 $string = join("\n", [$headers['timestamp'], $headers['nonce'], $content, '']);
                 if (!$this->signVerify($string, $headers['signature'], $headers['serial'])) {
-                    throw new InvalidResponseException("验证响应签名失败");
+                    throw new InvalidResponseException('验证响应签名失败');
                 }
             } catch (\Exception $exception) {
                 throw new InvalidResponseException($exception->getMessage(), $exception->getCode());

From 32382bb75b739a9a873163fb0d85da2545114156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 5 May 2023 21:26:53 +0800
Subject: [PATCH 14/16] =?UTF-8?q?fix=20=E5=85=BC=E5=AE=B9=E5=86=85?=
 =?UTF-8?q?=E5=AD=98=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失败！');
         }

From 1f73aad17d5e376bfabfda44e6631a00bcf5765f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 5 May 2023 21:56:45 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E8=BF=81=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WePayV3/Order.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/WePayV3/Order.php b/WePayV3/Order.php
index 9aa5cba..489f386 100644
--- a/WePayV3/Order.php
+++ b/WePayV3/Order.php
@@ -18,6 +18,7 @@ namespace WePayV3;
 
 use WeChat\Contracts\Tools;
 use WeChat\Exceptions\InvalidArgumentException;
+use WeChat\Exceptions\InvalidDecryptException;
 use WeChat\Exceptions\InvalidResponseException;
 use WePayV3\Contracts\BasicWePay;
 use WePayV3\Contracts\DecryptAes;
@@ -152,6 +153,30 @@ class Order extends BasicWePay
         return $this->doRequest('GET', $path, '', true);
     }
 
+    /**
+     * 获取退款通知
+     * @param string $xml
+     * @return array
+     * @return array
+     * @throws \WeChat\Exceptions\InvalidDecryptException
+     * @throws \WeChat\Exceptions\InvalidResponseException
+     */
+    public function notifyRefund($xml = '')
+    {
+        $data = Tools::xml2arr(empty($xml) ? Tools::getRawInput() : $xml);
+        if (empty($data['return_code']) || $data['return_code'] !== 'SUCCESS') {
+            throw new InvalidResponseException('获取退款通知失败！');
+        }
+        try {
+            $decrypt = base64_decode($data['req_info']);
+            $response = openssl_decrypt($decrypt, 'aes-256-ecb', md5($this->config['mch_v3_key']), OPENSSL_RAW_DATA);
+            $data['result'] = Tools::xml2arr($response);
+            return $data;
+        } catch (\Exception $exception) {
+            throw new InvalidDecryptException($exception->getMessage(), $exception->getCode());
+        }
+    }
+
     /**
      * 申请交易账单
      * @param array|string $params

From af1051ce6f6779a7d8df94c22ea3388c46d93536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 5 May 2023 21:58:03 +0800
Subject: [PATCH 16/16] Update Refund.php

---
 WePayV3/Refund.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WePayV3/Refund.php b/WePayV3/Refund.php
index 56f1e43..e14ecb5 100644
--- a/WePayV3/Refund.php
+++ b/WePayV3/Refund.php
@@ -23,6 +23,7 @@ use WePayV3\Contracts\BasicWePay;
 
 /**
  * 电商接口 | 订单退款接口
+ * 注意：直连商户退款接口集成在 Order 中
  * @deprecated
  * @class Refund
  * @package WePayV3