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

2
.gitignore vendored
View File

@@ -1,7 +1,7 @@
.idea .idea
composer.lock composer.lock
*.log *.log
public/ /public/
config/ config/
nbproject/ nbproject/
/.vscode/ /.vscode/

8
application/api/controller/Admin.php
View File

@@ -321,8 +321,8 @@ class Admin extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // 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']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
//发送消息信息--编辑 //发送消息信息--编辑
$journal_res = $this->journal_obj->where('journal_id', $data['journal'])->find(); $journal_res = $this->journal_obj->where('journal_id', $data['journal'])->find();
@@ -373,9 +373,9 @@ class Admin extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // 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']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
//发送消息信息--编辑 //发送消息信息--编辑
$journal_res = $this->journal_obj->where('journal_id', $data['journal'])->find(); $journal_res = $this->journal_obj->where('journal_id', $data['journal'])->find();

62
application/api/controller/Article.php
View File

@@ -329,9 +329,9 @@ class Article extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
//sendEmail($editor_info['email'],$journal_info['title'], $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword']); sendEmail($editor_info['email'],$journal_info['title'], $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword']);
//发送消息给编辑 //发送消息给编辑
add_usermsg($journal_info['editor_id'], 'New transfer manuscript ', '/articleDetailEditor?id=' . $article_info['article_id']); add_usermsg($journal_info['editor_id'], 'New transfer manuscript ', '/articleDetailEditor?id=' . $article_info['article_id']);
@@ -446,9 +446,9 @@ class Article extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // 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']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt,$journal_info['email'],$journal_info['epassword']);
//记录历史file信息 //记录历史file信息
@@ -704,9 +704,9 @@ class Article extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // 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']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt,$journal_info['email'],$journal_info['epassword']);
//添加usermsg //添加usermsg
add_usermsg($journal_info['editor_id'], 'Manuscript authors be changed,please contact the author to confirm.', 'articleDetailEditor?id='.$data['articleId']); add_usermsg($journal_info['editor_id'], 'Manuscript authors be changed,please contact the author to confirm.', 'articleDetailEditor?id='.$data['articleId']);
@@ -788,19 +788,19 @@ class Article extends Controller {
$sendUser['user_id'] = $user_info['user_id']; $sendUser['user_id'] = $user_info['user_id'];
$sendUser['email'] = $user_info['email']; $sendUser['email'] = $user_info['email'];
$sendUser['content'] = $tt; $sendUser['content'] = $tt;
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
//sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
//发送邮件提醒编辑有新的转投稿件 //发送邮件提醒编辑有新的转投稿件
//$tt1 = 'Dear editor'; $tt1 = 'Dear editor';
//$tt1 .= 'Please check the new transfer manuscript in the submission system.'; $tt1 .= 'Please check the new transfer manuscript in the submission system.';
//sendEmail($trans_editor_info['email'],$journal_info['title'], $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword']); sendEmail($trans_editor_info['email'],$journal_info['title'], $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword']);
$sendUser['user_id'] = $trans_editor_info['user_id']; // $sendUser['user_id'] = $trans_editor_info['user_id'];
$sendUser['email'] = $trans_editor_info['email']; // $sendUser['email'] = $trans_editor_info['email'];
$sendUser['content'] = 'Dear editor,Please check the new transfer manuscript in the submission system.'; // $sendUser['content'] = 'Dear editor,Please check the new transfer manuscript in the submission system.';
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
//增加usermsg //增加usermsg
add_usermsg($tran_journal['editor_id'], 'New transfer manuscript ', '/articleDetailEditor?id=' . $article_info['article_id']); add_usermsg($tran_journal['editor_id'], 'New transfer manuscript ', '/articleDetailEditor?id=' . $article_info['article_id']);
@@ -919,8 +919,8 @@ class Article extends Controller {
$tt .= 'Website: '.$journal_info['website']; $tt .= 'Website: '.$journal_info['website'];
if($data['state']!=5||$journal_info['journal_id']!=9){ if($data['state']!=5||$journal_info['journal_id']!=9){
$sendUser['content'] = $tt; $sendUser['content'] = $tt;
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
// sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
} }
if($data['state']==6){//进入终审，通知主编邮件 if($data['state']==6){//进入终审，通知主编邮件
$chiefs = $this->chief_to_journal_obj->join('t_user','t_user.user_id = t_chief_to_journal.user_id','left')->where('t_chief_to_journal.journal_id',$journal_info['journal_id'])->where('t_chief_to_journal.state',0)->select(); $chiefs = $this->chief_to_journal_obj->join('t_user','t_user.user_id = t_chief_to_journal.user_id','left')->where('t_chief_to_journal.journal_id',$journal_info['journal_id'])->where('t_chief_to_journal.state',0)->select();
@@ -938,8 +938,8 @@ class Article extends Controller {
$sendUser['user_id'] = $v['user_id']; $sendUser['user_id'] = $v['user_id'];
$sendUser['email'] = $v['email']; $sendUser['email'] = $v['email'];
$sendUser['content'] = $tts; $sendUser['content'] = $tts;
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
// sendEmail($v['email'], $journal_info['title'], $journal_info['title'], $tts, $journal_info['email'], $journal_info['epassword']); sendEmail($v['email'], $journal_info['title'], $journal_info['title'], $tts, $journal_info['email'], $journal_info['epassword']);
} }
} }
@@ -993,9 +993,9 @@ class Article extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'], 'from_name'=>$journal_info['title'],
]; ];
Queue::push('app\api\job\domail@fire',$sendReviewer,'domail'); // Queue::push('app\api\job\domail@fire',$sendReviewer,'domail');
//sendEmail($v['email'], $journal_info['title'], $journal_info['title'], $tts, $journal_info['email'], $journal_info['epassword']); sendEmail($v['email'], $journal_info['title'], $journal_info['title'], $tts, $journal_info['email'], $journal_info['epassword']);
} }
private function creatLoginUrlForChief($user,$article_id){ private function creatLoginUrlForChief($user,$article_id){
@@ -1200,9 +1200,9 @@ class Article extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
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 //记录userlog
$log_data['user_id'] = $article_info['editor_id']; $log_data['user_id'] = $article_info['editor_id'];
@@ -1374,9 +1374,9 @@ class Article extends Controller {
//发送邮件到编辑，提醒有待审文章 //发送邮件到编辑，提醒有待审文章
$editor_info = $this->user_obj->where('user_id',$journal_info['editor_id'])->find(); $editor_info = $this->user_obj->where('user_id',$journal_info['editor_id'])->find();
//$tt = 'Dear editor,<br>'; $tt = 'Dear editor,<br>';
//$tt .= 'Please check the new manuscript in the submission system.'; $tt .= 'Please check the new manuscript in the submission system.';
//sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt,$journal_info['email'],$journal_info['epassword']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt,$journal_info['email'],$journal_info['epassword']);
$sendEditor=[ $sendEditor=[
'title'=> $journal_info['title'], // 邮件标题 'title'=> $journal_info['title'], // 邮件标题
'content'=>'Dear editor,<br> Please check the new manuscript in the submission system.',//邮件内容 'content'=>'Dear editor,<br> Please check the new manuscript in the submission system.',//邮件内容
@@ -1387,7 +1387,7 @@ class Article extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendEditor,'domail'); // Queue::push('app\api\job\domail@fire',$sendEditor,'domail');
$user_rev_info = $this->user_reviewer_info_obj->where("reviewer_id",$user_res['user_id'])->find(); $user_rev_info = $this->user_reviewer_info_obj->where("reviewer_id",$user_res['user_id'])->find();
//发送邮件给作者，表示感谢 //发送邮件给作者，表示感谢
@@ -1418,9 +1418,9 @@ class Article extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
//sendEmail($user_res['email'],$journal_info['title'], $journal_info['title'], $tt1,$journal_info['email'],$journal_info['epassword']); sendEmail($user_res['email'],$journal_info['title'], $journal_info['title'], $tt1,$journal_info['email'],$journal_info['epassword']);
//增加用户操作log //增加用户操作log
$log_data['user_id'] = $user_res['user_id']; $log_data['user_id'] = $user_res['user_id'];
@@ -1549,7 +1549,7 @@ class Article extends Controller {
$tt .= 'Email: '.$journal_info['email'].'<br>'; $tt .= 'Email: '.$journal_info['email'].'<br>';
$tt .= 'Website:<a href="'.$journal_info['website'].'">'.$journal_info['website'].'</a>'; $tt .= 'Website:<a href="'.$journal_info['website'].'">'.$journal_info['website'].'</a>';
//sendEmail($author_info['email'], $journal_info['title'], $journal_info['title'], $tt,$journal_info['email'],$journal_info['epassword']); sendEmail($author_info['email'], $journal_info['title'], $journal_info['title'], $tt,$journal_info['email'],$journal_info['epassword']);
$sendUser=[ $sendUser=[
'title'=>$journal_info['title'], // 邮件标题 'title'=>$journal_info['title'], // 邮件标题
@@ -1561,7 +1561,7 @@ class Article extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
//添加转换表数据 //添加转换表数据
$art_insert['art_aut_id'] = $art_aut_id; $art_insert['art_aut_id'] = $art_aut_id;

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

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

14
application/api/controller/Chief.php
View File

@@ -736,12 +736,12 @@ class Chief extends Controller {
$tt .= 'Email: '.$journal_info['email'].'<br>'; $tt .= 'Email: '.$journal_info['email'].'<br>';
$tt .= 'Website: '.$journal_info['website']; $tt .= 'Website: '.$journal_info['website'];
//$maidata['email'] = $board_info['email']; $maidata['email'] = $board_info['email'];
//$maidata['title'] = $journal_info['title']; $maidata['title'] = $journal_info['title'];
//$maidata['content'] = $tt; $maidata['content'] = $tt;
//$maidata['tmail'] = $journal_info['email']; $maidata['tmail'] = $journal_info['email'];
//$maidata['tpassword'] = $journal_info['epassword']; $maidata['tpassword'] = $journal_info['epassword'];
//Queue::push( 'app\api\job\mail@fire' , $maidata , "tmail" ); Queue::push( 'app\api\job\mail@fire' , $maidata , "tmail" );
$sendUser=[ $sendUser=[
'title'=>$journal_info['title'], // 邮件标题 'title'=>$journal_info['title'], // 邮件标题
@@ -753,7 +753,7 @@ class Chief extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>'TMR' 'from_name'=>'TMR'
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
return jsonSuccess([]); return jsonSuccess([]);
} }

24
application/api/controller/Reviewer.php
View File

@@ -387,9 +387,9 @@ class Reviewer extends Controller
//发送email提醒 //发送email提醒
if ($type != 'editor') { if ($type != 'editor') {
// $tt = 'Dear editor,<br>'; $tt = 'Dear editor,<br>';
// $tt .= 'Please check the new comments from the reviewer.'; $tt .= 'Please check the new comments from the reviewer.';
// sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
$sendEditor = [ $sendEditor = [
'title' => $journal_info['title'], // 邮件标题 'title' => $journal_info['title'], // 邮件标题
'content' => 'Dear editor,<br>Please check the new comments from the reviewer.', //邮件内容 'content' => 'Dear editor,<br>Please check the new comments from the reviewer.', //邮件内容
@@ -400,7 +400,7 @@ class Reviewer extends Controller
'sendPassword' => $journal_info['epassword'], // 期刊密码 'sendPassword' => $journal_info['epassword'], // 期刊密码
'from_name' => $journal_info['title'] 'from_name' => $journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire', $sendEditor, 'domail'); // Queue::push('app\api\job\domail@fire', $sendEditor, 'domail');
} }
//保存usermsg //保存usermsg
@@ -553,8 +553,8 @@ class Reviewer extends Controller
'sendPassword' => $journal_info['epassword'], // 期刊密码 'sendPassword' => $journal_info['epassword'], // 期刊密码
'from_name' => $journal_info['title'] 'from_name' => $journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire', $sendEditor, 'domail'); // Queue::push('app\api\job\domail@fire', $sendEditor, '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']);
return jsonSuccess([]); return jsonSuccess([]);
} }
@@ -732,8 +732,8 @@ class Reviewer extends Controller
'sendPassword' => $journal_info['epassword'], // 期刊密码 'sendPassword' => $journal_info['epassword'], // 期刊密码
'from_name' => $journal_info['title'] 'from_name' => $journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire', $sendEditor, 'domail'); // Queue::push('app\api\job\domail@fire', $sendEditor, 'domail');
//sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
//发送email感谢reviewer并携带附件 //发送email感谢reviewer并携带附件
$reviewer_info = $this->user_obj->where('user_id', $art_rev_info['reviewer_id'])->find(); $reviewer_info = $this->user_obj->where('user_id', $art_rev_info['reviewer_id'])->find();
@@ -753,9 +753,9 @@ class Reviewer extends Controller
'from_name' => $journal_info['title'], 'from_name' => $journal_info['title'],
'attachment_url' => $reviewer_ZS 'attachment_url' => $reviewer_ZS
]; ];
Queue::push('app\api\job\domail@fire', $sendReviewer, 'domail'); // Queue::push('app\api\job\domail@fire', $sendReviewer, 'domail');
//sendEmail($reviewer_info['email'], 'Your contribution is greatly appreciated', $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword'], $reviewer_ZS); sendEmail($reviewer_info['email'], 'Your contribution is greatly appreciated', $journal_info['title'], $tt1, $journal_info['email'], $journal_info['epassword'], $reviewer_ZS);
//记录usermsg //记录usermsg
add_usermsg($journal_info['editor_id'], 'Feedback questionnaire be uploaded.', '/articleReviewerDetail?id=' . $data['art_rev_id']); add_usermsg($journal_info['editor_id'], 'Feedback questionnaire be uploaded.', '/articleReviewerDetail?id=' . $data['art_rev_id']);
@@ -999,9 +999,9 @@ class Reviewer extends Controller
'sendPassword' => $journal_info['epassword'], // 期刊密码 'sendPassword' => $journal_info['epassword'], // 期刊密码
'from_name' => $journal_info['title'] 'from_name' => $journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire', $sendReviewer, 'domail'); // Queue::push('app\api\job\domail@fire', $sendReviewer, 'domail');
//sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
$re['art_rev_id'] = $res; $re['art_rev_id'] = $res;
return jsonSuccess($re); return jsonSuccess($re);

8
application/api/controller/Special.php
View File

@@ -85,8 +85,8 @@ class Special extends Controller {
'sendPassword'=>Env::get('email.send_email_password'), // 期刊密码 'sendPassword'=>Env::get('email.send_email_password'), // 期刊密码
'from_name'=>'TMR' 'from_name'=>'TMR'
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
// sendEmail($email, 'Dear ' . $data['realname'], 'TMR', $content); sendEmail($email, 'Dear ' . $data['realname'], 'TMR', $content);
return json($inser_data); return json($inser_data);
} }
@@ -257,7 +257,7 @@ class Special extends Controller {
$editor_info = $this->user_obj->where('user_id', $journal_info['editor_id'])->find(); $editor_info = $this->user_obj->where('user_id', $journal_info['editor_id'])->find();
$tt = 'Dear editor,<br>'; $tt = 'Dear editor,<br>';
$tt .= 'Please check the new manuscript in the submission system.'; $tt .= 'Please check the new manuscript in the submission system.';
// sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
$sendEditor=[ $sendEditor=[
'title'=>$journal_info['title'], // 邮件标题 'title'=>$journal_info['title'], // 邮件标题
'content'=>$tt,//邮件内容 'content'=>$tt,//邮件内容
@@ -268,7 +268,7 @@ class Special extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendEditor,'domail'); // Queue::push('app\api\job\domail@fire',$sendEditor,'domail');
//增加用户操作log //增加用户操作log
$log_data['user_id'] = $user_res['user_id']; $log_data['user_id'] = $user_res['user_id'];

124
application/api/controller/Staff.php
View File

@@ -488,73 +488,73 @@ class Staff extends Controller {
return $re; return $re;
} }
public function getgrtc(){ // public function getgrtc(){
$staff_info = $this->staff_obj->where('name', $name)->where('state',0)->find(); // $staff_info = $this->staff_obj->where('name', $name)->where('state',0)->find();
$baseprice = $this->getBasePrice($name); // $baseprice = $this->getBasePrice($name);
//获取实时期刊提成情况 // //获取实时期刊提成情况
$c_time = strtotime("-1 month", strtotime(date('Y-m') . '-26 00:00:00')); // $c_time = strtotime("-1 month", strtotime(date('Y-m') . '-26 00:00:00'));
$c_time1 = strtotime(date('Y-m' . '-25 23:59:59')); // $c_time1 = strtotime(date('Y-m' . '-25 23:59:59'));
$where['ctime'] = array(['>', $c_time], ['<=', $c_time1]); // $where['ctime'] = array(['>', $c_time], ['<=', $c_time1]);
$journals = $this->journal_obj->where('staff_id', $staff_info['staff_id'])->select(); // $journals = $this->journal_obj->where('staff_id', $staff_info['staff_id'])->select();
$journal_price = 0; // $journal_price = 0;
$cite_price = 0; // $cite_price = 0;
if($staff_info['type']==0){ // if($staff_info['type']==0){
foreach ($journals as $v) { // foreach ($journals as $v) {
$c_price = 0; // $c_price = 0;
$where['accept_sn'] = ['like',$v['abbr'].'%']; // $where['accept_sn'] = ['like',$v['abbr'].'%'];
$cache_articles = $this->article_obj->where($where)->select(); // $cache_articles = $this->article_obj->where($where)->select();
echo '<pre>'; // echo '<pre>';
var_dump($cache_articles); // var_dump($cache_articles);
echo '</pre>'; // echo '</pre>';
$c_gn = 0; // $c_gn = 0;
$c_gw = 0; // $c_gw = 0;
foreach ($cache_articles as $vv) { // foreach ($cache_articles as $vv) {
$c_country = $this->article_author_obj->where('article_id', $vv['article_id'])->where('state', 0)->column('country'); // $c_country = $this->article_author_obj->where('article_id', $vv['article_id'])->where('state', 0)->column('country');
$c_c = 'gn'; // $c_c = 'gn';
foreach ($c_country as $vvv) { // foreach ($c_country as $vvv) {
if ($vvv != 'China' && $vvv != '') { // if ($vvv != 'China' && $vvv != '') {
$c_c = 'gw'; // $c_c = 'gw';
} // }
} // }
if ($c_c == 'gn') { // if ($c_c == 'gn') {
$c_gn++; // $c_gn++;
} else { // } else {
$c_gw++; // $c_gw++;
} // }
} // }
if ($c_gn - $v['jour_num'] >= 0) { // if ($c_gn - $v['jour_num'] >= 0) {
$c_price = ($c_gn - $v['jour_num']) * 100 + $c_gw * 200; // $c_price = ($c_gn - $v['jour_num']) * 100 + $c_gw * 200;
} else { // } else {
if (($c_gw - ($v['jour_num'] - $c_gn)) >= 0) { // if (($c_gw - ($v['jour_num'] - $c_gn)) >= 0) {
$c_price = ($c_gn + $c_gw - $v['jour_num']) * 200; // $c_price = ($c_gn + $c_gw - $v['jour_num']) * 200;
} else { // } else {
$c_price = 0 - ($v['jour_num'] - $c_gn - $c_gw) * 50; // $c_price = 0 - ($v['jour_num'] - $c_gn - $c_gw) * 50;
} // }
} // }
$journal_price += $c_price; // $journal_price += $c_price;
//获取cite提成 // //获取cite提成
$jcites = json_decode(myPost(self::JURL,['issn'=>$v['issn']])); // $jcites = json_decode(myPost(self::JURL,['issn'=>$v['issn']]));
$jcs = $jcites->data->cites; // $jcs = $jcites->data->cites;
$cite_price += count($jcs)*500; // $cite_price += count($jcs)*500;
} // }
echo '------------------------------------------------'; // echo '------------------------------------------------';
} // }
$re['staff_log_id'] = 0; // $re['staff_log_id'] = 0;
$re['baseprice'] = $baseprice; // $re['baseprice'] = $baseprice;
$re['journalprice'] = $journal_price; // $re['journalprice'] = $journal_price;
$re['citeprice'] = $cite_price; // $re['citeprice'] = $cite_price;
$re['add_price'] = 0; // $re['add_price'] = 0;
$re['sub_price'] = 0; // $re['sub_price'] = 0;
echo '<pre>'; // echo '<pre>';
var_dump($re); // var_dump($re);
echo '</pre>'; // echo '</pre>';
die; // die;
} // }

26
application/api/controller/User.php
View File

@@ -276,11 +276,11 @@ class User extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendEditor,'domail'); // Queue::push('app\api\job\domail@fire',$sendEditor,'domail');
// $tt = 'Dear editor,<br>'; $tt = 'Dear editor,<br>';
// $tt .= 'Please check the new reviewer application.'; $tt .= 'Please check the new reviewer application.';
// sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']); sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
//发送消息信息--编辑 //发送消息信息--编辑
add_usermsg($journal_info['editor_id'], '新增审稿人申请，申请人（' . $data['username'] . ')', '/reviewerApplyDetail?id=' . $res); add_usermsg($journal_info['editor_id'], '新增审稿人申请，申请人（' . $data['username'] . ')', '/reviewerApplyDetail?id=' . $res);
@@ -457,7 +457,7 @@ class User extends Controller {
$tt .= "Username:$account<br>"; $tt .= "Username:$account<br>";
$tt .= "Password:" . $data['password'] . '<br><br>'; $tt .= "Password:" . $data['password'] . '<br><br>';
$tt .= "Many thanks<br>TMR Publishing Group"; $tt .= "Many thanks<br>TMR Publishing Group";
// sendEmail($email, 'Dear ' . $data['name'], 'TMR', $tt); sendEmail($email, 'Dear ' . $data['name'], 'TMR', $tt);
$sendUser=[ $sendUser=[
'title'=>'Dear ' . $data['name'], // 邮件标题 'title'=>'Dear ' . $data['name'], // 邮件标题
'content'=>$tt,//邮件内容 'content'=>$tt,//邮件内容
@@ -468,7 +468,7 @@ class User extends Controller {
'sendPassword'=>Env::get('email.send_email_password'), // 期刊密码 'sendPassword'=>Env::get('email.send_email_password'), // 期刊密码
'from_name'=>'TMR' 'from_name'=>'TMR'
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
return json($inser_data); return json($inser_data);
} }
@@ -559,12 +559,12 @@ class User extends Controller {
'sendPassword'=>Env::get('email.send_email_password'), // 期刊密码 'sendPassword'=>Env::get('email.send_email_password'), // 期刊密码
'from_name'=>'TMR' 'from_name'=>'TMR'
]; ];
$isUserPushed = Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // $isUserPushed = Queue::push('app\api\job\domail@fire',$sendUser,'domail');
if ($isUserPushed) {//成功 // if ($isUserPushed) {//成功
return json(['code' => 0, 'msg' => 'success']); return json(['code' => 0, 'msg' => 'success']);
} else {//失败 // } else {//失败
return json(['code' => 1, 'msg' => 'fail']); // return json(['code' => 1, 'msg' => 'fail']);
} // }
} }
/** /**
@@ -933,8 +933,8 @@ class User extends Controller {
'sendPassword'=>$journal_info['epassword'], // 期刊密码 'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title'] 'from_name'=>$journal_info['title']
]; ];
Queue::push('app\api\job\domail@fire',$sendUser,'domail'); // Queue::push('app\api\job\domail@fire',$sendUser,'domail');
//sendEmail($apply_info['email'], $journal_info['title'], $journal_info['title'], $content, $journal_info['email'], $journal_info['epassword']); sendEmail($apply_info['email'], $journal_info['title'], $journal_info['title'], $content, $journal_info['email'], $journal_info['epassword']);
$update_res = $this->user_reviewer_obj->where($where)->update(['state' => 1]); $update_res = $this->user_reviewer_obj->where($where)->update(['state' => 1]);
if ($res && $add_res && $addinfo_res && $update_res) { if ($res && $add_res && $addinfo_res && $update_res) {
Db::commit(); Db::commit();

6
public/index.php
View File

@@ -17,7 +17,7 @@ define('APP_PATH', __DIR__ . '/../application/');
require __DIR__ . '/../thinkphp/start.php'; require __DIR__ . '/../thinkphp/start.php';
//跨越解决 //跨越解决
header("Access-Control-Allow-Origin:*"); // header("Access-Control-Allow-Origin:*");
header("Access-Control-Allow-Methods:GET, POST, OPTIONS, DELETE"); // header("Access-Control-Allow-Methods:GET, POST, OPTIONS, DELETE");
header("Access-Control-Allow-Headers:DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type, Accept-Language, Origin, Accept-Encoding"); // header("Access-Control-Allow-Headers:DNT,X-Mx-ReqToken,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type, Accept-Language, Origin, Accept-Encoding");