diff --git a/deploy/docker-compose.sqlite.yml b/deploy/docker-compose.sqlite.yml index 70c7619..88391c1 100644 --- a/deploy/docker-compose.sqlite.yml +++ b/deploy/docker-compose.sqlite.yml @@ -23,7 +23,7 @@ services: context: .. dockerfile: deploy/Dockerfile target: runtime - image: classhelper-server:${APP_VERSION:-1.4.4} + image: classhelper-server:${APP_VERSION:-1.4.5} restart: unless-stopped environment: NODE_ENV: production diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index ae0c628..382fab7 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -60,7 +60,7 @@ services: context: .. dockerfile: deploy/Dockerfile target: runtime - image: classhelper-server:${APP_VERSION:-1.4.4} + image: classhelper-server:${APP_VERSION:-1.4.5} restart: unless-stopped environment: NODE_ENV: production diff --git a/deploy/package.runtime.json b/deploy/package.runtime.json index ab86c69..eec596c 100644 --- a/deploy/package.runtime.json +++ b/deploy/package.runtime.json @@ -1,6 +1,6 @@ { "name": "classhelper-server-runtime", - "version": "1.4.4", + "version": "1.4.5", "private": true, "type": "module", "description": "ClassHelper 服务端运行时(安装包 / 容器内置)", diff --git a/docs/app/appearance.md b/docs/app/appearance.md index 6af036f..2f42e57 100644 --- a/docs/app/appearance.md +++ b/docs/app/appearance.md @@ -96,6 +96,6 @@ beUI 的组件本身是 React,用不到这里,但它的动效语言与框架 | 灵动岛 | 尺寸、字号、主题色、视觉风格、停靠、边距、空闲细缝(详见[灵动岛](island.md)) | | 提醒 | 本机课程等提醒开关与行为 | | 账号 | 当前班级信息、退出登录 | -| 关于 | 版本 / Electron / Chromium / Node、诊断信息、检查更新、鸣谢 | +| 关于 | 版本 / Electron / Chromium / Node、诊断信息、云端下发更新的进度、鸣谢 | `/settings` 会自动跳到「通用」。设置页的改动会**立刻生效并写进本机配置**,重启后仍保留。 diff --git a/docs/app/imports.md b/docs/app/imports.md index 7152b3e..ec5eb48 100644 --- a/docs/app/imports.md +++ b/docs/app/imports.md @@ -16,7 +16,7 @@ description: 表格预览、名单与成绩校验,以及完整离线档案导 - 学生成绩按学号匹配,姓名兜底要求同班唯一;转出学生不参与匹配,重复记录和写入模式由服务校验。 - 学生模板使用学号、姓名、班级、性别、家长电话,无密码;学号 1–32 位字母/数字/._-,在 Student 表查重。 -- 教师模板使用工号、姓名、手机号、初始密码、角色;学生/教师名单导入仍要求管理员和导入权限。 +- 教师模板使用工号、姓名、手机号、角色;每个新建教师分别生成随机初始密码,导入结果提供一次性查看和 CSV 下载,关闭前请保存分发。重复导入已有教师不修改密码,旧表格中的密码列不再用于设置密码。任课关系导入中新建的教师采用相同规则;学生/教师名单导入仍要求管理员和导入权限。 - 成绩表格导入当前先要求管理员或本班班主任,再校验每行科目任课关系;科任老师的单条/批量成绩写入权限不代表能走表格导入。 - 任课关系导入用于既有班级、科目和教师的对应关系,不把档案中的 TeacherName 当账号授权。 diff --git a/docs/app/island.md b/docs/app/island.md index 67ac4f5..e5eac1d 100644 --- a/docs/app/island.md +++ b/docs/app/island.md @@ -37,7 +37,7 @@ description: 经典提醒、自定义常驻方案、课程与课件传输。 “设置 → 灵动岛 → 自定义 → 编辑岛内组件”进入主窗口设置页。 页面上方排列当前组件,右上角选择配置方案;刷新图标重置当前方案,加号新建方案,文件夹菜单提供方案设置、复制、删除及 JSON 导入导出。 -下方组件库常驻显示文本、分割线、课程表、日期、时钟、天气简报、倒计时和组合容器,并保留班级通知、作业和叫人组件。 +下方组件库常驻显示文本、分割线、课程表、日期、时钟、天气简报、倒计时和组合容器。通知、作业和叫人通过岛内铃铛及共用消息面板展示,组件库不再提供这些消息选项;已有方案中的消息节点仍兼容。 从组件库拖入上方的行或容器以添加,拖动已有组件调整顺序或跨行移动;也可点击组件库添加到选中的容器或当前行。 分别编辑常态 rows 与无消息展开 expandedRows,点选组件打开内容、外观、尺寸与隐藏条件设置;行可以新增、排序、设为主要行或删除。 “进入编辑模式”切换为实际内容预览,支持预览缩放;退出后回到组件标签排列。轮播和滚动容器在编辑时展示全部子组件,便于选择和排列。 @@ -50,7 +50,7 @@ description: 经典提醒、自定义常驻方案、课程与课件传输。 ## 外观、位置与输入 经典模式可调宽高、字号、主题色、黑色/半透明/渐变、停靠与边距;自定义内容根据实际测量适配工作区。 -自定义方案可配置缩放、圆角、颜色和行间距,默认值与范围在 shared/island-layout.ts。 +自定义方案可配置缩放、圆角、颜色和行间距,默认值与范围在 shared/island-layout.ts。外观页的圆角滑块同步修改当前自定义方案的常态圆角,与编辑器设置一致。 左右边距只在左/右停靠时生效,居中锚点仍在屏幕中线。 触摸屏自动进入触摸模式,保留触摸命中和失焦宽限;鼠标模式按光标控制输入穿透。 自定义常驻内容支持鼠标避让淡化及反转,交互入口、展开/编辑和触摸操作按实现暂停避让。 @@ -65,9 +65,9 @@ description: 经典提醒、自定义常驻方案、课程与课件传输。 自定义常驻岛的「课程表」组件可选「当前时间点 / 下一节课 / 今日时间点」: 「今日时间点」显示当天全部时间点,只有当前项展开显示起止时间,其余折叠只显示课程名; 课间休息与「默认隐藏」的上课时间点折叠时完全隐藏,轮到它们时才展开;分割线显示一条竖线,行动不显示。 -课中课程表不再常驻显示倒计时,只在最后一分钟由既有的「下课提醒」页显示「距下课还剩」; -倒计时阈值沿用本机提醒设置(默认 60 秒)。没有时间点数据时退回按课表条目显示课程。 -经典 fixed 岛的课中提醒条保持原有倒计时行为。 +临近下课时,当前课程名右侧显示蓝色圆形秒数徽标,例如剩余一秒显示 `-1`,不显示“即将下课”遮罩,也不替换自定义岛的常态组件。 +倒计时阈值沿用本机提醒设置(默认 60 秒),关闭即将下课倒数后不显示徽标。没有时间点数据时退回按课表条目显示课程。 +经典 fixed 岛的临近下课提醒也使用课程名右侧的秒数徽标,其余上下课提醒保留。 课件接收时显示文件名、类型、教师、字节和进度,覆盖当前固定/自定义内容;完成后校验 SHA256 并回执。 客户端不会自动执行收到的文件,见[课件](courseware.md)。 diff --git a/docs/management/production.md b/docs/management/production.md index 6a54700..b4515f7 100644 --- a/docs/management/production.md +++ b/docs/management/production.md @@ -307,27 +307,27 @@ pnpm --filter @classhelper/server start # 或 node packages/server/dist/ind ## 五、环境变量清单 -| 变量 | 默认 | 说明 | -| --------------------------------------------------- | ---------------------- | ----------------------------------------------------------- | -| `NODE_ENV` | `development` | `production` 会启用生产校验、HSTS、更严的限流 | -| `HOST` / `PORT` | `0.0.0.0` / `4000` | 监听地址与端口 | -| `DATABASE_PROVIDER` | `sqlite` | `sqlite` 或 `mysql` | -| `DATABASE_URL` | `file:./prisma/dev.db` | SQLite 相对路径以 `server` 根为基准;MySQL 用连接串 | -| `AUTO_MIGRATE` | `false` | SQLite 启动时补跑随包迁移,空库另创建管理员 | -| `JWT_SECRET` | — | **必填**,至少 16 位;生产需 ≥32 位且拒绝示例密钥 | -| `JWT_EXPIRES_IN` | `7d` | 令牌有效期 | -| `CORS_ORIGIN` | `*` | 允许来源,多个用逗号分隔;生产建议写具体域名 | -| `TRUST_PROXY` | `false` | 反向代理层数(Nginx 填 `1`),影响限流与日志中的真实 IP | -| `RATE_LIMIT_ENABLED` | `true` | 通用限流(生产 600 次/5 分钟)+ 登录限流(20 次/10 分钟) | -| `STARTUP_DB_CHECK` | `true` | 启动校验数据库;生产不可用时直接退出 | -| `PID_FILE` | — | PID 文件路径(安装包启停脚本依赖),相对 `server` 根 | -| `WEB_DIST_DIR` | 自动探测 | Web 管理端产物目录(`../web-admin/dist` 或 `./web`) | -| `LOG_LEVEL` | `info` | `debug` / `info` / `warn` / `error` | -| `DEFAULT_CLASS_PASSWORD` | `123456` | 新建班级时班级账号(ClassHelper 班级端登录)的默认密码 | -| `DEFAULT_TEACHER_PASSWORD` | `123456` | 新增/重置教师账号的默认密码(管理员录入教师用) | -| `COURSEWARE_DIR` | 默认 data/courseware | 课件文件实体目录;需纳入完整备份 | -| `TERM_START_DATE` | — | 开学日环境兜底;界面全校/班级设置与逐周区间优先,见课表帮助 | -| `INITIAL_ADMIN_USERNAME` / `INITIAL_ADMIN_PASSWORD` | `admin` / `admin123` | 空库首启动创建的管理员 | +| 变量 | 默认 | 说明 | +| --------------------------------------------------- | ---------------------- | ------------------------------------------------------------------------------------------------------------- | +| `NODE_ENV` | `development` | `production` 会启用生产校验、HSTS、更严的限流 | +| `HOST` / `PORT` | `0.0.0.0` / `4000` | 监听地址与端口 | +| `DATABASE_PROVIDER` | `sqlite` | `sqlite` 或 `mysql` | +| `DATABASE_URL` | `file:./prisma/dev.db` | SQLite 相对路径以 `server` 根为基准;MySQL 用连接串 | +| `AUTO_MIGRATE` | `false` | SQLite 启动时补跑随包迁移,空库另创建管理员 | +| `JWT_SECRET` | — | **必填**,至少 16 位;生产需 ≥32 位且拒绝示例密钥 | +| `JWT_EXPIRES_IN` | `7d` | 令牌有效期 | +| `CORS_ORIGIN` | `*` | 允许来源,多个用逗号分隔;生产建议写具体域名 | +| `TRUST_PROXY` | `false` | 反向代理层数(Nginx 填 `1`),影响限流与日志中的真实 IP | +| `RATE_LIMIT_ENABLED` | `true` | 通用限流(生产 600 次/5 分钟);同一来源 IP 连续五次登录失败后封禁 5 分钟,成功登录清零,两种登录入口共用计数 | +| `STARTUP_DB_CHECK` | `true` | 启动校验数据库;生产不可用时直接退出 | +| `PID_FILE` | — | PID 文件路径(安装包启停脚本依赖),相对 `server` 根 | +| `WEB_DIST_DIR` | 自动探测 | Web 管理端产物目录(`../web-admin/dist` 或 `./web`) | +| `LOG_LEVEL` | `info` | `debug` / `info` / `warn` / `error` | +| `DEFAULT_CLASS_PASSWORD` | `123456` | 新建班级时班级账号(ClassHelper 班级端登录)的默认密码 | +| `DEFAULT_TEACHER_PASSWORD` | `123456` | 新增/重置教师账号的默认密码(管理员录入教师用) | +| `COURSEWARE_DIR` | 默认 data/courseware | 课件文件实体目录;需纳入完整备份 | +| `TERM_START_DATE` | — | 开学日环境兜底;界面全校/班级设置与逐周区间优先,见课表帮助 | +| `INITIAL_ADMIN_USERNAME` / `INITIAL_ADMIN_PASSWORD` | `admin` / `admin123` | 空库首启动创建的管理员 | --- diff --git a/docs/management/upgrade.md b/docs/management/upgrade.md index 15ebf05..e09b16e 100644 --- a/docs/management/upgrade.md +++ b/docs/management/upgrade.md @@ -17,18 +17,12 @@ description: 检查更新与各形态的升级步骤、Linux 的升级回滚链 ## 检查更新 -| 端 | 入口 | 检查路径 | -| ------------------- | --------------------------------------------------------------- | ------------------------------------------------ | -| 服务端 / Web 管理端 | 顶栏用户菜单 →「检查更新」 | 浏览器 → 服务端 `GET /api/update/check` → GitHub | -| 桌面客户端 | 启动后自动一次(延迟 5 秒)+「设置 → 关于」里的「检查更新」按钮 | 主进程 → GitHub(不经后端) | +| 端 | 入口 | 检查路径 | +| ------------------- | ---------------------------------------------- | ------------------------------------------------ | +| 服务端 / Web 管理端 | 顶栏用户菜单 →「检查更新」 | 浏览器 → 服务端 `GET /api/update/check` → GitHub | +| 桌面客户端 | 管理端「客户端管理」登记安装包并向班级下发更新 | 客户端只从当前服务端领取更新策略与安装包 | -两端的路径不同是**被约束逼出来的**: - -- **Web 端不能直连 GitHub**。服务端下发的 CSP 里 `connect-src` 只放行 `'self'` 与 WebSocket, - 浏览器发往 `api.github.com` 的请求会直接被拦掉。走服务端转发还有个好处:所有管理员共享同一份缓存 - (GitHub 匿名限流是 60 次/小时/IP)。 -- **客户端在主进程做**。渲染进程的 CSP 与导航防线是安全模型里最要紧的一层, - 不让它去连外部域名、解析外部 JSON。 +Web 管理端经服务端查询 GitHub Release。客户端不再主动检查 GitHub,也不提供手动检查入口;更新由管理端统一下发,仍校验 SHA256 并遵循本机自动更新开关和服务端策略。 ### "查不到"是设计内的结果 @@ -38,13 +32,12 @@ description: 检查更新与各形态的升级步骤、Linux 的升级回滚链 失败结果同样进缓存 —— 否则断网时每点一次按钮都要白等一个超时。 -| 细节 | 说明 | -| ---------- | ----------------------------------------------------------------------------------------------------- | -| 缓存 | 两端各缓存 30 分钟;`?force=1` 绕过服务端缓存,但**仅管理员生效**(否则任意登录用户都能刷爆匿名限流) | -| 权限 | 任何已登录用户都能查(信息来自公开仓库);`force` 除外 | -| 只提示一次 | 客户端启动检查发现新版才推提示;点「忽略此版本」记进配置,同一版本不再提示 | +| 细节 | 说明 | +| ---- | ----------------------------------------------------------------------------------------------------- | +| 缓存 | 服务端缓存 30 分钟;`?force=1` 绕过服务端缓存,但**仅管理员生效**(否则任意登录用户都能刷爆匿名限流) | +| 权限 | 任何已登录用户都能查(信息来自公开仓库);`force` 除外 | -更新**只提示,不自动下载、不自动安装**。安装包仍由人从 [Releases](https://github.com/LoveChengke/classhelper/releases) +服务端的更新检查只提示,不自动安装。管理员可从 [Releases](https://github.com/LoveChengke/classhelper/releases) 页面取,可用 `SHA256SUMS-<版本>.txt` 核对。 ## 升级步骤 diff --git a/package.json b/package.json index abdb3b7..f1a3b98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "class-helper", - "version": "1.4.4", + "version": "1.4.5", "private": true, "description": "ClassHelper - 班级信息管理系统(Web 管理端 + 后端服务 + 桌面客户端)", "packageManager": "pnpm@11.8.0", @@ -38,6 +38,8 @@ "verify:update-installer": "node scripts/verify-update-installer.mjs", "verify:client-update:real": "node scripts/verify-client-update-real.mjs --real-install", "verify:review-client": "node scripts/verify-review-client.mjs", + "verify:panel-security": "node scripts/verify-panel-security.mjs", + "verify:island-editor": "node scripts/verify-island-editor.mjs", "verify:review-api": "node scripts/verify-e2e-isolated.mjs --review-api", "verify:clients-api": "node scripts/verify-e2e-isolated.mjs --clients-api", "verify:client-migrations": "node scripts/verify-client-migrations.mjs", diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json index a7821f9..da09c72 100644 --- a/packages/desktop-client/package.json +++ b/packages/desktop-client/package.json @@ -1,6 +1,6 @@ { "name": "@classhelper/desktop-client", - "version": "1.4.4", + "version": "1.4.5", "private": true, "description": "ClassHelper EXE 客户端(Electron + Vue 3 + Element Plus + Socket.IO + IndexedDB 离线缓存)", "author": "Class Helper", diff --git a/packages/desktop-client/scripts/smoke.mjs b/packages/desktop-client/scripts/smoke.mjs index cc7ac6d..aff9e38 100644 --- a/packages/desktop-client/scripts/smoke.mjs +++ b/packages/desktop-client/scripts/smoke.mjs @@ -84,8 +84,8 @@ function launchSmoke(extraEnv) { child.kill(); resolve(124); }, - // 快速套件已包含本地 HTTP、校验下载和布局编辑;保留冷启动余量,单项断言不放宽。 - mode === 'visual' ? 360_000 : 90_000, + // 快速套件包含两种布局的完整上下课时序、本地下载和编辑;总时限保留冷启动余量。 + mode === 'visual' ? 360_000 : 120_000, ); child.once('exit', (code) => { clearTimeout(deadline); diff --git a/packages/desktop-client/src/island/ComponentNode.vue b/packages/desktop-client/src/island/ComponentNode.vue index daa062c..a1444de 100644 --- a/packages/desktop-client/src/island/ComponentNode.vue +++ b/packages/desktop-client/src/island/ComponentNode.vue @@ -37,8 +37,8 @@ const current = computed(() => today.value.find((s) => s.id === status.value.cur const next = computed(() => today.value.find((s) => s.id === status.value.next?.scheduleId)); function timeAt(time: string) { const d = new Date(props.now); - const [h, m] = time.split(':').map(Number); - d.setHours(h!, m!, 0, 0); + const [h, m, s = 0] = time.split(':').map(Number); + d.setHours(h!, m!, s, 0); return d.getTime(); } /** @@ -106,6 +106,7 @@ const remaining = computed(() => currentLesson.value ? Math.max(0, Math.ceil((timeAt(currentLesson.value.endTime) - props.now) / 1000)) : 0, ); const hidden = computed( + // 临近下课仍使用真实时间点,不因提醒切换而替换课程组件。 () => !props.editing && ((['notification', 'homework', 'call'].includes(props.node.kind) && @@ -256,6 +257,13 @@ const style = computed(() => { :class="{ current: p.id === currentPoint?.id, break: p.timeType === 'BREAK' }" > {{ p.courseName || p.name || '—' }} + + -{{ remaining }} + {{ p.startTime }}–{{ p.endTime }} @@ -352,8 +360,11 @@ const style = computed(() => { transform-origin: left; transition: transform 1s linear; } -.schedule > .lesson-line + .lesson-line { - margin-top: 8px; +.schedule { + display: flex; + flex-direction: column; + align-items: center; + gap: 8px; } .separator > span { display: block; @@ -441,3 +452,5 @@ strong, } } + + diff --git a/packages/desktop-client/src/island/CustomIslandRuntime.vue b/packages/desktop-client/src/island/CustomIslandRuntime.vue index d91d658..08e4fc8 100644 --- a/packages/desktop-client/src/island/CustomIslandRuntime.vue +++ b/packages/desktop-client/src/island/CustomIslandRuntime.vue @@ -27,7 +27,10 @@ const props = defineProps<{ }>(); const scheme = computed(() => props.settings.schemes.find((s) => s.id === props.settings.activeSchemeId)!); const expanded = computed(() => props.state.mode === 'expanded'); -const lesson = computed(() => props.state.lessonReminder ?? null); +// 即将下课只在当前课程旁显示秒数,保留常驻组件与消息入口。 +const lesson = computed(() => + props.state.lessonReminder?.kind === 'ending' ? null : (props.state.lessonReminder ?? null), +); const lastLesson = ref(null); watch( lesson, @@ -283,7 +286,15 @@ watch( { deep: true, flush: 'post' }, ); watch( - [fit, motion, expanded, lesson, () => props.appearance.radius, () => props.appearance.speed], + [ + fit, + motion, + expanded, + lesson, + () => scheme.value.radius, + () => props.appearance.radius, + () => props.appearance.speed, + ], () => { animate(); trackHit(); diff --git a/packages/desktop-client/src/island/LessonReminderContent.vue b/packages/desktop-client/src/island/LessonReminderContent.vue index 65ac88c..2e6df6d 100644 --- a/packages/desktop-client/src/island/LessonReminderContent.vue +++ b/packages/desktop-client/src/island/LessonReminderContent.vue @@ -10,7 +10,7 @@ const props = defineProps<{ }>(); const root = ref(); const width = ref(480); -const mask = computed(() => props.now < props.reminder.maskUntil); +const mask = computed(() => props.reminder.kind !== 'ending' && props.now < props.reminder.maskUntil); const title = computed( () => ({ @@ -140,15 +140,14 @@ onUnmounted(() => { aria-live="polite" >
- + {{ reminder.kind === 'prepare' ? '距上课还剩' : '距下课还剩' }} {{ leftSeconds }} 秒 - {{ reminder.kind === 'on-class' ? '开始上课' : '课间休息' }} + + {{ reminder.kind === 'on-class' ? '开始上课' : '课间休息' }} + {{ @@ -158,6 +157,13 @@ onUnmounted(() => { }} {{ course || '今日课程已结束' }} + + -{{ leftSeconds }} + {{ time }}
@@ -309,3 +315,4 @@ onUnmounted(() => { transition: transform 50ms linear; } + diff --git a/packages/desktop-client/src/island/lesson-ending.css b/packages/desktop-client/src/island/lesson-ending.css new file mode 100644 index 0000000..bafe5f7 --- /dev/null +++ b/packages/desktop-client/src/island/lesson-ending.css @@ -0,0 +1,16 @@ +/* 两种岛共用临近下课徽标;固定正圆,数字使用等宽字形。 */ +.lesson-ending-badge { + display: inline-flex; + align-items: center; + justify-content: center; + flex: 0 0 auto; + width: 30px; + height: 30px; + border-radius: 50%; + color: #fff; + background: #0a84ff; + font-size: 12px; + font-weight: 600; + font-variant-numeric: tabular-nums; + line-height: 1; +} diff --git a/packages/desktop-client/src/main/channels.ts b/packages/desktop-client/src/main/channels.ts index 1b9812f..27563c5 100644 --- a/packages/desktop-client/src/main/channels.ts +++ b/packages/desktop-client/src/main/channels.ts @@ -19,8 +19,6 @@ export const IPC_CHANNELS = { clearConfig: 'classhelper:config:clear', appInfo: 'classhelper:app:info', openExternal: 'classhelper:shell:open-external', - updateCheck: 'classhelper:update:check', - updateIgnore: 'classhelper:update:ignore', getAutoLaunch: 'classhelper:app:get-autolaunch', setAutoLaunch: 'classhelper:app:set-autolaunch', openLogDir: 'classhelper:app:open-log-dir', @@ -28,6 +26,3 @@ export const IPC_CHANNELS = { clientStatus: 'classhelper:client:status', clientBeatNow: 'classhelper:client:beat-now', } as const; - -/** 主进程 → 渲染进程的单向推送:有可用更新(同理,供 preload 与主进程共用) */ -export const UPDATE_AVAILABLE_CHANNEL = 'classhelper:update:available'; diff --git a/packages/desktop-client/src/main/config.ts b/packages/desktop-client/src/main/config.ts index 2b8cda1..4af3ee7 100644 --- a/packages/desktop-client/src/main/config.ts +++ b/packages/desktop-client/src/main/config.ts @@ -43,7 +43,7 @@ interface PersistedConfig { theme?: 'light' | 'dark'; /** 主侧边栏是否折叠(向后兼容:旧配置没有该字段视为展开) */ sidebarCollapsed?: boolean; - /** 用户选择「忽略此版本」的版本号(向后兼容:旧配置没有该字段视为没忽略过任何版本) */ + /** 旧版主动更新检查的兼容字段;统一云端下发更新后不再参与更新决策。 */ ignoredUpdateVersion?: string; /** 本机设备标识(向后兼容:旧配置没有该字段时首次读取生成并落盘,之后永不变) */ deviceKey?: string; diff --git a/packages/desktop-client/src/main/index.ts b/packages/desktop-client/src/main/index.ts index 59d67ba..d461074 100644 --- a/packages/desktop-client/src/main/index.ts +++ b/packages/desktop-client/src/main/index.ts @@ -10,7 +10,6 @@ import { island, registerIslandIpc } from './island.js'; import { logger } from './logger.js'; import { runSmokeTest } from './smoke.js'; import { createTray, destroyTray, isTrayReady } from './tray.js'; -import { scheduleStartupUpdateCheck } from './update.js'; // 主进程由 esbuild 打包为 CommonJS,因此这里可以直接使用 __dirname // (dist/main/index.js -> dist/preload/index.js 与 dist/renderer/index.html) @@ -259,9 +258,6 @@ if (!gotLock) { logger.warn(`系统托盘初始化失败(不影响主功能):${error instanceof Error ? error.message : error}`); } - // 启动后自动查一次更新(延迟几秒,不跟首屏抢带宽);冒烟模式下自动跳过,见 main/update.ts - scheduleStartupUpdateCheck(() => mainWindow); - // 服务端统一下发:定时上报本机状态并领取「待执行命令 / 统一更新」(冒烟默认不上报) startClientAgent(); diff --git a/packages/desktop-client/src/main/ipc.ts b/packages/desktop-client/src/main/ipc.ts index aab3c4a..059727f 100644 --- a/packages/desktop-client/src/main/ipc.ts +++ b/packages/desktop-client/src/main/ipc.ts @@ -9,12 +9,10 @@ import { island } from './island.js'; import { getIslandWeather } from './island-weather.js'; import { getUpdateProgress } from './auto-update.js'; import { app, BrowserWindow, ipcMain, shell } from 'electron'; -import type { UpdateInfo } from '@classhelper/shared'; import { IPC_CHANNELS } from './channels.js'; import { beatNow, getClientAgentStatus } from './client-agent.js'; import { clearConfig, getConfig, getConfigPath, saveConfig } from './config.js'; import { logger } from './logger.js'; -import { checkForUpdates, ignoreUpdateVersion } from './update.js'; import type { DesktopAppInfo, DesktopStoredConfig } from '../types/desktop.js'; // 通道名定义搬到了叶子模块 `channels.ts`(原因见那里的注释:preload 在沙箱里不能碰 node 内建模块); @@ -65,21 +63,6 @@ export function registerIpcHandlers(): void { return true; }); - /** - * 检查更新(走主进程直连 GitHub,见 main/update.ts 的说明)。 - * - * `force` 为 true 时绕过主进程缓存 —— 对应「关于」页里用户主动点的那次检查; - * 启动自动检查一律用缓存(避免同一分钟内重复请求打满匿名限流)。 - */ - ipcMain.handle(IPC_CHANNELS.updateCheck, (_event, force?: boolean): Promise => { - return checkForUpdates(force === true); - }); - - /** 忽略某个版本的更新提示(记入 config.json,启动自动检查不再提示它) */ - ipcMain.handle(IPC_CHANNELS.updateIgnore, (_event, version: string): void => { - if (typeof version === 'string') ignoreUpdateVersion(version); - }); - /** 开机自启:读的是系统登录项,不是配置文件里的值(两者可能被外部改过) */ ipcMain.handle(IPC_CHANNELS.getAutoLaunch, (): boolean => { try { diff --git a/packages/desktop-client/src/main/island.ts b/packages/desktop-client/src/main/island.ts index 63359a7..15f3327 100644 --- a/packages/desktop-client/src/main/island.ts +++ b/packages/desktop-client/src/main/island.ts @@ -171,6 +171,7 @@ class IslandController { private lessonTimer: ReturnType | null = null; private lessonTestTime: number | null = null; private get lessonShowing(): boolean { + if (this.customLayout && this.lessonCue?.kind === 'ending') return false; return Boolean( this.lessonCue && !this.editingLayout && @@ -649,7 +650,10 @@ class IslandController { return { ...this.state, coursewareTransfer: this.coursewareShowing ? this.state.coursewareTransfer : null, - lessonReminder: this.lessonShowing ? this.lessonCue : null, + lessonReminder: + this.lessonShowing || (this.customLayout && this.lessonCue?.kind === 'ending') + ? this.lessonCue + : null, queued: [...this.state.queued], }; } diff --git a/packages/desktop-client/src/main/smoke-resident.ts b/packages/desktop-client/src/main/smoke-resident.ts index 30fe63d..63ea9fc 100644 --- a/packages/desktop-client/src/main/smoke-resident.ts +++ b/packages/desktop-client/src/main/smoke-resident.ts @@ -527,7 +527,7 @@ export async function verifyResidentSmoke( await pause(700); return Math.abs(immediate - opacity) < 0.01 && Math.abs(after - opacity) < 0.01; }); - await check('两种布局均弹出ClassIsland课前/上下课提醒,倒计时与右侧时间正确且不写入通知队列', async () => { + await check('两种布局的上下课提醒、课程旁下课倒数与右侧时间正确且不写入通知队列', async () => { const capture = process.env.ISLAND_MOTION_CAPTURE === '1' && process.env.ELECTRON_SMOKE_MODE === 'visual'; const recorded: Array<{ at: number; image: Electron.NativeImage }> = []; const start = Date.now(); @@ -642,17 +642,33 @@ export async function verifyResidentSmoke( throw new Error('自动倒计时未切到本节下课'); } if (layout === 'custom') { - saveConfig({ islandLayout: { ...fixture, layout } }); + const endingLayout = JSON.parse(JSON.stringify(fixture)); + endingLayout.schemes[0].rows[0].nodes = [islandNode('schedule', 'lesson-ending-course')]; + saveConfig({ islandLayout: endingLayout }); island.syncCustomLayout(); } await setTime(9, 44); - await pause(700); + await pause(1100); if (island.getState().lessonReminder?.kind !== 'ending') throw new Error(layout + '下课倒数状态错误:' + JSON.stringify(island.getState().lessonReminder)); const ending = await win.webContents.executeJavaScript( - `document.querySelector('${layout === 'custom' ? '.resident-lesson-page' : '.ci-fixed-lesson'}')?.textContent.includes('距下课还剩')`, + `(() => { + const root=document.querySelector('${layout === 'custom' ? '.resident-compact' : '.ci-fixed-lesson'}'); + const badge=root?.querySelector('.lesson-ending-badge'); + const course=root?.querySelector('${layout === 'custom' ? '.lesson-line.current strong' : '.ci-lesson-course strong'}'); + const rect=badge?.getBoundingClientRect(),name=course?.getBoundingClientRect(); + return Boolean(badge?.textContent.trim()==='-60'&&rect&&name&&rect.left>=name.right&&Math.abs(rect.width-rect.height)<1&&!root?.querySelector('.ci-mask-active')); + })()`, ); if (!ending) throw new Error(layout + '下课倒数未渲染'); + await setTime(9, 44, 59); + await pause(1100); + if ( + !(await win.webContents.executeJavaScript( + `document.querySelector('${layout === 'custom' ? '.resident-compact' : '.ci-fixed-lesson'} .lesson-ending-badge')?.textContent.trim()==='-1'`, + )) + ) + throw new Error(layout + '最后一秒徽标错误'); await shot('lesson-ending-' + layout); await setTime(9, 45); island.setClassState({ inClass: false }); diff --git a/packages/desktop-client/src/main/smoke.ts b/packages/desktop-client/src/main/smoke.ts index dc5db5b..650ab14 100644 --- a/packages/desktop-client/src/main/smoke.ts +++ b/packages/desktop-client/src/main/smoke.ts @@ -17,7 +17,6 @@ import { ISLAND_URGENT_SIZE, } from './island.js'; import { destroyTray, getTrayState, isTrayReady } from './tray.js'; -import { checkForUpdates, wasStartupCheckSkipped } from './update.js'; interface SmokeResult { name: string; @@ -4478,46 +4477,6 @@ export async function runSmokeTest(win: BrowserWindow): Promise { ); record('关于页渲染(应用信息/诊断信息/鸣谢)', Boolean(aboutPage?.ok), String(aboutPage?.detail ?? '')); - // 更新检查(新功能回归):主进程直连 GitHub 取最新 Release。 - // - // **刻意不断言"一定有新版本"**:那会把冒烟绑死在外网可达上,而教室机器常常没有外网 - // (`ok=false` 是设计内的降级结果,不是失败)。因此两种结果都算通过,验的是: - // 结构完整、失败时有可读原因、以及缓存真的生效。 - const updateFirst = await checkForUpdates(true); - const isVersionLike = (value: unknown): boolean => typeof value === 'string' && /^\d/.test(value); - const updateShapeOk = - isVersionLike(updateFirst.currentVersion) && - typeof updateFirst.ok === 'boolean' && - typeof updateFirst.hasUpdate === 'boolean' && - (updateFirst.ok - ? isVersionLike(updateFirst.latestVersion) && - Array.isArray(updateFirst.assets) && - /^https:\/\//.test(updateFirst.releaseUrl) && - updateFirst.error === null - : typeof updateFirst.error === 'string' && updateFirst.error.length > 0); - record( - '更新检查返回结构正确(无外网时降级为 ok=false 且带原因)', - updateShapeOk, - `ok=${updateFirst.ok} 本机=${updateFirst.currentVersion} 最新=${updateFirst.latestVersion ?? '-'} ` + - `有新版本=${updateFirst.hasUpdate} 附件=${updateFirst.assets.length}` + - `${updateFirst.error ? ` 原因=${updateFirst.error}` : ''}`, - ); - - // 缓存:紧接着再查一次(不传 force)应命中缓存 —— checkedAt 不变即说明没有二次请求 - const updateSecond = await checkForUpdates(); - record( - '更新检查结果带缓存(不重复请求 GitHub)', - updateSecond.checkedAt === updateFirst.checkedAt, - `两次 checkedAt 相同=${updateSecond.checkedAt === updateFirst.checkedAt}`, - ); - - // 启动自动检查在冒烟模式下必须被跳过,否则每次验证都会产生一次真实网络请求与提示条 - record( - '冒烟模式下跳过启动自动检查(验证不依赖外网)', - wasStartupCheckSkipped(), - `skipped=${wasStartupCheckSkipped()}`, - ); - // 未读红点必须挂在"通知"图标右上方(用户反馈:原来挂在文字后面,位置不对) const readBadgeGeometry = async (): Promise<{ ok: boolean; diff --git a/packages/desktop-client/src/main/update.ts b/packages/desktop-client/src/main/update.ts deleted file mode 100644 index 65b3641..0000000 --- a/packages/desktop-client/src/main/update.ts +++ /dev/null @@ -1,216 +0,0 @@ -import { app, type BrowserWindow } from 'electron'; -import { - GITHUB_RELEASES_LATEST_API, - GITHUB_RELEASES_PAGE, - UPDATE_CHECK_CACHE_TTL_MS, - UPDATE_CHECK_TIMEOUT_MS, - UPDATE_CHECK_USER_AGENT, - isNewerVersion, - normalizeVersion, - type UpdateAssetDto, - type UpdateInfo, -} from '@classhelper/shared'; -import { UPDATE_AVAILABLE_CHANNEL } from './channels.js'; -import { getConfig, saveConfig } from './config.js'; -import { logger } from './logger.js'; - -/** - * 更新检查(桌面客户端)。 - * - * **为什么在主进程做**:渲染进程通过 preload 能拿到 `getConfig()` 的明文 token(代表全班身份), - * 它的 CSP 与导航防线是整个安全模型里最要紧的一层;让它额外去连一个外部域名、 - * 解析外部 JSON,等于把"外部数据"请进最有价值的那一侧。主进程本来就在做网络与文件, - * 放这里也顺带复用 Node 的 fetch(无需额外依赖)。 - * - * 与 Web 管理端的差别:Web 端受服务端 CSP 的 `connect-src` 限制,只能走 `/api/update/check` 转发; - * 客户端没有这个限制,按用户选择**直连 GitHub**。两边归一化出的 `UpdateInfo` 结构一致。 - */ - -/** 主进程 → 渲染进程:发现新版本(渲染进程据此弹一次性提示);定义在叶子模块 `channels.ts` */ -export { UPDATE_AVAILABLE_CHANNEL }; - -/** 启动后多久自动查一次:等窗口与登录流程就绪,也不跟首屏请求抢带宽 */ -const STARTUP_DELAY_MS = 5_000; - -interface GithubReleasePayload { - tag_name?: unknown; - name?: unknown; - published_at?: unknown; - body?: unknown; - html_url?: unknown; - assets?: unknown; -} - -let cache: { at: number; info: UpdateInfo } | null = null; -let startupTimer: ReturnType | null = null; -/** 冒烟断言用:启动自动检查是否被跳过(冒烟模式下必须是 true) */ -let startupCheckSkipped = false; - -/** 失败的统一出口:结构完整,界面不必做 null 判断 */ -function failure(error: string): UpdateInfo { - return { - ok: false, - error, - currentVersion: app.getVersion(), - latestVersion: null, - hasUpdate: false, - releaseUrl: GITHUB_RELEASES_PAGE, - releaseName: null, - publishedAt: null, - notes: null, - assets: [], - checkedAt: new Date().toISOString(), - }; -} - -function toAssets(raw: unknown): UpdateAssetDto[] { - if (!Array.isArray(raw)) return []; - return raw - .map((item) => item as { name?: unknown; browser_download_url?: unknown; size?: unknown }) - .filter( - (item): item is { name: string; browser_download_url: string; size?: unknown } => - typeof item.name === 'string' && typeof item.browser_download_url === 'string', - ) - .map((item) => ({ - name: item.name, - downloadUrl: item.browser_download_url, - size: typeof item.size === 'number' && Number.isFinite(item.size) ? item.size : 0, - })); -} - -function toInfo(payload: GithubReleasePayload, currentVersion: string): UpdateInfo { - const latestVersion = normalizeVersion(typeof payload.tag_name === 'string' ? payload.tag_name : ''); - if (!latestVersion) { - logger.warn('更新检查:GitHub 返回的 Release 里没有可识别的 tag_name'); - return failure('GitHub 返回的版本号无法识别'); - } - - return { - ok: true, - error: null, - currentVersion, - latestVersion, - hasUpdate: isNewerVersion(currentVersion, latestVersion), - releaseUrl: - typeof payload.html_url === 'string' && payload.html_url ? payload.html_url : GITHUB_RELEASES_PAGE, - releaseName: typeof payload.name === 'string' ? payload.name : null, - publishedAt: typeof payload.published_at === 'string' ? payload.published_at : null, - notes: typeof payload.body === 'string' ? payload.body : null, - assets: toAssets(payload.assets), - checkedAt: new Date().toISOString(), - }; -} - -/** 把各种失败翻译成一句用户能看懂的话(教室里最常见的就是"这台机器没有外网") */ -function describeFailure(error: unknown): string { - const message = error instanceof Error ? error.message : String(error); - if (error instanceof Error && error.name === 'TimeoutError') { - return `连接 GitHub 超时(${UPDATE_CHECK_TIMEOUT_MS / 1000} 秒),本机可能没有外网`; - } - if (/fetch failed|ENOTFOUND|ECONNREFUSED|EAI_AGAIN|ETIMEDOUT|certificate|net::/i.test(message)) { - return '无法连接 GitHub,本机可能没有外网'; - } - return `检查更新失败:${message}`; -} - -/** - * 检查 GitHub 上有没有比本机新的版本(结果带缓存)。 - * - * 缓存的意义:匿名调用 GitHub API 的限流是 60 次/小时/IP,而「关于」页的按钮可以随便点。 - * 失败结果同样进缓存 —— 否则离线时每点一次都要白等一个超时。 - */ -export async function checkForUpdates(force = false): Promise { - const currentVersion = app.getVersion(); - const now = Date.now(); - if (!force && cache && now - cache.at < UPDATE_CHECK_CACHE_TTL_MS) { - return cache.info; - } - - let info: UpdateInfo; - try { - const response = await fetch(GITHUB_RELEASES_LATEST_API, { - headers: { - // GitHub API 强制要求 User-Agent,不带会直接 403 - 'User-Agent': UPDATE_CHECK_USER_AGENT, - Accept: 'application/vnd.github+json', - }, - signal: AbortSignal.timeout(UPDATE_CHECK_TIMEOUT_MS), - }); - - if (!response.ok) { - info = - response.status === 403 || response.status === 429 - ? failure('GitHub 暂时拒绝了请求(匿名查询次数过多),请过一会儿再试') - : failure(`GitHub 返回 HTTP ${response.status}`); - logger.warn(`更新检查失败:HTTP ${response.status}(本机版本 ${currentVersion})`); - } else { - info = toInfo((await response.json()) as GithubReleasePayload, currentVersion); - logger.info( - `更新检查:本机 ${currentVersion} / 最新 ${info.latestVersion ?? '-'}` + - `${info.hasUpdate ? '(有新版本)' : '(已是最新)'}`, - ); - } - } catch (error) { - info = failure(describeFailure(error)); - logger.warn(`更新检查失败:${info.error}(本机版本 ${currentVersion})`); - } - - cache = { at: now, info }; - return info; -} - -/** 「知道了 / 忽略此版本」:记到配置里,同一个版本不再重复弹提示 */ -export function ignoreUpdateVersion(version: string): void { - const normalized = normalizeVersion(version); - if (!normalized) return; - saveConfig({ ignoredUpdateVersion: normalized }); - logger.info(`已忽略版本 ${normalized} 的更新提示`); -} - -/** 该版本是否已被用户忽略 */ -export function isUpdateIgnored(version: string): boolean { - return normalizeVersion(getConfig().ignoredUpdateVersion) === normalizeVersion(version); -} - -/** - * 启动后的自动检查:延迟 `STARTUP_DELAY_MS` 查一次,有新版本(且没被忽略)就通知渲染进程弹提示。 - * - * **冒烟模式直接跳过**:自动化验证不该每次都发真实网络请求(既抖动又依赖外网), - * 而且凭空多出来的提示条会撞坏既有 UI 断言。冒烟用例改为直接调 IPC 验证返回结构。 - */ -export function scheduleStartupUpdateCheck(getWindow: () => BrowserWindow | null): void { - if (process.env.ELECTRON_SMOKE_TEST === '1') { - startupCheckSkipped = true; - logger.info('更新检查:冒烟模式下跳过启动自动检查'); - return; - } - if (startupTimer) clearTimeout(startupTimer); - - startupTimer = setTimeout(() => { - startupTimer = null; - void (async () => { - try { - const info = await checkForUpdates(); - if (!info.ok || !info.hasUpdate || !info.latestVersion) return; - if (isUpdateIgnored(info.latestVersion)) { - logger.info(`更新检查:${info.latestVersion} 已被用户忽略,本次不提示`); - return; - } - const win = getWindow(); - if (!win || win.isDestroyed()) return; - win.webContents.send(UPDATE_AVAILABLE_CHANNEL, info); - logger.info(`更新检查:已提示新版本 ${info.latestVersion}`); - } catch (error) { - // 自动检查失败不该打扰用户(手动检查才需要看到原因) - logger.warn(`启动自动检查更新失败:${error instanceof Error ? error.message : error}`); - } - })(); - }, STARTUP_DELAY_MS); - // 不阻止进程退出:这个定时器只是"顺便查一下" - startupTimer.unref?.(); -} - -/** 冒烟断言用:启动自动检查是否被跳过(冒烟模式下应为 true —— 否则每次验证都会发真实网络请求) */ -export function wasStartupCheckSkipped(): boolean { - return startupCheckSkipped; -} diff --git a/packages/desktop-client/src/preload/index.ts b/packages/desktop-client/src/preload/index.ts index fadf7cd..2685b88 100644 --- a/packages/desktop-client/src/preload/index.ts +++ b/packages/desktop-client/src/preload/index.ts @@ -3,7 +3,7 @@ import type { CoursewareTransfer, } from '@classhelper/shared'; import { contextBridge, ipcRenderer } from 'electron'; -import { IPC_CHANNELS, UPDATE_AVAILABLE_CHANNEL } from '../main/channels.js'; +import { IPC_CHANNELS } from '../main/channels.js'; import type { ClientAgentStatus } from '../main/client-agent.js'; import type { DesktopAppInfo, @@ -12,7 +12,7 @@ import type { IslandClassStatePayload, IslandPushContext, } from '../types/desktop.js'; -import type { IslandNotification, UpdateInfo } from '@classhelper/shared'; +import type { IslandNotification } from '@classhelper/shared'; /** * 预加载脚本:在开启了 contextIsolation + sandbox 的前提下, @@ -65,15 +65,6 @@ const bridge: DesktopBridge = { getAppInfo: (): Promise => ipcRenderer.invoke(IPC_CHANNELS.appInfo), openExternal: (url: string): Promise => ipcRenderer.invoke(IPC_CHANNELS.openExternal, url), - /* 更新检查(主进程直连 GitHub,见 main/update.ts) */ - checkForUpdates: (force = false): Promise => - ipcRenderer.invoke(IPC_CHANNELS.updateCheck, force), - ignoreUpdateVersion: (version: string): Promise => - ipcRenderer.invoke(IPC_CHANNELS.updateIgnore, version), - onUpdateAvailable: (handler: (info: UpdateInfo) => void): void => { - ipcRenderer.on(UPDATE_AVAILABLE_CHANNEL, (_event, info: UpdateInfo) => handler(info)); - }, - islandPush: (payload: { notification: IslandNotification; context?: IslandPushContext }): void => { ipcRenderer.send('island:push', payload); }, diff --git a/packages/desktop-client/src/renderer/App.vue b/packages/desktop-client/src/renderer/App.vue index 9a58b61..e26a23c 100644 --- a/packages/desktop-client/src/renderer/App.vue +++ b/packages/desktop-client/src/renderer/App.vue @@ -1,8 +1,6 @@ diff --git a/packages/desktop-client/src/renderer/views/settings/IslandSettingsView.vue b/packages/desktop-client/src/renderer/views/settings/IslandSettingsView.vue index 195a1c1..fcb9044 100644 --- a/packages/desktop-client/src/renderer/views/settings/IslandSettingsView.vue +++ b/packages/desktop-client/src/renderer/views/settings/IslandSettingsView.vue @@ -5,6 +5,7 @@ import { ElMessage } from 'element-plus'; import { useRouter } from 'vue-router'; import { DEFAULT_ISLAND_APPEARANCE, + defaultIslandLayouts, ISLAND_APPEARANCE_RANGES as RANGES, ISLAND_POSITION_LABELS, ISLAND_POSITIONS, @@ -30,6 +31,13 @@ function editLayout() { void router.push('/settings/island/editor'); } const layoutMode = ref<'fixed' | 'custom'>('fixed'); +const layoutSettings = ref(defaultIslandLayouts()); +const activeScheme = computed(() => + layoutSettings.value.schemes.find((s) => s.id === layoutSettings.value.activeSchemeId)!, +); +const currentRadius = computed(() => + layoutMode.value === 'custom' ? activeScheme.value.radius : island.value.radius, +); const residentEnabled = ref(false); const pointerFadeEnabled = ref(true); const pointerFadeReversed = ref(false); @@ -65,6 +73,7 @@ async function changePointerFade( } async function loadLayout() { const settings = (await window.desktop?.getConfig())?.islandLayout; + if (settings) layoutSettings.value = settings; layoutMode.value = settings?.layout ?? 'fixed'; residentEnabled.value = settings?.residentEnabled ?? false; pointerFadeEnabled.value = settings?.pointerFadeEnabled ?? true; @@ -103,6 +112,12 @@ async function loadIslandAppearance(): Promise { /** 改动即生效:属性变化时先应用(实时预览),点"保存"再落盘 */ function applyIslandAppearance(patch: Partial = {}): void { island.value = { ...island.value, ...patch }; + if (layoutMode.value === 'custom' && patch.radius !== undefined) { + activeScheme.value.radius = patch.radius; + void window.desktop + ?.saveConfig({ islandLayout: JSON.parse(JSON.stringify(layoutSettings.value)) }) + .catch(() => ElMessage.error('圆角保存失败,请重试')); + } window.desktop?.islandSetAppearance({ ...island.value }); } @@ -230,9 +245,9 @@ onMounted(async () => { @input="(value: number) => applyIslandAppearance({ width: value })" /> - +

- 沿用 ClassIsland 的遮罩、课前倒计时、上下课提示及下节课预告;课中显示课程进度,临近下课显示倒数。 + 课前倒计时、上下课提示及下节课预告保留遮罩;课中显示课程进度,临近下课在课程名右侧显示蓝色圆形秒数倒计时。

; - /** 忽略某个版本的更新提示(写入 config.json,启动自动检查不再提示它) */ - ignoreUpdateVersion(version: string): Promise; - /** 订阅"启动自动检查发现新版本"(仅新版本且未被忽略时触发一次) */ - onUpdateAvailable(handler: (info: UpdateInfo) => void): void; - /* 灵动岛 */ getIslandWeather(coordinates: { latitude: number; longitude: number }): Promise; /** 把一条通知投递到灵动岛(payload 必须是纯数据,说明见 saveConfig) */ diff --git a/packages/server/package.json b/packages/server/package.json index 5eb3ac0..97a2079 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,6 +1,6 @@ { "name": "@classhelper/server", - "version": "1.4.4", + "version": "1.4.5", "private": true, "description": "ClassHelper后端服务:REST API + Socket.IO 实时推送 + Prisma 数据访问", "//": "yaml:课表 YAML 导入的解析器(yaml@2,自带类型、无子依赖);仓库只有传递依赖 js-yaml,不要直接引用", diff --git a/packages/server/scripts/verify-courseware.ts b/packages/server/scripts/verify-courseware.ts index cf57a47..d7b1c22 100644 --- a/packages/server/scripts/verify-courseware.ts +++ b/packages/server/scripts/verify-courseware.ts @@ -437,11 +437,20 @@ try { coursewareCategory('a.7z') === 'archive', ); await restoreSnapshot(prisma, 'sqlite', snapshot); + const restoredFolders = await prisma.coursewareFolder.findMany(); check( '恢复数据库后保留课件共享和回执数据', (await prisma.courseware.count()) === 3 && (await prisma.coursewareReceipt.count()) === 1 && - (await prisma.coursewareFolder.count()) === 1, + restoredFolders.length === snapshot.data.CoursewareFolder.length && + snapshot.data.CoursewareFolder.every((expected) => + restoredFolders.some( + (actual) => + actual.id === expected.id && + actual.path === expected.path && + actual.teacherId === expected.teacherId, + ), + ), ); console.log(`=== 课件隔离验收:${count}/${count} 项通过 ===`); } finally { diff --git a/packages/server/scripts/verify-e2e.mjs b/packages/server/scripts/verify-e2e.mjs index a0ed78f..d4619d6 100644 --- a/packages/server/scripts/verify-e2e.mjs +++ b/packages/server/scripts/verify-e2e.mjs @@ -3223,7 +3223,8 @@ async function main() { // 教师名单表格导入:教师预览 403;管理员预览 + 提交(教师与班级无关,classId 可省略) const teacherCsv = '\ufeff工号,姓名,初始密码,角色\n' + - `imp_t_${Date.now().toString().slice(-8)},冒烟导入教师,import123456,教师\n`; + `imp_t_${Date.now().toString().slice(-8)},冒烟导入教师,import123456,教师\n` + + `imp_t_${Date.now().toString().slice(-8)}_b,冒烟导入教师乙,import123456,教师\n`; const teacherCsvBase64 = Buffer.from(teacherCsv, 'utf8').toString('base64'); const importedTeacherUsername = teacherCsv.split('\n')[1]?.split(',')[0] ?? ''; @@ -3250,7 +3251,10 @@ async function main() { }); const importedTeacherLogin = await api('/auth/login', { method: 'POST', - body: { username: importedTeacherUsername, password: 'import123456' }, + body: { + username: importedTeacherUsername, + password: adminTeacherCommit.payload?.data?.credentials?.[0]?.password ?? '', + }, }); record( '教师名单表格导入(教师 403 / 管理员预览+导入成功,且导入账号可登录)', @@ -3258,13 +3262,47 @@ async function main() { adminTeacherPreview.status === 200 && Boolean(adminTeacherPreview.payload?.data?.suggestedMapping?.username) && adminTeacherCommit.status === 200 && - adminTeacherCommit.payload?.data?.inserted === 1 && + adminTeacherCommit.payload?.data?.inserted === 2 && + adminTeacherCommit.payload?.data?.credentials?.[0]?.password !== 'import123456' && importedTeacherLogin.status === 200, `教师预览=${teacherPreviewDenied.status} 管理员预览=${adminTeacherPreview.status} ` + `建议映射=${JSON.stringify(adminTeacherPreview.payload?.data?.suggestedMapping ?? {})} ` + `导入新增=${adminTeacherCommit.payload?.data?.inserted ?? '-'} 登录=${importedTeacherLogin.status}`, ); + const importedCredentials = adminTeacherCommit.payload?.data?.credentials ?? []; + const repeatedImport = await api('/imports/table/commit', { + method: 'POST', + token: adminToken, + body: { + kind: 'teachers', + fileName: 'teachers.csv', + contentBase64: teacherCsvBase64, + mapping: { username: '工号', name: '姓名', role: '角色' }, + mode: 'upsert', + }, + }); + const repeatLogin = await api('/auth/login', { + method: 'POST', + body: { username: importedTeacherUsername, password: importedCredentials[0]?.password ?? '' }, + }); + const importAudits = await api('/permissions/audit?pageSize=100', { token: adminToken }); + const teacherImportAudits = (importAudits.payload?.data?.items ?? []).filter( + (item) => item.action === 'import-commitTeachers', + ); + record( + '教师导入逐人生成随机密码,重复导入不重置且审计不含凭据', + importedCredentials.length === 2 && + new Set(importedCredentials.map((c) => c.password)).size === 2 && + importedCredentials.every((c) => c.password.length >= 16 && c.password !== 'import123456') && + repeatedImport.payload?.data?.updated === 2 && + repeatedImport.payload?.data?.credentials?.length === 0 && + repeatLogin.status === 200 && + teacherImportAudits.length > 0 && + teacherImportAudits.every((item) => !/password|credentials/.test(item.afterJson)), + `凭据=${importedCredentials.length} 重复更新=${repeatedImport.payload?.data?.updated ?? '-'} 登录=${repeatLogin.status}`, + ); + // 删除护栏:还是班主任的账号不允许删除;没有班级职责的可以删 const deleteHeadTeacher = teacher1 ? await api(`/teachers/${teacher1.id}`, { method: 'DELETE', token: adminToken }) @@ -3661,10 +3699,10 @@ async function main() { await api(`/classes/${probeClassId}`, { method: 'DELETE', token: adminToken }); } } - const importedTeacherRow = (await api('/teachers', { token: adminToken })).payload?.data?.find( - (item) => item.username === importedTeacherUsername, + const importedTeacherRows = (await api('/teachers', { token: adminToken })).payload?.data?.filter((item) => + importedCredentials.some((credential) => credential.username === item.username), ); - if (importedTeacherRow) { + for (const importedTeacherRow of importedTeacherRows ?? []) { await api(`/teachers/${importedTeacherRow.id}`, { method: 'DELETE', token: adminToken }); } const isProbeAccount = (username) => diff --git a/packages/server/src/middleware/security.ts b/packages/server/src/middleware/security.ts index c2cddc4..51674c0 100644 --- a/packages/server/src/middleware/security.ts +++ b/packages/server/src/middleware/security.ts @@ -1,6 +1,6 @@ import type { RequestHandler } from 'express'; import helmet from 'helmet'; -import { rateLimit } from 'express-rate-limit'; +import { ipKeyGenerator, rateLimit } from 'express-rate-limit'; import { env } from '../config/env.js'; import { logger } from '../lib/logger.js'; @@ -78,25 +78,50 @@ export function apiRateLimiter(): RequestHandler { return limiter; } -/** 登录接口专用限流:防暴力破解 */ +/** 两种登录入口共用来源 IP:连续五次密码错误,从第五次失败起封禁五分钟。 */ export function loginRateLimiter(): RequestHandler { - return rateLimit({ - windowMs: 10 * 60 * 1000, - limit: env.isProduction ? 20 : 200, - standardHeaders: 'draft-7', - legacyHeaders: false, - skipSuccessfulRequests: true, - skip: () => !env.rateLimitEnabled, - handler: (req, res) => { - logger.warn(`登录尝试过于频繁:${req.ip ?? '-'}`); + const duration = 5 * 60 * 1000; + const attempts = new Map(); + let sweepAt = 0; + return (req, res, next) => { + if (!env.rateLimitEnabled) return next(); + const now = Date.now(); + if (now >= sweepAt) { + for (const [key, attempt] of attempts) { + if (attempt.expiresAt <= now) attempts.delete(key); + } + sweepAt = now + 60_000; + } + const key = ipKeyGenerator(req.ip ?? req.socket.remoteAddress ?? 'unknown'); + let attempt = attempts.get(key); + if (attempt && attempt.expiresAt <= now) { + attempts.delete(key); + attempt = undefined; + } + if (attempt && attempt.blockedUntil > now) { + res.setHeader('Retry-After', Math.ceil((attempt.blockedUntil - now) / 1000)); res.status(429).json({ success: false, data: null, - message: '登录尝试过于频繁,请 10 分钟后再试', + message: '连续五次密码错误,已封禁登录 5 分钟,请稍后再试', code: 'TOO_MANY_REQUESTS', }); - }, - }); + return; + } + res.once('finish', () => { + if (res.statusCode >= 200 && res.statusCode < 300) { + attempts.delete(key); + } else if (res.statusCode === 401) { + const finishedAt = Date.now(); + const previous = attempts.get(key); + const failures = (previous && previous.expiresAt > finishedAt ? previous.failures : 0) + 1; + const blockedUntil = failures >= 5 ? previous?.blockedUntil || finishedAt + duration : 0; + attempts.set(key, { failures, blockedUntil, expiresAt: blockedUntil || finishedAt + duration }); + if (failures === 5) logger.warn(`连续五次登录失败,封禁五分钟:${req.ip ?? '-'}`); + } + }); + next(); + }; } /** diff --git a/packages/server/src/modules/imports/table-import.service.ts b/packages/server/src/modules/imports/table-import.service.ts index 13b3d8e..1abcf86 100644 --- a/packages/server/src/modules/imports/table-import.service.ts +++ b/packages/server/src/modules/imports/table-import.service.ts @@ -1,3 +1,4 @@ +import { randomBytes } from 'node:crypto'; import { refreshClassSubscriptions } from '../../realtime/bus.js'; import { assertAdmin, assertManage, assertContentWrite } from '../../lib/authz/index.js'; import { changeStudentLifecycle, notifyStudentClasses } from '../../lib/student-lifecycle.js'; @@ -7,7 +8,6 @@ import * as XLSX from 'xlsx'; import { formatClassName, normalizeStudentNo, type TableImportKind } from '@classhelper/shared'; import { activeStudentWhere, isActiveStudent } from '../../lib/students.js'; import { prisma } from '../../lib/db.js'; -import { env } from '../../config/env.js'; import { ApiError } from '../../lib/http.js'; import type { TokenPayload } from '../../lib/jwt.js'; import { logger } from '../../lib/logger.js'; @@ -98,7 +98,6 @@ export const IMPORT_FIELDS: Record = { }, { key: 'name', label: '姓名', required: true, synonyms: ['姓名', 'name', '教师', '教师姓名'] }, { key: 'phone', label: '手机号', required: false, synonyms: ['手机号', '电话', 'phone', '联系方式'] }, - { key: 'password', label: '初始密码', required: false, synonyms: ['密码', 'password', '初始密码'] }, { key: 'role', label: '角色', @@ -226,7 +225,7 @@ function parseTable(buffer: Buffer, fileName: string): ParsedTable { const TEMPLATE_SAMPLES: Record = { grades: ['202601', '王小明', '期中考试', 92, 100, '数学', 'A'], students: ['202601', '王小明', '2026级1班', '男', '13800000000'], - teachers: ['T1001', '王老师', '13800000000', 'teacher123', '教师'], + teachers: ['T1001', '王老师', '13800000000', '教师'], classTeachers: ['2026级1班', '数学', 'T1001', '王老师', '科任'], }; @@ -311,6 +310,7 @@ export interface ImportResult { failed: number; errors: ImportRowError[]; warnings: string[]; + credentials?: { username: string; name: string; password: string }[]; } function cellValue(row: string[], columns: string[], mapping: Record, key: string): string { @@ -677,6 +677,7 @@ export async function commitTeachers(user: TokenPayload, input: TableCommitInput const errors: ImportRowError[] = []; const warnings: string[] = []; + const credentials: NonNullable = []; let inserted = 0; let updated = 0; let skipped = 0; @@ -686,7 +687,6 @@ export async function commitTeachers(user: TokenPayload, input: TableCommitInput const username = cellValue(row, parsed.columns, input.mapping, 'username'); const name = cellValue(row, parsed.columns, input.mapping, 'name'); const phone = cellValue(row, parsed.columns, input.mapping, 'phone'); - const password = cellValue(row, parsed.columns, input.mapping, 'password'); const roleCell = cellValue(row, parsed.columns, input.mapping, 'role'); if (!username || !name) { @@ -715,7 +715,7 @@ export async function commitTeachers(user: TokenPayload, input: TableCommitInput }); updated += 1; } else { - const initialPassword = password || env.defaultTeacherPassword; + const initialPassword = `Ch!${randomBytes(12).toString('base64url')}`; await tx.user.create({ data: { username, @@ -726,6 +726,7 @@ export async function commitTeachers(user: TokenPayload, input: TableCommitInput }, }); inserted += 1; + credentials.push({ username, name, password: initialPassword }); } } @@ -753,7 +754,7 @@ export async function commitTeachers(user: TokenPayload, input: TableCommitInput afterJson: JSON.stringify(result), }, }); - return result; + return { ...result, credentials }; }, { timeout: 30000 }, ); @@ -788,6 +789,7 @@ export async function commitClassTeachers( const errors: ImportRowError[] = []; const warnings: string[] = []; + const credentials: NonNullable = []; let inserted = 0; let updated = 0; let skipped = 0; @@ -877,19 +879,25 @@ export async function commitClassTeachers( } await assertPermission(user, 'teacher:manage'); await assertPermission(user, 'import:teachers'); + const initialPassword = `Ch!${randomBytes(12).toString('base64url')}`; const created = await tx.user.create({ data: { username: teacherNo, name: teacherName || teacherNo, role: 'TEACHER', - passwordHash: await hashPassword(env.defaultTeacherPassword), + passwordHash: await hashPassword(initialPassword), }, select: { id: true }, }); teacherId = created.id; inserted += 1; + credentials.push({ + username: teacherNo, + name: teacherName || teacherNo, + password: initialPassword, + }); warnings.push( - `第 ${rowNumber} 行:工号 ${teacherNo} 没有对应账号,已新建教师「${teacherName || teacherNo}」(初始密码见部署配置)`, + `第 ${rowNumber} 行:工号 ${teacherNo} 没有对应账号,已新建教师「${teacherName || teacherNo}」,请保存本次生成的随机密码`, ); } createdTeachers.set(teacherNo.toLowerCase(), teacherId); @@ -947,7 +955,7 @@ export async function commitClassTeachers( afterJson: JSON.stringify(result), }, }); - return result; + return { ...result, credentials }; }, { timeout: 30000 }, ) diff --git a/packages/shared/package.json b/packages/shared/package.json index 18c11a9..b766c01 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -1,6 +1,6 @@ { "name": "@classhelper/shared", - "version": "1.4.4", + "version": "1.4.5", "private": true, "description": "ClassHelper - 三端共享的类型、常量与工具函数", "type": "module", diff --git a/packages/shared/src/types.ts b/packages/shared/src/types.ts index e31a2cc..eab6d0a 100644 --- a/packages/shared/src/types.ts +++ b/packages/shared/src/types.ts @@ -1313,6 +1313,8 @@ export interface TableImportResult { failed: number; errors: TableImportRowError[]; warnings: string[]; + /** 仅在新建教师的导入响应中返回,供管理员一次性分发;不写审计记录。 */ + credentials?: { username: string; name: string; password: string }[]; } /** ClassIsland 时间配置条目 */ diff --git a/packages/ui/package.json b/packages/ui/package.json index 7637fa3..bcf0760 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@classhelper/ui", - "version": "1.4.4", + "version": "1.4.5", "private": true, "type": "module", "exports": { diff --git a/packages/web-admin/package.json b/packages/web-admin/package.json index 676b21d..7000da4 100644 --- a/packages/web-admin/package.json +++ b/packages/web-admin/package.json @@ -1,6 +1,6 @@ { "name": "@classhelper/web-admin", - "version": "1.4.4", + "version": "1.4.5", "private": true, "description": "ClassHelper Web 管理端(Vue 3 + Vite + Element Plus)", "type": "module", diff --git a/packages/web-admin/src/api/http.ts b/packages/web-admin/src/api/http.ts index 0defb82..986526e 100644 --- a/packages/web-admin/src/api/http.ts +++ b/packages/web-admin/src/api/http.ts @@ -39,7 +39,10 @@ instance.interceptors.response.use( const status = error.response?.status; const message = error.response?.data?.message ?? error.message ?? '网络请求失败'; - if (status === 401) { + const loginAttempt = + error.config?.method?.toLowerCase() === 'post' && + /\/auth\/(?:class-)?login\/?(?:\?|$)/.test(error.config?.url ?? ''); + if (status === 401 && !loginAttempt) { clearCalendarCache(); localStorage.removeItem(STORAGE_KEYS.token); localStorage.removeItem(STORAGE_KEYS.user); diff --git a/packages/web-admin/src/components/TableImportDialog.vue b/packages/web-admin/src/components/TableImportDialog.vue index a069ff7..f4f9bc2 100644 --- a/packages/web-admin/src/components/TableImportDialog.vue +++ b/packages/web-admin/src/components/TableImportDialog.vue @@ -55,7 +55,6 @@ const FIELDS: Record = { { key: 'username', label: '工号', required: true }, { key: 'name', label: '姓名', required: true }, { key: 'phone', label: '手机号', required: false }, - { key: 'password', label: '初始密码', required: false }, { key: 'role', label: '角色', required: false }, ], classTeachers: [ @@ -72,7 +71,8 @@ const KIND_HINTS: Record = { grades: '按**学号**匹配本班学生;同一学生 + 科目 + 考试重复导入会覆盖旧分数。', students: '按**学号**去重;只生成班级名单,**不创建任何账号**(学生没有密码、不能登录)。班级列可留空,用上一步选的班级。', - teachers: '按**工号**去重;工号就是登录名。', + teachers: + '按**工号**去重;工号就是登录名。新教师分别生成随机密码,导入后请保存密码清单;已有账号密码保持不变。', classTeachers: '导入「班级 + 科目 + 教师」的任课关系。角色填「班主任」或「科任」;' + '同一位老师既是班主任又教某一科时,写两条记录即可 —— 系统只保留一个账号,权限自动合并。', @@ -279,6 +279,26 @@ async function submit(): Promise { committing.value = false; } } + +function downloadCredentials(): void { + if (!result.value?.credentials?.length) return; + const cell = (value: string) => + `"${(/^[=+@\-\t\r]/.test(value) ? `'${value}` : value).replaceAll('"', '""')}"`; + const rows = [ + ['工号', '姓名', '初始密码'], + ...result.value.credentials.map((c) => [c.username, c.name, c.password]), + ]; + const url = URL.createObjectURL( + new Blob(['\ufeff' + rows.map((row) => row.map(cell).join(',')).join('\r\n')], { + type: 'text/csv;charset=utf-8', + }), + ); + const link = document.createElement('a'); + link.href = url; + link.download = '教师初始密码.csv'; + link.click(); + setTimeout(() => URL.revokeObjectURL(url), 1000); +}