zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wangjinlei
2022-04-08 14:01:38 +08:00
parent 2b127afc44
commit a0eacfd144
10 changed files with 192 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
application/api/controller/Auto.php
View File

@@ -97,24 +97,24 @@ class Auto extends Controller {
$tt .= 'Email: ' . $cache_journal['email'] . '<br>';
$tt .= 'Website:<a href="' . $cache_journal['website'] . '">' . $cache_journal['website'] . '</a>';
//$maidata['email'] = $cache_reviewer['email'];
//$maidata['title'] = "Invitation to review manuscript for " . $cache_journal['title'] . " - Reminder";
//$maidata['content'] = $tt;
//$maidata['tmail'] = $cache_journal['email'];
//$maidata['tpassword'] = $cache_journal['epassword'];
//Queue::push('app\api\job\mail@fire', $maidata, "tmail");
$maidata['email'] = $cache_reviewer['email'];
$maidata['title'] = "Invitation to review manuscript for " . $cache_journal['title'] . " - Reminder";
$maidata['content'] = $tt;
$maidata['tmail'] = $cache_journal['email'];
$maidata['tpassword'] = $cache_journal['epassword'];
Queue::push('app\api\job\mail@fire', $maidata, "tmail");
$sendUser=[
'title'=>"Invitation to review manuscript for " . $cache_journal['title'] . " - Reminder", // 邮件标题
'content'=>$tt,//邮件内容
'user_id'=>$v['reviewer_id'], //收件人ID
'email'=>$cache_reviewer['email'],// 收件人邮箱
'journal_id'=>$cache_journal['journal_id'], // 期刊ID
'sendEmail'=>$cache_journal['email'], // 期刊邮箱
'sendPassword'=>$cache_journal['epassword'], // 期刊密码
'from_name'=>"Invitation to review manuscript for " . $cache_journal['title'] . " - Reminder"
];
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
// $sendUser=[
// 'title'=>"Invitation to review manuscript for " . $cache_journal['title'] . " - Reminder", // 邮件标题
// 'content'=>$tt,//邮件内容
// 'user_id'=>$v['reviewer_id'], //收件人ID
// 'email'=>$cache_reviewer['email'],// 收件人邮箱
// 'journal_id'=>$cache_journal['journal_id'], // 期刊ID
// 'sendEmail'=>$cache_journal['email'], // 期刊邮箱
// 'sendPassword'=>$cache_journal['epassword'], // 期刊密码
// 'from_name'=>"Invitation to review manuscript for " . $cache_journal['title'] . " - Reminder"
// ];
// Queue::push('app\api\job\domail@fire',$sendUser,'domail');
}
}
}
@@ -184,24 +184,24 @@ class Auto extends Controller {
$tt .= 'Email: ' . $cache_journal['email'] . '<br>';
$tt .= 'Website:<a href="' . $cache_journal['website'] . '">' . $cache_journal['website'] . '</a>';
//$maidata['email'] = $cache_author['email'];
//$maidata['title'] = "Revision Due Date-" . $cache_journal['title'];
//$maidata['content'] = $tt;
//$maidata['tmail'] = $cache_journal['email'];
//$maidata['tpassword'] = $cache_journal['epassword'];
//Queue::push('app\api\job\mail@fire', $maidata, "tmail");
$maidata['email'] = $cache_author['email'];
$maidata['title'] = "Revision Due Date-" . $cache_journal['title'];
$maidata['content'] = $tt;
$maidata['tmail'] = $cache_journal['email'];
$maidata['tpassword'] = $cache_journal['epassword'];
Queue::push('app\api\job\mail@fire', $maidata, "tmail");
$sendUser=[
'title'=>"Revision Due Date-" . $cache_journal['title'], // 邮件标题
'content'=>$tt,//邮件内容
'user_id'=>$cache_author['user_id'], //收件人ID
'email'=>$cache_author['email'],// 收件人邮箱
'journal_id'=>$cache_journal['journal_id'], // 期刊ID
'sendEmail'=>$cache_journal['email'], // 期刊邮箱
'sendPassword'=>$cache_journal['epassword'], // 期刊密码
'from_name'=>"Revision Due Date-" . $cache_journal['title']
];
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
// $sendUser=[
// 'title'=>"Revision Due Date-" . $cache_journal['title'], // 邮件标题
// 'content'=>$tt,//邮件内容
// 'user_id'=>$cache_author['user_id'], //收件人ID
// 'email'=>$cache_author['email'],// 收件人邮箱
// 'journal_id'=>$cache_journal['journal_id'], // 期刊ID
// 'sendEmail'=>$cache_journal['email'], // 期刊邮箱
// 'sendPassword'=>$cache_journal['epassword'], // 期刊密码
// 'from_name'=>"Revision Due Date-" . $cache_journal['title']
// ];
// Queue::push('app\api\job\domail@fire',$sendUser,'domail');
}
@@ -220,24 +220,24 @@ class Auto extends Controller {
$tt .= 'Email: ' . $cache_journal['email'] . '<br>';
$tt .= 'Website:<a href="' . $cache_journal['website'] . '">' . $cache_journal['website'] . '</a>';
//$maidata['email'] = $cache_author['email'];
//$maidata['title'] = "Revision Due Date-" . $cache_journal['title'];
//$maidata['content'] = $tt;
//$maidata['tmail'] = $cache_journal['email'];
//$maidata['tpassword'] = $cache_journal['epassword'];
//Queue::push('app\api\job\mail@fire', $maidata, "tmail");
$maidata['email'] = $cache_author['email'];
$maidata['title'] = "Revision Due Date-" . $cache_journal['title'];
$maidata['content'] = $tt;
$maidata['tmail'] = $cache_journal['email'];
$maidata['tpassword'] = $cache_journal['epassword'];
Queue::push('app\api\job\mail@fire', $maidata, "tmail");
$sendUser=[
'title'=>"Revision Due Date-" . $cache_journal['title'], // 邮件标题
'content'=>$tt,//邮件内容
'user_id'=>$cache_author['user_id'], //收件人ID
'email'=>$cache_author['email'],// 收件人邮箱
'journal_id'=>$cache_journal['journal_id'], // 期刊ID
'sendEmail'=>$cache_journal['email'], // 期刊邮箱
'sendPassword'=>$cache_journal['epassword'], // 期刊密码
'from_name'=>"Revision Due Date-" . $cache_journal['title']
];
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
// $sendUser=[
// 'title'=>"Revision Due Date-" . $cache_journal['title'], // 邮件标题
// 'content'=>$tt,//邮件内容
// 'user_id'=>$cache_author['user_id'], //收件人ID
// 'email'=>$cache_author['email'],// 收件人邮箱
// 'journal_id'=>$cache_journal['journal_id'], // 期刊ID
// 'sendEmail'=>$cache_journal['email'], // 期刊邮箱
// 'sendPassword'=>$cache_journal['epassword'], // 期刊密码
// 'from_name'=>"Revision Due Date-" . $cache_journal['title']
// ];
// Queue::push('app\api\job\domail@fire',$sendUser,'domail');
}
}
@@ -421,8 +421,8 @@ class Auto extends Controller {
$sendUser['user_id'] = $editor_info['editor_id'];
$sendUser['email'] = $editor_info['email'];
$sendUser['content'] = $tt;
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
//sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
// Queue::push('app\api\job\domail@fire',$sendUser,'domail');
sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
} else {//查询到审稿人，执行添加操作
//将审稿时间定义至现在
$this->user_obj->where('user_id', $reviewer['user_id'])->update(['rtime' => time()]);
@@ -467,9 +467,9 @@ class Auto extends Controller {
$sendUser['user_id'] = $reviewer_info['editor_id'];
$sendUser['email'] = $reviewer_info['email'];
$sendUser['content'] = $tt;
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
// Queue::push('app\api\job\domail@fire',$sendUser,'domail');
//sendEmail($reviewer_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
sendEmail($reviewer_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
//记录userlog
$log_data['user_id'] = $article_info['editor_id'];