更新了md文件

最终版本2.0
最终版本1.2
42 changed files with 899 additions and 482 deletions
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="GoogleStyle" />
+  </state>
+</component>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -6,12 +6,54 @@
  <component name="ChangeListManager">
    <list default="true" id="72b0954a-217b-4c2e-9f54-fc09e16134d2" name="更改" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+<<<<<<< HEAD
+      <change beforePath="$PROJECT_DIR$/src/account/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/account/Account.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/account/AccountService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/account/AccountService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/account/SimpleAccountService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/account/SimpleAccountService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/Launcher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/Launcher.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/MainApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/MainApp.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/model/Question.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/model/Question.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/model/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/persistence/FileSaver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/persistence/FileSaver.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/persistence/JsonUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/persistence/JsonUtils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/persistence/QuestionChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/persistence/QuestionChecker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/HighQuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/HighQuestionGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/MiddleQuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/MiddleQuestionGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/PrimaryQuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/PrimaryQuestionGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/Question.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/Question.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/QuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/QuestionGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/IQuizService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/IQuizService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/IUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/IUserService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/QuizServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/QuizServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/UserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/ChangePasswordController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/ChangePasswordController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/LoginViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/LoginViewController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/MainMenuViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/MainMenuViewController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/QuizViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/QuizViewController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/RegisterViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/RegisterViewController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/ScoreViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/ScoreViewController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/ChangePasswordView.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/ChangePasswordView.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/LoginView.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/LoginView.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/MainMenuView.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/MainMenuView.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/QuizView.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/QuizView.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/RegisterView.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/RegisterView.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/RootLayout.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/RootLayout.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/ScoreView.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/student/mathquiz/view/ScoreView.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/persistence/FileSaver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/persistence/FileSaver.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/persistence/QuestionChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/persistence/QuestionChecker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/question/HighQuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/question/HighQuestionGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/question/MiddleQuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/question/MiddleQuestionGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/question/PrimaryQuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/question/PrimaryQuestionGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/question/Question.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/question/Question.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/question/QuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/question/QuestionGenerator.java" afterDir="false" />
+=======
      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/MainApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/MainApp.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/PrimaryQuestionGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/question/PrimaryQuestionGenerator.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/IUserService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/IUserService.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/service/UserServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/LoginViewController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/student/mathquiz/view/LoginViewController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/user_data/users.json" beforeDir="false" afterPath="$PROJECT_DIR$/user_data/users.json" afterDir="false" />
+>>>>>>> develop
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -37,6 +79,26 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
+<<<<<<< HEAD
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Maven.mathquiz [clean].executor": "Run",
+    "Maven.mathquiz [compile].executor": "Run",
+    "Maven.mathquiz [org.openjfx:javafx-maven-plugin:0.0.8:run].executor": "Run",
+    "Maven.mathquiz [package].executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "main",
+    "ignore.virus.scanning.warn.message": "true",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "C:/Users/lyq20/OneDrive/桌面/Finally/MathQuiz",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.sourceCode.Java",
+    "vue.rearranger.settings.migration": "true"
+=======
  <component name="PropertiesComponent">{
  &quot;keyToString&quot;: {
    &quot;Maven.mathquiz [clean].executor&quot;: &quot;Run&quot;,
@ -54,6 +116,7 @@
    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+>>>>>>> develop
  }
 }</component>
  <component name="SharedIndexes">
