队列任务加日志
This commit is contained in:
@@ -9,76 +9,80 @@ class SendRelatedArticleEmail
|
||||
public function fire(Job $job, $data)
|
||||
{
|
||||
|
||||
// 记录任务开始执行
|
||||
$sLogPath = ROOT_PATH.'public/queue_log/SendRelatedArticleEmail_'.date('Ymd').'.log';
|
||||
file_put_contents($sLogPath,'-----------Queue job started-----------' . json_encode($data)."\n",FILE_APPEND);
|
||||
|
||||
//获取任务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);
|
||||
|
||||
$aJob = empty($job->getRawBody()) ? [] : json_decode($job->getRawBody(), true);
|
||||
$aParam = [
|
||||
'job_id' => empty($aJob['id']) ? 'SendRelatedArticleEmail'.rand(100, 999) : $aJob['id'],
|
||||
'job_class' => get_class($this),
|
||||
'status' => 0,
|
||||
'create_time' => time(),
|
||||
'params' => json_encode($data, JSON_UNESCAPED_UNICODE)
|
||||
];
|
||||
$iLogId = $oQueueJob->addLog($aParam);
|
||||
|
||||
//文章ID
|
||||
$iArticleId = empty($data['article_id']) ? 0 : $data['article_id'];
|
||||
//作者邮箱
|
||||
$email = empty($data['email']) ? '' : $data['email'];
|
||||
//邮件主题
|
||||
$title = empty($data['title']) ? '' : $data['title'];
|
||||
//发送来源
|
||||
$from_name = empty($data['from_name']) ? '' : $data['from_name'];
|
||||
//邮件内容
|
||||
$content = empty($data['content']) ? '' : $data['content'];
|
||||
//邮箱
|
||||
$memail = empty($data['memail']) ? '' : $data['memail'];
|
||||
//密码
|
||||
$mpassword = empty($data['mpassword']) ? '' : $data['mpassword'];
|
||||
//文章作者
|
||||
$article_author_id = empty($data['article_author_id']) ? 0 : $data['article_author_id'];
|
||||
//关联文章ID
|
||||
$related_article_id = empty($data['related_article_id']) ? 0 : $data['related_article_id'];
|
||||
//期刊ID
|
||||
$journal_id = empty($data['journal_id']) ? '' : $data['journal_id'];
|
||||
//期刊issn
|
||||
$journal_issn = empty($data['journal_issn']) ? '' : $data['journal_issn'];
|
||||
//发送邮件
|
||||
if (!empty($iArticleId) && !empty($article_author_id) && !empty($related_article_id) && !empty($memail) && !empty($mpassword)) {
|
||||
//文章ID
|
||||
$iArticleId = empty($data['article_id']) ? 0 : $data['article_id'];
|
||||
//作者邮箱
|
||||
$email = empty($data['email']) ? '' : $data['email'];
|
||||
//邮件主题
|
||||
$title = empty($data['title']) ? '' : $data['title'];
|
||||
//发送来源
|
||||
$from_name = empty($data['from_name']) ? '' : $data['from_name'];
|
||||
//邮件内容
|
||||
$content = empty($data['content']) ? '' : $data['content'];
|
||||
//邮箱
|
||||
$memail = empty($data['memail']) ? '' : $data['memail'];
|
||||
//密码
|
||||
$mpassword = empty($data['mpassword']) ? '' : $data['mpassword'];
|
||||
//文章作者
|
||||
$article_author_id = empty($data['article_author_id']) ? 0 : $data['article_author_id'];
|
||||
//关联文章ID
|
||||
$related_article_id = empty($data['related_article_id']) ? 0 : $data['related_article_id'];
|
||||
//期刊ID
|
||||
$journal_id = empty($data['journal_id']) ? '' : $data['journal_id'];
|
||||
//期刊issn
|
||||
$journal_issn = empty($data['journal_issn']) ? '' : $data['journal_issn'];
|
||||
//发送邮件
|
||||
if (!empty($iArticleId) && !empty($article_author_id) && !empty($related_article_id) && !empty($memail) && !empty($mpassword)) {
|
||||
|
||||
//查询是否发送过邮件
|
||||
$oJournalArticle = new JournalArticle;
|
||||
$aLog = json_decode($oJournalArticle::getLog(['article_id' => $iArticleId,'article_author_id' => $article_author_id,'related_article_id' => $related_article_id,'is_success' => 1]),true);
|
||||
$sMsg = '邮件已发送:'.json_encode($aLog['data']);
|
||||
if(empty($aLog['data'])){
|
||||
$aResult = sendEmail($email,$title,$from_name,$content,$memail,$mpassword);
|
||||
$iStatus = empty($aResult['status']) ? 1 : $aResult['status'];
|
||||
$iIsSuccess = 2;
|
||||
$sMsg = empty($aResult['data']) ? '失败' : $aResult['data'];
|
||||
if($iStatus == 1){
|
||||
$iIsSuccess = 1;
|
||||
$sMsg = '成功';
|
||||
}
|
||||
|
||||
//记录邮件发送日志
|
||||
$aEmailLog = ['article_id' => $iArticleId,'article_author_id' => $article_author_id,'related_article_id' => $related_article_id,'email' => $email,'content' => $content,'create_time' => time(),'is_success' => $iIsSuccess,'journal_id' => $journal_id,'journal_issn' => $journal_issn,'msg' => $sMsg];
|
||||
//添加邮件发送日志
|
||||
$iId = JournalArticle::addLog($aEmailLog);
|
||||
//查询是否发送过邮件
|
||||
$oJournalArticle = new JournalArticle;
|
||||
$aLog = json_decode($oJournalArticle::getLog(['article_id' => $iArticleId,'article_author_id' => $article_author_id,'related_article_id' => $related_article_id,'is_success' => 1]),true);
|
||||
$sMsg = '邮件已发送:'.json_encode($aLog['data']);
|
||||
if(empty($aLog['data'])){
|
||||
$aResult = sendEmail($email,$title,$from_name,$content,$memail,$mpassword);
|
||||
$iStatus = empty($aResult['status']) ? 1 : $aResult['status'];
|
||||
$iIsSuccess = 2;
|
||||
$sMsg = empty($aResult['data']) ? '失败' : $aResult['data'];
|
||||
if($iStatus == 1){
|
||||
$iIsSuccess = 1;
|
||||
$sMsg = '成功';
|
||||
}
|
||||
|
||||
//记录邮件发送日志
|
||||
$aEmailLog = ['article_id' => $iArticleId,'article_author_id' => $article_author_id,'related_article_id' => $related_article_id,'email' => $email,'content' => $content,'create_time' => time(),'is_success' => $iIsSuccess,'journal_id' => $journal_id,'journal_issn' => $journal_issn,'msg' => $sMsg];
|
||||
//添加邮件发送日志
|
||||
$iId = JournalArticle::addLog($aEmailLog);
|
||||
}
|
||||
}
|
||||
|
||||
$job->delete();
|
||||
|
||||
//更新任务状态
|
||||
$aParam = ['log_id' => $iLogId,'status' => 1,'update_time' => time(),'error' => $sMsg];
|
||||
$oQueueJob->updateLog($aParam);
|
||||
// // 记录日志
|
||||
// \think\Log::info("RelatedArticle延迟任务执行成功: ".json_encode($data));
|
||||
file_put_contents($sLogPath,'-----------Queue job end---------'."\n\n\n",FILE_APPEND);
|
||||
} catch (\Exception $e) {
|
||||
|
||||
//实例化
|
||||
@@ -88,8 +92,7 @@ class SendRelatedArticleEmail
|
||||
$aParam = ['log_id' => $iLogId,'status' => 2,'update_time' => time(),'error' => $sMsg];
|
||||
$oQueueJob->updateLog($aParam);
|
||||
$job->delete();
|
||||
// // 记录错误日志
|
||||
// \think\Log::error("RelatedArticle延迟任务失败: ".$e->getMessage());
|
||||
|
||||
}finally {
|
||||
gc_collect_cycles(); // 强制垃圾回收
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user