33

app/Jobs/SendTelegramGroupMessageJob.php

@@ -39,41 +39,22 @@ class SendTelegramGroupMessageJob implements ShouldQueue
 
     public function handle()
     {
-        $maxRetries = 3; // 最大重试次数
-        $retryCount = 0;
-        
-        while ($retryCount <= $maxRetries) {
-            try {
-                BaseService::bettingGroupNotice($this->text, $this->buttons, $this->image, $this->isTop);
-                return; // 成功则退出
-                
-            } catch (\Telegram\Bot\Exceptions\TelegramResponseException $e) {
-                $retryCount++;
-                
-                // 捕获 Too Many Requests
-                if (str_contains($e->getMessage(), 'Too Many Requests')) {
-                    preg_match('/retry after (\d+)/', $e->getMessage(), $matches);
-                    $retryAfter = $matches[1] ?? 5;
-                    
-                    Log::warning("Telegram 429 限制，等待 {$retryAfter} 秒重试... (尝试 {$retryCount}/{$maxRetries})");
-                    
-                    if ($retryCount <= $maxRetries) {
-                        sleep($retryAfter + 1);
-                        continue; // 继续下一次尝试
-                    }
-                }
-                
-                // 其他错误或达到最大重试次数
-                Log::error("Telegram 消息发送失败 (尝试 {$retryCount}/{$maxRetries}): ".$e->getMessage());
-                
-                // 可以选择记录失败任务或抛出异常
-                if ($retryCount > $maxRetries) {
-                    Log::error("Telegram 消息发送已达到最大重试次数，任务失败");
-                    // 可以在这里记录到失败队列或发送通知
-                }
-                
-                return;
-            }
+  
+        try {
+            BaseService::bettingGroupNotice($this->text, $this->buttons, $this->image,$this->isTop);
+        } catch (\Telegram\Bot\Exceptions\TelegramResponseException $e) {
+            // // 捕获 Too Many Requests
+            // if (str_contains($e->getMessage(), 'Too Many Requests')) {
+            //     preg_match('/retry after (\d+)/', $e->getMessage(), $matches);
+            //     $retryAfter = $matches[1] ?? 5;
+            //     Log::warning("Telegram 429 限制，等待 {$retryAfter} 秒重试...");
+            //     sleep($retryAfter + 1);
+
+            //     // 重试
+            //     $this->handle();
+            // } else {
+                Log::error('Telegram 消息发送失败: '.$e->getMessage());
+            // }
         }
     }
 }