' + esc(scope) + ' 共 ' + all.n + ' 人 · 平均 ' + all.avg +
+ ' · 合格率 ' + all.passRate + '%（合格线：满分的 ' + passRate + '%，即 ' +
+ (Math.round(passRate / 100 * full * 10) / 10) + ' 分） · 打印时间：' + new Date().toLocaleString() + '
' +
+ html +
+ '
+
+ 选择一个问卷与班级查看考试整体情况
+
最后更新：—
@@ -60,7 +58,7 @@ if (!ny_is_auth()) {
缺考-
提交率-
平均分-
-
合格率(≥60%满分)-
+
合格率(≥60%满分)-
分组对比 / 考试成员
@@ -200,6 +198,9 @@ async function refreshClassSel(){
try {
const data = await api('dashboard', { projectId: pid });
DASH = data;
+ // 合格率阈值可配（全局或本卷独立），卡片标题实时反映
+ const bl = document.getElementById('bPassLabel');
+ if (bl) bl.textContent = '(≥' + (data.pass_rate == null ? 60 : data.pass_rate) + '%满分)';
const classes = (data.classes || []).map(c => c.class);
sel.innerHTML = classes.length
? classes.map(c => '
').join('')
@@ -285,8 +286,9 @@ function renderPlaceholderBoard(){
$('#boardSummary').innerHTML = cards.map(c =>
'
' + c[0] + '' + c[1] + '
').join('');
$('#boardBody').innerHTML = '
请选择问卷与班级查看考试整体情况
';
- $('#heroTitle').textContent = '班级看板';
- $('#heroSub').textContent = '选择一个问卷与班级查看考试整体情况';
+ // 注意：heroTitle 已随导航栏精简移除，只保留 heroSub（承载当前问卷/班级提示）
+ const _hs = document.getElementById('heroSub');
+ if (_hs) _hs.textContent = '选择一个问卷与班级查看考试整体情况';
const d = $('#liveDot'); if (d) { d.classList.remove('on','stale'); }
}
@@ -327,9 +329,8 @@ function renderBoard(){
return;
}
- // 顶部品牌区：动态标题
+ // 顶部提示：当前班级 / 问卷（heroTitle 已移除，只更新 heroSub）
const projectName = ($('#projectSel').selectedOptions[0] || {}).textContent || '';
- $('#heroTitle').textContent = cls + ' · 班级看板';
// 构建"学号 -> 多次刷题明细"映射（班级级 members 已含全班所有人的 attempts_list）
const MAP = {};
@@ -342,7 +343,8 @@ function renderBoard(){
const overall = DASH.overall || {};
const totalAttempts = (overall.attempts_total || 0);
- $('#heroSub').textContent = '问卷：' + projectName.replace(/\uff08\d+份\uff09$/, '') + ' · ' +
+ const _hs2 = document.getElementById('heroSub');
+ if (_hs2) _hs2.textContent = cls + ' · 问卷：' + projectName.replace(/\uff08\d+份\uff09$/, '') + ' · ' +
'总 ' + c.total + ' / 已交 ' + c.submitted + ' / 缺考 ' + c.absent +
(totalAttempts ? ' · 共 ' + totalAttempts + ' 次提交' : '');
@@ -354,7 +356,7 @@ function renderBoard(){
'
缺考' + c.absent + '
' +
'
提交率' + c.rate + '%
' +
'
平均分' + (c.avg != null ? c.avg : '-') + '
' +
- '
合格率' + c.pass_rate + '%
';
+ '
合格率(≥' + (DASH && DASH.pass_rate != null ? DASH.pass_rate : 60) + '%满分)' + c.pass_rate + '%
';
const groups = (c.groups || []).filter(g => g.group !== '（未分组）');
const box = $('#boardBody');
@@ -392,10 +394,21 @@ function toggleFullscreen(){
const el = document.documentElement;
if (!document.fullscreenElement && !document.webkitFullscreenElement) {
const req = el.requestFullscreen || el.webkitRequestFullscreen;
- if (req) req.call(el);
+ if (req) {
+ const p = req.call(el);
+ // 部分浏览器（尤其 Safari）会返回 Promise，被拒绝时静默吞掉会让人以为"点了没反应"
+ if (p && typeof p.catch === 'function') {
+ p.catch(() => { alert('当前浏览器/环境不允许进入全屏，请按 F11 手动切换'); });
+ }
+ }
} else {
- const ex = el.exitFullscreen || el.webkitExitFullscreen;
- if (ex) ex.call(document);
+ // 注意：exitFullscreen 挂在 document 上，不是 documentElement 上
+ // （写成 el.exitFullscreen 恒为 undefined → 退出全屏点了没反应）
+ const ex = document.exitFullscreen || document.webkitExitFullscreen;
+ if (ex) {
+ const p = ex.call(document);
+ if (p && typeof p.catch === 'function') p.catch(() => {});
+ }
}
}
function onFsChange(){
diff --git a/draw.php b/draw.php
index b500af8..d7645f7 100644
--- a/draw.php
+++ b/draw.php
@@ -26,11 +26,7 @@ $rosterCount = Roster::count();
-
NY
-
- 随机抽取
- 名单 / 已提交人员 → 卷王白名单
-
+
NY问卷考试系统数据平台
名单管理
diff --git a/index.php b/index.php
index 9759476..c861a4d 100644
--- a/index.php
+++ b/index.php
@@ -22,11 +22,7 @@ $rosterCount = Roster::count();
@@ -197,9 +195,14 @@ $rosterCount = Roster::count();
实际生效上限 200，超出会自动夹到 200（防止单页内存耗尽）
diff --git a/lib/DataService.php b/lib/DataService.php
index 787f5de..c7a60d4 100644
--- a/lib/DataService.php
+++ b/lib/DataService.php
@@ -79,11 +79,73 @@ class DataService
/**
* 组装结果
*/
+ /**
+ * 读取某份试卷的独立配置（满分 / 合格率 / 免考名单）。
+ * 优先 SQLite（ny_project_config 表）；不可用时退回 config.json 里的 project_config 字段，
+ * 保证没有 pdo_sqlite 的环境也能用（只是隔离粒度仍在，只是落到文件）。
+ *
+ * @return array{full_score:?int,pass_rate:?float,exempt:array}
+ */
+ public static function projectConfig(string $projectId): array
+ {
+ $def = ['full_score' => null, 'pass_rate' => null, 'exempt' => []];
+ if ($projectId === '') {
+ return $def;
+ }
+ if (class_exists('Db') && Db::pdo() !== null) {
+ return Db::projectConfigGet($projectId);
+ }
+ // 文件回退
+ $all = [];
+ $saved = ny_read_json(NY_DATA . '/project_config.json', null);
+ if (is_array($saved)) {
+ $all = $saved;
+ }
+ $one = $all[$projectId] ?? null;
+ return is_array($one) ? array_merge($def, $one) : $def;
+ }
+
+ /** 写入某份试卷的独立配置 */
+ public static function projectConfigSave(string $projectId, array $cfg): void
+ {
+ if ($projectId === '') {
+ return;
+ }
+ if (class_exists('Db') && Db::pdo() !== null) {
+ Db::projectConfigSet($projectId, $cfg);
+ return;
+ }
+ $all = [];
+ $saved = ny_read_json(NY_DATA . '/project_config.json', null);
+ if (is_array($saved)) {
+ $all = $saved;
+ }
+ $all[$projectId] = $cfg;
+ ny_write_json(NY_DATA . '/project_config.json', $all);
+ }
+
public static function build(array $cfg, string $projectId, string $nameQid = ''): array
{
$client = new SurveyKingClient($cfg);
+ // 每卷独立配置（满分 / 合格率 / 免考名单）：试卷之间互相隔离
+ $pCfg = self::projectConfig($projectId);
+ $exempt = [];
+ foreach ((array)($pCfg['exempt'] ?? []) as $sid) {
+ $sid = trim((string)$sid);
+ if ($sid !== '') {
+ $exempt[$sid] = true;
+ }
+ }
+
$students = Roster::all();
+ // 免考：从名单中剔除，使其既不计入「总人数」也不计入「缺考」
+ if ($exempt !== []) {
+ $students = array_values(array_filter(
+ $students,
+ static fn(array $s): bool => !isset($exempt[trim((string)($s['sid'] ?? ''))])
+ ));
+ }
// 姓名 -> 学号 / 班级（规范化）
$studentInfo = [];
foreach ($students as $s) {
@@ -313,6 +375,12 @@ class DataService
'anomalies' => $anomalies,
'roster' => $students,
'roster_count' => count($students),
+ // 本卷独立配置（前端据此回显满分/合格率/免考）；full_score 已按本卷解析
+ 'project_cfg' => [
+ 'full_score' => $pCfg['full_score'] ?? null,
+ 'pass_rate' => $pCfg['pass_rate'] ?? null,
+ 'exempt' => array_values(array_map('strval', array_keys($exempt))),
+ ],
'updated_at' => date('Y-m-d H:i:s'),
];
}
diff --git a/lib/Db.php b/lib/Db.php
index abb4f1f..d8e4fb9 100644
--- a/lib/Db.php
+++ b/lib/Db.php
@@ -1,83 +1,411 @@
'sqlite', 'file' => self::dbFile()];
+ }
+
+ public static function saveParams(array $p): bool
+ {
+ return true; // SQLite 无需外部配置
+ }
+
+ /** 建立/复用连接；失败返回 null 而不抛异常（上层要能优雅降级） */
+ public static function connect(array $p = []): PDO
+ {
+ if (self::$pdo instanceof PDO) {
+ return self::$pdo;
+ }
+ if (!self::isConfigured()) {
+ self::$err = 'PHP 未启用 pdo_sqlite 扩展，已回退到文件存储';
+ throw new RuntimeException(self::$err);
+ }
+ $file = self::dbFile();
+ $dir = dirname($file);
+ if (!is_dir($dir)) {
+ @mkdir($dir, 0777, true);
+ }
+ try {
+ $pdo = new PDO('sqlite:' . $file, null, null, [
+ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+ PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+ PDO::ATTR_EMULATE_PREPARES => false,
+ ]);
+ // WAL + 合理超时，避免多人同时刷新时 "database is locked"
+ $pdo->exec('PRAGMA journal_mode=WAL');
+ $pdo->exec('PRAGMA synchronous=NORMAL');
+ $pdo->exec('PRAGMA busy_timeout=5000');
+ $pdo->exec('PRAGMA foreign_keys=ON');
+ self::$pdo = $pdo;
+ self::$err = '';
+ self::migrate();
+ return $pdo;
+ } catch (Throwable $e) {
+ self::$pdo = null;
+ self::$err = $e->getMessage();
+ throw new RuntimeException('SQLite 连接失败：' . $e->getMessage());
+ }
+ }
+
+ /** 获取连接（不可用返回 null） */
+ public static function pdo(): ?PDO
+ {
+ if (self::$pdo instanceof PDO) {
+ return self::$pdo;
+ }
+ if (self::$initTried) {
+ return null; // 已经试过且失败，不再反复重试（每次请求最多试一次）
+ }
+ self::$initTried = true;
+ try {
+ return self::connect();
+ } catch (Throwable $e) {
+ return null;
+ }
+ }
+
+ /** 建表 + 索引（幂等，可重复调用） */
+ public static function migrate(): int
+ {
+ $pdo = self::$pdo;
+ if (!$pdo) {
+ return 0;
+ }
+ $p = self::prefix();
+ $pdo->exec("CREATE TABLE IF NOT EXISTS {$p}settings (
+ k TEXT PRIMARY KEY,
+ v TEXT NOT NULL DEFAULT '',
+ updated_at INTEGER NOT NULL DEFAULT 0
+ )");
+ $pdo->exec("CREATE TABLE IF NOT EXISTS {$p}roster (
+ sid TEXT PRIMARY KEY,
+ name TEXT NOT NULL DEFAULT '',
+ cls TEXT NOT NULL DEFAULT '',
+ grp TEXT NOT NULL DEFAULT '',
+ login TEXT NOT NULL DEFAULT '',
+ sort INTEGER NOT NULL DEFAULT 0,
+ updated_at INTEGER NOT NULL DEFAULT 0
+ )");
+ $pdo->exec("CREATE TABLE IF NOT EXISTS {$p}project_config (
+ project_id TEXT PRIMARY KEY,
+ config_json TEXT NOT NULL DEFAULT '{}',
+ updated_at INTEGER NOT NULL DEFAULT 0
+ )");
+ $pdo->exec("CREATE INDEX IF NOT EXISTS idx_{$p}roster_cls ON {$p}roster(cls)");
+ self::ensureRosterLogin();
+ return 3;
+ }
+
+ /** 旧库缺少 login 列时补上（幂等） */
+ public static function ensureRosterLogin(): void
+ {
+ $pdo = self::$pdo;
+ if (!$pdo) {
+ return;
+ }
+ $p = self::prefix();
+ try {
+ $cols = $pdo->query("PRAGMA table_info({$p}roster)")->fetchAll(PDO::FETCH_ASSOC);
+ $has = false;
+ foreach ($cols as $c) {
+ if (($c['name'] ?? '') === 'login') {
+ $has = true;
+ break;
+ }
+ }
+ if (!$has) {
+ $pdo->exec("ALTER TABLE {$p}roster ADD COLUMN login TEXT NOT NULL DEFAULT ''");
+ }
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ }
+ }
+
+ // ---------------- 设置 ----------------
public static function settingsAll(): array
{
- return [];
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return [];
+ }
+ try {
+ $p = self::prefix();
+ $st = $pdo->query("SELECT k, v FROM {$p}settings");
+ $out = [];
+ foreach ($st->fetchAll(PDO::FETCH_ASSOC) as $r) {
+ $out[(string)$r['k']] = (string)$r['v'];
+ }
+ return $out;
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ return [];
+ }
}
- public static function settingsSet(string $k, string $v): void {}
+ /** SQLite 用 ON CONFLICT 做 upsert（其它方言见历史版本） */
+ public static function settingsSet(string $k, string $v): void
+ {
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return;
+ }
+ try {
+ $p = self::prefix();
+ $st = $pdo->prepare(
+ "INSERT INTO {$p}settings (k, v, updated_at) VALUES (?, ?, ?)
+ ON CONFLICT(k) DO UPDATE SET v=excluded.v, updated_at=excluded.updated_at"
+ );
+ $st->execute([$k, $v, time()]);
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ }
+ }
+
+ public static function settingsGet(string $k, string $def = ''): string
+ {
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return $def;
+ }
+ try {
+ $p = self::prefix();
+ $st = $pdo->prepare("SELECT v FROM {$p}settings WHERE k = ?");
+ $st->execute([$k]);
+ $v = $st->fetchColumn();
+ return $v === false ? $def : (string)$v;
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ return $def;
+ }
+ }
+
+ // ---------------- 名单 ----------------
public static function rosterAll(): array
{
- return [];
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return [];
+ }
+ try {
+ $p = self::prefix();
+ $st = $pdo->query("SELECT sid, name, cls, grp, login FROM {$p}roster ORDER BY sort ASC, sid ASC");
+ $out = [];
+ foreach ($st->fetchAll(PDO::FETCH_ASSOC) as $r) {
+ $out[] = [
+ 'sid' => (string)($r['sid'] ?? ''),
+ 'name' => (string)($r['name'] ?? ''),
+ 'cls' => (string)($r['cls'] ?? ''),
+ 'grp' => (string)($r['grp'] ?? ''),
+ 'login' => (string)($r['login'] ?? ''),
+ ];
+ }
+ return $out;
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ return [];
+ }
}
- public static function rosterReplace(array $students): void {}
+ /** 全量替换名单（roster_save 语义） */
+ public static function rosterReplace(array $students): void
+ {
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return;
+ }
+ try {
+ $p = self::prefix();
+ $pdo->beginTransaction();
+ $pdo->exec("DELETE FROM {$p}roster");
+ $st = $pdo->prepare(
+ "INSERT INTO {$p}roster (sid, name, cls, grp, login, sort, updated_at)
+ VALUES (?, ?, ?, ?, ?, ?, ?)"
+ );
+ $i = 0;
+ foreach ($students as $s) {
+ if (!is_array($s)) {
+ continue;
+ }
+ $st->execute([
+ (string)($s['sid'] ?? ''),
+ (string)($s['name'] ?? ''),
+ (string)($s['cls'] ?? ''),
+ (string)($s['grp'] ?? ''),
+ (string)($s['login'] ?? ''),
+ $i++,
+ time(),
+ ]);
+ }
+ $pdo->commit();
+ } catch (Throwable $e) {
+ if ($pdo->inTransaction()) {
+ $pdo->rollBack();
+ }
+ self::$err = $e->getMessage();
+ }
+ }
public static function rosterCount(): int
{
- return 0;
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return 0;
+ }
+ try {
+ $p = self::prefix();
+ return (int)$pdo->query("SELECT COUNT(*) FROM {$p}roster")->fetchColumn();
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ return 0;
+ }
+ }
+
+ // ---------------- 每卷独立配置（满分 / 合格率 / 免考名单） ----------------
+
+ /** @return array 全部试卷配置 [project_id => cfg] */
+ public static function projectConfigAll(): array
+ {
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return [];
+ }
+ try {
+ $p = self::prefix();
+ $st = $pdo->query("SELECT project_id, config_json FROM {$p}project_config");
+ $out = [];
+ foreach ($st->fetchAll(PDO::FETCH_ASSOC) as $r) {
+ $j = json_decode((string)($r['config_json'] ?? '{}'), true);
+ if (is_array($j)) {
+ $out[(string)$r['project_id']] = $j;
+ }
+ }
+ return $out;
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ return [];
+ }
+ }
+
+ /** @return array 单卷配置（缺省返回空结构） */
+ public static function projectConfigGet(string $projectId): array
+ {
+ $def = ['full_score' => null, 'pass_rate' => null, 'exempt' => []];
+ if ($projectId === '') {
+ return $def;
+ }
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return $def;
+ }
+ try {
+ $p = self::prefix();
+ $st = $pdo->prepare("SELECT config_json FROM {$p}project_config WHERE project_id = ?");
+ $st->execute([$projectId]);
+ $v = $st->fetchColumn();
+ if ($v === false) {
+ return $def;
+ }
+ $j = json_decode((string)$v, true);
+ return is_array($j) ? array_merge($def, $j) : $def;
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ return $def;
+ }
+ }
+
+ /** 写入单卷配置（整份覆盖；null 表示"用全局默认"） */
+ public static function projectConfigSet(string $projectId, array $cfg): void
+ {
+ if ($projectId === '') {
+ return;
+ }
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return;
+ }
+ try {
+ $p = self::prefix();
+ $st = $pdo->prepare(
+ "INSERT INTO {$p}project_config (project_id, config_json, updated_at) VALUES (?, ?, ?)
+ ON CONFLICT(project_id) DO UPDATE SET config_json=excluded.config_json, updated_at=excluded.updated_at"
+ );
+ $st->execute([$projectId, json_encode($cfg, JSON_UNESCAPED_UNICODE), time()]);
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ }
+ }
+
+ public static function projectConfigDelete(string $projectId): void
+ {
+ $pdo = self::pdo();
+ if (!$pdo) {
+ return;
+ }
+ try {
+ $p = self::prefix();
+ $st = $pdo->prepare("DELETE FROM {$p}project_config WHERE project_id = ?");
+ $st->execute([$projectId]);
+ } catch (Throwable $e) {
+ self::$err = $e->getMessage();
+ }
}
}
diff --git a/lib/Roster.php b/lib/Roster.php
index 165a192..dcf9677 100644
--- a/lib/Roster.php
+++ b/lib/Roster.php
@@ -19,10 +19,49 @@ class Roster
return class_exists('Db') && Db::pdo() !== null;
}
+ /**
+ * 首次启用 SQLite 时，把已有的 data/roster.json 迁进数据库（老数据不丢）。
+ * 只在「DB 名单为空 且 文件有数据」时执行一次，之后由 DB 全权负责。
+ */
+ private static function migrateFileToDbOnce(): void
+ {
+ if (!self::useDb()) {
+ return;
+ }
+ try {
+ if (Db::rosterCount() > 0) {
+ return; // DB 已有数据，不覆盖
+ }
+ $d = ny_read_json(self::file(), null);
+ if (!is_array($d) || empty($d['students']) || !is_array($d['students'])) {
+ return;
+ }
+ $clean = [];
+ foreach ($d['students'] as $s) {
+ if (!is_array($s)) {
+ continue;
+ }
+ $clean[] = [
+ 'sid' => trim((string)($s['sid'] ?? '')),
+ 'name' => trim((string)($s['name'] ?? '')),
+ 'cls' => trim((string)($s['cls'] ?? '')),
+ 'grp' => trim((string)($s['grp'] ?? '')),
+ 'login' => trim((string)($s['login'] ?? '')),
+ ];
+ }
+ if ($clean !== []) {
+ Db::rosterReplace($clean);
+ }
+ } catch (Throwable $e) {
+ // 迁移失败不影响主流程：仍可退回文件读取
+ }
+ }
+
/** @return array */
public static function all(): array
{
if (self::useDb()) {
+ self::migrateFileToDbOnce();
return Db::rosterAll();
}
$d = ny_read_json(self::file(), null);
@@ -105,7 +144,10 @@ class Roster
public static function fingerprint(): string
{
if (self::useDb()) {
- return 'db:' . self::count();
+ // 人数 + 内容哈希：名单内容变了指纹才变（只靠人数会在"换人"时误命中缓存）
+ $n = self::count();
+ $hash = md5(json_encode(self::all(), JSON_UNESCAPED_UNICODE));
+ return 'db:' . $n . ':' . $hash;
}
$f = self::file();
$mt = is_file($f) ? (string)filemtime($f) : '0';
diff --git a/tools/test-config-save.js b/tools/test-config-save.js
index 70afd36..c06764d 100644
--- a/tools/test-config-save.js
+++ b/tools/test-config-save.js
@@ -20,6 +20,17 @@ const hasToken = fs.existsSync(tokenFile);
const tokenSnap = hasToken ? fs.readFileSync(tokenFile, 'utf8') : null;
if (hasToken) fs.renameSync(tokenFile, tokenBak);
+// SQLite 优先：若不先移走 data/ny.db，里面的旧配置会盖掉本测试写入的 config.json，
+// 导致登录用的是上一次遗留的账号密码（表现为"登录成功但 auth_check=false"）。
+// 同时清掉登录限流记录，避免上一轮失败把本轮锁住。
+const dbFile = path.join(ROOT, 'data', 'ny.db');
+const dbBak = dbFile + '.bak';
+const hasDb = fs.existsSync(dbFile);
+if (hasDb) { try { fs.renameSync(dbFile, dbBak); } catch (e) {} }
+
+const throttleFile = path.join(ROOT, 'data', 'login_fail.json');
+if (fs.existsSync(throttleFile)) { try { fs.unlinkSync(throttleFile); } catch (e) {} }
+
fs.writeFileSync(cfgFile, JSON.stringify({
base_url: 'http://127.0.0.1:19911',
api_prefix: '/api',
@@ -51,6 +62,14 @@ function cleanup() {
try {
if (hasToken && fs.existsSync(tokenBak)) fs.renameSync(tokenBak, tokenFile);
} catch(e) { console.error('cleanup token failed:', e.message); }
+ // 恢复 SQLite（本轮测试新建的 ny.db 丢弃，换回原有的）
+ try {
+ if (fs.existsSync(dbFile)) fs.unlinkSync(dbFile);
+ if (hasDb && fs.existsSync(dbBak)) fs.renameSync(dbBak, dbFile);
+ } catch(e) { console.error('cleanup db failed:', e.message); }
+ try {
+ if (fs.existsSync(throttleFile)) fs.unlinkSync(throttleFile);
+ } catch(e) {}
}
process.on('exit', cleanup);
process.on('SIGINT', () => { cleanup(); process.exit(1); });
@@ -235,35 +254,44 @@ async function login() {
const after = fs.existsSync(tokenFile) ? fs.readFileSync(tokenFile, 'utf8') : '';
chk('token 保持未变', before === after, 'changed=' + (before !== after));
- console.log('\n--- 4) 各试卷独立满分：仅当 apply_pid 显式指定时写 ---');
- // 不传 apply_pid，也不传 full_scores → full_scores 应保留原值（保持空映射）
- const cs2 = await req('POST', '/api.php?action=config_save', {
- full_score: 90,
+ console.log('\n--- 4) 试卷独立配置（满分/合格率/免考）已从设置移出，改走 project_config ---');
+ // 每卷满分已不在 config_save 里；改为 project_config_save（试卷间隔离）
+ const pc1 = await req('POST', '/api.php?action=project_config_save&projectId=p1', {
+ full_score: 150, pass_rate: 70, exempt: 'S1,S2',
});
- const _cs2fs = cs2.body && cs2.body.data && cs2.body.data.config
- ? cs2.body.data.config.full_scores : undefined;
- chk('未传 apply_pid → full_scores 保持空映射（不被覆盖为非空）',
- _cs2fs === undefined || Object.keys(_cs2fs).length === 0,
- JSON.stringify(_cs2fs));
- // 显式 apply_pid='p1', apply_score=85 → 写入
- const cs3 = await req('POST', '/api.php?action=config_save', {
- full_score: 90,
- apply_pid: 'p1',
- apply_score: 85,
+ chk('project_config_save 200', pc1.status === 200, 'status=' + pc1.status + ' ' + JSON.stringify(pc1.body));
+ chk('生效满分=150', pc1.body && pc1.body.data && pc1.body.data.effective
+ && pc1.body.data.effective.full_score === 150,
+ JSON.stringify(pc1.body && pc1.body.data && pc1.body.data.effective));
+ chk('生效合格率=70', pc1.body && pc1.body.data && pc1.body.data.effective
+ && Number(pc1.body.data.effective.pass_rate) === 70,
+ JSON.stringify(pc1.body && pc1.body.data && pc1.body.data.effective));
+
+ // 隔离性：p2 未配置 → 跟随全局（注：上面的 config_save 已把全局满分改成 95，
+ // 所以这里不能写死 100，必须与响应里的 global 比对）
+ const pc2 = await req('GET', '/api.php?action=project_config&projectId=p2');
+ const gFs = pc2.body && pc2.body.data && pc2.body.data.global ? pc2.body.data.global.full_score : null;
+ const gPr = pc2.body && pc2.body.data && pc2.body.data.global ? pc2.body.data.global.pass_rate : null;
+ chk('p2 隔离：满分跟随全局（=' + gFs + '）', pc2.body && pc2.body.data && pc2.body.data.effective
+ && pc2.body.data.effective.full_score === gFs,
+ JSON.stringify(pc2.body && pc2.body.data && pc2.body.data.effective) + ' global=' + gFs);
+ chk('p2 隔离：合格率跟随全局（=' + gPr + '）', pc2.body && pc2.body.data && pc2.body.data.effective
+ && Number(pc2.body.data.effective.pass_rate) === Number(gPr),
+ JSON.stringify(pc2.body && pc2.body.data && pc2.body.data.effective) + ' global=' + gPr);
+
+ // 免考名单往返
+ const pc3 = await req('GET', '/api.php?action=project_config&projectId=p1');
+ const ex = pc3.body && pc3.body.data && pc3.body.data.cfg && pc3.body.data.cfg.exempt;
+ chk('免考名单往返 = [S1,S2]', Array.isArray(ex) && ex.length === 2 && ex[0] === 'S1' && ex[1] === 'S2',
+ JSON.stringify(ex));
+
+ // 清除本卷设置 → 回到全局
+ const pc4 = await req('POST', '/api.php?action=project_config_save&projectId=p1', {
+ full_score: '', pass_rate: '', exempt: '',
});
- chk('apply_pid=85 → full_scores.p1=85', cs3.body && cs3.body.data && cs3.body.data.config
- && cs3.body.data.config.full_scores && cs3.body.data.config.full_scores.p1 === 85,
- JSON.stringify(cs3.body.data && cs3.body.data.config && cs3.body.data.config.full_scores));
- // apply_pid='p1', apply_score=0 → 清除
- const cs4 = await req('POST', '/api.php?action=config_save', {
- full_score: 90,
- apply_pid: 'p1',
- apply_score: 0,
- });
- chk('apply_pid=0 → 清除 p1',
- cs4.body && cs4.body.data && cs4.body.data.config
- && (!cs4.body.data.config.full_scores || cs4.body.data.config.full_scores.p1 === undefined),
- JSON.stringify(cs4.body.data && cs4.body.data.config && cs4.body.data.config.full_scores));
+ chk('清除后 p1 回到全局满分（=' + gFs + '）', pc4.body && pc4.body.data && pc4.body.data.effective
+ && pc4.body.data.effective.full_score === gFs,
+ JSON.stringify(pc4.body && pc4.body.data && pc4.body.data.effective) + ' global=' + gFs);
console.log('\n--- 5) 修改连接信息：应清 token + 重新登录（ping）---');
const tokBefore = fs.existsSync(tokenFile) ? fs.readFileSync(tokenFile, 'utf8') : '';