补全job文件

application/common/PlagiarismService.php

@@ -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,
+        ];
     }
 
     /**

application/common/TurnitinService.php

@@ -488,7 +488,7 @@ class TurnitinService
      * Crossref 通道常用 ADMINISTRATOR/USER，非 INSTRUCTOR。可在 .env 配置：
      *   turnitin.viewer_permission_set=ADMINISTRATOR
      *
-     * @param array $viewer 可选，覆盖默认 viewer 请求体字段
+     * @param array $viewer 可选：viewer_user_id、triggered_by（映射为 editor_{id}）、或完整请求体覆盖
      */
     public function getViewerUrl($submissionId, $viewer = [])
     {
@@ -497,6 +497,12 @@ class TurnitinService
             throw new Exception('submissionId required for viewer-url');
         }
 
+        $statusResp = $this->getSimilarityStatus($submissionId);
+        $st = strtoupper(trim((string) ($statusResp['status'] ?? '')));
+        if ($st !== '' && $st !== 'COMPLETE') {
+            throw new Exception('similarity report not ready for viewer-url, status=' . $st);
+        }
+
         $path = '/submissions/' . rawurlencode($submissionId) . '/viewer-url';
         $lastError = null;
 
@@ -521,8 +527,12 @@ class TurnitinService
      */
     private function buildViewerUrlBodies(array $viewerOverrides)
     {
-        if (!empty($viewerOverrides)) {
-            return [$viewerOverrides];
+        if (!empty($viewerOverrides) && isset($viewerOverrides['viewer_default_permission_set'])) {
+            $body = $viewerOverrides;
+            if (empty($body['viewer_user_id'])) {
+                $body['viewer_user_id'] = $this->resolveViewerUserId($viewerOverrides);
+            }
+            return [$body];
         }
 
         $locale = trim((string) Env::get('turnitin.viewer_locale', 'en-US')) ?: 'en-US';
@@ -530,27 +540,67 @@ class TurnitinService
         $permissionSets = $configured !== ''
             ? array_map('trim', explode(',', $configured))
             : $this->defaultViewerPermissionSets();
+        $viewerUserId = $this->resolveViewerUserId($viewerOverrides);
+        $saveChanges  = $this->envBool('turnitin.viewer_save_changes', false);
+        $simModes     = $this->defaultViewerSimilarityBlock();
 
         $bodies = [];
         foreach ($permissionSets as $perm) {
             if ($perm === '') {
                 continue;
             }
+            // TCA 认证要求：必须带 viewer_user_id（此前缺失会导致 400 Bad request）
             $bodies[] = [
-                'viewer_default_permission_set' => $perm,
+                'viewer_user_id'                => $viewerUserId,
                 'locale'                        => $locale,
-                'similarity' => $this->defaultViewerSimilarityBlock(),
+                'viewer_default_permission_set' => $perm,
+                'similarity'                    => [
+                    'view_settings' => ['save_changes' => $saveChanges],
+                ],
             ];
-            // 最简请求体（部分 Crossref 租户只接受 permission + locale）
             $bodies[] = [
-                'viewer_default_permission_set' => $perm,
+                'viewer_user_id'                => $viewerUserId,
                 'locale'                        => $locale,
+                'viewer_default_permission_set' => $perm,
+                'similarity'                    => array_merge($simModes, [
+                    'view_settings' => ['save_changes' => $saveChanges],
+                ]),
+            ];
+            $bodies[] = [
+                'viewer_user_id'                => $viewerUserId,
+                'locale'                        => $locale,
+                'viewer_default_permission_set' => $perm,
             ];
         }
 
         return $bodies;
     }
 
+    /**
+     * viewer-url 必填：与 createSubmission 的 owner/submitter 同一命名空间（editor_{user_id}）。
+     */
+    public function resolveViewerUserId(array $opts = [])
+    {
+        if (!empty($opts['viewer_user_id'])) {
+            return trim((string) $opts['viewer_user_id']);
+        }
+        // 打开报告的人（当前编辑）须与申请 viewer-url 时一致，否则易出现 session 认证失败
+        $editorId = isset($opts['editor_id']) ? intval($opts['editor_id']) : 0;
+        if ($editorId > 0) {
+            return 'editor_' . $editorId;
+        }
+        $triggeredBy = isset($opts['triggered_by']) ? intval($opts['triggered_by']) : 0;
+        if ($triggeredBy > 0) {
+            return 'editor_' . $triggeredBy;
+        }
+        $custom = trim((string) Env::get('turnitin.viewer_user_id', ''));
+        if ($custom !== '') {
+            return $custom;
+        }
+        $name = trim((string) $this->integrationName);
+        return ($name !== '' ? $name : 'tmr') . '_viewer';
+    }
+
     /**
      * Crossref Similarity Check 通常不用 INSTRUCTOR；按常见可用角色排序尝试。
      *