[Bug修复](master): 修复会话存档密钥不匹配导致重复获取消息问题

Author: maxincai

src/Provider/AbstractProvider.php

@@ -8,6 +8,7 @@
  * @contact  group@mo.chat
  * @license  https://github.com/mochat-cloud/mochat/blob/master/LICENSE
  */
+
 namespace MoChat\WeWorkFinanceSDK\Provider;
 
 use MoChat\WeWorkFinanceSDK\Contract\ProviderInterface;
@@ -20,23 +21,26 @@ abstract class AbstractProvider implements ProviderInterface
      * 获取会话解密记录数据.
      * @param int $seq 起始位置
      * @param int $limit 限制条数
-     * @throws FinanceSDKException
-     * @throws InvalidArgumentException
+     * @param int $retry 重试次数
      * @return array ...
+     * @throws InvalidArgumentException
+     * @throws FinanceSDKException
      */
-    public function getDecryptChatData(int $seq, int $limit): array
+    public function getDecryptChatData(int $seq, int $limit, int $retry = 0): array
     {
         $config = $this->getConfig();
-        if (! isset($config['private_keys'])) {
+        if (!isset($config['private_keys'])) {
             throw new InvalidArgumentException('缺少配置:private_keys[{"version":"private_key"}]');
         }
         $privateKeys = $config['private_keys'];
 
         try {
-            $chatData    = json_decode($this->getChatData($seq, $limit), true)['chatdata'];
+            $chatData = json_decode($this->getChatData($seq, $limit), true)['chatdata'];
             $newChatData = [];
+            $lastSeq = 0;
             foreach ($chatData as $i => $item) {
-                if (! isset($privateKeys[$item['publickey_ver']])) {
+                $lastSeq = $item['seq'];
+                if (!isset($privateKeys[$item['publickey_ver']])) {
                     continue;
                 }
 
@@ -47,10 +51,21 @@ public function getDecryptChatData(int $seq, int $limit): array
                     $privateKeys[$item['publickey_ver']],
                     OPENSSL_PKCS1_PADDING
                 );
-                $newChatData[$i]        = json_decode($this->decryptData($decryptRandKey, $item['encrypt_chat_msg']), true);
+
+                // TODO 无法解密，一般为秘钥不匹配
+                // 临时补丁方案，需要改为支持多版本key
+                if ($decryptRandKey === null) {
+                    continue;
+                }
+
+                $newChatData[$i] = json_decode($this->decryptData($decryptRandKey, $item['encrypt_chat_msg']), true);
                 $newChatData[$i]['seq'] = $item['seq'];
             }
 
+            if (!empty($chatData) && empty($chatData) && $retry && $retry < 10) {
+                return $this->getDecryptChatData($lastSeq, $limit, ++$retry);
+            }
+
             return $newChatData;
         } catch (\Exception $e) {
             throw new FinanceSDKException($e->getMessage(), $e->getCode());

src/Provider/FFIProvider.php

@@ -112,7 +112,7 @@ public function decryptData(string $randomKey, string $encryptStr): string
      */
     public function getMediaData(string $sdkFileId, string $ext): \SplFileInfo
     {
-        $path = '/tmp/' . md5((string) time());
+        $path = sys_get_temp_dir() . '/' . md5($sdkFileId);
         $ext && $path .= '.' . $ext;
         try {
             $this->downloadMediaData($sdkFileId, $path);

src/Provider/PHPExtProvider.php

@@ -66,7 +66,7 @@ public function decryptData(string $randomKey, string $encryptStr): string
      */
     public function getMediaData(string $sdkFileId, string $ext): \SplFileInfo
     {
-        $path = '/tmp/' . md5((string) time());
+        $path = sys_get_temp_dir() . '/' . md5($sdkFileId);
         $ext && $path .= '.' . $ext;
         try {
             $this->financeSdk->downloadMedia($sdkFileId, $path);