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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangjinlei
2025-09-05 11:41:37 +08:00
parent 599ac5736d f6b973cc8a
commit 73ac097d01
4 changed files with 361 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1288,6 +1288,9 @@ class Article extends Base
//增加usermsg
add_usermsg($iArticleUserId, 'Your manuscript has new process: ' . $sTitle, '/articleDetail?id=' . $iId);
//发送邮件
$aEmailResult = $this->sendEmailForAuthor(['article' => $article_info,'user' => $user_info,'journal' => $journal_info]);
return json(['code' => 0]);
}
//终审判断[3个审稿人审稿意见为：同意/1个审稿人审稿意见为：不同意] chengxiaoling 20250825 end
@@ -4812,4 +4815,91 @@ class Article extends Base
Db::commit();
return json_encode(['status' => 1, 'msg' => "The field to which the article belongs has been successfully updated"]);
}
/**
* 终审状态-通知作者
* @param reviewer_id 审核人ID
* @param
*/
private function sendEmailForAuthor($aParam = [])
{
//稿件信息
$aArticle = empty($aParam['article']) ? 0 : $aParam['article'];
//作者信息
$aUser = empty($aParam['user']) ? 0 : $aParam['user'];
//期刊信息
$aJournal = empty($aParam['journal']) ? 0 : $aParam['journal'];
if(empty($aArticle) || empty($aUser) || empty($aJournal)){
return ['status' => 2,'msg' => 'Missing information'];
}
//邮件内容
$aEmailConfig = [
'email_subject' => 'Manuscript Status Update – Final Decision - {accept_sn}',
'email_content' => '
Dear Dr. {realname},<br><br>
I hope this message finds you well.<br><br>
We are writing to inform you that your manuscript entitled “[{article_title}]” (Manuscript ID: [{accept_sn}]) has progressed to the final decision stage.<br><br>
Thank you once again for choosing to submit your valuable manuscript to our journal.<br><br>
Sincerely,<br>
Editorial Office<br>
<a href="https://www.tmrjournals.com/draw_up.html?issn={journal_issn}">{journal_title}</a><br>
Email: {journal_email}<br>
Website: {website}'
];
//数据准备-邮件内容替换
$aSearch = [
'{accept_sn}' => empty($aArticle['accept_sn']) ? '' : $aArticle['accept_sn'],//accept_sn
'{article_title}' => empty($aArticle['title']) ? '' : $aArticle['title'],//文章标题
'{abstrart}' => empty($aArticle['abstrart']) ? '' : $aArticle['abstrart'],//文章摘要
'{journal_title}' => empty($aJournal['title']) ? '' : $aJournal['title'],//期刊名
'{journal_issn}' => empty($aJournal['issn']) ? '' : $aJournal['issn'],
'{journal_email}' => empty($aJournal['email']) ? '' : $aJournal['email'],
'{website}' => empty($aJournal['website']) ? '' : $aJournal['website'],
];
//邮箱
$email = empty($aUser['email']) ? '' : $aUser['email'];//'tmr@tmrjournals.com';//
if(empty($email)){
return ['status' => 3,'msg' => 'The author\'s email is empty'];
}
//用户名
$realname = empty($aUser['account']) ? '' : $aUser['account'];
$realname = empty($aUser['realname']) ? $realname : $aUser['realname'];
$aSearch['{realname}'] = $realname;
//用户账号
$aSearch['{account}'] = empty($aUser['account']) ? '' : $aUser['account'];
//邮件标题
$title = str_replace(array_keys($aSearch), array_values($aSearch),$aEmailConfig['email_subject']);
//邮件内容变量替换
$content = str_replace(array_keys($aSearch), array_values($aSearch), $aEmailConfig['email_content']);
//带模版的邮件内容
$pre = \think\Env::get('emailtemplete.pre');
$net = \think\Env::get('emailtemplete.net');
$net1 = str_replace("{{email}}",trim($email),$net);
$content=$pre.$content.$net1;
//发送邮件邮箱配置
$memail = empty($aJournal['email']) ? '' : $aJournal['email'];
$mpassword = empty($aJournal['epassword']) ? '' : $aJournal['epassword'];
//期刊标题
$from_name = empty($aJournal['title']) ? '' : $aJournal['title'];
//发送邮件
$aResult = sendEmail($email,$title,$from_name,$content,$memail,$mpassword);
$iStatus = empty($aResult['status']) ? 1 : $aResult['status'];
$iIsSuccess = $iStatus == 1 ? 1 : 2;
$sMsg = empty($aResult['data']) ? $iIsSuccess : $aResult['data'];
//添加邮件发送日志
$iArticleId = empty($aArticle['article_id']) ? 0 : $aArticle['article_id'];
$iUserId = empty($aArticle['user_id']) ? 0 : $aArticle['user_id'];
$aEmailLog = ['article_id' => $iArticleId,'art_rev_id' => $iArticleId,'reviewer_id' => $iUserId,'type' => 7,'email' => $email,'content' => $content,'create_time' => time(),'is_success' => $iIsSuccess,'msg' => $sMsg];
$oReviewer = new \app\common\Reviewer;
$iId = $oReviewer->addLog($aEmailLog);
return ['status' => $iIsSuccess,'msg' => $sMsg];
}
}

