From 9d8e244ea91b7604fb42d8509d9ab80c9658ff91 Mon Sep 17 00:00:00 2001 From: chengxl Date: Mon, 7 Jul 2025 17:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=9F=E5=88=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/job/ArticleAiCreateContent.php | 4 ++-- application/api/job/RecommendReviewer.php | 4 ++-- application/api/job/RelatedArticle.php | 4 ++-- application/api/job/ReviewerScore.php | 4 ++-- application/api/job/RevisionReviewer.php | 4 ++-- application/api/job/SendRelatedArticleEmail.php | 4 ++-- application/api/job/SendReviewEmail.php | 4 ++-- application/api/job/WechatDraft.php | 4 ++-- application/api/job/WechatDraftPublish.php | 4 ++-- application/api/job/WechatMaterial.php | 4 ++-- application/api/job/WechatQueryStatus.php | 4 ++-- application/common/QueueJob.php | 13 +++++++++---- 12 files changed, 31 insertions(+), 26 deletions(-) diff --git a/application/api/job/ArticleAiCreateContent.php b/application/api/job/ArticleAiCreateContent.php index f774121..b9c8a72 100644 --- a/application/api/job/ArticleAiCreateContent.php +++ b/application/api/job/ArticleAiCreateContent.php @@ -45,9 +45,9 @@ class ArticleAiCreateContent //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/RecommendReviewer.php b/application/api/job/RecommendReviewer.php index c218479..0aeab06 100644 --- a/application/api/job/RecommendReviewer.php +++ b/application/api/job/RecommendReviewer.php @@ -44,9 +44,9 @@ class RecommendReviewer //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/RelatedArticle.php b/application/api/job/RelatedArticle.php index 122e7e0..faf5ad6 100644 --- a/application/api/job/RelatedArticle.php +++ b/application/api/job/RelatedArticle.php @@ -46,9 +46,9 @@ class RelatedArticle //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/ReviewerScore.php b/application/api/job/ReviewerScore.php index 045cb64..bb106c5 100644 --- a/application/api/job/ReviewerScore.php +++ b/application/api/job/ReviewerScore.php @@ -45,9 +45,9 @@ class ReviewerScore //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/RevisionReviewer.php b/application/api/job/RevisionReviewer.php index 3faea07..e1deb52 100644 --- a/application/api/job/RevisionReviewer.php +++ b/application/api/job/RevisionReviewer.php @@ -43,9 +43,9 @@ class RevisionReviewer //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/SendRelatedArticleEmail.php b/application/api/job/SendRelatedArticleEmail.php index 15e068c..7f7103c 100644 --- a/application/api/job/SendRelatedArticleEmail.php +++ b/application/api/job/SendRelatedArticleEmail.php @@ -66,9 +66,9 @@ class SendRelatedArticleEmail //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/SendReviewEmail.php b/application/api/job/SendReviewEmail.php index 880a629..b8958c8 100644 --- a/application/api/job/SendReviewEmail.php +++ b/application/api/job/SendReviewEmail.php @@ -63,9 +63,9 @@ class SendReviewEmail //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/WechatDraft.php b/application/api/job/WechatDraft.php index 1b62a89..ca6f737 100644 --- a/application/api/job/WechatDraft.php +++ b/application/api/job/WechatDraft.php @@ -44,9 +44,9 @@ class WechatDraft //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/WechatDraftPublish.php b/application/api/job/WechatDraftPublish.php index a05509d..b5da1a0 100644 --- a/application/api/job/WechatDraftPublish.php +++ b/application/api/job/WechatDraftPublish.php @@ -45,9 +45,9 @@ class WechatDraftPublish //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/WechatMaterial.php b/application/api/job/WechatMaterial.php index 93e9a99..8342174 100644 --- a/application/api/job/WechatMaterial.php +++ b/application/api/job/WechatMaterial.php @@ -45,9 +45,9 @@ class WechatMaterial //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/api/job/WechatQueryStatus.php b/application/api/job/WechatQueryStatus.php index dfa7442..ca41059 100644 --- a/application/api/job/WechatQueryStatus.php +++ b/application/api/job/WechatQueryStatus.php @@ -45,9 +45,9 @@ class WechatQueryStatus //判断Redis是否存在 $oQueueJob = new QueueJob; $result = $oQueueJob->setRedisLabel(['redis_key' => $sRedisKey]); - if(empty($result)){ + if($result != 1){ $job->delete(); - file_put_contents($sLogPath,'-----------Queue job already:'.$sTime.'-----------'); + file_put_contents($sLogPath,'-----------Queue job already:'.$result."===".$sRedisKey.'==='.$iArticleId."===".$sTime.'-----------'); return; } diff --git a/application/common/QueueJob.php b/application/common/QueueJob.php index f09f463..3995e5d 100644 --- a/application/common/QueueJob.php +++ b/application/common/QueueJob.php @@ -51,17 +51,22 @@ class QueueJob */ public function setRedisLabel($aParam = []){ + //判断数据是否为空 if(empty($aParam['redis_key'])){ - return false; + return 3; } //获取值 $sValue = $this->getRedisLabel($aParam['redis_key']); - if(!empty($sValue)){ - return false; + if($sValue == $aParam['redis_key']){ + return 4; + } + $result = Cache::set($aParam['redis_key'], $aParam['redis_key'], 3600); + if($result == true){ + return 1; } //写入 - return Cache::set($aParam['redis_key'], $aParam['redis_key'], 3600); + return 2; } /**