--- a/doc/README.md
+++ b/doc/README.md
@ -1,93 +1,128 @@
-# 小初高数学学习软件 (Math Learning Software for K-12)
-
-这是一个专为小学、初中、高中学生设计的桌面数学学习与测验软件。本项目作为软件工程导论课程的结对编程项目，旨在提供一个用户友好、功能完善的图形化学习工具，帮助学生通过练习来巩固数学知识。
-
-本软件实现了前后端完全分离的架构，前端负责界面展示与用户交互，后端负责业务逻辑、数据处理与持久化，最终通过 `jpackage` 工具打包成一个免安装的 Windows 可执行文件。
-
-## ✨ 功能特性 (Features)
-
-*   **用户注册**：通过邮箱验证码进行安全注册，确保用户身份的真实性。
-*   **双重登录方式**：支持 **邮箱** 或 **用户名** 登录，为用户提供便利。
-*   **密码管理**：支持用户在登录状态下修改密码，所有密码均经过加密存储，保障账户安全。
-*   **分级题库**：内置 **小学**、**初中**、**高中** 三个不同难度的数学题库，题目类型符合对应学段的教学大纲。
-*   **动态生成试卷**：用户可自定义需要生成的题目数量，系统会根据所选难度，动态生成一张不含重复题目的试卷。
-*   **交互式答题界面**：清爽的图形化界面，以单项选择题的形式呈现，用户可以方便地进行选择和提交。
-*   **自动评分**：所有题目回答完毕后，系统会立即自动计算并显示本次测验的分数。
-*   **数据持久化**：用户信息与用户的历史题目记录均通过本地 JSON 和文本文件进行存储（遵循项目要求，不使用数据库），程序关闭后数据不会丢失。
-
-## 🛠️ 技术栈 (Technology Stack)
-
-*   **前端 (Frontend)**: JavaFX, FXML
-*   **后端 (Backend)**: Java 17
-*   **构建工具 (Build Tool)**: Apache Maven
-*   **打包工具 (Packaging)**: JDK `jpackage`
-*   **依赖库 (Libraries)**:
-    *   `Gson`: 用于处理用户数据的 JSON 序列化与反序列化。
-    *   `Jakarta Mail`: 用于实现注册时的邮件验证码功能。
-
-## 🚀 如何运行 (Getting Started)
-
-#### 面向用户 (For Users)
-
-1.  找到打包后生成的 `数学学习软件` 文件夹。
-2.  双击文件夹内的 `数学学习软件.exe` 即可直接运行。
-3.  程序所需的数据文件（如 `users.json`）会自动在您的用户主目录下的 `.mathquiz` 文件夹中创建。
-
-#### 面向开发者 (For Developers)
-
-1.  **环境准备**:
-    *   JDK 17 或更高版本
-    *   Apache Maven 3.6+
-    *   IntelliJ IDEA
-    
-2.  **克隆项目**:
-    
-    ```bash
-        git clone https://bdgit.educoder.net/hnu202326010416/MyMathQuiz_UI.git
-    ```
-    
-3.  **配置邮箱服务**:
-    
-    *   **重要**: 请修改 `src/main/java/com/student/mathquiz/service/UserServiceImpl.java` 文件中的 `SENDER_EMAIL` 和 `SENDER_AUTHORIZATION_CODE` 为你自己的发件人邮箱和授权码。
-    
-4.  **构建项目**:
-    ```bash
-    # 生成包含所有依赖的 "胖JAR"
-    mvn clean package
-    ```
-    
-5.  **在IDE中运行**:
-    ```bash
-    # 直接运行主程序
-    mvn javafx:run
-    ```
-
-## 📂 项目结构 (Project Structure)
-
-本项目采用前后端分离的设计思想，将视图、业务逻辑和数据持久化清晰地分层。
-
-```
-src
-└── main
-├── java
-│ └── com/student/mathquiz
-│ ├── MainApp.java // 程序主入口，负责视图切换和前后端桥接
-│ ├── constant/ // 存放常量和枚举 (后端)
-│ ├── model/ // 数据模型 (User, Question) (后端)
-│ ├── persistence/ // 数据持久化层 (文件读写) (后端)
-│ ├── question/ // 题目生成器 (后端)
-│ ├── service/ // 业务逻辑服务层 (IUserService, IQuizService) (后端)
-│ └── view/ // 视图控制器 (xxxController.java) (前端)
-└── resources
-└── com/student/mathquiz
-└── view/ // FXML 界面定义文件 (前端)
-```
-
-## 👨‍💻 开发成员 (Authors)
-
-*   **组长**: 李瑜清 (学号: 202326010416)
-*   **组员**: 马芳琼 (学号: 202326010423)
-
---
-
-> 感谢使用！希望这个软件能帮助你更好地学习数学！
+> # 小初高数学学习软件 (Math Learning Software for K-12)
+>
+> 这是一个专为小学、初中、高中学生设计的桌面数学学习与测验软件。本项目作为软件工程导论课程的结对编程项目，旨在提供一个用户友好、功能完善的图形化学习工具，帮助学生通过练习来巩固数学知识。
+>
+> 本软件实现了前后端完全分离的架构，前端负责界面展示与用户交互，后端负责业务逻辑、数据处理与持久化，最终通过 `jpackage` 工具打包成一个免安装的 Windows 可执行文件。
+>
+> ---
+>
+> ## ✨ 功能特性 (Features)
+>
+> - **用户注册**：通过邮箱验证码进行安全注册，确保用户身份的真实性。
+> - **双重登录方式**：支持 **邮箱** 或 **用户名** 登录，为用户提供便利。
+> - **密码管理**：支持用户在登录状态下修改密码，所有密码均经过加密存储，保障账户安全。
+> - **分级题库**：内置 **小学**、**初中**、**高中** 三个不同难度的数学题库，题目类型符合对应学段的教学大纲。
+> - **动态生成试卷**：用户可自定义需要生成的题目数量，系统会根据所选难度，动态生成一张不含重复题目的试卷。
+> - **交互式答题界面**：清爽的图形化界面，以单项选择题的形式呈现，用户可以方便地进行选择和提交。
+> - **自动评分**：所有题目回答完毕后，系统会立即自动计算并显示本次测验的分数。
+> - **数据持久化**：用户信息与用户的历史题目记录均通过本地 JSON 和文本文件进行存储（遵循项目要求，不使用数据库），程序关闭后数据不会丢失。
+>
+> ---
+>
+> ## 🛠️ 技术栈 (Technology Stack)
+>
+> - **前端 (Frontend)**: JavaFX, FXML
+> - **后端 (Backend)**: Java 17
+> - **构建工具 (Build Tool)**: Apache Maven
+> - **打包工具 (Packaging)**: JDK `jpackage`
+> - **依赖库 (Libraries)**:
+>   - `Gson`: 用于处理用户数据的 JSON 序列化与反序列化。
+>   - `Jakarta Mail`: 用于实现注册时的邮件验证码功能。
+>
+> ---
+>
+> ## 🚀 如何运行 (Getting Started)
+>
+> ### 面向开发者 (For Developers)
+>
+> 1. **环境准备**:
+>    - JDK 17 或更高版本
+>    - Apache Maven 3.6+
+>    - IntelliJ IDEA
+>
+> 2. **克隆项目**:
+>    ```bash
+>    git clone https://bdgit.educoder.net/hnu202326010416/MyMathQuiz_UI.git
+>    cd MyMathQuiz_UI
+>    ```
+>
+> 3. **配置邮箱服务**:
+>    
+> - **重要**: 请修改 `src/main/java/com/student/mathquiz/service/UserServiceImpl.java` 文件中的 `SENDER_EMAIL` 和 `SENDER_AUTHORIZATION_CODE` 为你自己的发件人邮箱和授权码。
+>    
+> 4. **构建项目**:
+>    ```bash
+>    # 生成包含所有依赖的 "胖JAR"（位于 target 目录下）
+>    mvn clean package
+>    ```
+>
+> 5. **运行 JAR 文件**:
+>    ```bash
+>    # 构建成功后，在项目根目录执行以下命令运行 JAR
+>    java -jar target/mathquiz-1.0-SNAPSHOT.jar
+>    ```
+>
+> 6. **在IDE中运行**:
+>    ```bash
+>    # 直接通过 Maven 插件运行主程序
+>    mvn javafx:run
+>    ```
+>
+> ---
+>
+> ### 面向普通用户 (For Users)
+>
+> #### 方式一：直接运行 EXE（推荐）
+> 找到打包后生成的 数学学习软件 文件夹。
+> 双击文件夹内的 数学学习软件.exe 即可直接运行。
+> 程序所需的数据文件（如 users.json）会自动在您的用户主目录下的 .mathquiz 文件夹中创建。
+>
+> #### 方式二：运行 JAR 文件
+> 如果您已经安装了 JDK 17 或更高版本，可以直接运行 JAR 文件：
+> 1. 确保您的电脑已安装 [JDK 17](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)。
+> 2. 打开命令行工具（Windows 上是 CMD 或 PowerShell）。
+> 3. 进入 JAR 文件所在目录。
+> 4. 执行以下命令：
+>    ```bash
+>    java -jar mathquiz-1.0-SNAPSHOT.jar
+>    ```
+> 5. 如果运行时提示 JavaFX 相关错误，请使用完整命令：
+>    ```bash
+>    java --module-path "path\to\javafx-sdk-17\lib" --add-modules javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web -jar mathquiz-1.0-SNAPSHOT.jar
+>    ```
+>    其中 `path\to\javafx-sdk-17\lib` 替换为您本地 JavaFX SDK 的实际路径。
+>
+> ---
+>
+> ## 📂 项目结构 (Project Structure)
+>
+> 本项目采用前后端分离的设计思想，将视图、业务逻辑和数据持久化清晰地分层。
+>
+> ```
+> src
+> └── main
+>     ├── java
+>     │   └── com/student/mathquiz
+>     │       ├── MainApp.java // 程序主入口，负责视图切换和前后端桥接
+>     │       ├── Launcher.java // 解决 JavaFX 模块化启动问题的启动器
+>     │       ├── constant/ // 存放常量和枚举 (后端)
+>     │       ├── model/ // 数据模型 (User, Question) (后端)
+>     │       ├── persistence/ // 数据持久化层 (文件读写) (后端)
+>     │       ├── question/ // 题目生成器 (后端)
+>     │       ├── service/ // 业务逻辑服务层 (IUserService, IQuizService) (后端)
+>     │       └── view/ // 视图控制器 (xxxController.java) (前端)
+>     └── resources
+>         └── com/student/mathquiz
+>             └── view/ // FXML 界面定义文件 (前端)
+> ```
+>
+> ---
+>
+> ## 👨‍💻 开发成员 (Authors)
+>
+> - **组长**: 李瑜清 (学号: 202326010416)
+> - **组员**: 马芳琼 (学号: 202326010423)
+>
+> ---
+>
+> > 感谢使用！希望这个软件能帮助你更好地学习数学！
--- a/src/account/Account.java
+++ b/src/account/Account.java
@ -1,30 +1,31 @@
 package account;

 public class Account {
-    private String userName;
-    private String password;
-    private String userType;
-
-    public Account(String userName, String password,String userType) {
-        this.userName = userName;
-        this.password = password;
-        this.userType = userType;
-    }
-
-    public String getUserType() {
-        return userType;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setUserType(String userType) {
-        this.userType = userType;
-    }
+
+  private String userName;
+  private String password;
+  private String userType;
+
+  public Account(String userName, String password, String userType) {
+    this.userName = userName;
+    this.password = password;
+    this.userType = userType;
+  }
+
+  public String getUserType() {
+    return userType;
+  }
+
+  public String getUserName() {
+    return userName;
+  }
+
+  public String getPassword() {
+    return password;
+  }
+
+  public void setUserType(String userType) {
+    this.userType = userType;
+  }

 }
--- a/src/account/AccountService.java
+++ b/src/account/AccountService.java
@ -1,5 +1,6 @@
 package account;

 public interface AccountService {
-    Account login(String username, String password);
+
+  Account login(String username, String password);
 }
--- a/src/account/SimpleAccountService.java
+++ b/src/account/SimpleAccountService.java
@ -4,27 +4,28 @@ import java.util.HashMap;
 import java.util.Map;

 public class SimpleAccountService implements AccountService {
-    private static final Map<String, Account> accounts = new HashMap<>();

-    static {
-        accounts.put("张三1", new Account("张三1", "123", "小学"));
-        accounts.put("张三2", new Account("张三2", "123", "小学"));
-        accounts.put("张三3", new Account("张三3", "123", "小学"));
-        accounts.put("李四1", new Account("李四1", "123", "初中"));
-        accounts.put("李四2", new Account("李四2", "123", "初中"));
-        accounts.put("李四3", new Account("李四3", "123", "初中"));
-        accounts.put("王五1", new Account("王五1", "123", "高中"));
-        accounts.put("王五2", new Account("王五2", "123", "高中"));
-        accounts.put("王五3", new Account("王五3", "123", "高中"));
-    }
+  private static final Map<String, Account> accounts = new HashMap<>();

-    @Override
-    public Account login(String username, String password) {
-        Account account = accounts.get(username);
-        if (account != null && account.getPassword().equals(password)) {
-            return account;
-        }
-        return null;
+  static {
+    accounts.put("张三1", new Account("张三1", "123", "小学"));
+    accounts.put("张三2", new Account("张三2", "123", "小学"));
+    accounts.put("张三3", new Account("张三3", "123", "小学"));
+    accounts.put("李四1", new Account("李四1", "123", "初中"));
+    accounts.put("李四2", new Account("李四2", "123", "初中"));
+    accounts.put("李四3", new Account("李四3", "123", "初中"));
+    accounts.put("王五1", new Account("王五1", "123", "高中"));
+    accounts.put("王五2", new Account("王五2", "123", "高中"));
+    accounts.put("王五3", new Account("王五3", "123", "高中"));
+  }

+  @Override
+  public Account login(String username, String password) {
+    Account account = accounts.get(username);
+    if (account != null && account.getPassword().equals(password)) {
+      return account;
    }
+    return null;
+
+  }
 }
--- a/src/main/java/com/student/mathquiz/Launcher.java
+++ b/src/main/java/com/student/mathquiz/Launcher.java
@ -1,11 +1,11 @@
 package com.student.mathquiz;

 /**
- * 这是一个独立的启动器类，用于解决 JavaFX 11+ 在模块化系统中
- * 通过 `java -jar` 启动 "胖JAR" 时，找不到 JavaFX 组件的问题。
- * 它的 main 方法会调用真正的 MainApp 的 main 方法。
+ * 这是一个独立的启动器类，用于解决 JavaFX 11+ 在模块化系统中 通过 `java -jar` 启动 "胖JAR" 时，找不到 JavaFX 组件的问题。 它的 main 方法会调用真正的
+ * MainApp 的 main 方法。
 */
 public class Launcher {
+
  public static void main(String[] args) {
    MainApp.main(args);
  }
--- a/src/main/java/com/student/mathquiz/MainApp.java
+++ b/src/main/java/com/student/mathquiz/MainApp.java
@ -47,7 +47,9 @@ public class MainApp extends Application {
      rootLayout = loader.load();
      Scene scene = new Scene(rootLayout);
      primaryStage.setScene(scene);
-    } catch (IOException e) { e.printStackTrace(); }
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
  }

  private <T> T switchScene(String fxmlFile) {
@ -62,12 +64,24 @@ public class MainApp extends Application {
      T controller = loader.getController();

      // ... 后面的代码完全不变 ...
-      if (controller instanceof LoginViewController) ((LoginViewController) controller).setMainApp(this);
-      if (controller instanceof RegisterViewController) ((RegisterViewController) controller).setMainApp(this);
-      if (controller instanceof MainMenuViewController) ((MainMenuViewController) controller).setMainApp(this);
-      if (controller instanceof QuizViewController) ((QuizViewController) controller).setMainApp(this);
-      if (controller instanceof ScoreViewController) ((ScoreViewController) controller).setMainApp(this);
-      if (controller instanceof ChangePasswordController) ((ChangePasswordController) controller).setMainApp(this);
+      if (controller instanceof LoginViewController) {
+        ((LoginViewController) controller).setMainApp(this);
+      }
+      if (controller instanceof RegisterViewController) {
+        ((RegisterViewController) controller).setMainApp(this);
+      }
+      if (controller instanceof MainMenuViewController) {
+        ((MainMenuViewController) controller).setMainApp(this);
+      }
+      if (controller instanceof QuizViewController) {
+        ((QuizViewController) controller).setMainApp(this);
+      }
+      if (controller instanceof ScoreViewController) {
+        ((ScoreViewController) controller).setMainApp(this);
+      }
+      if (controller instanceof ChangePasswordController) {
+        ((ChangePasswordController) controller).setMainApp(this);
+      }
      return controller;
    } catch (IOException e) {
      e.printStackTrace();
@ -75,6 +89,25 @@ public class MainApp extends Application {
    }
  }

+<<<<<<< HEAD
+  // ... (所有其他方法保持不变)
+  public void handleLoginSuccess(String email) {
+    this.currentUserEmail = email;
+    showMainMenuView();
+  }
+
+  public void showLoginView() {
+    switchScene("LoginView.fxml");
+  }
+
+  public void showRegisterView() {
+    switchScene("RegisterView.fxml");
+  }
+
+  public void showMainMenuView() {
+    switchScene("MainMenuView.fxml");
+  }
+=======
  // ★★★ 修改这个方法的参数类型，从 String 改为 User ★★★
  public void handleLoginSuccess(com.student.mathquiz.model.User user) {
    // ★★★ 从 User 对象中，准确地获取并保存 email！★★★
@ -85,6 +118,7 @@ public class MainApp extends Application {
  public void showLoginView() { switchScene("LoginView.fxml"); }
  public void showRegisterView() { switchScene("RegisterView.fxml"); }
  public void showMainMenuView() { switchScene("MainMenuView.fxml"); }
+>>>>>>> develop
  // 在 MainApp.java 中

  public void showQuizView(String level, int count) {
@ -105,7 +139,8 @@ public class MainApp extends Application {
    new Thread(() -> {
      System.out.println("    -> 【后台线程】: 线程已启动！");
      try {
-        System.out.println("    -> 【后台线程】: 即将调用 quizService.generateQuiz(...)，这可能会很耗时...");
+        System.out.println(
+            "    -> 【后台线程】: 即将调用 quizService.generateQuiz(...)，这可能会很耗时...");

        // 【重活】让后台工人去生成试卷
        quizService.generateQuiz(level, count, currentUserEmail);
@ -134,11 +169,23 @@ public class MainApp extends Application {

  public void showScoreView(int score) {
    ScoreViewController controller = switchScene("ScoreView.fxml");
-    if (controller != null) controller.setScore(score);
+    if (controller != null) {
+      controller.setScore(score);
+    }
+  }
+
+  public IUserService getUserService() {
+    return userService;
+  }
+
+  public IQuizService getQuizService() {
+    return quizService;
  }
-  public IUserService getUserService() { return userService; }
-  public IQuizService getQuizService() { return quizService; }
-  public static void main(String[] args) { launch(args); }
+
+  public static void main(String[] args) {
+    launch(args);
+  }
+
  // 在 MainApp.java 的末尾添加
  public void showChangePasswordView() {
    switchScene("ChangePasswordView.fxml");
--- a/src/main/java/com/student/mathquiz/model/Question.java
+++ b/src/main/java/com/student/mathquiz/model/Question.java
@ -3,6 +3,7 @@ package com.student.mathquiz.model;
 import java.util.List;

 public class Question {
+
  private String content;
  private List<String> options;
  private int correctAnswerIndex;
@ -13,7 +14,15 @@ public class Question {
    this.correctAnswerIndex = correctAnswerIndex;
  }

-  public String getContent() { return content; }
-  public List<String> getOptions() { return options; }
-  public int getCorrectAnswerIndex() { return correctAnswerIndex; }
+  public String getContent() {
+    return content;
+  }
+
+  public List<String> getOptions() {
+    return options;
+  }
+
+  public int getCorrectAnswerIndex() {
+    return correctAnswerIndex;
+  }
 }
--- a/src/main/java/com/student/mathquiz/model/User.java
+++ b/src/main/java/com/student/mathquiz/model/User.java
@ -3,13 +3,15 @@ package com.student.mathquiz.model;
 import com.student.mathquiz.constant.UserType;

 public class User {
+
  // ★★★ 1. 新增 username 字段 ★★★
  private String username;
  private String email;
  private String encryptedPwd;
  private UserType userType;

-  public User() {} // Gson需要无参构造
+  public User() {
+  } // Gson需要无参构造

  // ★★★ 2. 修改构造函数，加入 username ★★★
  public User(String username, String email, String encryptedPwd, UserType userType) {
@ -20,14 +22,36 @@ public class User {
  }

  // ★★★ 3. 新增 username 的 Getter 和 Setter ★★★
-  public String getUsername() { return username; }
-  public void setUsername(String username) { this.username = username; }
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }

  // --- 下面的代码保持不变 ---
-  public String getEmail() { return email; }
-  public void setEmail(String email) { this.email = email; }
-  public String getEncryptedPwd() { return encryptedPwd; }
-  public void setEncryptedPwd(String encryptedPwd) { this.encryptedPwd = encryptedPwd; }
-  public UserType getUserType() { return userType; }
-  public void setUserType(UserType userType) { this.userType = userType; }
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public String getEncryptedPwd() {
+    return encryptedPwd;
+  }
+
+  public void setEncryptedPwd(String encryptedPwd) {
+    this.encryptedPwd = encryptedPwd;
+  }
+
+  public UserType getUserType() {
+    return userType;
+  }
+
+  public void setUserType(UserType userType) {
+    this.userType = userType;
+  }
 }
--- a/src/main/java/com/student/mathquiz/persistence/FileSaver.java
+++ b/src/main/java/com/student/mathquiz/persistence/FileSaver.java
@ -9,12 +9,15 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;

 public class FileSaver {
+
  public static void saveQuestions(String username, List<Question> questions) {
    File dir = new File(username);
-    if (!dir.exists()) dir.mkdirs();
+    if (!dir.exists()) {
+      dir.mkdirs();
+    }

    String filename = LocalDateTime.now().format(
-      DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) + ".txt";
+        DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) + ".txt";

    try (FileWriter writer = new FileWriter(new File(dir, filename))) {
      for (int i = 0; i < questions.size(); i++) {
--- a/src/main/java/com/student/mathquiz/persistence/JsonUtils.java
+++ b/src/main/java/com/student/mathquiz/persistence/JsonUtils.java
@ -6,11 +6,14 @@ import java.io.*;
 import java.lang.reflect.Type;

 public class JsonUtils {
+
  private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();

  public static <T> T readFromJson(String filePath, Type type) {
    File file = new File(filePath);
-    if (!file.exists()) return null;
+    if (!file.exists()) {
+      return null;
+    }
    try (Reader reader = new FileReader(file)) {
      return GSON.fromJson(reader, type);
    } catch (IOException e) {
--- a/src/main/java/com/student/mathquiz/persistence/QuestionChecker.java
+++ b/src/main/java/com/student/mathquiz/persistence/QuestionChecker.java
@ -5,12 +5,17 @@ import java.io.FileNotFoundException;
 import java.util.Scanner;

 public class QuestionChecker {
+
  public static boolean isDuplicate(String username, String question) {
    File dir = new File(username);
-    if (!dir.exists()) return false;
+    if (!dir.exists()) {
+      return false;
+    }

    File[] files = dir.listFiles();
-    if (files == null) return false;
+    if (files == null) {
+      return false;
+    }

    String target = question.trim();

@ -19,7 +24,9 @@ public class QuestionChecker {
        try (Scanner scanner = new Scanner(file)) {
          while (scanner.hasNextLine()) {
            String line = scanner.nextLine().trim();
-            if (line.isEmpty()) continue;
+            if (line.isEmpty()) {
+              continue;
+            }
            int dotIndex = line.indexOf('.');
            if (dotIndex != -1) {
              String storedQuestion = line.substring(dotIndex + 1).trim();
--- a/src/main/java/com/student/mathquiz/question/HighQuestionGenerator.java
+++ b/src/main/java/com/student/mathquiz/question/HighQuestionGenerator.java
@ -3,6 +3,13 @@ package com.student.mathquiz.question;
 import java.util.*;

 public class HighQuestionGenerator implements QuestionGenerator {
+<<<<<<< HEAD
+
+  private static final Random RANDOM = new Random();
+  private static final String[] TRIG_FUNCTIONS = {"sin", "cos", "tan"};
+  private static final Map<String, String> TRIG_VALUES = new HashMap<>();
+=======
+>>>>>>> develop

  private static final Random RANDOM = new Random();
  private static final String[] FUNCTIONS = {"sin", "cos", "tan"};
@ -11,6 +18,17 @@ public class HighQuestionGenerator implements QuestionGenerator {

  // 静态初始化三角函数精确值表（特殊角）
  static {
+<<<<<<< HEAD
+    TRIG_VALUES.put("sin30", "1/2");
+    TRIG_VALUES.put("sin45", "√2/2");
+    TRIG_VALUES.put("sin60", "√3/2");
+    TRIG_VALUES.put("cos30", "√3/2");
+    TRIG_VALUES.put("cos45", "√2/2");
+    TRIG_VALUES.put("cos60", "1/2");
+    TRIG_VALUES.put("tan30", "√3/3");
+    TRIG_VALUES.put("tan45", "1");
+    TRIG_VALUES.put("tan60", "√3");
+=======
    // 0°
    TRIG_EXACT_VALUES.put("sin0", "0");
    TRIG_EXACT_VALUES.put("cos0", "1");
@ -77,6 +95,7 @@ public class HighQuestionGenerator implements QuestionGenerator {
    TRIG_EXACT_VALUES.put("tan180", "0");

    // 其他角度可以继续补充...
+>>>>>>> develop
  }

  @Override
--- a/src/main/java/com/student/mathquiz/question/MiddleQuestionGenerator.java
+++ b/src/main/java/com/student/mathquiz/question/MiddleQuestionGenerator.java
@ -3,6 +3,7 @@ package com.student.mathquiz.question;
 import java.util.*;

 public class MiddleQuestionGenerator implements QuestionGenerator {
+
  private static final Random RANDOM = new Random();
  private static final char[] OPERATORS = {'+', '-', '*', '/'};
  private static final String[] SPECIAL_OPS = {"^2", "sqrt"};
@ -48,11 +49,16 @@ public class MiddleQuestionGenerator implements QuestionGenerator {

  private int calculateNormalAnswer(int num1, int num2, char op) {
    switch (op) {
-      case '+': return num1 + num2;
-      case '-': return num1 - num2;
-      case '*': return num1 * num2;
-      case '/': return num1 / num2;
-      default: return 0;
+      case '+':
+        return num1 + num2;
+      case '-':
+        return num1 - num2;
+      case '*':
+        return num1 * num2;
+      case '/':
+        return num1 / num2;
+      default:
+        return 0;
    }
  }

--- a/src/main/java/com/student/mathquiz/question/PrimaryQuestionGenerator.java
+++ b/src/main/java/com/student/mathquiz/question/PrimaryQuestionGenerator.java
@ -3,6 +3,7 @@ package com.student.mathquiz.question;
 import java.util.*;

 public class PrimaryQuestionGenerator implements QuestionGenerator {
+
  private static final Random RANDOM = new Random();
  private static final char[] OPERATORS = {'+', '-', '*', '/'};

@ -153,6 +154,25 @@ public class PrimaryQuestionGenerator implements QuestionGenerator {
   * 计算答案
   */
  private String calculateAnswer(List<Integer> operands, List<Character> ops) {
+<<<<<<< HEAD
+    // Simplified calculation for primary school (no operator precedence)
+    int result = operands.get(0);
+    for (int i = 0; i < ops.size(); i++) {
+      int nextOperand = operands.get(i + 1);
+      switch (ops.get(i)) {
+        case '+':
+          result += nextOperand;
+          break;
+        case '-':
+          result -= nextOperand;
+          break;
+        case '*':
+          result *= nextOperand;
+          break;
+        case '/':
+          result /= nextOperand;
+          break;
+=======
    List<Integer> nums = new ArrayList<>(operands);
    List<Character> operators = new ArrayList<>(ops);

@ -169,6 +189,7 @@ public class PrimaryQuestionGenerator implements QuestionGenerator {
        operators.remove(i);
      } else {
        i++;
+>>>>>>> develop
      }
    }

--- a/src/main/java/com/student/mathquiz/question/Question.java
+++ b/src/main/java/com/student/mathquiz/question/Question.java
@ -3,19 +3,29 @@ package com.student.mathquiz.question;
 import java.util.List;

 public class Question {
+
  private String content;
  private String correctAnswer;
  private List<String> options;
  private int correctAnswerIndex;

-  public Question(String content, String correctAnswer, List<String> options, int correctAnswerIndex) {
+  public Question(String content, String correctAnswer, List<String> options,
+      int correctAnswerIndex) {
    this.content = content;
    this.correctAnswer = correctAnswer;
    this.options = options;
    this.correctAnswerIndex = correctAnswerIndex;
  }

-  public String getContent() { return content; }
-  public List<String> getOptions() { return options; }
-  public int getCorrectAnswerIndex() { return correctAnswerIndex; }
+  public String getContent() {
+    return content;
+  }
+
+  public List<String> getOptions() {
+    return options;
+  }
+
+  public int getCorrectAnswerIndex() {
+    return correctAnswerIndex;
+  }
 }
--- a/src/main/java/com/student/mathquiz/question/QuestionGenerator.java
+++ b/src/main/java/com/student/mathquiz/question/QuestionGenerator.java
@ -3,6 +3,7 @@ package com.student.mathquiz.question;
 import com.student.mathquiz.constant.UserType;

 public interface QuestionGenerator {
+
  Question generateQuestion();

  static QuestionGenerator getGeneratorByUserType(UserType userType) {
--- a/src/main/java/com/student/mathquiz/service/IQuizService.java
+++ b/src/main/java/com/student/mathquiz/service/IQuizService.java
@ -3,11 +3,18 @@ package com.student.mathquiz.service;
 import com.student.mathquiz.model.Question;

 public interface IQuizService {
+
  void generateQuiz(String level, int count, String userEmail);
+
  Question getCurrentQuestion();
+
  boolean isLastQuestion();
+
  void submitAnswer(int selectedOptionIndex);
+
  int calculateScore();
+
  int getTotalQuestionCount();
+
  int getCurrentQuestionIndex();
 }
--- a/src/main/java/com/student/mathquiz/service/IUserService.java
+++ b/src/main/java/com/student/mathquiz/service/IUserService.java
@ -3,11 +3,22 @@ package com.student.mathquiz.service;
 import com.student.mathquiz.model.User; // ★★★ 确保导入了这个类 ★★★

 public interface IUserService {
+
  boolean sendVerificationCode(String email);
+<<<<<<< HEAD
+
+  // ★★★ 修改 register 方法，加入 username 参数 ★★★
+  String register(String username, String email, String code, String password,
+      String confirmPassword);
+
+  // ★★★ 修改 login 方法，参数从 email 改为 identifier (标识符) ★★★
+  boolean login(String identifier, String password);
+=======
  String register(String username, String email, String code, String password, String confirmPassword);

  // ★★★ 修改这里的返回类型 ★★★
  User login(String identifier, String password);
+>>>>>>> develop

  String changePassword(String email, String oldPassword, String newPassword1, String newPassword2);
 }
--- a/src/main/java/com/student/mathquiz/service/QuizServiceImpl.java
+++ b/src/main/java/com/student/mathquiz/service/QuizServiceImpl.java
@ -45,28 +45,33 @@ public class QuizServiceImpl implements IQuizService {

      // 每循环20次打印一次日志，防止刷屏，又能看到进度
      if (currentTry % 20 == 0) {
-        System.out.println("        --> 【QuizService】: 循环中... 已尝试 " + currentTry + " 次, 已生成 " + generatedQuestions.size() + " 道题。");
+        System.out.println("        --> 【QuizService】: 循环中... 已尝试 " + currentTry + " 次, 已生成 "
+            + generatedQuestions.size() + " 道题。");
      }

      com.student.mathquiz.question.Question newQuestion = generator.generateQuestion();//
      String content = newQuestion.getContent();

-      if (!questionContentSet.contains(content) && !QuestionChecker.isDuplicate(userEmail, content)) {
+      if (!questionContentSet.contains(content) && !QuestionChecker.isDuplicate(userEmail,
+          content)) {
        questionContentSet.add(content);
        generatedQuestions.add(newQuestion);
      }
    }

-    System.out.println("        --> 【QuizService】: 循环结束！最终尝试 " + currentTry + " 次, 成功生成 " + generatedQuestions.size() + " 道题。");
+    System.out.println("        --> 【QuizService】: 循环结束！最终尝试 " + currentTry + " 次, 成功生成 "
+        + generatedQuestions.size() + " 道题。");

    if (generatedQuestions.size() < count) {
-      System.err.println("        --> 【QuizService】: 警告: 题库不足或重复率过高，只生成了 " + generatedQuestions.size() + " 道题。");
+      System.err.println("        --> 【QuizService】: 警告: 题库不足或重复率过高，只生成了 "
+          + generatedQuestions.size() + " 道题。");
    }

    // ... 后面的代码不变 ...
    this.quizQuestions = new ArrayList<>();
    for (com.student.mathquiz.question.Question q : generatedQuestions) {
-      this.quizQuestions.add(new Question(q.getContent(), q.getOptions(), q.getCorrectAnswerIndex()));
+      this.quizQuestions.add(
+          new Question(q.getContent(), q.getOptions(), q.getCorrectAnswerIndex()));
    }

    FileSaver.saveQuestions(userEmail, generatedQuestions);
@ -78,7 +83,9 @@ public class QuizServiceImpl implements IQuizService {

  @Override
  public Question getCurrentQuestion() {
-    if (quizQuestions == null || currentQuestionIndex >= quizQuestions.size()) return null;
+    if (quizQuestions == null || currentQuestionIndex >= quizQuestions.size()) {
+      return null;
+    }
    return quizQuestions.get(currentQuestionIndex);
  }

@ -90,23 +97,33 @@ public class QuizServiceImpl implements IQuizService {
  @Override
  public void submitAnswer(int selectedOptionIndex) {
    userAnswers.add(selectedOptionIndex);
-    if (!isLastQuestion()) currentQuestionIndex++;
+    if (!isLastQuestion()) {
+      currentQuestionIndex++;
+    }
  }

  @Override
  public int calculateScore() {
    int correctCount = 0;
    for (int i = 0; i < quizQuestions.size(); i++) {
-      if (i < userAnswers.size() && quizQuestions.get(i).getCorrectAnswerIndex() == userAnswers.get(i)) {
+      if (i < userAnswers.size() && quizQuestions.get(i).getCorrectAnswerIndex() == userAnswers.get(
+          i)) {
        correctCount++;
      }
    }
-    if (quizQuestions.isEmpty()) return 0;
+    if (quizQuestions.isEmpty()) {
+      return 0;
+    }
    return (int) ((double) correctCount / quizQuestions.size() * 100);
  }

  @Override
-  public int getTotalQuestionCount() { return quizQuestions != null ? quizQuestions.size() : 0; }
+  public int getTotalQuestionCount() {
+    return quizQuestions != null ? quizQuestions.size() : 0;
+  }
+
  @Override
-  public int getCurrentQuestionIndex() { return currentQuestionIndex; }
+  public int getCurrentQuestionIndex() {
+    return currentQuestionIndex;
+  }
 }
--- a/src/main/java/com/student/mathquiz/service/UserServiceImpl.java
+++ b/src/main/java/com/student/mathquiz/service/UserServiceImpl.java
@ -14,22 +14,27 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;

 public class UserServiceImpl implements IUserService {
+
  private static final String SENDER_EMAIL = "3048494657@qq.com"; // 你的邮箱
  private static final String SENDER_AUTHORIZATION_CODE = "ymnbezwjzrnfdgih"; // 你的授权码
  private static final String USER_DATA_PATH = "user_data/users.json";
-  private static final Type USER_LIST_TYPE = new TypeToken<List<User>>() {}.getType();
+  private static final Type USER_LIST_TYPE = new TypeToken<List<User>>() {
+  }.getType();

  private final Map<String, User> userDatabase;
  private final Map<String, String> verificationCodes = new ConcurrentHashMap<>();

  public UserServiceImpl() {
    this.userDatabase = loadUsersFromFile();
-    System.out.println("后端日志: 已从 " + USER_DATA_PATH + " 加载 " + userDatabase.size() + " 个用户。");
+    System.out.println(
+        "后端日志: 已从 " + USER_DATA_PATH + " 加载 " + userDatabase.size() + " 个用户。");
  }

  private Map<String, User> loadUsersFromFile() {
    List<User> userList = JsonUtils.readFromJson(USER_DATA_PATH, USER_LIST_TYPE);
-    if (userList == null) return new ConcurrentHashMap<>();
+    if (userList == null) {
+      return new ConcurrentHashMap<>();
+    }
    return userList.stream().collect(Collectors.toConcurrentMap(User::getEmail, user -> user));
  }

@ -40,7 +45,10 @@ public class UserServiceImpl implements IUserService {

  @Override
  public boolean sendVerificationCode(String recipientEmail) {
-    if (recipientEmail == null || !recipientEmail.matches("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,6}$")) return false;
+    if (recipientEmail == null || !recipientEmail.matches(
+        "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,6}$")) {
+      return false;
+    }
    String code = String.valueOf(100000 + new Random().nextInt(900000));
    verificationCodes.put(recipientEmail, code);

@ -60,33 +68,47 @@ public class UserServiceImpl implements IUserService {
      message.setFrom(new InternetAddress(SENDER_EMAIL));
      message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(recipientEmail));
      message.setSubject("【数学学习软件】您的注册验证码");
-      message.setText("尊敬的用户，您好！\n\n您的注册验证码是：" + code + "\n\n(此为系统自动发送，请勿回复)");
+      message.setText(
+          "尊敬的用户，您好！\n\n您的注册验证码是：" + code + "\n\n(此为系统自动发送，请勿回复)");
      Transport.send(message);
      System.out.println("后端日志: 验证码 " + code + " 已成功发送至 " + recipientEmail);
      return true;
-    } catch (MessagingException e) { e.printStackTrace(); return false; }
+    } catch (MessagingException e) {
+      e.printStackTrace();
+      return false;
+    }
  }

  // 在 UserServiceImpl.java 中

  // ★★★ 用这个新版本替换掉旧的 register 方法 ★★★
  @Override
-  public String register(String username, String email, String code, String password, String confirmPassword) {
+  public String register(String username, String email, String code, String password,
+      String confirmPassword) {
    // 1. 新增：校验用户名是否为空
    if (username == null || username.trim().isEmpty()) {
      return "用户名不能为空！";
    }
    // 2. 新增：校验用户名是否已被占用
-    if (userDatabase.values().stream().anyMatch(user -> user.getUsername().equalsIgnoreCase(username))) {
+    if (userDatabase.values().stream()
+        .anyMatch(user -> user.getUsername().equalsIgnoreCase(username))) {
      return "该用户名已被使用！";
    }

    // 3. 原有的校验逻辑保持不变
-    if (userDatabase.containsKey(email)) return "该邮箱已被注册！";
+    if (userDatabase.containsKey(email)) {
+      return "该邮箱已被注册！";
+    }
    String storedCode = verificationCodes.get(email);
-    if (storedCode == null || !storedCode.equals(code)) return "验证码错误！";
-    if (!password.equals(confirmPassword)) return "两次输入的密码不一致！";
-    if (!password.matches("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d).{6,10}$")) return "密码必须为6-10位，且包含大小写字母和数字！";
+    if (storedCode == null || !storedCode.equals(code)) {
+      return "验证码错误！";
+    }
+    if (!password.equals(confirmPassword)) {
+      return "两次输入的密码不一致！";
+    }
+    if (!password.matches("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d).{6,10}$")) {
+      return "密码必须为6-10位，且包含大小写字母和数字！";
+    }

    // 4. 创建新用户时加入用户名
    String encryptedPwd = Base64.getEncoder().encodeToString(password.getBytes());
@ -132,7 +154,8 @@ public class UserServiceImpl implements IUserService {


  @Override
-  public String changePassword(String email, String oldPassword, String newPassword1, String newPassword2) {
+  public String changePassword(String email, String oldPassword, String newPassword1,
+      String newPassword2) {
    User user = userDatabase.get(email);
    if (user == null) {
      return "用户不存在！请重新登录。"; // 增加健壮性
--- a/src/main/java/com/student/mathquiz/view/ChangePasswordController.java
+++ b/src/main/java/com/student/mathquiz/view/ChangePasswordController.java
@ -9,10 +9,14 @@ import javafx.scene.control.PasswordField;

 public class ChangePasswordController {

-  @FXML private PasswordField oldPasswordField;
-  @FXML private PasswordField newPasswordField1;
-  @FXML private PasswordField newPasswordField2;
-  @FXML private Label statusLabel;
+  @FXML
+  private PasswordField oldPasswordField;
+  @FXML
+  private PasswordField newPasswordField1;
+  @FXML
+  private PasswordField newPasswordField2;
+  @FXML
+  private Label statusLabel;

  private MainApp mainApp;
  private IUserService userService;
@ -29,7 +33,8 @@ public class ChangePasswordController {
    String newPass2 = newPasswordField2.getText();

    // ★★★ 调用后端的修改密码服务 ★★★
-    String result = userService.changePassword(mainApp.getCurrentUserEmail(), oldPass, newPass1, newPass2);
+    String result = userService.changePassword(mainApp.getCurrentUserEmail(), oldPass, newPass1,
+        newPass2);

    if (result == null) { // null 代表成功
      statusLabel.setText("密码修改成功！请重新登录。");
--- a/src/main/java/com/student/mathquiz/view/LoginViewController.java
+++ b/src/main/java/com/student/mathquiz/view/LoginViewController.java
@ -8,9 +8,13 @@ import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;

 public class LoginViewController {
-  @FXML private TextField emailField;
-  @FXML private PasswordField passwordField;
-  @FXML private Label statusLabel;
+
+  @FXML
+  private TextField emailField;
+  @FXML
+  private PasswordField passwordField;
+  @FXML
+  private Label statusLabel;

  private MainApp mainApp;
  private IUserService userService;
--- a/src/main/java/com/student/mathquiz/view/MainMenuViewController.java
+++ b/src/main/java/com/student/mathquiz/view/MainMenuViewController.java
@ -6,6 +6,7 @@ import javafx.scene.control.TextInputDialog;
 import java.util.Optional;

 public class MainMenuViewController {
+
  private MainApp mainApp;

  public void setMainApp(MainApp mainApp) {
--- a/src/main/java/com/student/mathquiz/view/QuizViewController.java
+++ b/src/main/java/com/student/mathquiz/view/QuizViewController.java
@ -10,15 +10,24 @@ import java.util.List;

 public class QuizViewController {

-  @FXML private Label questionNumberLabel;
-  @FXML private Label questionTextLabel;
-  @FXML private RadioButton option1;
-  @FXML private RadioButton option2;
-  @FXML private RadioButton option3;
-  @FXML private RadioButton option4;
-  @FXML private ToggleGroup optionsGroup;
-  @FXML private Button submitButton;
-  @FXML private Label feedbackLabel;
+  @FXML
+  private Label questionNumberLabel;
+  @FXML
+  private Label questionTextLabel;
+  @FXML
+  private RadioButton option1;
+  @FXML
+  private RadioButton option2;
+  @FXML
+  private RadioButton option3;
+  @FXML
+  private RadioButton option4;
+  @FXML
+  private ToggleGroup optionsGroup;
+  @FXML
+  private Button submitButton;
+  @FXML
+  private Label feedbackLabel;

  private MainApp mainApp;
  private IQuizService quizService;
@ -40,9 +49,13 @@ public class QuizViewController {

  private void loadQuestion() {
    Question currentQuestion = quizService.getCurrentQuestion();
-    if (currentQuestion == null) return;
+    if (currentQuestion == null) {
+      return;
+    }

-    questionNumberLabel.setText(String.format("第 %d/%d 题", quizService.getCurrentQuestionIndex() + 1, quizService.getTotalQuestionCount()));
+    questionNumberLabel.setText(
+        String.format("第 %d/%d 题", quizService.getCurrentQuestionIndex() + 1,
+            quizService.getTotalQuestionCount()));
    questionTextLabel.setText(currentQuestion.getContent());

    List<String> options = currentQuestion.getOptions();
--- a/src/main/java/com/student/mathquiz/view/RegisterViewController.java
+++ b/src/main/java/com/student/mathquiz/view/RegisterViewController.java
@ -9,13 +9,20 @@ import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;

 public class RegisterViewController {
+
  // ★★★ 1. 新增 usernameField 的引用 ★★★
-  @FXML private TextField usernameField;
-  @FXML private TextField emailField;
-  @FXML private TextField codeField;
-  @FXML private PasswordField passwordField1;
-  @FXML private PasswordField passwordField2;
-  @FXML private Label statusLabel;
+  @FXML
+  private TextField usernameField;
+  @FXML
+  private TextField emailField;
+  @FXML
+  private TextField codeField;
+  @FXML
+  private PasswordField passwordField1;
+  @FXML
+  private PasswordField passwordField2;
+  @FXML
+  private Label statusLabel;

  private MainApp mainApp;
  private IUserService userService;
@ -55,7 +62,9 @@ public class RegisterViewController {
        try {
          Thread.sleep(1500);
          Platform.runLater(mainApp::showLoginView);
-        } catch (InterruptedException e) { e.printStackTrace(); }
+        } catch (InterruptedException e) {
+          e.printStackTrace();
+        }
      }).start();
    } else {
      statusLabel.setText(result);
--- a/src/main/java/com/student/mathquiz/view/ScoreViewController.java
+++ b/src/main/java/com/student/mathquiz/view/ScoreViewController.java
@ -7,7 +7,8 @@ import javafx.scene.control.Label;

 public class ScoreViewController {

-  @FXML private Label scoreLabel;
+  @FXML
+  private Label scoreLabel;
  private MainApp mainApp;

  public void setMainApp(MainApp mainApp) {
--- a/src/main/resources/com/student/mathquiz/view/ChangePasswordView.fxml
+++ b/src/main/resources/com/student/mathquiz/view/ChangePasswordView.fxml
@ -7,22 +7,26 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="15.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.student.mathquiz.view.ChangePasswordController">
-    <children>
-        <Label text="修改密码">
-            <font>
-                <Font name="System Bold" size="24.0" />
-            </font>
-        </Label>
-        <PasswordField fx:id="oldPasswordField" prefWidth="250.0" promptText="请输入旧密码" />
-        <PasswordField fx:id="newPasswordField1" prefWidth="250.0" promptText="请输入新密码 (6-10位,含大小写字母和数字)" />
-        <PasswordField fx:id="newPasswordField2" prefWidth="250.0" promptText="请再次输入新密码" />
-        <Button onAction="#handleConfirmChange" text="确认修改" />
-        <Button onAction="#handleBackToMenu" text="返回主菜单" style="-fx-background-color: transparent; -fx-underline: true;" />
-        <Label fx:id="statusLabel" textFill="RED" wrapText="true">
-            <VBox.margin>
-                <Insets top="10.0" />
-            </VBox.margin>
-        </Label>
-    </children>
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="15.0"
+  xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="com.student.mathquiz.view.ChangePasswordController">
+  <children>
+    <Label text="修改密码">
+      <font>
+        <Font name="System Bold" size="24.0"/>
+      </font>
+    </Label>
+    <PasswordField fx:id="oldPasswordField" prefWidth="250.0" promptText="请输入旧密码"/>
+    <PasswordField fx:id="newPasswordField1" prefWidth="250.0"
+      promptText="请输入新密码 (6-10位,含大小写字母和数字)"/>
+    <PasswordField fx:id="newPasswordField2" prefWidth="250.0" promptText="请再次输入新密码"/>
+    <Button onAction="#handleConfirmChange" text="确认修改"/>
+    <Button onAction="#handleBackToMenu" text="返回主菜单"
+      style="-fx-background-color: transparent; -fx-underline: true;"/>
+    <Label fx:id="statusLabel" textFill="RED" wrapText="true">
+      <VBox.margin>
+        <Insets top="10.0"/>
+      </VBox.margin>
+    </Label>
+  </children>
 </VBox>
--- a/src/main/resources/com/student/mathquiz/view/LoginView.fxml
+++ b/src/main/resources/com/student/mathquiz/view/LoginView.fxml
@ -7,20 +7,24 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.student.mathquiz.view.LoginViewController">
-    <children>
-        <Label text="用户登录">
-            <font>
-                <Font size="24.0" />
-            </font>
-        </Label>
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0"
+  xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="com.student.mathquiz.view.LoginViewController">
+  <children>
+    <Label text="用户登录">
+      <font>
+        <Font size="24.0"/>
+      </font>
+    </Label>

-        <!-- ★★★ 修改这里的提示文字 ★★★ -->
-        <TextField fx:id="emailField" promptText="邮箱 / 用户名" maxWidth="300"/>
+    <!-- ★★★ 修改这里的提示文字 ★★★ -->
+    <TextField fx:id="emailField" promptText="邮箱 / 用户名" maxWidth="300"/>

-        <PasswordField fx:id="passwordField" promptText="密码" maxWidth="300"/>
-        <Button onAction="#handleLogin" text="登录" prefWidth="100" />
-        <Button onAction="#handleGoToRegister" style="-fx-background-color: transparent; -fx-border-color: transparent; -fx-underline: true; -fx-cursor: hand;" text="还没有账户？去注册" />
-        <Label fx:id="statusLabel" textFill="RED" />
-    </children>
+    <PasswordField fx:id="passwordField" promptText="密码" maxWidth="300"/>
+    <Button onAction="#handleLogin" text="登录" prefWidth="100"/>
+    <Button onAction="#handleGoToRegister"
+      style="-fx-background-color: transparent; -fx-border-color: transparent; -fx-underline: true; -fx-cursor: hand;"
+      text="还没有账户？去注册"/>
+    <Label fx:id="statusLabel" textFill="RED"/>
+  </children>
 </VBox>
--- a/src/main/resources/com/student/mathquiz/view/MainMenuView.fxml
+++ b/src/main/resources/com/student/mathquiz/view/MainMenuView.fxml
@ -6,24 +6,27 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.student.mathquiz.view.MainMenuViewController">
-    <children>
-        <Label text="请选择难度">
-            <font>
-                <Font size="24.0" />
-            </font>
-        </Label>
-        <Button onAction="#handlePrimary" prefWidth="120.0" text="小学" />
-        <Button onAction="#handleMiddle" prefWidth="120.0" text="初中" />
-        <Button onAction="#handleHigh" prefWidth="120.0" text="高中" />
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0"
+  xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="com.student.mathquiz.view.MainMenuViewController">
+  <children>
+    <Label text="请选择难度">
+      <font>
+        <Font size="24.0"/>
+      </font>
+    </Label>
+    <Button onAction="#handlePrimary" prefWidth="120.0" text="小学"/>
+    <Button onAction="#handleMiddle" prefWidth="120.0" text="初中"/>
+    <Button onAction="#handleHigh" prefWidth="120.0" text="高中"/>

-        <!-- ★★★ 新增的按钮在这里！ ★★★ -->
-        <Button onAction="#handleChangePassword" prefWidth="120.0" text="修改密码">
-            <VBox.margin>
-                <Insets top="20.0" />
-            </VBox.margin>
-        </Button>
-        <Button onAction="#handleLogout" prefWidth="120.0" text="退出登录" style="-fx-background-color: #f0f0f0;" />
+    <!-- ★★★ 新增的按钮在这里！ ★★★ -->
+    <Button onAction="#handleChangePassword" prefWidth="120.0" text="修改密码">
+      <VBox.margin>
+        <Insets top="20.0"/>
+      </VBox.margin>
+    </Button>
+    <Button onAction="#handleLogout" prefWidth="120.0" text="退出登录"
+      style="-fx-background-color: #f0f0f0;"/>

-    </children>
+  </children>
 </VBox>
--- a/src/main/resources/com/student/mathquiz/view/QuizView.fxml
+++ b/src/main/resources/com/student/mathquiz/view/QuizView.fxml
@ -9,34 +9,51 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.student.mathquiz.view.QuizViewController">
+<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17"
+  xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.student.mathquiz.view.QuizViewController">

-    <!-- ★★★ 关键修改：把 ToggleGroup 的定义放在这里！★★★ -->
-    <!-- ★★★ 它不属于任何布局，只是一个在后台工作的逻辑对象 ★★★ -->
-    <fx:define>
-        <ToggleGroup fx:id="optionsGroup" />
-    </fx:define>
+  <!-- ★★★ 关键修改：把 ToggleGroup 的定义放在这里！★★★ -->
+  <!-- ★★★ 它不属于任何布局，只是一个在后台工作的逻辑对象 ★★★ -->
+  <fx:define>
+    <ToggleGroup fx:id="optionsGroup"/>
+  </fx:define>

-    <VBox alignment="TOP_CENTER" layoutX="50.0" layoutY="50.0" prefHeight="300.0" prefWidth="500.0" spacing="15.0">
-        <Label fx:id="questionNumberLabel" text="第 1/10 题">
-            <font><Font name="System Bold" size="18.0" /></font>
-        </Label>
-        <Label fx:id="questionTextLabel" alignment="CENTER" text="这里是题干：1 + 1 = ?" wrapText="true">
-            <font><Font size="20.0" /></font>
-            <VBox.margin><Insets bottom="10.0" /></VBox.margin>
-        </Label>
-        <VBox fx:id="optionsBox" alignment="CENTER_LEFT" prefWidth="100.0" spacing="10.0">
-            <padding><Insets left="150.0" /></padding>
+  <VBox alignment="TOP_CENTER" layoutX="50.0" layoutY="50.0" prefHeight="300.0" prefWidth="500.0"
+    spacing="15.0">
+    <Label fx:id="questionNumberLabel" text="第 1/10 题">
+      <font>
+        <Font name="System Bold" size="18.0"/>
+      </font>
+    </Label>
+    <Label fx:id="questionTextLabel" alignment="CENTER" text="这里是题干：1 + 1 = ?" wrapText="true">
+      <font>
+        <Font size="20.0"/>
+      </font>
+      <VBox.margin>
+        <Insets bottom="10.0"/>
+      </VBox.margin>
+    </Label>
+    <VBox fx:id="optionsBox" alignment="CENTER_LEFT" prefWidth="100.0" spacing="10.0">
+      <padding>
+        <Insets left="150.0"/>
+      </padding>

-            <!-- ★★★ RadioButton 像以前一样，通过 $optionsGroup 引用它 ★★★ -->
-            <RadioButton fx:id="option1" mnemonicParsing="false" text="选项 A" toggleGroup="$optionsGroup" />
-            <RadioButton fx:id="option2" mnemonicParsing="false" text="选项 B" toggleGroup="$optionsGroup" />
-            <RadioButton fx:id="option3" mnemonicParsing="false" text="选项 C" toggleGroup="$optionsGroup" />
-            <RadioButton fx:id="option4" mnemonicParsing="false" text="选项 D" toggleGroup="$optionsGroup" />
-        </VBox>
-        <Button fx:id="submitButton" mnemonicParsing="false" onAction="#handleSubmitAnswer" text="提交/下一题" />
-        <Label fx:id="feedbackLabel" textFill="RED">
-            <font><Font name="System Bold" size="14.0" /></font>
-        </Label>
+      <!-- ★★★ RadioButton 像以前一样，通过 $optionsGroup 引用它 ★★★ -->
+      <RadioButton fx:id="option1" mnemonicParsing="false" text="选项 A"
+        toggleGroup="$optionsGroup"/>
+      <RadioButton fx:id="option2" mnemonicParsing="false" text="选项 B"
+        toggleGroup="$optionsGroup"/>
+      <RadioButton fx:id="option3" mnemonicParsing="false" text="选项 C"
+        toggleGroup="$optionsGroup"/>
+      <RadioButton fx:id="option4" mnemonicParsing="false" text="选项 D"
+        toggleGroup="$optionsGroup"/>
    </VBox>
+    <Button fx:id="submitButton" mnemonicParsing="false" onAction="#handleSubmitAnswer"
+      text="提交/下一题"/>
+    <Label fx:id="feedbackLabel" textFill="RED">
+      <font>
+        <Font name="System Bold" size="14.0"/>
+      </font>
+    </Label>
+  </VBox>
 </AnchorPane>
--- a/src/main/resources/com/student/mathquiz/view/RegisterView.fxml
+++ b/src/main/resources/com/student/mathquiz/view/RegisterView.fxml
@ -8,28 +8,33 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="15.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.student.mathquiz.view.RegisterViewController">
-    <children>
-        <Label text="用户注册">
-            <font>
-                <Font size="24.0" />
-            </font>
-        </Label>
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="15.0"
+  xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1"
+  fx:controller="com.student.mathquiz.view.RegisterViewController">
+  <children>
+    <Label text="用户注册">
+      <font>
+        <Font size="24.0"/>
+      </font>
+    </Label>

-        <!-- ★★★ 新增的用户名字段 ★★★ -->
-        <TextField fx:id="usernameField" promptText="用户名" maxWidth="300"/>
+    <!-- ★★★ 新增的用户名字段 ★★★ -->
+    <TextField fx:id="usernameField" promptText="用户名" maxWidth="300"/>

-        <HBox alignment="CENTER" maxWidth="300" spacing="10">
-            <children>
-                <TextField fx:id="emailField" promptText="邮箱" HBox.hgrow="ALWAYS" />
-                <Button onAction="#handleSendCode" text="发送验证码" />
-            </children>
-        </HBox>
-        <TextField fx:id="codeField" promptText="验证码" maxWidth="300"/>
-        <PasswordField fx:id="passwordField1" promptText="设置密码 (6-10位,含大小写字母和数字)" maxWidth="300"/>
-        <PasswordField fx:id="passwordField2" promptText="确认密码" maxWidth="300"/>
-        <Button onAction="#handleRegister" text="注册" prefWidth="100" />
-        <Button onAction="#handleGoToLogin" style="-fx-background-color: transparent; -fx-border-color: transparent; -fx-underline: true; -fx-cursor: hand;" text="已有账户？去登录" />
-        <Label fx:id="statusLabel" textFill="RED" wrapText="true" />
-    </children>
+    <HBox alignment="CENTER" maxWidth="300" spacing="10">
+      <children>
+        <TextField fx:id="emailField" promptText="邮箱" HBox.hgrow="ALWAYS"/>
+        <Button onAction="#handleSendCode" text="发送验证码"/>
+      </children>
+    </HBox>
+    <TextField fx:id="codeField" promptText="验证码" maxWidth="300"/>
+    <PasswordField fx:id="passwordField1" promptText="设置密码 (6-10位,含大小写字母和数字)"
+      maxWidth="300"/>
+    <PasswordField fx:id="passwordField2" promptText="确认密码" maxWidth="300"/>
+    <Button onAction="#handleRegister" text="注册" prefWidth="100"/>
+    <Button onAction="#handleGoToLogin"
+      style="-fx-background-color: transparent; -fx-border-color: transparent; -fx-underline: true; -fx-cursor: hand;"
+      text="已有账户？去登录"/>
+    <Label fx:id="statusLabel" textFill="RED" wrapText="true"/>
+  </children>
 </VBox>
--- a/src/main/resources/com/student/mathquiz/view/RootLayout.fxml
+++ b/src/main/resources/com/student/mathquiz/view/RootLayout.fxml
@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?import javafx.scene.layout.BorderPane?>
-<BorderPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" />
+<BorderPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"/>
--- a/src/main/resources/com/student/mathquiz/view/ScoreView.fxml
+++ b/src/main/resources/com/student/mathquiz/view/ScoreView.fxml
@ -2,15 +2,21 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
-<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.student.mathquiz.view.ScoreViewController">
-    <VBox alignment="CENTER" layoutX="200.0" layoutY="100.0" prefHeight="200.0" prefWidth="200.0" spacing="20.0">
-        <Label text="测试完成!">
-            <font><Font name="System Bold" size="24.0" /></font>
-        </Label>
-        <Label fx:id="scoreLabel" text="你的分数是: 100">
-            <font><Font size="18.0" /></font>
-        </Label>
-        <Button onAction="#handleTryAgain" text="再做一组" />
-        <Button onAction="#handleExit" text="退出程序" />
-    </VBox>
+<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17"
+  xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.student.mathquiz.view.ScoreViewController">
+  <VBox alignment="CENTER" layoutX="200.0" layoutY="100.0" prefHeight="200.0" prefWidth="200.0"
+    spacing="20.0">
+    <Label text="测试完成!">
+      <font>
+        <Font name="System Bold" size="24.0"/>
+      </font>
+    </Label>
+    <Label fx:id="scoreLabel" text="你的分数是: 100">
+      <font>
+        <Font size="18.0"/>
+      </font>
+    </Label>
+    <Button onAction="#handleTryAgain" text="再做一组"/>
+    <Button onAction="#handleExit" text="退出程序"/>
+  </VBox>
 </AnchorPane>
--- a/src/persistence/FileSaver.java
+++ b/src/persistence/FileSaver.java
@ -10,20 +10,23 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;

 public class FileSaver {
-    public static void saveQuestions(String username, List<Question> questions) {
-        File dir = new File(username);
-        if (!dir.exists()) dir.mkdirs();

-        String filename = LocalDateTime.now().format(
-                DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) + ".txt";
+  public static void saveQuestions(String username, List<Question> questions) {
+    File dir = new File(username);
+    if (!dir.exists()) {
+      dir.mkdirs();
+    }
+
+    String filename = LocalDateTime.now().format(
+        DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) + ".txt";

-        try (FileWriter writer = new FileWriter(new File(dir, filename))) {
-            for (int i = 0; i < questions.size(); i++) {
-                writer.write((i + 1) + ". " + questions.get(i).getQuestion() + "\n\n");
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        System.out.println("题目已生成并保存！");
+    try (FileWriter writer = new FileWriter(new File(dir, filename))) {
+      for (int i = 0; i < questions.size(); i++) {
+        writer.write((i + 1) + ". " + questions.get(i).getQuestion() + "\n\n");
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
    }
+    System.out.println("题目已生成并保存！");
+  }
 }
--- a/src/persistence/QuestionChecker.java
+++ b/src/persistence/QuestionChecker.java
@ -5,39 +5,46 @@ import java.io.FileNotFoundException;
 import java.util.Scanner;

 public class QuestionChecker {
-    public static boolean isDuplicate(String username, String question) {
-        File dir = new File(username);
-        if (!dir.exists()) return false;
-
-        File[] files = dir.listFiles();/*每次调用都获取一次文件列表*/
-        if (files == null) return false;
-
-        // 待查题目去掉空格，方便精确匹配
-        String target = question.trim();
-
-        for (File file : files) {/* 遍历所有历史文件 */
-            if (file.isFile() && file.getName().endsWith(".txt")) {
-                try (Scanner scanner = new Scanner(file)) {
-                    while (scanner.hasNextLine()) {
-                        String line = scanner.nextLine().trim(); /*遍历文件中的每一行 */
-
-                        if (line.isEmpty()) continue;// 跳过空行
-
-                        // 去掉题号部分（如 "1. "）
-                        int dotIndex = line.indexOf('.');
-                        if (dotIndex != -1) {
-                            String storedQuestion = line.substring(dotIndex + 1).trim();
-                            // 精确匹配
-                            if (storedQuestion.equals(target)) {
-                                return true;
-                            }
-                        }
-                    }
-                } catch (FileNotFoundException e) {
-                    e.printStackTrace();
-                }
+
+  public static boolean isDuplicate(String username, String question) {
+    File dir = new File(username);
+    if (!dir.exists()) {
+      return false;
+    }
+
+    File[] files = dir.listFiles();/*每次调用都获取一次文件列表*/
+    if (files == null) {
+      return false;
+    }
+
+    // 待查题目去掉空格，方便精确匹配
+    String target = question.trim();
+
+    for (File file : files) {/* 遍历所有历史文件 */
+      if (file.isFile() && file.getName().endsWith(".txt")) {
+        try (Scanner scanner = new Scanner(file)) {
+          while (scanner.hasNextLine()) {
+            String line = scanner.nextLine().trim(); /*遍历文件中的每一行 */
+
+            if (line.isEmpty()) {
+              continue;// 跳过空行
+            }
+
+            // 去掉题号部分（如 "1. "）
+            int dotIndex = line.indexOf('.');
+            if (dotIndex != -1) {
+              String storedQuestion = line.substring(dotIndex + 1).trim();
+              // 精确匹配
+              if (storedQuestion.equals(target)) {
+                return true;
+              }
            }
+          }
+        } catch (FileNotFoundException e) {
+          e.printStackTrace();
        }
-        return false;
+      }
    }
+    return false;
+  }
 }
--- a/src/question/HighQuestionGenerator.java
+++ b/src/question/HighQuestionGenerator.java
@ -3,24 +3,25 @@ package question;
 import java.util.Random;

 public class HighQuestionGenerator implements QuestionGenerator {
-    private static final Random random = new Random();
-    private final QuestionGenerator primaryGenerator = new PrimaryQuestionGenerator();

-    @Override
-    public Question generateQuestion() {
-        Question q = primaryGenerator.generateQuestion();
-        String[] funcs = {"sin", "cos", "tan"};
-        String func = funcs[random.nextInt(funcs.length)];
-        return new Question(func + "(" + q.getQuestion() + ")", evaluate(func, q.getQuestion()));
-    }
+  private static final Random random = new Random();
+  private final QuestionGenerator primaryGenerator = new PrimaryQuestionGenerator();
+
+  @Override
+  public Question generateQuestion() {
+    Question q = primaryGenerator.generateQuestion();
+    String[] funcs = {"sin", "cos", "tan"};
+    String func = funcs[random.nextInt(funcs.length)];
+    return new Question(func + "(" + q.getQuestion() + ")", evaluate(func, q.getQuestion()));
+  }

-    private String evaluate(String func, String expr) {
-        try {
-            javax.script.ScriptEngineManager mgr = new javax.script.ScriptEngineManager();
-            javax.script.ScriptEngine engine = mgr.getEngineByName("JavaScript");
-            return String.valueOf(engine.eval("Math." + func + "(Math.toRadians(" + expr + "))"));
-        } catch (Exception e) {
-            return "?";
-        }
+  private String evaluate(String func, String expr) {
+    try {
+      javax.script.ScriptEngineManager mgr = new javax.script.ScriptEngineManager();
+      javax.script.ScriptEngine engine = mgr.getEngineByName("JavaScript");
+      return String.valueOf(engine.eval("Math." + func + "(Math.toRadians(" + expr + "))"));
+    } catch (Exception e) {
+      return "?";
    }
+  }
 }
--- a/src/question/MiddleQuestionGenerator.java
+++ b/src/question/MiddleQuestionGenerator.java
@ -3,26 +3,27 @@ package question;
 import java.util.Random;

 public class MiddleQuestionGenerator implements QuestionGenerator {
-    private static final Random random = new Random();
-    private final QuestionGenerator primaryGenerator = new PrimaryQuestionGenerator();

-    @Override
-    public Question generateQuestion() {
-        Question q = primaryGenerator.generateQuestion();
-        if (random.nextBoolean()) {
-            return new Question(q.getQuestion() + " ^ 2", evaluate(q.getQuestion() + "^2"));
-        } else {
-            return new Question("√" + q.getQuestion(), evaluate("Math.sqrt(" + q.getQuestion() + ")"));
-        }
+  private static final Random random = new Random();
+  private final QuestionGenerator primaryGenerator = new PrimaryQuestionGenerator();
+
+  @Override
+  public Question generateQuestion() {
+    Question q = primaryGenerator.generateQuestion();
+    if (random.nextBoolean()) {
+      return new Question(q.getQuestion() + " ^ 2", evaluate(q.getQuestion() + "^2"));
+    } else {
+      return new Question("√" + q.getQuestion(), evaluate("Math.sqrt(" + q.getQuestion() + ")"));
    }
+  }

-    private String evaluate(String expr) {
-        try {
-            javax.script.ScriptEngineManager mgr = new javax.script.ScriptEngineManager();
-            javax.script.ScriptEngine engine = mgr.getEngineByName("JavaScript");
-            return String.valueOf(engine.eval(expr.replace("^", "**")));
-        } catch (Exception e) {
-            return "?";
-        }
+  private String evaluate(String expr) {
+    try {
+      javax.script.ScriptEngineManager mgr = new javax.script.ScriptEngineManager();
+      javax.script.ScriptEngine engine = mgr.getEngineByName("JavaScript");
+      return String.valueOf(engine.eval(expr.replace("^", "**")));
+    } catch (Exception e) {
+      return "?";
    }
+  }
 }
--- a/src/question/PrimaryQuestionGenerator.java
+++ b/src/question/PrimaryQuestionGenerator.java
@ -3,63 +3,80 @@ package question;
 import java.util.Random;

 public class PrimaryQuestionGenerator implements QuestionGenerator {
-    private static final Random random = new Random();

-    @Override
-    public Question generateQuestion() {
-        int numOperands = random.nextInt(5) + 1;
-        StringBuilder sb = new StringBuilder();
-        int currentValue = random.nextInt(100) + 1;
-        sb.append(currentValue);
+  private static final Random random = new Random();

-        for (int i = 1; i < numOperands; i++) {
-            String[] ops = {"+", "-", "*", "/"};
-            String op;
-            int nextVal;
-            do {
-                op = ops[random.nextInt(ops.length)];
-                nextVal = random.nextInt(100) + 1;
-            } while ((op.equals("-") && currentValue < nextVal) ||
-                    (op.equals("/") && (nextVal == 0 || currentValue % nextVal != 0)));
+  @Override
+  public Question generateQuestion() {
+    int numOperands = random.nextInt(5) + 1;
+    StringBuilder sb = new StringBuilder();
+    int currentValue = random.nextInt(100) + 1;
+    sb.append(currentValue);

-            sb.append(" ").append(op).append(" ").append(nextVal);
-            switch (op) {
-                case "+": currentValue += nextVal; break;
-                case "-": currentValue -= nextVal; break;
-                case "*": currentValue *= nextVal; break;
-                case "/": currentValue /= nextVal; break;
-            }
-        }
+    for (int i = 1; i < numOperands; i++) {
+      String[] ops = {"+", "-", "*", "/"};
+      String op;
+      int nextVal;
+      do {
+        op = ops[random.nextInt(ops.length)];
+        nextVal = random.nextInt(100) + 1;
+      } while ((op.equals("-") && currentValue < nextVal) ||
+          (op.equals("/") && (nextVal == 0 || currentValue % nextVal != 0)));

-        String expr = addParentheses(sb.toString());
-        return new Question(expr, evaluate(expr));
+      sb.append(" ").append(op).append(" ").append(nextVal);
+      switch (op) {
+        case "+":
+          currentValue += nextVal;
+          break;
+        case "-":
+          currentValue -= nextVal;
+          break;
+        case "*":
+          currentValue *= nextVal;
+          break;
+        case "/":
+          currentValue /= nextVal;
+          break;
+      }
    }

-    private String addParentheses(String expr) {
-        String[] tokens = expr.split(" ");
-        if (tokens.length < 3) return expr;
+    String expr = addParentheses(sb.toString());
+    return new Question(expr, evaluate(expr));
+  }

-        int start = random.nextInt(tokens.length / 2) * 2;
-        int end = start + 2 + random.nextInt((tokens.length - start) / 2) * 2;
-        end = Math.min(end, tokens.length - 1);
+  private String addParentheses(String expr) {
+    String[] tokens = expr.split(" ");
+    if (tokens.length < 3) {
+      return expr;
+    }
+
+    int start = random.nextInt(tokens.length / 2) * 2;
+    int end = start + 2 + random.nextInt((tokens.length - start) / 2) * 2;
+    end = Math.min(end, tokens.length - 1);

-        StringBuilder newExpr = new StringBuilder();
-        for (int i = 0; i < tokens.length; i++) {
-            if (i == start) newExpr.append("(");
-            newExpr.append(tokens[i]);
-            if (i == end) newExpr.append(")");
-            if (i != tokens.length - 1) newExpr.append(" ");
-        }
-        return newExpr.toString();
+    StringBuilder newExpr = new StringBuilder();
+    for (int i = 0; i < tokens.length; i++) {
+      if (i == start) {
+        newExpr.append("(");
+      }
+      newExpr.append(tokens[i]);
+      if (i == end) {
+        newExpr.append(")");
+      }
+      if (i != tokens.length - 1) {
+        newExpr.append(" ");
+      }
    }
+    return newExpr.toString();
+  }

-    private String evaluate(String expr) {
-        try {
-            javax.script.ScriptEngineManager mgr = new javax.script.ScriptEngineManager();
-            javax.script.ScriptEngine engine = mgr.getEngineByName("JavaScript");
-            return String.valueOf(engine.eval(expr));
-        } catch (Exception e) {
-            return "?";
-        }
+  private String evaluate(String expr) {
+    try {
+      javax.script.ScriptEngineManager mgr = new javax.script.ScriptEngineManager();
+      javax.script.ScriptEngine engine = mgr.getEngineByName("JavaScript");
+      return String.valueOf(engine.eval(expr));
+    } catch (Exception e) {
+      return "?";
    }
+  }
 }
--- a/src/question/Question.java
+++ b/src/question/Question.java
@ -1,20 +1,21 @@
 package question;

 public class Question {
-    private String question;
-    private String answer;

-    public Question(String question, String answer) {
-        this.question = question;
-        this.answer = answer;
-    }
+  private String question;
+  private String answer;

-    public String getQuestion() {
-        return question;
-    }
+  public Question(String question, String answer) {
+    this.question = question;
+    this.answer = answer;
+  }

-    public String getAnswer() {
-        return answer;
-    }
+  public String getQuestion() {
+    return question;
+  }
+
+  public String getAnswer() {
+    return answer;
+  }

 }
--- a/src/question/QuestionGenerator.java
+++ b/src/question/QuestionGenerator.java
@ -1,5 +1,6 @@
 package question;

 public interface QuestionGenerator {
-    Question generateQuestion();
+
+  Question generateQuestion();
 }
Author	SHA1	Message	Date
LYQ	88e94d97e7	更新了md文件	4 months ago
LYQ	ab76ebf447	最终版本2.0	4 months ago
LYQ	c2819895b0	最终版本1.2	4 months ago