job任务修改

application/api/job/ArticleAiCreateContent.php

@@ -9,10 +9,7 @@ class ArticleAiCreateContent
 {
     private $oQueueJob;
     private $QueueRedis;
-    private $maxRetries = 2;
-    private $lockExpire = 1800;
     private $completedExprie = 3600;
-    const JSON_OPTIONS = JSON_UNESCAPED_UNICODE | JSON_THROW_ON_ERROR;
 
     public function __construct()
     {
@@ -22,22 +19,16 @@ class ArticleAiCreateContent
 
     public function fire(Job $job, $data)
     {
-        $startTime = microtime(true);
+        //任务开始判断
+        $this->oQueueJob->init($job);
+
+        // 获取 Redis 任务的原始数据
+        $rawBody = empty($job->getRawBody()) ? '' : $job->getRawBody();
+        $jobData = empty($rawBody) ? [] : json_decode($rawBody, true);
+        $jobId = empty($jobData['id']) ? 'unknown' : $jobData['id'];
+
         $this->oQueueJob->log("-----------队列任务开始-----------");
-
-        // 检查数据库连接
-        if (!$this->oQueueJob->checkDbConnection(true)) {
-            $this->oQueueJob->log("数据库连接失败，无法执行任务，10秒后重试");
-            $job->release(10);
-            return;
-        }
-
-        // 检查Redis连接状态
-        if (!$this->QueueRedis->getConnectionStatus()) {
-            $this->oQueueJob->log("Redis连接失败，10秒后重试");
-            $job->release(10);
-            return;
-        }
+        $this->oQueueJob->log("当前任务ID: {$jobId}, 尝试次数: {$job->attempts()}");
 
         // 获取文章ID
         $iArticleId = empty($data['article_id']) ? 0 : $data['article_id'];
@@ -46,42 +37,29 @@ class ArticleAiCreateContent
             $job->delete();
             return;
         }
-
-        $sClassName = get_class($this);
-        $sRedisKey = "queue_job:{$sClassName}:{$iArticleId}";
-        $sRedisValue = uniqid() . '_' . getmypid();
-        $lockExpire = $this->lockExpire;
-
-        $isLocked = $this->QueueRedis->startJob($sRedisKey, $sRedisValue, $lockExpire);
-        if (!$isLocked) {
-            $jobStatus = $this->QueueRedis->getJobStatus($sRedisKey);
-            if (in_array($jobStatus, ['completed', 'failed'])) {
-                $this->oQueueJob->log("任务已完成或失败，删除任务 | 状态: {$jobStatus}");
-                $job->delete();
-            } else {
-                $attempts = $job->attempts();
-                if ($attempts >= $this->maxRetries) {
-                    $this->oQueueJob->log("超过最大重试次数，停止重试");
-                    $job->delete();
-                } else {
-                    $lockTtl = $this->QueueRedis->getLockTtl($sRedisKey);
-                    $delay = $lockTtl > 0 ? $lockTtl + 5 : 30;
-                    $this->oQueueJob->log("锁竞争，{$delay}秒后重试({$attempts}/{$this->maxRetries})");
-                    $job->release($delay);
-                }
-            }
-            return;
-        }
         try {
-            // 执行核心任务前再次检查连接
-            $result = $this->oQueueJob->checkDbConnection();
-            if (!$result) {
-                throw new \RuntimeException("数据库连接异常，无法执行核心任务");
+            
+            // 生成Redis键并尝试获取锁
+            $sClassName = get_class($this);
+            $sRedisKey = "queue_job:{$sClassName}:{$iArticleId}";
+            $sRedisValue = uniqid() . '_' . getmypid();
+            if (!$this->oQueueJob->acquireLock($sRedisKey, $sRedisValue, $job)) {
+                return; // 未获取到锁，已处理
             }
+
             //生成内容
             $oAiarticle = new Aiarticle;
-            $aResult = json_decode($oAiarticle->create($data),true);
-            $sMsg = empty($aResult['msg']) ? '内容生成失败' : $aResult['msg'];
+            $response = $oAiarticle->create($data);
+            // 验证API响应
+            if (empty($response)) {
+                throw new RuntimeException("OpenAI API返回空结果");
+            }
+            // 检查JSON解析错误
+            $aResult = json_decode($response, true);
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                throw new RuntimeException("解析OpenAI响应失败: " . json_last_error_msg() . " | 原始响应: {$response}");
+            }
+            $sMsg = empty($aResult['msg']) ? 'success' : $aResult['msg'];
             //更新完成标识
             $this->QueueRedis->finishJob($sRedisKey, 'completed', $this->completedExprie,$sRedisValue);
             $job->delete();
@@ -94,9 +72,7 @@ class ArticleAiCreateContent
         } catch (\Exception $e) {
             $this->oQueueJob->handleRetryableException($e,$sRedisKey,$sRedisValue, $job);
         } finally {
-            $executionTime = microtime(true) - $startTime;
-            $this->oQueueJob->log("任务执行完成，耗时: " . number_format($executionTime, 4) . "秒");
-            gc_collect_cycles();
+            $this->oQueueJob->finnal();
         }
     }
 }