fix: 更新平台证书下载及证书读取

Author: zoujingli

WePayV3/Cert.php

@@ -42,13 +42,14 @@ class Cert extends BasicWePay
     public function download()
     {
         try {
-            $aes = new DecryptAes($this->config['mch_v3_key']);
-            $result = $this->doRequest('GET', '/v3/certificates');
             $certs = [];
+            $result = $this->doRequest('GET', '/v3/certificates');
+            $decrypt = new DecryptAes($this->config['mch_v3_key']);
             foreach ($result['data'] as $vo) {
                 $certs[$vo['serial_no']] = [
                     'expire'  => strtotime($vo['expire_time']),
-                    'content' => $aes->decryptToString(
+                    'serial'  => $vo['serial_no'],
+                    'content' => $decrypt->decryptToString(
                         $vo['encrypt_certificate']['associated_data'],
                         $vo['encrypt_certificate']['nonce'],
                         $vo['encrypt_certificate']['ciphertext']

WePayV3/Contracts/BasicWePay.php

@@ -367,12 +367,12 @@ protected function signVerify($data, $sign, $serial)
     protected function _getCert($serial = '')
     {
         $certs = $this->tmpFile("{$this->config['mch_id']}_certs");
-        if (empty($certs) || empty($certs[$serial]['content'])) {
+        if (empty($certs) || empty($certs[$serial]['serial']) || empty($certs[$serial]['content'])) {
             Cert::instance($this->config)->download();
             $certs = $this->tmpFile("{$this->config['mch_id']}_certs");
         }
         foreach ($certs as $cert) {
-            if ($certs[$serial]['expire'] > time()) {
+            if ($cert[$serial]['expire'] > time() && !empty($cert['serial']) && !empty($cert['content'])) {
                 $this->config['cert_package'][$cert['serial']] = $cert['content'];
                 if (empty($this->config['mp_cert_serial'])) {
                     $this->config['mp_cert_serial'] = $cert['serial'];