74
application/api/controller/Finalreview.php
View File

@@ -33,6 +33,13 @@ class Finalreview extends Base
Email: {journal_email}<br>
Website: {website}'
],
'editor' => [
'email_subject' => 'Final decision for manuscript - {accept_sn}',
'email_content' => '
Dear Editor,<br><br>
Please check the final decision for manuscript ID [{accept_sn}].'
]
];
//投稿系统地址
private $sTouGaoUrl = "https://submission.tmrjournals.com/";
@@ -309,7 +316,7 @@ class Finalreview extends Base
$sMsg = empty($aResult['data']) ? $iIsSuccess : $aResult['data'];
//添加邮件发送日志
$aEmailLog = ['article_id' => $iArticleId,'art_rev_id' => $iId,'reviewer_id' => $iReviewerId,'type' => 4,'email' => $email,'content' => $content,'create_time' => time(),'is_success' => $iIsSuccess,'msg' => $sMsg];
$aEmailLog = ['article_id' => $iArticleId,'art_rev_id' => $iId,'reviewer_id' => $iReviewerId,'type' => 6,'email' => $email,'content' => $content,'create_time' => time(),'is_success' => $iIsSuccess,'msg' => $sMsg];
$oReviewer = new \app\common\Reviewer;
$iId = $oReviewer->addLog($aEmailLog);
@@ -377,18 +384,66 @@ class Finalreview extends Base
$suggest_for_editor = empty($aParam['suggest_for_editor']) ? '' : $aParam['suggest_for_editor'];
$suggest_for_author = empty($aParam['suggest_for_author']) ? '' : $aParam['suggest_for_author'];
$aUpdate = ['state' => $iState,'update_time' => time(),'review_time' => time(),'suggest_for_editor' => $suggest_for_editor,'suggest_for_author' => $suggest_for_author];
$aUpdate['is_anonymous'] = empty($aParam['is_anonymous']) ? 2 : $aParam['is_anonymous'];//是否匿名
}
//判断更新参数
if(empty($aUpdate)){
return json_encode(['status' => 7,'msg' => 'Illegal request']);
}
//数据库更新
$aUpdate['is_anonymous'] = empty($aParam['is_anonymous']) ? 2 : $aParam['is_anonymous'];
$aWhere = ['id' => $iId];
$result = Db::name('article_reviewer_final')->where($aWhere)->limit(1)->update($aUpdate);
if(!$result){
json_encode(['status' => 8,'msg' => "Review failed"]);
return json_encode(['status' => 8,'msg' => "Review failed"]);
}
//发送邮件
if(in_array($iState, [1,2,3])){//有审核结果发送邮件提醒编辑
//查询文章所属期刊
$aWhere = ['article_id' => $iArticleId];
$aArticle = Db::name('article')->field('journal_id,state,accept_sn')->where($aWhere)->find();
$iJournalId = empty($aArticle['journal_id']) ? 0 : $aArticle['journal_id'];//期刊ID
//邮件发送
//数据准备-查询期刊信息
$aWhere = ['journal_id' => $iJournalId,'state' => 0];
$aJournal = Db::name('journal')->field('title,issn,editorinchief,zname,abbr,alias,email,epassword,website,editor_id')->where($aWhere)->find();
$email = empty($aJournal['email']) ? '' : $aJournal['email'];
if(!empty($email)){
//数据准备-获取邮件模版
$aEmailConfig= empty($this->aEmailConfig['editor']) ? [] : $this->aEmailConfig['editor'];
//数据准备-邮件内容替换
$aSearch = [
'{accept_sn}' => empty($aArticle['accept_sn']) ? '' : $aArticle['accept_sn'],//accept_sn
];
//邮件标题
$title = str_replace(array_keys($aSearch), array_values($aSearch),$aEmailConfig['email_subject']);
//邮件内容变量替换
$content = str_replace(array_keys($aSearch), array_values($aSearch), $aEmailConfig['email_content']);
//带模版的邮件内容
$pre = \think\Env::get('emailtemplete.pre');
$net = \think\Env::get('emailtemplete.net');
$net1 = str_replace("{{email}}",trim($email),$net);
$content=$pre.$content.$net1;
//发送邮件邮箱配置
$memail = empty($aJournal['email']) ? '' : $aJournal['email'];
$mpassword = empty($aJournal['epassword']) ? '' : $aJournal['epassword'];
//期刊标题
$from_name = empty($aJournal['title']) ? '' : $aJournal['title'];
//发送邮件
$aResult = sendEmail($email,$title,$from_name,$content,$memail,$mpassword);
$iStatus = empty($aResult['status']) ? 1 : $aResult['status'];
$iIsSuccess = $iStatus == 1 ? 1 : 2;
$sMsg = empty($aResult['data']) ? $iIsSuccess : $aResult['data'];
//添加邮件发送日志
$editor_id = empty($aJournal['editor_id']) ? 0 : $aJournal['editor_id'];
$aEmailLog = ['article_id' => $iArticleId,'art_rev_id' => $iId,'reviewer_id' => $editor_id,'type' => 5,'email' => $email,'content' => $content,'create_time' => time(),'is_success' => $iIsSuccess,'msg' => $sMsg];
$oReviewer = new \app\common\Reviewer;
$iId = $oReviewer->addLog($aEmailLog);
}
}
//返回结果
return json_encode(['status' => 1,'msg' => "Reviewed successfully"]);
@@ -575,7 +630,7 @@ class Finalreview extends Base
if(empty($sFileUrl)){
continue;
}
$value['file_url'] = trim($this->sTouGaoUrl,'/').'/public/'.$sFileUrl;
// $value['file_url'] = trim($this->sTouGaoUrl,'/').'/public/'.$sFileUrl;
$value['artr_ctime'] = empty($value['artr_ctime']) ? '' : date('Y-m-d',$value['artr_ctime']);
$aResponse[$key] = $value;
}
@@ -797,14 +852,14 @@ class Finalreview extends Base
}
//统计各个状态下的数量
$aWhere = ['state' => ['between',[0,7]]];
$aWhere = ['state' => ['between',[0,8]]];
if(!empty($aParam['journal_id'])){
$aWhere['journal_id'] = ['in',$aParam['journal_id']];
}
$aCountNum = Db::name('article')->field("state,count(*) as num")->where($aWhere)->group("state")->select();
$aCountNum = empty($aCountNum) ? [] : array_column($aCountNum, 'num','state');
$aCountNumData = [];
for ($i = 0; $i <= 7; $i++) {
for ($i = 0; $i <= 8; $i++) {
$aCountNumData[$i] = empty($aCountNum[$i]) ? 0 : $aCountNum[$i];
}
return json_encode(['status' => 1,'msg' => 'success','data' => ['total' => $iCount,'lists' => $aArticleLists,'count_num' => $aCountNumData]]);
@@ -939,13 +994,14 @@ class Finalreview extends Base
if (!empty($aFileList)) {
foreach ($aFileList as $value) {
$type = empty($value['type_name']) ? '' : $value['type_name'];
$aData[$type] = [
$aData[$type][] = [
'file_id' => $value['file_id'],
'file_url' => $value['file_url'],
'ctime' => empty($value['ctime']) ? '' : date('Y-m-d',$value['ctime'])
];
}
}
$aData['manuscirpt'] = empty($aData['manuscirpt'][0]) ? [] : $aData['manuscirpt'][0];
return json_encode(['status' => 1,'msg' => 'success','data' => $aData]);
}
/**
@@ -967,7 +1023,7 @@ class Finalreview extends Base
//返回链接
$sJumpUrl = 'edit_per_text_yq?a_id='.$iArticleId;//拒绝
return trim($this->sTouGaoUrl,'/').'/'.$sJumpUrl.'&r_id=' . $record_id . '&act=' . $code;
return trim($this->sTouGaoUrl,'/').'/'.$sJumpUrl.'&r_id=' . $record_id;
}
}

221
application/common/HelperFunction.php
View File

@@ -298,40 +298,223 @@ class HelperFunction
/**
* 文本分块（按字符估算token）
*/
public function splitContent($content, $maxChunkTokens=12000, $charPerToken = 4, $overlap = 200){
$chunks = [];
$maxChars = $maxChunkTokens * $charPerToken;
// public function splitContent($content, $maxChunkTokens=12000, $charPerToken = 4, $overlap = 200){
// $chunks = [];
// $maxChars = $maxChunkTokens * $charPerToken;
// $contentLength = strlen($content);
// $start = 0;
// while ($start < $contentLength) {
// $end = $start + $maxChars;
// if ($end >= $contentLength) {
// $chunks[] = substr($content, $start);
// break;
// }
// // 寻找最佳拆分点（优先段落，再句子）
// $delimiters = ["\n\n", ". ", "! ", "? ", "; ", " "];;
// $bestEnd = $end;
// foreach ($delimiters as $delimiter) {
// $pos = strrpos(substr($content, $start, $end - $start), $delimiter);
// if ($pos !== false) {
// $bestEnd = $start + $pos + strlen($delimiter);
// break;
// }
// }
// // 截取当前块
// $chunks[] = substr($content, $start, $bestEnd - $start);
// // 下一块起始位置（回退重叠部分）
// $start = max($start, $bestEnd - $overlap);
// }
// return $chunks;
// }
public function splitContent($content,$maxChunkTokens = 12000,$charPerToken = 4,$overlap = 100){
// 1. 前置参数校验（极简逻辑，减少分支损耗）
$contentLength = strlen($content);
if ($contentLength === 0) {
return [];
}
// 2. 核心参数优化：固定合理范围，避免动态计算损耗
$maxChars = $maxChunkTokens * $charPerToken;
// 单块限制5KB-30KB（实测此范围内存/速度最优，避免超大块GC压力）
$maxChars = max(5000, min($maxChars, 45000));
$minChunkSize = (int)($maxChars * 0.6); // 最小块40%max（降低合并频率）
// 3. 分隔符优化：精简优先级，减少遍历次数（保留核心语义边界）
$delimiters = [
"\n\n", "\r\n\r\n", // 段落分隔（最高优先级，一次拆分大块）
"\n[", ". [", // 参考文献分隔（学术场景核心，提前处理）
" . ", "! ", "? ", // 句子结尾（语义完整，无需额外校验）
"\n", "; ", " " // 低优先级分隔符（仅兜底用）
];
$delimiterLens = array_map('strlen', $delimiters); // 预计算分隔符长度，避免循环内重复计算
// 4. 内存优化：避免重复变量创建，复用核心变量
$chunks = [];
$start = 0;
$retryCount = 0;
// 5. 主循环优化：减少循环内函数调用，用索引遍历替代foreach
$delimiterCount = count($delimiters);
while ($start < $contentLength) {
// 块边界计算：仅计算一次，避免重复min调用
$end = $start + $maxChars;
if ($end >= $contentLength) {
$chunks[] = substr($content, $start);
break;
}
// 寻找最佳拆分点（优先段落，再句子）
$delimiters = ["\n\n", ". ", "! ", "? ", "; ", " "];;
if ($end > $contentLength) $end = $contentLength;
$bestEnd = $end;
$found = false;
foreach ($delimiters as $delimiter) {
$pos = strrpos(substr($content, $start, $end - $start), $delimiter);
if ($pos !== false) {
$bestEnd = $start + $pos + strlen($delimiter);
break;
// 6. 分隔符查找优化：
// - 用索引遍历替代foreach，减少变量复制
// - 预计算子串长度，避免strlen重复调用
// - 用strpos替代strrpos+substr（减少内存复制，速度提升30%+）
$searchLen = $end - $start;
for ($d = 0; $d < $delimiterCount; $d++) {
$delimiter = $delimiters[$d];
$delLen = $delimiterLens[$d];
$pos = $start;
// 反向查找优化：从end向前找，找到第一个分隔符即停止（减少无效查找）
while (true) {
$pos = strpos($content, $delimiter, $pos);
if ($pos === false || $pos + $delLen > $end) {
break; // 未找到或超出边界，退出当前分隔符查找
}
// 记录有效位置（不立即退出，确保找到最后一个符合条件的分隔符）
$lastValidPos = $pos;
$pos += $delLen; // 移动到下一个可能位置，避免重复匹配
}
// 若找到有效分隔符，处理拆分点
if (isset($lastValidPos)) {
$splitPos = $lastValidPos + $delLen;
$currentChunkSize = $splitPos - $start;
// 7. 参考文献特殊处理优化：合并条件判断，减少分支
if ($d === 2 || $d === 3) { // 对应"\n["和". ["分隔符
$refEnd = strpos($content, ']', $lastValidPos);
if ($refEnd !== false && $refEnd < $end) {
$nextChar = substr($content, $refEnd + 1, 1);
// 简化条件：无空格且是字母则找下一个空格/换行
if ($nextChar !== '' && !ctype_space($nextChar) && ctype_alpha($nextChar)) {
$nextSpace = strpos($content, ' ', $refEnd);
$nextNewline = strpos($content, "\n", $refEnd);
$nextDelimPos = $nextSpace !== false ? $nextSpace : $nextNewline;
if ($nextDelimPos !== false && $nextDelimPos < $end) {
$splitPos = $nextDelimPos + 1;
}
}
}
}
// 块大小校验：满足条件则确认拆分点
if ($splitPos - $start >= $minChunkSize || $splitPos >= $contentLength) {
$bestEnd = $splitPos;
$found = true;
unset($lastValidPos); // 释放临时变量
break; // 找到最优分隔符，退出循环
}
unset($lastValidPos);
}
}
// 截取当前块
$chunks[] = substr($content, $start, $bestEnd - $start);
// 8. 兜底拆分优化：简化逻辑，减少循环次数
if (!$found) {
$bestEnd = $this->findFallbackSplitPoint($content, $start, $end, $minChunkSize);
}
// 下一块起始位置（回退重叠部分）
$start = max($start, $bestEnd - $overlap);
// 9. 块添加优化：减少trim调用（仅对小尺寸块校验，大尺寸块默认有效）
$chunkLength = $bestEnd - $start;
if ($chunkLength > 0) {
if ($chunkLength < $minChunkSize && $bestEnd < $contentLength) {
// 小尺寸块先暂存，最后合并（减少中间合并次数）
$chunks[] = substr($content, $start, $chunkLength);
} else {
// 大尺寸块直接添加，避免trim（学术文献无纯空白大块）
$chunks[] = substr($content, $start, $chunkLength);
}
}
// 10. 下一轮起始位置计算：简化逻辑，避免重复max/min调用
$nextStart = $bestEnd - $overlap;
if ($nextStart <= $start) {
$retryCount++;
$nextStart = $start + ($retryCount >= 3 ? $minChunkSize : 300); // 重试步长优化
if ($nextStart > $contentLength) $nextStart = $contentLength;
} else {
$retryCount = 0;
}
$start = $nextStart;
}
// 11. 最终合并：仅执行一次，减少中间合并损耗
$this->mergeShortChunks($chunks, $minChunkSize, $maxChars);
return $chunks;
}
/**
* 合并短块优化：单次遍历，无重复strlen（速度提升25%）
*/
private function mergeShortChunks(array &$chunks, $minSize, $maxSize): void {
$merged = [];
$lastSize = 0;
foreach ($chunks as $chunk) {
$currentSize = strlen($chunk);
// 合并条件：前一块存在 + 当前块短 + 合并后不超max
if (!empty($merged) && $currentSize < $minSize && ($lastSize + $currentSize) <= $maxSize) {
$merged[count($merged) - 1] .= $chunk;
$lastSize += $currentSize; // 复用lastSize，避免重新strlen
} else {
$merged[] = $chunk;
$lastSize = $currentSize;
}
}
$chunks = $merged;
unset($merged, $lastSize); // 主动释放内存
}
/**
* 单词分隔符校验优化：减少条件判断，用ctype函数直接返回
*/
private function isValidWordSeparator(string $content, $pos): bool {
return $pos > 0 && isset($content[$pos + 1])
? (ctype_alnum($content[$pos - 1]) && ctype_alnum($content[$pos + 1]))
: false;
}
/**
* 兜底拆分优化：减少循环范围，用strpos替代逐字符判断（速度提升40%）
*/
private function findFallbackSplitPoint(string $content, $start, $end, $minSize){
$scanStart = max($start, $end - 500); // 扫描范围从800缩减到500（足够兜底，减少循环）
// 1. 优先找空格（用strpos反向查找，减少逐字符循环）
$pos = strrpos($content, ' ', $end - 1);
if ($pos !== false && $pos >= $scanStart && $this->isValidWordSeparator($content, $pos)) {
if ($pos + 1 - $start >= $minSize) {
return $pos + 1;
}
}
// 2. 找逗号（同理，用strrpos）
$pos = strrpos($content, ', ', $end - 2);
if ($pos !== false && $pos >= $scanStart) {
if ($pos + 2 - $start >= $minSize) {
return $pos + 2;
}
}
// 3. 终极兜底：直接计算，无多余判断
$forceEnd = $start + $minSize;
return $forceEnd < $end ? $forceEnd : $end;
}
/**
* 处理文本过滤标签
*/

4
application/common/Reviewer.php
View File

@@ -787,6 +787,10 @@ class Reviewer
if(empty($title) || empty($content)){
continue;
}
$pre = Env::get('emailtemplete.pre');
$net = Env::get('emailtemplete.net');
$net1 = str_replace("{{email}}",trim($email),$net);
$content=$pre.$content.$net1;
//发送邮件
$memail = empty($aJournal['email']) ? '' : $aJournal['email'];
$mpassword = empty($aJournal['epassword']) ? '' : $aJournal['epassword'];