队列相关的调整

application/api/job/WechatDraft.php

@@ -0,0 +1,62 @@
+<?php
+namespace app\api\job;
+use think\queue\Job;
+use app\api\controller\Aiarticle;
+use app\common\QueueJob;
+class WechatDraft
+{
+    // 上传文章到草稿箱任务入口
+    public function fire(Job $job, $data)
+    {
+
+        //获取任务ID
+        $iLogId = 0;
+        try {
+
+            //实例化
+            $oQueueJob = new QueueJob;
+            $sMsg = '上传草稿箱成功';
+            if(!empty($job->getRawBody())){
+                $aJob = json_decode($job->getRawBody(), true);
+                $aParam = [
+                    'job_id'     => empty($aJob['id']) ? '' : $aJob['id'],
+                    'job_class'  => get_class($this),
+                    'status'     => 0,
+                    'create_time' => time(),
+                    'params'     => json_encode($aJob, JSON_UNESCAPED_UNICODE)
+                ];          
+                $iLogId = $oQueueJob->addLog($aParam);
+                // 步骤1：上传素材（图片）
+                $iArticleId = empty($data['article_id']) ? 0 : $data['article_id'];
+                if (!empty($iArticleId)) {
+                    //上传素材
+                    $oAiarticle = new Aiarticle;
+                    $aResult = json_decode($oAiarticle->syncWechat($data),true);
+                    $iStatus = empty($aResult['status']) ? 0 : $aResult['status']; 
+                    $sMsg = empty($aResult['msg']) ? '上传草稿箱失败' : $aResult['msg'];
+                }
+            }
+            $job->delete();
+
+            //更新任务状态
+            $aParam = ['log_id' => $iLogId,'status' => 1,'update_time' => time(),'error' => $sMsg];
+            $oQueueJob->updateLog($aParam);
+            // 记录日志
+            \think\Log::info("WechatDraft-延迟任务执行成功: ".json_encode($data));
+        } catch (\Exception $e) {
+
+            //实例化
+            $oQueueJob = new QueueJob;
+            //更新任务状态
+            $sMsg = empty($e->getMessage()) ? '任务出错' : $e->getMessage();
+            $aParam = ['log_id' => $iLogId,'status' => 2,'update_time' => time(),'error' => $sMsg];
+            $oQueueJob->updateLog($aParam);
+            $job->delete();
+             // 记录错误日志
+            \think\Log::error("WechatDraft-延迟任务失败: ".$e->getMessage());
+        }finally {
+            gc_collect_cycles(); // 强制垃圾回收
+        }
+    }
+
+}

application/api/job/WechatQueryStatus.php

@@ -0,0 +1,61 @@
+<?php
+namespace app\api\job;
+use think\queue\Job;
+use app\api\controller\Aiarticle;
+use app\common\QueueJob;
+class WechatQueryStatus
+{
+    // 草稿箱文章发布状态任务入口
+    public function fire(Job $job, $data)
+    {
+
+        //获取任务ID
+        $iLogId = 0;
+        try {
+            //实例化
+            $oQueueJob = new QueueJob;
+            $sMsg = '查询草稿箱文章发布状态成功';
+            if(!empty($job->getRawBody())){
+                $aJob = json_decode($job->getRawBody(), true);
+                $aParam = [
+                    'job_id'     => empty($aJob['id']) ? '' : $aJob['id'],
+                    'job_class'  => get_class($this),
+                    'status'     => 0,
+                    'create_time' => time(),
+                    'params'     => json_encode($aJob, JSON_UNESCAPED_UNICODE)
+                ];          
+                $iLogId = $oQueueJob->addLog($aParam);
+                // 步骤1：上传素材（图片）
+                $iArticleId = empty($data['article_id']) ? 0 : $data['article_id'];
+                if (!empty($iArticleId)) {
+                    //上传素材
+                    $oAiarticle = new Aiarticle;
+                    $aResult = json_decode($oAiarticle->queryStatus($data),true);
+                    $iStatus = empty($aResult['status']) ? 0 : $aResult['status']; 
+                    $sMsg = empty($aResult['msg']) ? '上传草稿箱失败' : $aResult['msg'];
+                }
+            }
+            $job->delete();
+
+            //更新任务状态
+            $aParam = ['log_id' => $iLogId,'status' => 1,'update_time' => time(),'error' => $sMsg];
+            $oQueueJob->updateLog($aParam);
+            // 记录日志
+            \think\Log::info("WechatQueryStatus延迟任务执行成功: ".json_encode($data));
+        } catch (\Exception $e) {
+
+            //实例化
+            $oQueueJob = new QueueJob;
+            //更新任务状态
+            $sMsg = empty($e->getMessage()) ? '任务出错' : $e->getMessage();
+            $aParam = ['log_id' => $iLogId,'status' => 2,'update_time' => time(),'error' => $sMsg];
+            $oQueueJob->updateLog($aParam);
+            $job->delete();
+            // 记录错误日志
+            \think\Log::error("WechatQueryStatus延迟任务失败: ".$e->getMessage());
+        }finally {
+            gc_collect_cycles(); // 强制垃圾回收
+        }
+    }
+
+}

application/common/QueueJob.php

@@ -0,0 +1,48 @@
+<?php
+namespace app\common;
+use think\Db;
+class QueueJob
+{
+
+    //必填参数
+    protected $aField = ['job_id','job_class','status','create_time','update_time','error','params'];
+
+    // 记录任务开始
+    public function addLog($aParam = []) {
+
+        //数据处理
+        $aField = $this->aField;
+        $aInsert = [];
+        foreach ($aField as $key => $value) {
+           if(isset($aParam[$value])){
+                $aInsert[$value] = $aParam[$value];
+           }
+        }
+        $result = 0;
+        if(!empty($aInsert)){
+            $result = DB::name('queue_job_logs')->insertGetId($aParam);
+        }
+        return $result;
+    }
+
+    // 记录任务成功
+    public function updateLog($aParam = []) {
+
+        $iLogId = empty($aParam['log_id']) ? 0 : $aParam['log_id'];
+        if(empty($iLogId)){
+            return false;
+        }
+        //数据处理
+        $aField = $this->aField;
+        $aUpdate = [];
+        foreach ($aField as $key => $value) {
+           if(isset($aParam[$value])){
+                $aUpdate[$value] = $aParam[$value];
+           }
+        }
+        unset($aParam['log_id']);
+        $result = DB::name('queue_job_logs')->where('log_id',$iLogId)->limit(1)->update($aUpdate);
+        return $result;
+    }
+}
+?>