diff --git a/Dockerfile b/Dockerfile
index ebbd433..2a074bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,15 +14,21 @@ RUN sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list.d/debia
apt-get install -y gcc sqlite3 && \
rm -rf /var/lib/apt/lists/*
-# 复制requirements文件并安装Python依赖
-COPY requirements.txt .
-
-# 配置pip使用阿里云镜像源
+# 安装Poetry
RUN pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/ && \
pip config set global.trusted-host mirrors.aliyun.com && \
- pip install --no-cache-dir -r requirements.txt
+ pip install --no-cache-dir poetry
# 复制项目文件
+COPY pyproject.toml poetry.lock* ./
+
+# 配置Poetry使用阿里云镜像源并安装依赖
+RUN poetry config pypi-token.pypi-token "" && \
+ poetry config repositories.aliyun https://mirrors.aliyun.com/pypi/simple/ && \
+ poetry source add --priority=secondary aliyun https://mirrors.aliyun.com/pypi/simple/ && \
+ poetry install --no-dev --no-interaction --no-ansi
+
+# 复制剩余的项目文件
COPY . .
# 暴露端口
@@ -33,4 +39,4 @@ ENV PYTHONPATH=/app
ENV PYTHONUNBUFFERED=1
# 启动命令
-CMD ["python", "-c", "import os; os.chdir('/app'); import sys; sys.path.append('/app'); from enhanced_server import run_enhanced_server; run_enhanced_server(8000)"]
+CMD ["poetry", "run", "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
diff --git a/main.py b/main.py
new file mode 100644
index 0000000..1392017
--- /dev/null
+++ b/main.py
@@ -0,0 +1,1035 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sqlite3
+import json
+import uuid
+import os
+from datetime import datetime
+from fastapi import FastAPI, HTTPException, Request, Response
+from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
+from fastapi.middleware.cors import CORSMiddleware
+from pydantic import BaseModel
+from typing import Dict, List, Optional, Any
+import asyncio
+import threading
+from enhanced_survey_system import enhanced_system, get_east8_time_string
+
+app = FastAPI(title="Enhanced Survey System")
+
+# 配置CORS
+app.add_middleware(
+ CORSMiddleware,
+ allow_origins=["*"],
+ allow_credentials=True,
+ allow_methods=["*"],
+ allow_headers=["*"],
+)
+
+# 挂载静态文件
+if os.path.exists("public"):
+ app.mount("/public", StaticFiles(directory="public"), name="public")
+
+# 模板配置
+templates = Jinja2Templates(directory="public" if os.path.exists("public") else ".")
+
+# 数据模型
+class CreateSessionRequest(BaseModel):
+ name: str
+ school: str
+ grade: str
+ selectedTag: str = ""
+ questionsConfig: Dict[str, int]
+
+class SaveAnswersRequest(BaseModel):
+ sessionId: str
+ answers: List[Dict[str, Any]]
+
+class GenerateReportRequest(BaseModel):
+ sessionId: str
+
+class SessionResponse(BaseModel):
+ success: bool
+ sessionId: str
+ studentId: str
+
+class SaveAnswersResponse(BaseModel):
+ success: bool
+ totalScore: int
+ sessionId: str
+
+class ApiResponse(BaseModel):
+ success: bool
+ message: str
+
+# API端点
+@app.post("/api/create-session", response_model=SessionResponse)
+async def create_session(request: CreateSessionRequest):
+ """创建答题会话"""
+ name = request.name.strip()
+ school = request.school.strip()
+ grade = request.grade.strip()
+ selected_tag = request.selectedTag.strip()
+ questions_config = request.questionsConfig
+
+ if not name or not school or not grade:
+ raise HTTPException(status_code=400, detail="姓名、学校和年级不能为空")
+
+ # 创建学员记录
+ student_id = str(uuid.uuid4())
+ conn = sqlite3.connect('data/survey.db')
+ cursor = conn.cursor()
+
+ cursor.execute('''
+ INSERT INTO students (id, name, school, grade, selected_tag)
+ VALUES (?, ?, ?, ?, ?)
+ ''', (student_id, name, school, grade, selected_tag))
+
+ # 创建答题会话
+ session_id = str(uuid.uuid4())
+ cursor.execute('''
+ INSERT INTO quiz_sessions (id, student_id, questions_config, status)
+ VALUES (?, ?, ?, 'created')
+ ''', (session_id, student_id, json.dumps(questions_config)))
+
+ conn.commit()
+ conn.close()
+
+ return SessionResponse(
+ success=True,
+ sessionId=session_id,
+ studentId=student_id
+ )
+
+def async_generate_report(session_id: str):
+ """异步生成报告"""
+ try:
+ asyncio.run(enhanced_system.auto_generate_report(session_id))
+ print(f"报告生成成功: {session_id}")
+ except Exception as e:
+ print(f"报告生成失败: {e}")
+
+@app.post("/api/save-answers", response_model=SaveAnswersResponse)
+async def save_answers(request: SaveAnswersRequest):
+ """保存答题结果"""
+ session_id = request.sessionId
+ answers = request.answers
+
+ if not session_id or not answers:
+ raise HTTPException(status_code=400, detail="会话ID和答题结果不能为空")
+
+ # 保存答题结果 - JSON格式存储，包含用户信息
+ conn = sqlite3.connect('data/survey.db')
+ conn.row_factory = sqlite3.Row # 设置行工厂以支持字典访问
+ cursor = conn.cursor()
+
+ # 获取用户信息和会话信息
+ cursor.execute('''
+ SELECT s.name, s.school, s.grade, s.selected_tag, qs.questions_config
+ FROM students s
+ JOIN quiz_sessions qs ON s.id = qs.student_id
+ WHERE qs.id = ?
+ ''', (session_id,))
+
+ session_info = cursor.fetchone()
+ if not session_info:
+ raise HTTPException(status_code=404, detail="会话不存在")
+
+ student_name = session_info['name']
+ student_school = session_info['school']
+ student_grade = session_info['grade']
+ selected_tag = session_info['selected_tag']
+
+ total_score = 0
+
+ # 处理答题数据
+ processed_answers = []
+ for answer in answers:
+ # 兼容驼峰和下划线命名
+ user_answer = answer.get('userAnswer') or answer.get('user_answer', '')
+ correct_answer = answer.get('correctAnswer') or answer.get('correct_answer', '')
+ question_id = answer.get('questionId') or answer.get('question_id', '')
+ question_text = answer.get('questionText') or answer.get('question_text', '')
+ question_type = answer.get('questionType') or answer.get('question_type', '')
+
+ is_correct = user_answer == correct_answer
+ score = answer.get('score', 0) if is_correct else 0
+ total_score += score
+
+ processed_answers.append({
+ 'questionId': question_id,
+ 'questionText': question_text,
+ 'questionType': question_type,
+ 'userAnswer': user_answer,
+ 'correctAnswer': correct_answer,
+ 'isCorrect': is_correct,
+ 'score': score
+ })
+
+ # 将整个答题数据保存为JSON
+ answers_json = json.dumps(processed_answers, ensure_ascii=False)
+ answer_id = str(uuid.uuid4())
+
+ # 使用INSERT OR REPLACE确保每个session只有一条记录，包含用户信息
+ cursor.execute('''
+ INSERT OR REPLACE INTO quiz_answers
+ (id, session_id, student_name, student_school, student_grade, selected_tag, answers_data, total_score)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+ ''', (answer_id, session_id, student_name, student_school, student_grade, selected_tag, answers_json, total_score))
+
+ # 更新会话状态
+ cursor.execute('''
+ UPDATE quiz_sessions
+ SET status = 'completed', total_score = ?, completed_at = ?
+ WHERE id = ?
+ ''', (total_score, get_east8_time_string(), session_id))
+
+ conn.commit()
+ conn.close()
+
+ # 异步生成报告
+ threading.Thread(target=async_generate_report, args=(session_id,), daemon=True).start()
+
+ return SaveAnswersResponse(
+ success=True,
+ totalScore=total_score,
+ sessionId=session_id
+ )
+
+@app.post("/api/generate-report", response_model=ApiResponse)
+async def generate_report(request: GenerateReportRequest):
+ """手动生成报告"""
+ session_id = request.sessionId
+ if not session_id:
+ raise HTTPException(status_code=400, detail="会话ID不能为空")
+
+ # 同步生成报告
+ try:
+ loop = asyncio.new_event_loop()
+ asyncio.set_event_loop(loop)
+ result = loop.run_until_complete(enhanced_system.auto_generate_report(session_id))
+ loop.close()
+
+ return ApiResponse(
+ success=result['success'],
+ message='报告生成成功' if result['success'] else result['error']
+ )
+
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=str(e))
+
+@app.post("/api/regenerate-report", response_model=ApiResponse)
+async def regenerate_report(request: GenerateReportRequest):
+ """处理重新生成报告请求"""
+ session_id = request.sessionId
+ if not session_id:
+ raise HTTPException(status_code=400, detail="会话ID不能为空")
+
+ # 同步重新生成报告
+ try:
+ loop = asyncio.new_event_loop()
+ asyncio.set_event_loop(loop)
+ result = loop.run_until_complete(enhanced_system.regenerate_report(session_id))
+ loop.close()
+
+ response = ApiResponse(
+ success=result['success'],
+ message='报告重新生成成功' if result['success'] else result['error']
+ )
+
+ if result['success']:
+ # 使用额外的字段来存储report_id
+ response.extra = {"reportId": result.get('report_id')}
+
+ return response
+
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=str(e))
+
+@app.get("/api/sessions-can-regenerate")
+async def get_sessions_can_regenerate():
+ """获取可以重新生成的会话列表"""
+ try:
+ sessions = enhanced_system.get_sessions_can_regenerate()
+
+ return {
+ 'success': True,
+ 'sessions': sessions
+ }
+
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=str(e))
+
+@app.get("/api/reports")
+async def get_reports(page: int = 1, page_size: int = 10):
+ """获取报告列表"""
+ data = enhanced_system.get_reports_list(page, page_size)
+ return data
+
+@app.get("/api/report/{report_id}")
+async def get_report(report_id: str):
+ """获取单个报告"""
+ report = enhanced_system.get_report_by_id(report_id)
+
+ if not report:
+ raise HTTPException(status_code=404, detail="报告不存在")
+
+ # 解析报告数据
+ try:
+ report_data = json.loads(report['report_data'])
+ analysis_data = json.loads(report['analysis_data'])
+
+ # 返回与外部API相同格式的数据
+ response_data = {
+ 'studentInfo': report_data.get('studentInfo', {}),
+ 'report': report_data.get('report', {}),
+ 'footer': {
+ 'copyright': '© 2024 尚逸基石教育科技有限公司 版权所有'
+ }
+ }
+
+ return response_data
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=f"解析报告数据失败: {str(e)}")
+
+@app.get("/api/questions")
+async def get_questions():
+ """获取题库数据"""
+ try:
+ with open('public/questions.json', 'r', encoding='utf-8') as f:
+ questions_data = json.load(f)
+ return questions_data
+ except FileNotFoundError:
+ raise HTTPException(status_code=404, detail="题库文件不存在")
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=f"加载题库失败: {str(e)}")
+
+@app.get("/api/tags")
+async def get_tags():
+ """获取标签数据"""
+ try:
+ with open('public/tags.json', 'r', encoding='utf-8') as f:
+ tags_data = json.load(f)
+ return tags_data
+ except FileNotFoundError:
+ # 如果tags.json不存在，生成备用标签数据
+ try:
+ with open('public/questions.json', 'r', encoding='utf-8') as f:
+ questions_data = json.load(f)
+
+ all_tags = set()
+ for questions in questions_data.values():
+ for question in questions:
+ tags = question.get('题目标签', '') or question.get('标签', '')
+ if tags:
+ for tag in tags.split(r'[\s,，]+'):
+ if tag.strip():
+ all_tags.add(tag.strip())
+
+ backup_tags = {
+ "tags": sorted(list(all_tags)),
+ "tag_counts": {},
+ "total_unique_tags": len(all_tags)
+ }
+
+ return backup_tags
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=f"生成标签数据失败: {str(e)}")
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=f"加载标签数据失败: {str(e)}")
+
+@app.get("/api/questions/{session_id}")
+async def get_filtered_questions(session_id: str):
+ """根据会话ID获取筛选后的题目"""
+ try:
+ # 从数据库获取会话信息，包括选择的标签和题目配置
+ conn = sqlite3.connect('data/survey.db')
+ conn.row_factory = sqlite3.Row
+ cursor = conn.cursor()
+
+ cursor.execute('''
+ SELECT s.selected_tag, qs.questions_config
+ FROM students s
+ JOIN quiz_sessions qs ON s.id = qs.student_id
+ WHERE qs.id = ?
+ ''', (session_id,))
+
+ session_data = cursor.fetchone()
+ conn.close()
+
+ if not session_data:
+ raise HTTPException(status_code=404, detail="会话不存在")
+
+ selected_tag = session_data['selected_tag'] or ''
+ questions_config = json.loads(session_data['questions_config'])
+
+ # 加载所有题目
+ with open('public/questions.json', 'r', encoding='utf-8') as f:
+ all_questions = json.load(f)
+
+ # 根据标签筛选题目
+ filtered_questions = filter_questions_by_tag(all_questions, selected_tag)
+
+ # 根据配置选择题目
+ selected_questions = select_questions_by_config(filtered_questions, questions_config)
+
+ response_data = {
+ 'questions': selected_questions,
+ 'selectedTag': selected_tag,
+ 'questionsConfig': questions_config
+ }
+
+ return response_data
+
+ except HTTPException:
+ raise
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=f"获取筛选题目失败: {str(e)}")
+
+def filter_questions_by_tag(all_questions: Dict, selected_tag: str) -> Dict:
+ """根据标签筛选题目"""
+ if not selected_tag:
+ return all_questions
+
+ filtered = {
+ "基础题": [],
+ "进阶题": [],
+ "竞赛题": []
+ }
+
+ for question_type in ["基础题", "进阶题", "竞赛题"]:
+ for question in all_questions.get(question_type, []):
+ question_tags = question.get('题目标签', '') or question.get('标签', '')
+ # 正确分割标签（按空格、逗号等分隔符）
+ if isinstance(question_tags, str):
+ import re
+ tag_list = re.split(r'[\s,，]+', question_tags.strip())
+ if selected_tag in tag_list:
+ filtered[question_type].append(question)
+
+ return filtered
+
+def select_questions_by_config(filtered_questions: Dict, questions_config: Dict) -> List[Dict]:
+ """根据配置从筛选后的题目中选择题目"""
+ selected = []
+
+ # 按照题目类型顺序：基础题 -> 进阶题 -> 竞赛题
+ question_order = ["基础题", "进阶题", "竞赛题"]
+
+ for question_type in question_order:
+ if question_type not in questions_config:
+ continue
+
+ count = questions_config[question_type]
+ available_questions = filtered_questions.get(question_type, [])
+
+ if len(available_questions) < count:
+ print(f"警告：{question_type}可用题目不足 ({len(available_questions)}/{count})")
+
+ # 随机选择指定数量的题目
+ import random
+ random.shuffle(available_questions)
+ selected_for_type = available_questions[:min(count, len(available_questions))]
+
+ for question in selected_for_type:
+ selected.append({
+ **question,
+ 'questionType': question_type,
+ 'questionId': f"{question_type}_{question['序号']}"
+ })
+
+ return selected
+
+# HTML页面路由
+@app.get("/")
+async def index_page(request: Request):
+ """提供主页面"""
+ try:
+ with open('public/index.html', 'r', encoding='utf-8') as f:
+ content = f.read()
+ return Response(content=content, media_type="text/html; charset=utf-8")
+ except FileNotFoundError:
+ raise HTTPException(status_code=404, detail="主页文件不存在")
+
+@app.get("/survey.html")
+async def survey_page(request: Request):
+ """提供测评配置页面"""
+ try:
+ with open('public/survey.html', 'r', encoding='utf-8') as f:
+ content = f.read()
+ return Response(content=content, media_type="text/html; charset=utf-8")
+ except FileNotFoundError:
+ raise HTTPException(status_code=404, detail="测评页面文件不存在")
+
+@app.get("/report.html")
+async def report_page(request: Request):
+ """提供报告查看页面"""
+ try:
+ with open('public/report.html', 'r', encoding='utf-8') as f:
+ content = f.read()
+ return Response(content=content, media_type="text/html; charset=utf-8")
+ except FileNotFoundError:
+ raise HTTPException(status_code=404, detail="报告页面文件不存在")
+
+@app.get("/quiz/{session_id}")
+async def quiz_page(session_id: str, request: Request):
+ """处理答题页面"""
+ conn = sqlite3.connect('data/survey.db')
+ conn.row_factory = sqlite3.Row
+ cursor = conn.cursor()
+
+ cursor.execute('''
+ SELECT s.*, qs.questions_config, qs.status
+ FROM students s
+ JOIN quiz_sessions qs ON s.id = qs.student_id
+ WHERE qs.id = ?
+ ''', (session_id,))
+
+ session_data = cursor.fetchone()
+ conn.close()
+
+ if not session_data:
+ raise HTTPException(status_code=404, detail="Session not found")
+
+ # 生成答题页面HTML
+ html_content = generate_quiz_page(session_data, session_id)
+
+ return Response(content=html_content, media_type="text/html; charset=utf-8")
+
+def generate_quiz_page(session_data: sqlite3.Row, session_id: str) -> str:
+ """生成答题页面HTML"""
+ questions_config = json.loads(session_data['questions_config'])
+ student_name = session_data['name']
+ school = session_data['school']
+ grade = session_data['grade']
+
+ return f'''
+
+
+
+
+ {student_name} - 学科能力测评
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
请稍候，系统正在为您生成详细的测评报告...
+
+