diff --git a/apps/admin/src/App.css b/apps/admin/src/App.css deleted file mode 100644 index d6c7c9a..0000000 --- a/apps/admin/src/App.css +++ /dev/null @@ -1,182 +0,0 @@ -.counter { - font-size: 16px; - padding: 5px 10px; - border-radius: 5px; - color: var(--accent); - background: var(--accent-bg); - border: 2px solid transparent; - transition: border-color 0.3s; - margin-bottom: 24px; - - &:hover { - border-color: var(--accent-border); - } - &:focus-visible { - outline: 2px solid var(--accent); - outline-offset: 2px; - } -} - -.hero { - position: relative; - - .base, - .framework, - .vite { - inset-inline: 0; - margin: 0 auto; - } - - .base { - width: 170px; - position: relative; - z-index: 0; - } - - .framework, - .vite { - position: absolute; - } - - .framework { - z-index: 1; - top: 34px; - height: 28px; - transform: perspective(2000px) rotateZ(300deg) rotateX(44deg) rotateY(39deg) scale(1.4); - } - - .vite { - z-index: 0; - top: 107px; - height: 26px; - width: auto; - transform: perspective(2000px) rotateZ(300deg) rotateX(40deg) rotateY(39deg) scale(0.8); - } -} - -#center { - display: flex; - flex-direction: column; - gap: 25px; - place-content: center; - place-items: center; - flex-grow: 1; - - @media (max-width: 1024px) { - padding: 32px 20px 24px; - gap: 18px; - } -} - -#next-steps { - display: flex; - border-top: 1px solid var(--border); - text-align: left; - - & > div { - flex: 1 1 0; - padding: 32px; - @media (max-width: 1024px) { - padding: 24px 20px; - } - } - - .icon { - margin-bottom: 16px; - width: 22px; - height: 22px; - } - - @media (max-width: 1024px) { - flex-direction: column; - text-align: center; - } -} - -#docs { - border-right: 1px solid var(--border); - - @media (max-width: 1024px) { - border-right: none; - border-bottom: 1px solid var(--border); - } -} - -#next-steps ul { - list-style: none; - padding: 0; - display: flex; - gap: 8px; - margin: 32px 0 0; - - .logo { - height: 18px; - } - - a { - color: var(--text-h); - font-size: 16px; - border-radius: 6px; - background: var(--social-bg); - display: flex; - padding: 6px 12px; - align-items: center; - gap: 8px; - text-decoration: none; - transition: box-shadow 0.3s; - - &:hover { - box-shadow: var(--shadow); - } - .button-icon { - height: 18px; - width: 18px; - } - } - - @media (max-width: 1024px) { - margin-top: 20px; - flex-wrap: wrap; - justify-content: center; - - li { - flex: 1 1 calc(50% - 8px); - } - - a { - width: 100%; - justify-content: center; - box-sizing: border-box; - } - } -} - -#spacer { - height: 88px; - border-top: 1px solid var(--border); - @media (max-width: 1024px) { - height: 48px; - } -} - -.ticks { - position: relative; - width: 100%; - - &::before, - &::after { - content: ''; - position: absolute; - top: -4.5px; - border: 5px solid transparent; - } - - &::before { - left: 0; - border-left-color: var(--border); - } - &::after { - right: 0; - border-right-color: var(--border); - } -} diff --git a/apps/admin/src/assets/hero.png b/apps/admin/src/assets/hero.png deleted file mode 100644 index 02251f4..0000000 Binary files a/apps/admin/src/assets/hero.png and /dev/null differ diff --git a/apps/admin/src/assets/react.svg b/apps/admin/src/assets/react.svg deleted file mode 100644 index 6c87de9..0000000 --- a/apps/admin/src/assets/react.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/admin/src/assets/vite.svg b/apps/admin/src/assets/vite.svg deleted file mode 100644 index 5101b67..0000000 --- a/apps/admin/src/assets/vite.svg +++ /dev/null @@ -1 +0,0 @@ -Vite diff --git a/apps/admin/src/pages/Classrooms/classroom-fields.integration.test.ts b/apps/admin/src/pages/Classrooms/classroom-fields.integration.test.ts deleted file mode 100644 index f3843e5..0000000 --- a/apps/admin/src/pages/Classrooms/classroom-fields.integration.test.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { CLASSROOM_VISIBLE_FIELDS } from './classroom-fields'; - -describe('classroom visible fields', () => { - it('excludes obsolete course and supervisor metadata', () => { - expect(CLASSROOM_VISIBLE_FIELDS).toEqual([ - 'name', - 'building', - 'floor', - 'roomType', - 'capacity', - 'status', - 'notes', - ]); - }); -}); diff --git a/apps/admin/src/pages/Classrooms/classroom-fields.ts b/apps/admin/src/pages/Classrooms/classroom-fields.ts deleted file mode 100644 index 43fe469..0000000 --- a/apps/admin/src/pages/Classrooms/classroom-fields.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const CLASSROOM_VISIBLE_FIELDS = [ - 'name', - 'building', - 'floor', - 'roomType', - 'capacity', - 'status', - 'notes', -] as const; diff --git a/apps/admin/vite.config.ts b/apps/admin/vite.config.ts index c290e7c..4c60748 100644 --- a/apps/admin/vite.config.ts +++ b/apps/admin/vite.config.ts @@ -18,13 +18,13 @@ export default defineConfig({ name: 'echarts', test: /node_modules[\\/](echarts|zrender)[\\/]/, priority: 20, - maxSize: 300_000, + maxSize: 600_000, }, { name: 'antd', test: /node_modules[\\/](@ant-design|antd|rc-[^\\/]+)[\\/]/, priority: 10, - maxSize: 300_000, + maxSize: 600_000, }, ], }, diff --git a/apps/server/src/attendance/attendance.controller.spec.ts b/apps/server/src/attendance/attendance.controller.spec.ts index 83fdb1e..0f81373 100644 --- a/apps/server/src/attendance/attendance.controller.spec.ts +++ b/apps/server/src/attendance/attendance.controller.spec.ts @@ -63,7 +63,7 @@ describe('AttendanceController — DingTalk import scope', () => { attendanceService.getTeacherClassDingUserIds.mockResolvedValue(['ding-1', 'ding-2']); await controller.importFromDingTalk( - { start: '2026-07-01', end: '2026-07-02', classId: 8, autoMatch: true }, + { start: '2026-07-01', end: '2026-07-02', classId: 8 }, { user: { id: 21, username: 'teacher', permissions: [], isSuperAdmin: false } } as never, ); @@ -79,7 +79,7 @@ describe('AttendanceController — DingTalk import scope', () => { it('does not allow a teacher to supply arbitrary DingTalk user IDs', async () => { await expect( controller.importFromDingTalk( - { start: '2026-07-01', end: '2026-07-02', users: 'someone-else', autoMatch: true }, + { start: '2026-07-01', end: '2026-07-02', users: 'someone-else' }, { user: { id: 21, username: 'teacher', permissions: [], isSuperAdmin: false } } as never, ), ).rejects.toBeInstanceOf(ForbiddenException); @@ -89,7 +89,7 @@ describe('AttendanceController — DingTalk import scope', () => { it('requires teachers to select one of their classes', async () => { await expect( - controller.importFromDingTalk({ start: '2026-07-01', end: '2026-07-02', autoMatch: true }, { + controller.importFromDingTalk({ start: '2026-07-01', end: '2026-07-02' }, { user: { id: 21, username: 'teacher', permissions: [], isSuperAdmin: false }, } as never), ).rejects.toBeInstanceOf(BadRequestException); @@ -106,11 +106,11 @@ describe('AttendanceController — DingTalk import scope', () => { expect(attendanceService.getImportableClasses).toHaveBeenCalledWith(21, false); }); - it('always auto-matches class-scoped imports even if an old client sends autoMatch=false', async () => { + it('always auto-matches class-scoped imports', async () => { attendanceService.getTeacherClassDingUserIds.mockResolvedValue(['ding-1']); await controller.importFromDingTalk( - { start: '2026-07-01', end: '2026-07-02', classId: 8, autoMatch: false }, + { start: '2026-07-01', end: '2026-07-02', classId: 8 }, { user: { id: 21, username: 'teacher', permissions: [], isSuperAdmin: false } } as never, ); @@ -137,7 +137,7 @@ describe('AttendanceController — DingTalk import scope', () => { expect(attendanceService.getImportableClasses).toHaveBeenCalledWith(7, true); await controller.importFromDingTalk( - { start: '2026-07-01', end: '2026-07-02', users: 'ding-1,ding-2', autoMatch: true }, + { start: '2026-07-01', end: '2026-07-02', users: 'ding-1,ding-2' }, { user: { id: 7, diff --git a/apps/server/src/attendance/dto/dingtalk-import.dto.ts b/apps/server/src/attendance/dto/dingtalk-import.dto.ts index adaadc4..63244e7 100644 --- a/apps/server/src/attendance/dto/dingtalk-import.dto.ts +++ b/apps/server/src/attendance/dto/dingtalk-import.dto.ts @@ -27,11 +27,6 @@ export class DingTalkImportDto { @IsOptional() @IsString() users?: string; - - /** @deprecated Imports are always matched through DingTalk user mappings. */ - @IsOptional() - @Type(() => Boolean) - autoMatch?: boolean; } /** diff --git a/apps/server/src/bills/dto/bill.dto.ts b/apps/server/src/bills/dto/bill.dto.ts index 7d3d67d..55e7333 100644 --- a/apps/server/src/bills/dto/bill.dto.ts +++ b/apps/server/src/bills/dto/bill.dto.ts @@ -1,4 +1,4 @@ -import { ArrayNotEmpty, IsArray, IsIn, IsInt, IsNotEmpty, IsOptional, IsString, Matches, MaxLength } from 'class-validator'; +import { IsIn, IsNotEmpty, IsOptional, IsString, Matches, MaxLength } from 'class-validator'; export class GenerateBillsDto { @IsOptional() @@ -36,10 +36,3 @@ export class CancelBillDto { @MaxLength(300) reason: string; } - -export class BatchUpdateBillStatusDto extends UpdateBillStatusDto { - @IsArray() - @ArrayNotEmpty() - @IsInt({ each: true }) - ids: number[]; -} diff --git a/apps/server/src/classrooms/classroom-template.spec.ts b/apps/server/src/classrooms/classroom-template.spec.ts index 0444342..3ddbd24 100644 --- a/apps/server/src/classrooms/classroom-template.spec.ts +++ b/apps/server/src/classrooms/classroom-template.spec.ts @@ -1,7 +1,13 @@ -import { CLASSROOM_TEMPLATE_HEADERS } from './classroom-template'; +import { CLASSROOM_TEMPLATE_COLUMNS } from './classroom-template'; describe('classroom import template', () => { it('contains only classroom fields used by the product', () => { - expect(CLASSROOM_TEMPLATE_HEADERS).toEqual(['教室名', '楼栋', '楼层', '类型', '容量']); + expect(CLASSROOM_TEMPLATE_COLUMNS.map(({ header }) => header)).toEqual([ + '教室名', + '楼栋', + '楼层', + '类型', + '容量', + ]); }); }); diff --git a/apps/server/src/classrooms/classroom-template.ts b/apps/server/src/classrooms/classroom-template.ts index f4cc29d..5bfb004 100644 --- a/apps/server/src/classrooms/classroom-template.ts +++ b/apps/server/src/classrooms/classroom-template.ts @@ -5,5 +5,3 @@ export const CLASSROOM_TEMPLATE_COLUMNS = [ { header: '类型', key: 'roomType', width: 10 }, { header: '容量', key: 'capacity', width: 10 }, ]; - -export const CLASSROOM_TEMPLATE_HEADERS = CLASSROOM_TEMPLATE_COLUMNS.map(({ header }) => header); diff --git a/apps/server/src/entities/jinshuju-match-rule.entity.ts b/apps/server/src/entities/jinshuju-match-rule.entity.ts index bebb53a..5e01cb3 100644 --- a/apps/server/src/entities/jinshuju-match-rule.entity.ts +++ b/apps/server/src/entities/jinshuju-match-rule.entity.ts @@ -16,11 +16,6 @@ export interface JinshujuFieldMapping { studentNo?: string; } -export const DEFAULT_MAPPING: JinshujuFieldMapping = { - name: 'field_1', - phone: 'field_2', -}; - const mappingTransformer = { to(value: JinshujuFieldMapping): string { return JSON.stringify(value); diff --git a/apps/server/src/integration/dingtalk.service.ts b/apps/server/src/integration/dingtalk.service.ts index 7a39cba..cb2c3b2 100644 --- a/apps/server/src/integration/dingtalk.service.ts +++ b/apps/server/src/integration/dingtalk.service.ts @@ -915,11 +915,6 @@ export class DingTalkService { })); } - private delay(requestIndex: number): Promise { - const ms = requestIndex % 10 === 0 ? 200 : DingTalkService.MIN_INTERVAL; - return this.sleep(ms); - } - private sleep(ms: number): Promise { return new Promise((resolve) => setTimeout(resolve, ms)); } diff --git a/apps/server/src/main.ts b/apps/server/src/main.ts index 8a6ae5d..35946fd 100644 --- a/apps/server/src/main.ts +++ b/apps/server/src/main.ts @@ -1,5 +1,4 @@ import { NestFactory } from '@nestjs/core'; -import { ValidationPipe } from '@nestjs/common'; import { AppModule } from './app.module'; import { runMigrationsOnStartup } from './migration-runner'; diff --git a/scripts/browser-use-tests.py b/scripts/browser-use-tests.py deleted file mode 100644 index 9809182..0000000 --- a/scripts/browser-use-tests.py +++ /dev/null @@ -1,182 +0,0 @@ -#!/usr/bin/env python3 -""" -恭学基地管理系统 — 功能联动集成测试 -引擎: browser-use (本地 Playwright) + DeepSeek Chat - -用法: - export DEEPSEEK_API_KEY=sk-xxxx - # 先启动服务: npm run dev (admin=:3002, server=:3003) - pip install "browser-use>=0.2" playwright - playwright install chromium - python scripts/browser-use-tests.py - -说明: - 以下用例中的端口/菜单/字段/按钮文案均已核对当前代码库: - - 前端 admin: http://localhost:3002 (vite.config.ts) - - 后端 API : http://localhost:3003/api (main.ts setGlobalPrefix('api')) - - 默认账号 : admin / admin123 (rbac.service.ts 初始化) - 未实现的“课程管理 / 选课 / 学费应收”用例已剔除。 -""" - -import asyncio -import os -import sys -import time -from dataclasses import dataclass, field - -try: - from browser_use import Agent, BrowserProfile - from browser_use.llm import ChatDeepSeek -except ImportError as e: # pragma: no cover - print(f"❌ 缺少依赖: {e}\n 请先: pip install 'browser-use>=0.2' && playwright install chromium") - sys.exit(1) - -ADMIN = "http://localhost:3002" -API = "http://localhost:3003/api" - -# 每个用例的开场白:登录 admin 系统 -L = ( - f"打开 {ADMIN}/login ,在“用户名”输入框填 admin,在“密码”输入框填 admin123," - f"点“登录”按钮。登录成功后会跳转到“数据面板”。接着" -) - - -@dataclass -class Test: - name: str - task: str - expect: list[str] - - -TESTS: list[Test] = [ - # 1) 学生 → 入住:学生管理在“学员管理”分组;入住登记在“宿舍运营”→“入住管理” - Test( - name="创建学生→入住", - expect=["学生", "入住", "成功"], - task=( - f"{L}在左侧菜单点“学员管理”展开,点“学生管理”。点右上角“添加学生”按钮," - f"弹窗里“姓名”填“张三测试”,“学号”填“GX2026T01”,“性别”选“男”,点“保存”。" - f"若提示学号重复,改成 GX2026T02 再存。保存成功后,点左侧“宿舍运营”→“入住管理”," - f"点“入住登记”按钮,“选择学生”搜索并选“张三测试”,“选择宿舍”选任意一个未满的宿舍," - f"“入住日期”选今天,点“确认入住”。返回: 学生创建是否成功、入住登记是否成功。" - ), - ), - # 2) 宿舍费用 → 账单:费用录入在“财务管理”;账单周期是日期区间(RangePicker) - Test( - name="宿舍费用→生成账单", - expect=["费用", "账单", "成功"], - task=( - f"{L}点左侧“财务管理”→“费用录入”。默认在“宿舍费用”标签页,点“录入宿舍费用”按钮," - f"“宿舍”选任意一间,“费用类型”选“水费”,“金额”填 100,“账单周期”选本月第一天到最后一天" - f"(开始日期和结束日期都要选),点“确认录入”。然后点左侧“财务管理”→“账单管理”," - f"点右上角“生成账单”按钮,“账单周期”同样选本月起止两天,点“生成”。等待完成后查看账单列表。" - f"返回: 费用录入是否成功、账单是否生成成功、账单列表大概有几条记录。" - ), - ), - # 3) 班级创建:在“学员管理”→“班级管理”;班型只有 文化课/专业课/集训营/冲刺营;编码必填 - Test( - name="创建班级", - expect=["班级", "创建", "成功"], - task=( - f"{L}点左侧“学员管理”→“班级管理”。点右上角“创建班级”按钮," - f"“班级名称”填“测试班级-1班”,“班级编码”填“TEST-CLS-01”,“班型”选“文化课”," - f"“开班日期”选 2026-07-01,点弹窗的确定/保存按钮。" - f"返回: 班级是否创建成功,列表中能否看到“测试班级-1班”。" - ), - ), - # 4) 排课:注意——没有“新建排课”按钮,需点网格中某个空白单元格弹出新增表单 - Test( - name="课程排课", - expect=["排课", "成功"], - task=( - f"{L}点左侧“教务管理”→“排课管理”。页面是“教室 × 星期”的表格。" - f"在“周一”这一列,找任意一间教室对应的空白单元格(显示“—”)并点击它,弹出“新增排课”表单。" - f"“班级”选任意一个班级,“科目”填“语文”,“上课时段”选 08:00 到 10:00," - f"“日期范围”选 2026-07-01 到 2026-12-31,点“创建”。" - f"若提示需要先有教室或班级,请如实说明。返回: 排课是否创建成功。" - ), - ), - # 5) 仪表盘数据一致性 - Test( - name="仪表盘数据校验", - expect=["宿舍总数", "在读学生", "入住率"], - task=( - f"{L}停留在“数据面板”,等页面加载完。读出顶部这几个数字指标: " - f"“宿舍总数”、“在读学生”、“当前在住”、“入住率”。然后点“学员管理”→“学生管理”," - f"记录学生列表底部“共 N 人”的数字;再点“宿舍运营”→“入住管理”,记录“共 N 条”的数字。" - f"返回: 仪表盘的“在读学生”与学生列表条数是否一致、“当前在住”与在住入住记录数是否吻合。" - ), - ), - # 6) 权限边界:登录错误、未登录重定向、未授权 API 401 - Test( - name="权限边界", - expect=["错误", "登录", "401"], - task=( - f"做 3 个安全检查,逐条返回结果:\n" - f"1. 打开 {ADMIN}/login ,用户名 admin,密码 wrongpass,点“登录”,看是否提示错误(登录失败)。\n" - f"2. 新开标签直接访问 {ADMIN}/dashboard (不登录/清掉 token),看是否被重定向回 /login。\n" - f"3. 直接访问 {API}/students (不带登录态),看返回的内容里是否包含 401 或 Unauthorized。" - ), - ), -] - - -@dataclass -class Result: - name: str - passed: bool - hit: list[str] = field(default_factory=list) - miss: list[str] = field(default_factory=list) - out: str = "" - sec: float = 0.0 - err: str | None = None - - -async def run_one(t: Test, llm: ChatDeepSeek) -> Result: - start = time.monotonic() - try: - agent = Agent( - task=t.task, - llm=llm, - browser_profile=BrowserProfile(headless=True, window_size={"width": 1440, "height": 900}), - ) - history = await agent.run(max_steps=30) - out = history.final_result() or "" - hit = [k for k in t.expect if k in out] - miss = [k for k in t.expect if k not in out] - return Result(t.name, len(miss) == 0, hit, miss, out[:600], time.monotonic() - start) - except Exception as e: # noqa: BLE001 - return Result(t.name, False, [], t.expect, "", time.monotonic() - start, str(e)) - - -async def main() -> int: - key = os.environ.get("DEEPSEEK_API_KEY") - if not key: - print("❌ 未设置环境变量 DEEPSEEK_API_KEY") - return 1 - - bar = "=" * 64 - print(f"{bar}\n 恭学基地 集成测试 (browser-use + DeepSeek Chat)\n{bar}") - print(f" 前端 {ADMIN} 后端 {API}\n{bar}") - - llm = ChatDeepSeek(model="deepseek-chat", api_key=key) - results: list[Result] = [] - for i, t in enumerate(TESTS, 1): - print(f"\n[{i}/{len(TESTS)}] {t.name} …") - r = await run_one(t, llm) - results.append(r) - if r.passed: - print(f" ✅ 通过 ({r.sec:.0f}s)") - elif r.err: - print(f" ❌ 异常 ({r.sec:.0f}s): {r.err[:160]}") - else: - print(f" ❌ 失败 ({r.sec:.0f}s) 缺关键词: {','.join(r.miss)}\n 输出: {r.out[:180]}") - - passed = sum(1 for r in results if r.passed) - failed = len(results) - passed - print(f"\n{bar}\n ✅ {passed} / ❌ {failed} 通过率 {passed / len(results) * 100:.0f}%\n{bar}") - return 1 if failed else 0 - - -if __name__ == "__main__": - sys.exit(asyncio.run(main()))