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

补全job文件

Browse Source
This commit is contained in:
wangjinlei
2026-05-26 17:30:49 +08:00
parent 92b8a16d5e
commit a776f068d7
8 changed files with 481 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
application/common/PlagiarismService.php
View File

@@ -373,24 +373,26 @@ class PlagiarismService
/**
* 按需获取/刷新 Turnitin 在线报告 URL（与 poll 解耦，避免 viewer-url 失败拖死查重完成）。
*
* @return array{url:string, expire:int, local_pdf:string}
* @param array $viewerContext editor_id=当前打开报告的编辑 user_id；viewer_user_id 可显式指定
* @return array{url:string, expire:int, local_pdf:string, viewer_user_id:string}
*/
public function refreshViewerUrlFor($checkId)
public function refreshViewerUrlFor($checkId, array $viewerContext = [])
{
$check = $this->mustGetCheck($checkId);
if (empty($check['tii_submission_id'])) {
throw new Exception('check has no tii_submission_id');
}
$tii = new TurnitinService();
$info = $this->refreshViewerUrl($tii, $check['tii_submission_id']);
$info = $this->refreshViewerUrl($tii, $check['tii_submission_id'], $check, $viewerContext);
$this->updateCheck($checkId, [
'view_only_url' => $info['url'],
'view_only_url_expire' => $info['expire'],
]);
return [
'url' => $info['url'],
'expire' => $info['expire'],
'local_pdf' => $check['pdf_local_path'],
'url' => $info['url'],
'expire' => $info['expire'],
'local_pdf' => $check['pdf_local_path'],
'viewer_user_id' => $info['viewer_user_id'],
];
}
@@ -399,9 +401,14 @@ class PlagiarismService
/**
* 调用 Turnitin POST viewer-url；仅由 refreshViewerUrlFor / getReportUrl 触发。
*/
private function refreshViewerUrl($tii, $submissionId)
private function refreshViewerUrl($tii, $submissionId, array $check = [], array $viewerContext = [])
{
$resp = $tii->getViewerUrl($submissionId);
$viewerOpts = $viewerContext;
if (!isset($viewerOpts['editor_id']) && !empty($check['triggered_by'])) {
$viewerOpts['triggered_by'] = intval($check['triggered_by']);
}
$viewerUserId = $tii->resolveViewerUserId($viewerOpts);
$resp = $tii->getViewerUrl($submissionId, $viewerOpts);
$url = '';
if (isset($resp['viewer_url'])) {
$url = (string) $resp['viewer_url'];
@@ -413,8 +420,22 @@ class PlagiarismService
if ($url === '') {
throw new Exception('viewer-url response has no url: ' . json_encode($resp, JSON_UNESCAPED_UNICODE));
}
// 默认 2 小时过期，保守起见
return ['url' => $url, 'expire' => time() + 7200];
$expire = time() + 7200;
foreach (['viewer_url_expires', 'expires_at', 'expiration_time', 'expire_time'] as $k) {
if (empty($resp[$k])) {
continue;
}
$ts = is_numeric($resp[$k]) ? intval($resp[$k]) : strtotime((string) $resp[$k]);
if ($ts > time()) {
$expire = $ts;
break;
}
}
return [
'url' => $url,
'expire' => $expire,
'viewer_user_id' => $viewerUserId,
];
}
/**